Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,873 Commits 12 Branches 45 Tags 104 MiB
4f469f3df1
Commit Graph

974 Commits

Author SHA1 Message Date
Silversthorn
8e58d5f8ac Trying Fixing issue #106 2022-07-16 10:49:48 +02:00
Silversthorn
ee2c2f8bb1 Better use of functions and objects 2022-07-16 10:06:49 +02:00
Silversthorn
9f30ca3931 Fix pylint no-self-use 2022-07-16 09:52:30 +02:00
Andrew
11260a34d6 Toggle Visible servers on status page 2022-07-14 18:26:42 -04:00
luukas
875767e16c
Merge branch 'dev' into feature/ajax-schedule-enabled 2022-07-13 15:48:09 +03:00
amcmanu3
a498ef8986 Check if username exists 2022-07-05 19:49:51 -04:00
amcmanu3
69f915616b Fix unhandled serverjars api error on server creation 2022-07-05 16:15:49 -04:00
luukas
147f178c87
Add a basic API for modifying schedules. 
THIS IS VERY UNTESTED AND WILL BE EXPANDED TO FULL CRUD FOR SCHEDULES
 2022-06-23 01:57:29 +03:00
amcmanu3
205bbf356f Fix traceback on server schedule creation page 2022-06-21 18:40:16 -04:00
amcmanu3
d8d80bbb42 Remove bad check for backup path 2022-06-21 17:41:52 -04:00
amcmanu3
b725054dcd Appease the linter 2022-06-21 17:36:50 -04:00
amcmanu3
97900cd283 Fix issue on path transversal backups linux 2022-06-21 17:35:34 -04:00
amcmanu3
fdfec80a39 Fix bug with sec logic 2022-06-21 17:14:35 -04:00
amcmanu3
950cbce27c Fix java logic issue 2022-06-21 17:00:51 -04:00
Zedifus
ffba1fb438 Merge branch 'dev' into enhancement/backup-failure-alert 2022-06-21 21:34:51 +01:00
amcmanu3
d3b1095867 Disable backups directory from changing bad paths 2022-06-21 16:14:29 -04:00
amcmanu3
6c360d1ff1 Make backup failed alert 2022-06-21 15:59:08 -04:00
Zedifus
28e313ee1d Revert back to 'Do not override' as default 2022-06-21 19:53:23 +01:00
Zedifus
7379545186 Strip empty entry in update-alternatives output 
Catch ValueError on missing end quote in java execution command
 2022-06-21 19:28:53 +01:00
Zedifus
176f5a4004 Add java selection POST check 
Protect against tampered post requests to front end

Co-authored-by: andrew.charles.mcmanus@gmail.com <andrew.charles.mcmanus@gmail.com>
 2022-06-21 18:39:20 +01:00
amcmanu3
c4fb6482cc Fix sec bug with server creation roles 
Retain current java version in dropdown.
 2022-06-21 01:18:19 -04:00
Zedifus
bad7a8d625 Merge branch 'dev' into feature/java-selection 2022-06-21 04:29:37 +01:00
Zedifus
69d1aa6c87 Appease linter 2022-06-21 03:31:40 +01:00
Zedifus
8e646df58c Add Java detect for win, and hook up to front end 2022-06-20 23:44:33 +01:00
amcmanu3
32b3551108 Add java selection code to panel handler 2022-06-20 17:56:26 -04:00
amcmanu3
7670b91cc6 Add backup shutdown feature 
Add backup notif for failed backup
 2022-06-20 17:16:56 -04:00
Andrew
7d286e60e0 Backup/Config.json rework for API key hardening 
See merge request crafty-controller/crafty-4!369
 2022-06-20 19:26:21 +00:00
Zedifus
b9a9007b4f Merge branch 'dev' into tweak/front-end 2022-06-18 23:12:24 +01:00
Andrew
9569e760c9 Fix api key permission logic issue 2022-06-18 17:40:50 -04:00
xithical
464428ea7e Remove erroneous print statements 2022-06-18 16:29:36 -05:00
xithical
8b6d70ba9a Fix bug where non-superusers could not edit their own API keys 2022-06-18 16:27:06 -05:00
Andrew
31097da971 Fix type issue comparing 2022-06-18 17:06:44 -04:00
Andrew
a8cd982b96 Fix warning message 2022-06-18 17:03:44 -04:00
Andrew
37765dbebc Fix general user can view any api-key page 2022-06-18 17:02:10 -04:00
Andrew
72f97e4ff0 Fix issue where any user could add/remove api keys 2022-06-18 16:55:39 -04:00
Andrew
fd0da1ef20 Fix any user can recieve all api keys 2022-06-18 16:20:57 -04:00
Andrew
e9bf2af83b Add wiki iframe as requested. 2022-06-18 15:57:37 -04:00
Andrew
e435292a52 Fix blank server_detail page for general users 2022-06-17 00:58:18 -04:00
Iain Powrie
43906d531e Merge branch 'bug/support_logs' into 'dev' 
Bug/support logs

See merge request crafty-controller/crafty-4!354
 2022-06-16 16:56:56 +00:00
amcmanu3
e3d289e6fd Fix support logs download issues 2022-06-16 12:11:21 -04:00
amcmanu3
35518e960f Fix username capital issues once and for all 2022-06-16 09:52:21 -04:00
luukas
581b6734d3
Remove unused server_uuid variables to fix Pylint 2022-06-16 15:31:11 +03:00
luukas
e009ff9819
Use relative paths for the jarfile and logs 2022-06-16 02:10:26 +03:00
amcmanu3
17ef71046c Merge branch 'master' into dev 2022-06-14 15:49:32 -04:00
amcmanu3
50438c485b Fix support log delete order. 
Fix username uppercase.
 2022-06-14 15:42:13 -04:00
luukas
e73dd682c8
Fix no-else-* QA warnings 2022-06-14 15:40:57 +03:00
Zedifus
f1340f4f45 Appease black 2022-06-13 22:35:33 +01:00
Iain Powrie
75d3baccbd Remove deprecated pylint rules 
https://github.com/PyCQA/pylint/pull/3571
https://github.com/PyCQA/pylint/pull/3577
 2022-06-13 21:30:24 +00:00
amcmanu3
b3f167ab62 Add fallback for tz not being found 2022-06-13 14:29:25 -04:00
Andrew
25a1c67c26 Fix black formatting 2022-06-12 17:17:58 -04:00
Andrew
474597d16c Add survery to admin first log 2022-06-12 17:03:42 -04:00
Silversthorn
a9cdd33c77 Fixing Pylint Errors 2022-06-12 18:30:39 +02:00
Silversthorn
007218111f Should work now :) 2022-06-12 17:13:39 +02:00
amcmanu3
ddcd3dc5c3 Appease the linter 2022-06-11 17:46:36 -04:00
amcmanu3
e99cacfc53 Make call to controller and not stale object 2022-06-11 17:34:31 -04:00
luukas
f343db1a30
Fix inconsistency on the jsonschema API endpoint 2022-06-10 00:10:54 +03:00
Silversthorn
51b1097a96 Fixing Stack when redirected from Unauthorized page 2022-06-08 21:42:25 +02:00
Andrew
0df30d2f05 Fix typo in error message 2022-06-04 14:24:12 -04:00
amcmanu3
aa44650a05 Fix windows file pathing 2022-06-03 15:53:29 -04:00
Andrew
5e48b250fa Fix api v1 bug with list servers 2022-06-02 09:40:43 -04:00
Andrew
8ff2d8437d Fix permissions on server clone 2022-06-02 08:51:12 -04:00
Andrew
6b85620fec Fix schedule tasks not being killed on restore 2022-06-02 08:23:42 -04:00
Andrew
b793016c03 Redefine how servers are served to panel_handler 2022-06-02 07:34:17 -04:00
Andrew
273e2f465d Only show authorized servers on role creation 2022-06-01 19:26:57 -04:00
Andrew
ec730a1694 Merge branch 'bug/pretzel-support-log-temp-cleanup' into 'dev' 
Cleanup temp dirs on support log creation

See merge request crafty-controller/crafty-4!286
 2022-06-01 22:33:52 +00:00
Andrew
8e0ccd4f94 Fix indexing for updates made on branch 2022-06-01 18:25:27 -04:00
Andrew
5d3badef2c Cleanup temp dirs on support log creation 2022-06-01 17:54:58 -04:00
Silversthorn
9e4c8e99b1 Merge branch 'dev' into dev-StatsDBImprovement 2022-06-01 23:52:49 +02:00
luukas
45a1b835fb
Fix server error checking in API stdin endpoint 2022-06-01 14:17:33 +03:00
luukas
e0b0e52bd5
Add stdin route for the API 2022-05-31 00:11:17 +03:00
Silversthorn
f597a26e5b Trying to fix stuff 2022-05-30 22:05:36 +02:00
Silversthorn
b0ea943992 Fixing lasts pylint warning 2022-05-30 19:32:11 +02:00
Silversthorn
8f5c688b72 Fixing Pylint issues 2022-05-30 19:28:39 +02:00
Silversthorn
37bda32164 Fixing moved functions calls 2022-05-30 07:36:25 +02:00
Silversthorn
3b4253de9b Fixing get_authorized_server 2022-05-26 23:19:59 +02:00
Silversthorn
99b28efd33 Merge branch 'dev' into dev-StatsDBImprovement 2022-05-26 15:39:52 +02:00
Silversthorn
8423cc24c1 I'm breaking/fixing stuff 2022-05-26 14:50:20 +02:00
luukas
47fc398f26
Fix CORS preflight 2022-05-26 00:31:58 +03:00
luukas
8ce7a96071
Use a better ANSI escape regex in the API logs 2022-05-25 18:41:41 +03:00
luukas
2e51fa9629
Remove newline characters from API file logs 2022-05-25 18:41:16 +03:00
luukas
4b707aa9d1
Don't use get_latest_server_stats 
Use get_server_stats_by_id instead of get_latest_server_stats

The reasoning behind this is that all usages of get_latest_server_stats
had `DatabaseShortcuts.return_rows(latest)[0]`, which
get_server_stats_by_id already did
 2022-05-25 14:43:05 +03:00
luukas
166272e12c
Replace .count() != 0 with .exists() 2022-05-25 14:24:34 +03:00
luukas
2ac9118152 Merge remote's bugfix/api-v2-bugfixes to local 2022-05-25 00:58:32 +03:00
luukas
cbc73b7e92
Fix routing for the user permissions handler 2022-05-25 00:58:10 +03:00
luukas
57ef5e27dd
Add route for viewing user Crafty permissions 
The route includes the permission mask, counters and limits
 2022-05-25 00:55:49 +03:00
luukas
6dadce2c9a
Enable changing more of yourself with superuser 
Enable modifying your own superuser status, permissions and roles if you
have superuser status
 2022-05-25 00:43:49 +03:00
luukas
b0d342e949
Check if something is in a dict with a simpler way 
* Replace `data.get("key", None) is not None` with `"key" in data`
 2022-05-25 00:39:16 +03:00
luukas
2aa2d14f5e
Improve the invalidate tokens API handler 
* Remove the TODO
* Replace the Console.info with logger.debug
 2022-05-25 00:35:11 +03:00
luukas
9a9d101015
Add pasword hashing to API user modification 2022-05-25 00:32:31 +03:00
luukas
54ff888002
Fix user modification via the API 2022-05-25 00:29:31 +03:00
Zedifus
d0596af4c9 Add exemption orjson no-member falsepositive 2022-05-23 22:54:06 +01:00
luukas
4c981f50c2
Add more permission validation in user creation 2022-05-23 22:45:27 +03:00
luukas
0d62223982 Merge branch 'dev' into bugfix/api-v2-bugfixes 2022-05-23 20:20:49 +03:00
luukas
d97bcc608f
Fix info message in tornado server starter 
Yes I know it's a 1 character replace
 2022-05-21 00:00:21 +03:00
luukas
02f5318f76
Merge branch 'dev' into merge/pretzel-lukas-cleanup-nosquash 2022-05-20 22:04:41 +03:00
luukas
9ddcd13f2f
Fix W0611 & R1734 lint issues 2022-05-20 14:06:46 +03:00
luukas
73175d0f82 Remove the root example from the new server schema 
* It messed up https://json-schema-faker.js.org
* It wasn't updated for agree_to_eula
 2022-05-19 16:32:18 +03:00
luukas
bd4a35b418 Make role add and edit use API v2 internal APIs 2022-05-19 16:13:25 +03:00
luukas
f763fa9d0c Fix API v2 server modification 2022-05-19 16:01:03 +03:00
amcmanu3
67e20302c9 Add get_perms_server back 2022-05-18 19:19:58 -04:00
Andrew
b7780682d5 Merge branch 'dev' into 'merge/api-v2' 
# Conflicts:
#   app/classes/controllers/crafty_perms_controller.py
 2022-05-18 21:56:39 +00:00
luukas
6407900609 Merge branch 'dev' into experimental/lukas-cleanup 2022-05-19 00:52:59 +03:00
luukas
0ecc0a62ca Fix a comment regarding the Logs permission 2022-05-19 00:04:14 +03:00
amcmanu3
bc6309c91b Appease the linter 2022-05-18 16:56:54 -04:00
Andrew
ca73a5f60b Merge branch 'dev' into 'experimental/feature/permission-matrix' 
# Conflicts:
#   app/classes/web/panel_handler.py
 2022-05-18 20:47:43 +00:00
luukas
2b34e2c824 Remove role_id from role modify response 2022-05-18 23:41:28 +03:00
luukas
d64756a30c Make modify role not fetch the role again 2022-05-18 23:13:22 +03:00
luukas
ae7984c784 Change modify role's server id type to integer 2022-05-18 23:11:40 +03:00
luukas
4c397ff454 Only allow number IDs to the user handlers 2022-05-18 22:54:44 +03:00
luukas
2bc26ef3fd Check invalid IDs on roles 
* Only allow number IDs to the role handlers
* Catch DoesNotExist errors
 2022-05-18 22:34:33 +03:00
luukas
8b0da5da4c Remove unnecessary prints or use logger.debug 2022-05-18 22:06:33 +03:00
amcmanu3
a833a29fb7 Allow super users to add roles/users 2022-05-18 14:35:51 -04:00
amcmanu3
12390306fd Add permissions checks for quantity for users/role 
Remove the ability to add quantities for general users.
 2022-05-18 14:33:22 -04:00
amcmanu3
e3248e8657 Change cron validation to allow day abbreviations 2022-05-18 13:53:55 -04:00
luukas
4c64497a2f Add a JSON schema route 2022-05-18 15:58:54 +03:00
luukas
5bff6c12b4 Fix cq degradation: R1721 2022-05-18 13:05:58 +03:00
luukas
559a345f25 Merge branch 'dev' into merge/api-v2 2022-05-18 01:49:19 +03:00
luukas
14665042c6 Add and improve audit logging in the API 2022-05-18 01:34:31 +03:00
luukas
f9e5b9bc5f Fix the duplicated add_server_creation in the API 2022-05-18 01:23:32 +03:00
luukas
8737c15fcf Add a permission matrix to the role add and edit 2022-05-18 01:09:58 +03:00
luukas
42af86b6f7 Merge branch 'dev' into experimental/lukas-cleanup 2022-05-17 21:21:47 +03:00
luukas
5dfd1aae12 Make more places use the check_server_id function. 2022-05-17 20:52:32 +03:00
luukas
0115421243 Make queries narrower 2022-05-16 01:02:17 +03:00
luukas
27d310e2de Declutter set()s 2022-05-16 00:55:22 +03:00
Andrew
984f4cc4d6 Change Files Aesthetic 2022-05-15 12:38:48 -05:00
Andrew
30618c7456 Term spacing between player name and message 2022-05-14 20:53:18 -05:00
luukas
930c6936d9 Add more advanced role APIs 2022-05-10 02:08:49 +03:00
Andrew
184e50a825 Fix bug where excluded dir not persistant 2022-05-09 13:34:45 -04:00
luukas
bf59e2de6c Add and fix API v2 and db 
* Add basic role routes
* Add API v2 404 handler
* Add API v2 home handler pointing to the wiki
* Add tons more todos
* Add get_*_columns and get_*_column functions for many db models
* Modify and add tons of model and controller functions
 2022-05-08 00:07:55 +03:00
luukas
721c9cfe12 Add the server creation endpoint 2022-05-05 14:02:23 +03:00
luukas
53459d83dc Merge branch 'feature/api-v2' into merge/api-v2 2022-05-05 03:32:09 +03:00
Andrew
3c666e5702 Fix stack thrown on page refresh after clean db 2022-04-17 13:33:45 -04:00
Andrew
9fcd510be2 Make unzip_server snake case 2022-04-14 19:45:13 -04:00
Andrew
b380f09b06 Rename get_lang_page 2022-04-14 19:34:21 -04:00
luukas
20d32c04ce Fix login and token stuff 2022-04-14 18:48:46 +03:00
luukas
1aa0d65cf7 Merge branch feature/external-frontend to feature/api-v2 without the frontend 2022-04-14 15:33:53 +03:00
Zedifus
20141f3cba Fix typo at EOF 
'0' is my Discord P-T-T Toggle 😅
 2022-04-14 03:19:56 +01:00
Zedifus
92c8fc04f3 Refactor to standardize class/variable naming ✨ 2022-04-14 03:10:25 +01:00
Zedifus
0461c0c420 Cleanup unused import 2022-04-13 20:24:42 +01:00
Andrew
3711c94ffe Beef up security on API 2022-04-12 21:52:40 -04:00
Andrew
92579280a2 Appease the linter 2022-04-12 19:38:18 -04:00
Andrew
bb2c1de418 Fix bug where general user could not create sch 2022-04-12 18:49:50 -04:00
Andrew
add784df42 Fix stack when username is wrong. 2022-04-12 18:33:00 -04:00
Andrew
47025bec2a Make helper not static when unzipping. 2022-04-12 17:38:05 -04:00
Andrew
12b0f8326d Fix bug where no backup dir would exist on clone 2022-04-12 17:17:12 -04:00
computergeek125
d417950eae fix fstrings, refactored console to static 2022-04-11 20:34:46 -05:00
Zedifus
19f2429a4c Fix formatting to comply with ⬛Black 2022-04-11 11:08:36 +01:00
computergeek125
42ca4bb973 Refactored the yes to not pass objects in import 
Merge Conflicts ᴙ Us
 2022-04-11 00:23:55 -05:00
computergeek125
f42a697837 Merge branch 'dev' into macgeek.db 2022-04-10 18:10:22 -05:00
amcmanu3
3b50130f40 Fix bug - non-super users could not create servers 2022-04-10 19:01:53 -04:00
computergeek125
119c34535c Removed fn, reduced queries in login flow 2022-04-10 17:46:07 -05:00
amcmanu3
63c199a835 Fix bug where any user could see all stats 2022-04-10 17:30:48 -04:00
Andrew
b1ed9ba2bd Add API routes from 3.x 
Enhance security for permissions on API requests
Fix bug where server permissions and crafty permissions were flipped upon making a new token
Fix bug where new secret key would be created every time Crafty was started.
Fix bug where DB locks will occur with concurrent writes to the DB.
 2022-04-10 19:39:31 +00:00
amcmanu3
c7394ab77e Add ability for users to disable hints 2022-04-02 21:25:26 -04:00
amcmanu3
ade6c9f1b8 Make stream size calc more readable 2022-04-02 16:07:31 -04:00
amcmanu3
657d3e92f2 Add max stream size to config.json 
Add ability to translate error message
 2022-04-02 13:50:40 -04:00
amcmanu3
dc69a8a9f2 Add better feedback on upload max size failure 2022-04-02 13:06:20 -04:00
Andrew
f00830aeb5 Merge branch 'bug/general-user-gravatar' into 'dev' 
Bug/general user gravatar

See merge request crafty-controller/crafty-commander!232
 2022-04-02 01:11:01 +00:00
Andrew
8e704b61ca Fix naming on super user variables 2022-04-01 18:09:55 -04:00
Andrew
1242b318c8 Fix bug - general user could not add gravatar 2022-04-01 18:04:42 -04:00
Andrew
f78d59fd34 Server jars/gravatar would stack with no internet 2022-03-27 18:09:49 -04:00
Zedifus
2a512d7273 Fix files to conform with new ⚫Black pylintrc 
Mostly just breaking up strings and comments into new lines
Some strings dont require 'f' but keeping in for readability
with the rest of the concatinated string
 2022-03-23 06:06:13 +00:00
Zedifus
e06fe8a52a ⬛Black codebase 
Apply black formatting to codebase
 2022-03-23 02:50:12 +00:00
Andrew
ecc87a6137 Add context menu for iOS + Bug fix 2022-03-22 14:24:15 +00:00
Andrew
5682455bcc Appease the linter 2022-03-20 12:39:57 -04:00
Andrew
d311ccbfa1 Remove print statement everytime a page loads 2022-03-20 07:05:11 -04:00
Andrew
2efcacceb5 Fix server not being cleaned up when killed. 2022-03-18 21:50:09 -04:00
Iain Powrie
f280da8c52 Better dashboard re-ordering 2022-03-19 01:48:24 +00:00
Andrew
6659466427 Merge branch 'bug/cannot-create-server' into 'dev' 
Fix error where user could not create server

See merge request crafty-controller/crafty-commander!211
 2022-03-14 23:11:01 +00:00
amcmanu3
0f27b2df91 Fix error where user could not create server 
Fix error where user could not create support files
 2022-03-14 17:39:19 -04:00
Silversthorn
c00915e347 Remove unused line 2022-03-14 21:37:40 +00:00
Silversthorn
79f918b877 Adding back and Commenting Old lines 2022-03-14 22:27:19 +01:00
Silversthorn
5900033134 Fixing Cookies deletion 
Adding redirection at Login
 2022-03-14 22:26:09 +01:00
Andrew
b5dac31ad5 Fix bug where you cannot create user without stack 2022-03-13 22:31:48 -04:00
Andrew
d4a1efba78 Appease the linter 2022-03-13 09:26:38 -04:00
Andrew
3a8174cc22 Add status bar for support log archive 2022-03-13 08:29:26 -04:00
Andrew
8858780d41 Move backups to ajax request 2022-03-11 00:18:22 -05:00
Iain Powrie
4cc617fd0d Merge branch 'tweak/fix-imports' into 'dev' 
Tidy imports & dep auto-installer

See merge request crafty-controller/crafty-commander!199
 2022-03-08 04:50:21 +00:00
Zedifus
b306d1f313 Tidy imports & dep auto-installer 2022-03-08 04:40:44 +00:00
Andrew
b9f6aad33d Merge branch 'enhancement/security-machine' into 'dev' 
Attempt to appease Iain and the security machine

See merge request crafty-controller/crafty-commander!198
 2022-03-08 03:21:50 +00:00
amcmanu3
7629f9a3ff Attempt to appease Iain and the security machine 2022-03-07 22:12:56 -05:00
Andrew
eda9f44b5f Merge branch 'bug/backups-restore/download' into 'dev' 
Bug/backups restore/download

See merge request crafty-controller/crafty-commander!197
 2022-03-08 02:56:52 +00:00
amcmanu3
9520858c22 Fix backup restore 2022-03-07 21:36:23 -05:00
Andrew
344348fafc Merge branch 'sync-symbol' into 'dev' 
Add sync symbol to status page

See merge request crafty-controller/crafty-commander!196
 2022-03-08 01:08:28 +00:00
amcmanu3
f2cc0e89fb Add sync symbol to status page 2022-03-07 19:57:52 -05:00
Silversthorn
506129729e Update Translation 
- Adding Translation for Credits Page
 - Adding detection support for webpage
 2022-03-05 12:01:36 +01:00
Andrew
d36a06667e Merge branch 'bug/files-cursor' into 'dev' 
Fix cursor showing as text highlight not hand

See merge request crafty-controller/crafty-commander!186
 2022-03-04 23:53:36 +00:00
Iain Powrie
7f8960aed3 Merge branch 'staff/credits-update-leo' into 'dev' 
Staff/credits update leo

See merge request crafty-controller/crafty-commander!184
 2022-03-04 23:53:14 +00:00
Zedifus
a3656536b5 Remove '*' Prefix from joke languages 
Co-authored-by: Andrew McManus <amcmanus@arcadiatech.org>
 2022-03-04 23:38:36 +00:00
Andrew
55852de3d9 Fix cursor showing as text highlight not hand 2022-03-04 17:58:18 -05:00
Andrew
0775e28e56 Fix error thrown when no icon is available 2022-03-04 17:30:17 -05:00
Andrew
a76833b409 Optimize looping for server list nav 2022-03-04 12:42:12 -05:00
amcmanu3
db06eca12e ensure icon key exists to prevent stack 2022-03-03 23:59:17 -05:00
amcmanu3
0a08324963 Fix server reordering 2022-03-03 22:25:30 -05:00
amcmanu3
bbd4335d79 Merge branch 'dev' of gitlab.com:crafty-controller/crafty-commander into dev 2022-03-03 22:22:08 -05:00
amcmanu3
4a32744211 Fix indent causing server ordering to not work 2022-03-03 22:22:05 -05:00
amcmanu3
d5c623b928 Merge branch 'dev' into dev-RefreshStats_Threading 2022-03-03 19:57:06 -05:00
amcmanu3
dfa9ab40ca Appease the linter 2022-03-03 19:47:49 -05:00
amcmanu3
ab7889914f Bug fixes to ensure player stats display correctly 
Add sync indicator to dashboard
 2022-03-03 19:41:30 -05:00
Andrew
d73316119b Add server download status indicator 2022-03-04 00:36:36 +00:00
Silversthorn
cb1679806e Seperate refresh statistics for each server 
Fixing Broken Things
 2022-03-03 23:13:40 +01:00
Silversthorn
d016e0a59a Broke Things 2022-03-03 22:01:12 +01:00
Andrew
61ac97c02e Add unexecuted clear. Add option to compress backups 2022-03-02 12:55:49 -05:00
Andrew
e0b8fb35fe Add option to compress backups 2022-03-02 11:34:26 -05:00
Andrew
15610210b9 Fix bug in schedule creation where if interval was days an execption would be thrown for a missing key 2022-03-02 10:49:03 -05:00
Andrew
8e874ca997 Add option to disable language files through config.json 2022-03-02 10:30:40 -05:00
Andrew
19f8775b32 Fix traceback when importing regular server 2022-03-01 18:49:16 -05:00
Andrew
e1340d61ff Appease the linter 2022-03-01 17:10:04 -05:00
Andrew
5d6ada23a4 Fix visual file loading order. Fix zip imports where directories were not being copied 2022-03-01 16:54:06 -05:00
Andrew
11bf44b35e Add user feedback for wrong unzip path 2022-03-01 13:27:41 -05:00
xithical
c4f706d415 Rework of files handling and added exclusions selection for backups. 2022-03-01 01:02:30 +00:00
xithical
26014d0e86 Revert "Merge branch 'xithical-fixes' into 'dev'" 
This reverts merge request !173
 2022-02-28 04:40:33 +00:00
xithical
5758d64e96 Merge branch 'dev' into 'xithical-fixes' 
# Conflicts:
#   app/classes/web/ajax_handler.py
#   app/frontend/templates/panel/server_backup.html
 2022-02-28 03:04:23 +00:00
Andrew
3621672e81 appease the linter 2022-02-27 22:03:19 -05:00
Andrew
70ba8cceec Add fully working backups 2022-02-27 21:49:26 -05:00
Andrew
2bf2902754 Working backup exclusions 2022-02-27 21:40:05 -05:00
Andrew
008b7f4ade Run file tree serving thorugh ajax handler alone 2022-02-27 19:29:30 -05:00
Andrew
e7d78cadd4 Initial frontend for backup omissions 2022-02-27 16:15:40 -05:00
luukas
154b99792f Fix code quality :) 2022-02-27 19:45:32 +02:00
luukas
92c2af926a Reduced the amount of injection in JavaScript. 
* Moved file endpoints to file_handler.py
* Added a global `serverId` for some pages
* Fixed fi_FI translations
* Some other stuff I don't remember
 2022-02-27 19:26:54 +02:00
Andrew
5fa04d5ccc Refactor tasks.html to schedules.html to match naming scheme 2022-02-26 20:23:20 -05:00
Andrew
09335fc3d9 Add ability to reorder servers based on user 2022-02-26 18:00:54 -05:00
Andrew
18e2ac8328 Change zip import execution string to the correct one 
Fix front end for bedrock imports
Add server type to details
 2022-02-26 12:29:07 -05:00
Andrew
96d52376f3 Fix bug where new schedules could not be created 2022-02-25 20:50:07 -05:00
Andrew
58c9321c8f fix bug where schedules would not be able to be created. 2022-02-25 20:43:33 -05:00
Andrew
45ae49e84e Add features to child tasks 2022-02-25 19:53:38 -05:00
Andrew
31cb2793fd Fix a couple bugs with chain reactions 2022-02-24 00:19:54 -05:00
Andrew
af16834419 Working chain reactions 2022-02-23 22:59:16 -05:00
Andrew
540584990e Inital bedrock support 2022-02-10 18:20:36 -05:00
Andrew
5adc48c524 Merge branch 'pretzel-bedrock' into 'pretzel-fixes' 
# Conflicts:
#   app/frontend/templates/server/bedrock_wizard.html
#   app/frontend/templates/server/wizard.html
 2022-02-10 20:57:31 +00:00
Andrew
b025899aee Inital bedrock support 2022-02-10 15:54:00 -05:00
Andrew
260c3b0059 Merge branch 'dev' of https://gitlab.com/crafty-controller/crafty-commander into dev 2022-02-10 15:27:51 -05:00
Andrew
c89609ae61 Inital bedrock support 2022-02-10 15:27:40 -05:00
Zedifus
1596c720cb Add ability to load credits from remote 2022-02-10 06:13:52 +00:00
Andrew
3995560ba2 Enable/disable crash detection on setting change in config 2022-01-30 21:04:08 -05:00
Andrew
ac19c86089 Appease the linter 2022-01-30 15:34:09 -05:00
Andrew
37ccc447c4 Fix backup config bug 2022-01-29 16:37:00 -05:00
Andrew
8000acd74d Fix bug where server_obj method was not defined 2022-01-28 19:12:57 -05:00
Andrew
d1db65dc9c Fix typo when messages from players are written 2022-01-28 19:00:14 -05:00
Andrew
005ac1216e Add crash detection 2022-01-27 20:43:23 -05:00
Andrew
32852c00b9 Fix bug with motd crashing stats 2022-01-25 21:40:34 -05:00
Andrew
9b03163c6b Add try catch around troublesome logging statement 2022-01-25 21:11:06 -05:00
Iain Powrie
e0ce1d118c Create pylintrc, code review pipeline & correct codebase errors 
Fix uploads,
Only send server stats to user page when they have access to servers
 2022-01-26 01:45:30 +00:00
Andrew
33984c9629 Fix for perms error thrown when posting api key from regular user 2022-01-20 14:14:03 -05:00
Andrew
2f3110b107 fix server deleting function due to type error after JWT merge. 2022-01-19 18:28:08 -05:00
Andrew
7f45b0544a new windows fix for space escaping 2022-01-19 17:08:29 -05:00
Andrew
4fe174d6d2 additonal fix to windows path bug 2022-01-19 16:47:51 -05:00
Andrew
dff7c4890b push changes to fix loading server pages as regular user. Creating new api keys as a regular user does not work - get a white traceback. 2022-01-19 16:22:22 -05:00
Andrew
6f860e967c final changes for windows path issues 2022-01-19 15:14:56 -05:00
Andrew
cebb25b5e9 add try execpt around task scheduling. Fix edit task bug. Fix permission issue after JWT merge 2022-01-19 13:07:26 -05:00
Andrew
f37e1e04a4 Fix gravatar not loading after being removed from cookie. Improve gravatar loading so it changes without relogging 2022-01-18 16:44:36 -05:00
Andrew
2d169e8f97 Add terminal catches for server stop command and restart command in crafty's terminal 2022-01-18 15:42:26 -05:00
Lukas ‎‎‎‎
09bd01a634 Merge branch 'dev' into 'lukas-jwts' 
# Conflicts:
#   app/classes/web/panel_handler.py
#   app/frontend/templates/notify.html
#   app/translations/en_EN.json
#   requirements.txt
 2022-01-16 10:54:55 +00:00
luukas
351c386c17 Fix a websocket handler bug 2022-01-15 17:38:29 +02:00
luukas
a20f7c4acf Fix translation stuff 
* Make fallback stuff work
* Use helper.get_setting('language') instead of hardcoded 'en_US'
* Fix status and public pages lang variables
* Fix and add some translations for fi_FI
 2022-01-15 17:38:08 +02:00
Andrew
fefa6248b4 Remove time from cron dbs 2022-01-15 02:01:51 -05:00
Andrew
0d3fc43931 Remove schedules from DB when deleting a server. 
Add better messaging for support log prep.
Add english translation for notify.
Chnage dep to 4.0 for tzlocal
 2022-01-14 23:53:44 -05:00
Andrew
43a315874e Fix player data bug 2022-01-14 20:05:50 -05:00
luukas
93857f90db JWT login and multi API keys! 2022-01-15 02:23:50 +02:00
Andrew
2689a579a7 fix bug where transveral would be true every delete file due to typo 2022-01-14 16:06:02 -05:00
Andrew
8723a44402 better cron validation 2022-01-14 12:59:33 -05:00
Andrew
210b831a47 remove schedule import from servers 2022-01-14 12:57:23 -05:00
Andrew
8424fc3149 Put support logs into a thread. 2022-01-13 20:42:53 -05:00
Andrew
4a78f3c4bd update support logs to only download server logs for user permissions. Fix bug where updating user roles would update for all user roles with changes. 2022-01-13 16:44:57 -05:00
Andrew
3a3ee52f5c add logging for file downloads 2022-01-13 00:56:32 -05:00
Andrew
9f798ff291 Add popover for tasks mobile 
Add support logs download feature
 2022-01-12 21:12:28 -05:00
Andrew
e310d0e48b changing interval start times to midnight. not when the schedule was created. I think this will be more what people are expecting. 2022-01-12 11:33:08 -05:00
Andrew
e63966e7e6 fixing enabled bug in tasks for editing tasks 2022-01-11 19:20:26 -05:00
Andrew
b6a10d828e fix enable bug in tasks 2022-01-11 19:17:20 -05:00
Andrew
47b48c3ee4 Fix translations in schedules 2022-01-11 18:51:07 -05:00
Andrew
b9cf5fdbf9 Fix so bad cron characters will not destroy DB. 2022-01-11 17:41:46 -05:00
Andrew
51fcb2adc3 Add working schedules. 
Add ability to edit schedules.
Add new pages for task creation/edit.
 2022-01-11 17:24:05 -05:00
Andrew
5e7d0d64bd Cron tasks working. 
Starting to rearrange front end for better UX
 2022-01-11 12:17:57 -05:00
Andrew
c220c6d3d3 Remove schedule logic from backups. 2022-01-11 01:45:54 -05:00
Andrew
4f55ffed0f Add single execution to scheduled tasks. 2022-01-11 01:29:27 -05:00
Andrew
14ae7c9a46 Add working schedules. 
Do not use advanced cron scheduling yet.
Ability to add/delete scheduled jobs.
 2022-01-11 00:26:33 -05:00
Andrew
139b506554 Inital APScheduler code for integration with our SQLite DB in progress. Adding commands works with start/stop/restart 2022-01-10 20:11:52 -05:00
Andrew
73c6c1b871 Fix port reminder 
Add Server time zone to details
 2022-01-10 14:58:38 -05:00
Andrew
39ccb83008 Fix bug where backkups could not be restore. Directly caused by the changes made in server zip import 2022-01-10 00:10:03 -05:00
Andrew
70cc90549d Minor fixes to user deletion. 
Allow users with user permissions to delete users...wow. How many times can I say user?
 2022-01-09 23:34:11 -05:00
Andrew
db6a886e0f Fix minor bugs in super user activation. Add 'are you sure' to delete user 2022-01-09 23:16:11 -05:00
Andrew
4d636cce1b add working zip import selection functionality 2022-01-09 22:49:03 -05:00
Andrew
b815cf38a8 Zip import semi broken. 
Need to figure out why temp dir is not being passed correctly
Need to make sure tempdir gets deleted.
 2022-01-09 22:21:28 -05:00
Andrew
369ac7ad15 initial changes for zip imports selection 2022-01-09 18:04:54 -05:00
Andrew
3e90210f3b Remove port checker for a port reminder on first run 
Add DB column to track a server's first run
Send port reminder for crafty on fresh install.
Remove http server message from startup/logs - don't want to promote that it's running.
 2022-01-09 13:14:59 -05:00
Andrew
7dd24b6b15 Improved File Loading, Fixed Port checking 2022-01-08 23:03:45 +00:00
Andrew
3e2d2c89ee hotfix for failed scandir 2021-12-21 16:11:48 -05:00
Andrew
8a2f938dc9 Fix user error when trying to edit own language 
Fix bug where users could not be created because of a bad logical check for system uesr.
 2021-12-21 15:39:33 -05:00
Andrew
71d3e03875 Add final fix for system user 2021-12-20 23:04:07 -05:00
Quentin B
f018267b62 Made server polls asynchronus, fix for serverjars 2021-12-16 21:07:36 -05:00
Andrew
ebe65e081f Minor change to aestetic for tasks 2021-11-30 15:50:40 -05:00
Andrew
0845efc3b8 Add initial frontend to schedules 2021-11-30 15:46:30 -05:00
Andrew
33ab2583da Fix security issues 2021-11-30 14:37:45 -05:00
Andrew
b996f7e7e7 One added file for schedules. Fix large bug where any user could access subpages when they did not have a role to give them access. 2021-11-30 12:29:53 -05:00
Andrew
a19ba7dbb6 Backup Restore/Root Disable 2021-11-29 21:22:46 +00:00
Andrew
78834c1ed0 Fix bug where general user can change working directory and potentially destroy a system. 
Initial commit for path traversal for server config only.
 2021-11-27 21:52:49 -05:00
Andrew
4c6b459b43 Remove useless if in backups.i 2021-11-27 19:28:53 -05:00
Andrew
1bf47b5c54 Rework server start to look for user_id and not user_lang. Gives acces to more user info. 
Fixes websocket broadcast to only send broadcast to user who sent original request.
 2021-11-27 17:10:43 -05:00
Andrew
db4812c8ea Add feature where if server executable is changed in config it also changes the execution string to match. 2021-11-27 14:29:28 -05:00
Andrew
f569d3b4f0 Fix user lang for Lukas on panel_handler.py 2021-11-23 17:29:34 -05:00
Andrew
97ddc1b964 Merge branch 'pretzel-patches' into 'dev' 
# Conflicts:
#   app/classes/shared/server.py
 2021-11-23 22:12:06 +00:00
Andrew
dc83dc8fc8 Add EULA confirm message on server startup if EULA is not found. 2021-11-23 16:11:23 -05:00
Andrew
0e942311fb Add error message on login that does not direct to new page. 
Remove failed to create dir error on startup when crafty cannot create dir since it exists after first startup.

Error logging is still enabled for every error except FileExists for this case.
 2021-11-23 13:22:15 -05:00
Silversthorn
ea48bd5562 Merge branch 'dev' into dev-PathHelpers 2021-11-21 11:56:07 +01:00
Silversthorn
f20d41242d Adding Helpers for Path 
Correcting a MVC update missing function
 2021-11-21 11:52:29 +01:00
Andrew
315cd6909c Fixes update bug where 2 parameters were given when update only expected one. 
Adds "Access to All servers" for exec_super_user.

Will need to add translation support for accessto all servers message.
 2021-11-20 12:25:14 -05:00
Silversthorn
77deb6c126 Cleaner Path for Backups 2021-11-20 15:34:58 +01:00
Silversthorn
5164000c9a Fixing Path Errors for Backup files (Windows) 2021-11-20 14:44:20 +01:00
Andrew
b7039573a4 Maybe I fixed backups? 
Another attempt at allowing windows users to think about what they did by choosing windows to run a server on while also deleting backups
 2021-11-19 22:17:24 -05:00
Andrew
67444a2d4f More reverts from the windows issue. 2021-11-19 22:02:59 -05:00
Andrew
79190e15f5 Revert last push 2021-11-19 21:56:09 -05:00
Andrew
bd3da474f5 Another attempt to fix backup delete issue. 
This is hacky and can probably be done better.
 2021-11-19 21:47:03 -05:00
Andrew
146873eb10 Attempt to fix windows backup delete issue. Zedifus will test. 2021-11-19 21:28:46 -05:00
Andrew
4d31ee399a Puts a temporary fix on deleting backups. Will be fixed in alpha 4 2021-11-19 21:09:09 -05:00
Zedifus
6eb4f313f9 Add last updated timestamp to patrons 2021-11-18 21:08:19 +00:00
Zedifus
6744fe5409 Correct patreon to patron 
Patreon is the platform, supporters are patrons
 2021-11-18 20:01:30 +00:00
Andrew
aeb6b774f4 Fixes tryexceptpass for helpers and panel handler. 2021-11-17 17:23:14 -05:00
Andrew
327122348d Adds checkbox option for adding roles at server creation. 
Fixes bug on Panel Config page where duplicate servers would be listed.
Changes the way "roles" are served to the page. Dictionary instead of model object.
 2021-11-17 13:08:41 -05:00
Andrew
917bd5e32d Working single role selection on server creation. 2021-11-17 01:17:36 -05:00
Iain Powrie
1c9ffb2abc Merge branch 'dev' into 'subprocess' 
# Conflicts:
#   app/classes/shared/helpers.py
#   app/classes/shared/server.py
#   app/classes/web/ajax_handler.py
 2021-11-06 15:26:37 +00:00
Andrew
a93860ebd8 Fixes bug in player counts 2021-10-20 22:31:36 -04:00
Andrew
87b6bd7758 Enhances language on login page 2021-10-18 17:27:19 -04:00
Andrew
b4707703af Fixes translation error on status page. 2021-10-18 17:26:03 -04:00
Andrew
fdf9b3fcb9 Fixes bug where all servers would be included in offline/online count even if the user did not have access to those servers. 2021-10-18 17:11:43 -04:00
Silversthorn
eee528f329 Fixing Allowed Server on Config Page 2021-10-09 11:30:21 +02:00
Silversthorn
6984fe7abc Corrections on server creation 2021-10-09 10:59:54 +02:00
Silversthorn
a074cb7e1d Correction for roles on server creation 
Fix for superuser to be able to create a server
Don't create a role if the creator is a superuser
 2021-10-09 10:32:52 +02:00
Andrew
fc4e8a00e1 Working out bugs in regular user language 2021-09-29 19:50:51 -04:00
Andrew
72a85d7e64 Adds user based languages 
changes server creation so that it adds it to roles instead of creating one
Changes server creation so you cannot create a server without a role.
 2021-09-29 19:32:21 -04:00
Andrew
d0f6e6b8a9 More changes to users lang 2021-09-29 18:05:07 -04:00
Andrew
0ee8418ba5 Merge branch 'db-lang' into 'user-language' 
Db lang

See merge request crafty-controller/crafty-commander!79
 2021-09-29 21:50:17 +00:00
Andrew
56deaa0bcb Initial back end support for user based languages 2021-09-29 17:46:54 -04:00
Andrew
acedb0ad8a Added inital setup for user-based languages. 
Waiting for DB changes to finish.
 2021-09-28 22:25:47 -04:00
Silversthorn
8f2338c709 Correction for Uploading Files 2021-09-28 23:48:54 +02:00
Silversthorn
38f1b3908a Correction Crafty Perms 2021-09-28 18:41:54 +02:00
Silversthorn
93d3816f3a Correction controller links 2021-09-28 18:40:31 +02:00
Silversthorn
02358f189b Unique Name at Server Creation 2021-09-27 21:34:54 +02:00
Silversthorn
e059e7166c Fixing undefined controller on Upload 2021-09-26 01:02:05 +02:00
Silversthorn
05ced7610e Correction of undefined db_helper following merge 2021-09-25 23:05:49 +02:00
Silversthorn
e381ebe239 Merge branch 'dev' into dev-Silversthorn-MVC 2021-09-25 22:58:01 +02:00
computergeek125
250b68ae51 Protype subprocess management 2021-09-25 14:29:28 -05:00
Andrew
74f4bf748e Adds support for a friendlier splashscreen when no servers are created. 
Users can go to an empty dashboard instead of a wall of text.
 2021-09-25 15:07:39 -04:00
Andrew
959b02f58f Adds exception to page_data for initial server creation. 2021-09-25 11:56:12 -04:00
Silversthorn
186dcdc616 Merge branch 'dev-Silversthorn' into dev-Silversthorn-MVC 2021-09-21 21:12:56 +02:00
Andrew
44478939db Merge branch 'wait_start' into 'dev-staging' 
Wait start

See merge request crafty-controller/crafty-commander!72
 2021-09-20 22:32:19 +00:00
Andrew
6e54089890 Adds delayed start status for auto-launching servers when crafty starts. 2021-09-20 18:30:17 -04:00
Andrew
afc95a40fe Fixes bug where you cannot disable auto backup 2021-09-20 15:41:08 -04:00
Andrew
dfc07fcb4c Fixes message for audit log. I know, I know too many pushes to dev. I'm done I promise! 2021-09-13 22:58:29 -04:00
Andrew
f18d74540a Fixes bug where player counts would cause crash if not super user. 
Adds commands sent through terminal to audit log.
Makes it so regular users cannot see the audit log.
 2021-09-13 22:02:57 -04:00
Andrew
92725d2249 Starts troubleshooting of port not changing after config change. 2021-09-13 17:52:09 -04:00
Andrew
333cd33be3 Fixes server port writing issue. 2021-09-13 17:04:46 -04:00
Andrew
7316cc7ea0 Adds kill process button to dashboard. 2021-09-13 15:03:47 -04:00
Silversthorn
600430547f server creation fix 2021-09-09 00:20:38 +02:00
Silversthorn
70ca82a086 Rework architecture for better MVC 2021-09-09 00:01:10 +02:00
Silversthorn
cb73540e65 Doing MVC on Crafty Permissions 2021-09-06 19:27:01 +02:00
Silversthorn
3ff3d0ccf1 Adding MOTD on Status Page 2021-08-29 00:48:30 +02:00
Andrew
e4d94fbda5 Adds status page at /status 2021-08-26 21:06:22 -04:00
Silversthorn
f4ca0f6559 Addind support for -1 unlimited check 2021-08-25 20:22:43 +02:00
Andrew
b77aab954d Adds download options for files in file tree. This does not add ability to download directories. 2021-08-24 21:33:29 -04:00
Andrew
aea023b893 Fixes error thrown when calling add_user page 2021-08-24 19:25:35 -04:00
Andrew
af7e31a744 Fixes issue with error thrown when click save in edit_user 2021-08-24 19:19:33 -04:00
Andrew
754da44b5b Merge branch 'http_redirect' into 'dev' 
Adds support for http redirects to https

See merge request crafty-controller/crafty-commander!61
 2021-08-24 22:33:27 +00:00
Silversthorn
397fbd5268 Adding Support For Server Creation Quantity Limit 2021-08-25 00:23:33 +02:00
Silversthorn
bb1f43bc81 Adding Support for Crafty Permissions with limits 2021-08-24 23:07:00 +02:00
Andrew
d8f090b34d Makes redirect code way more efficient. 2021-08-23 22:54:52 -04:00
Andrew
42bdc055aa Adds some http redirect support. User is redirected to https login screen on attempted connection. 2021-08-23 22:25:19 -04:00
Silversthorn
cf331a8bc3 Merge branch 'dev' into dev-Silversthorn 2021-08-24 00:25:07 +02:00
Silversthorn
261c8665c8 Pretty Server Version Choice 2021-08-24 00:24:40 +02:00
Andrew
ce4a7619a6 Fixes wait window closing after first upload is complete and not waiting for all uploads to complete. 2021-08-23 18:22:35 -04:00
Andrew
6022e3814f Fixed typo in uploads 2021-08-22 17:37:37 -04:00
Andrew
192a5f2664 Modify handler to adapat to changes made in models. 2021-08-22 16:59:33 -04:00
Andrew
b24fd93487 Merge branch 'broken-uploads' into 'dev' 
Fixed upload streams

See merge request crafty-controller/crafty-commander!53
 2021-08-22 20:37:02 +00:00
Andrew
68202cfa7b Removed uploads from Ajax handler 2021-08-22 16:34:22 -04:00
Andrew
86c1b374bf Fixed upload streams 
Lukas added a lot of pretty things to the upload waiting screen.
Current bug: progress bar is not 100% working.
 2021-08-22 16:31:49 -04:00
Silversthorn
1acb7827ae Reworking Functions After User_Servers Deletion 2021-08-22 18:50:30 +02:00
Andrew
734a576cb9 Still broken 2021-08-22 10:54:34 -04:00
Andrew
7389b37198 Initial commit on this broken branch 2021-08-22 10:17:33 -04:00
Silversthorn
88042998d9 Merge branch 'dev' into dev-Silversthorn 2021-08-22 12:14:31 +02:00
Silversthorn
331f3e7b12 Adding Crafty Permissions 2021-08-22 11:57:02 +02:00
Silversthorn
540cdf6149 Fixing Roles Permissions for Server Creation 2021-08-22 11:06:44 +02:00
Andrew
a57a66901c Revert "Merge branch 'revert-ecb2cfbe' into 'dev'" 
This reverts merge request !49
 2021-08-22 03:34:05 +00:00
Andrew
f472b377d2 Revert "Fixed bug where servers would not get added to roles on creation" 
This reverts commit ecb2cfbe01
 2021-08-22 03:27:12 +00:00
Andrew
ecb2cfbe01 Fixed bug where servers would not get added to roles on creation 2021-08-21 22:47:43 -04:00
Andrew
c86c5040ea Fixed bug where new servers would not be added to current role 2021-08-21 22:43:16 -04:00
Silversthorn
1262d6708b Improve UI and Permissions on Dashboard 2021-08-22 01:41:25 +02:00
Silversthorn
0e7013f2bc Role Replication 
Removing because Can give Role from an other Server to This Server
 2021-08-21 16:46:50 +02:00
Silversthorn
31436bdc62 Merge branch 'dev' into dev-Silversthorn 2021-08-21 16:44:02 +02:00
Andrew
1150c98faf Made it so server is added to all user roles when created. 2021-08-21 10:30:37 -04:00
Andrew
89f6a98dc9 Took out ability to assign specific users to specific servers. All role based now. 2021-08-21 10:07:43 -04:00
Silversthorn
a68d24b890 Adding Working Permissions for roles on html pages 2021-08-21 10:44:03 +02:00
Andrew
77a6d260a1 Made it so a new thread is spawned for uploads. 
Need to add file checking so system doesn't crash when a user tries to upload a dmg or a .mov
 2021-08-20 15:41:22 -04:00
Andrew
f539f9e095 I leaned on my keyboard just before the last commit. Fixed the things 2021-08-19 23:50:24 -04:00
Andrew
e08df4d369 Completed file uploading. Need to fix listing when right clicking. Unzip is shown at all times. Added unzip function to helpers and is called through ajax for unzipping files to current directory. 2021-08-19 23:36:25 -04:00
Florian RVT
8b66fc3fc4 Adding permissions on role_servers with edit 2021-08-20 00:18:50 +02:00
Andrew
90d59faf5b This is broken right now. Trying to add unzip function 2021-08-19 16:50:18 -04:00
Andrew
00422f24cd Moved delete server to ajax call instead of a task. 2021-08-18 18:50:53 -04:00
Andrew
0ab8f11a60 Merge branch 'dev' into 'pretzel' 
# Conflicts:
#   app/classes/shared/server.py
#   app/classes/web/panel_handler.py
#   main.py
 2021-08-18 16:34:41 +00:00
Andrew
9a2212e94e Merge branch 'lukas-features' into 'dev' 
Lukas features

See merge request crafty-controller/crafty-commander!45
 2021-08-18 16:29:36 +00:00
luukas
d1f582edfe Full release on stdout fix! 
Basically I ditch the ANSI codes and use the old highlighting system.
 2021-08-11 23:29:31 +03:00
luukas
4bac56e84a Use stdout for virtual terminal. WebSockets seem to be "laggy". 2021-08-10 23:17:56 +03:00
xithical
c3be92f1e8 Fixed showing all servers on new server creation 
Removed extraneous variable definition for defined_servers, which caused all servers to appear in menu when creating a new server regardless of role
 2021-08-09 22:20:18 -04:00
xithical
0689b735ff Fixed showing all servers on new server creation 
Removed extraneous variable definition for defined_servers, which caused all servers to appear in menu when creating a new server regardless of role
 2021-08-09 21:11:15 -05:00
Andrew
8db46d6ab6 Added option to remove server files on delete. 
Added confirmation for server delete.
 2021-08-09 20:48:22 -04:00
Andrew
046228a0e1 Fixed bug that I created in create roles. Just didn't add data to the page that should have been there 2021-08-09 17:18:02 -04:00
Andrew
488175cc2e Added users attached to roles on role edit page. 2021-08-09 17:11:45 -04:00
Andrew
7dd4702680 Fixed error thrown on add user 2021-08-09 01:44:16 -04:00
Andrew
0e5e2cd217 Added the ability for non super-users to change their own password. 2021-08-09 01:29:13 -04:00
Andrew
b1215ff20a Fixed bug where all roles showed the sum of servers associated with all roles 2021-08-09 00:24:08 -04:00
Andrew
9ec10db762 Disabled checkboxes in user configs if servers were granted by role. 2021-08-08 18:26:28 -04:00
Andrew
debabfc045 Added server/role lists to panel config 2021-08-08 16:43:04 -04:00
Andrew
ca9788081b Removed print statements 2021-08-06 14:15:10 -04:00
Andrew
f957d54348 Fixed issue with duplicate servers on dash if role and user both had access to the server. 2021-08-06 13:47:06 -04:00
Andrew
67008f0e37 Fixed bug where if a user created a server they would not have access to it. 2021-08-06 12:49:07 -04:00
Andrew
e40fb45853 Bug fixes for user/role based servers. 2021-08-06 12:21:47 -04:00
Andrew
e827460a18 Revert 2021-08-06 01:13:58 -04:00
Andrew
4bb798fd0c Dumb commit because I had an extraneous _ 2021-08-06 01:08:33 -04:00
Andrew
41846e34a9 Made it so only super user can see other roles/users 2021-08-06 01:05:46 -04:00
Andrew
b39e0e3a62 Added users to servers. Fixed some bugs with assigning users to role/servers. Fixed bug where user could not edit server config 2021-08-06 00:34:57 -04:00
luukas
f5b6583dbf Remove unnecessary console.debug's 2021-07-30 19:27:48 +03:00
luukas
7acf095463 Make HTTP handler functions not return anything else than None to remove an error in the log. Also make users not log out when visiting a page on the public handler 2021-07-30 19:20:01 +03:00
Andrew McManus
3d979ffed3 Merge branch 'pretzel_update' into 'pretzel' 
Added update button and bug fixes

See merge request crafty-controller/crafty-commander!31
 2021-07-30 14:59:16 +00:00
Andrew McManus
9cb46a86fb Added executable updater 2021-07-24 21:09:39 -04:00
luukas
a79f42f4da Escape logfile output, fixes weird formatting and remote code execution vulnerability 2021-06-02 21:47:08 +03:00
luukas
5a5cd65d4f Sort server types, I suffered a lot while doing this 2021-06-02 21:17:50 +03:00
luukas
13d8259869 Make sure server name is not empty 2021-05-02 18:57:53 +03:00
luukas
092a8e85f1 Fix not being able to go to credits or contribute page when there are no servers 2021-05-02 18:52:10 +03:00
luukas
db9e6c2fac Move webserver online logging to the right place 2021-05-02 18:15:19 +03:00
luukas
890e0a1925 Fix blank page on wrong password and add spaces to previous login failed redirects 2021-05-02 18:05:14 +03:00
luukas
d13f8aedcb Add better audit log stuff to server creation 2021-04-19 13:36:12 +03:00
luukas
9049e44803 Fix logging on import errors 2021-04-17 23:34:13 +03:00
luukas
d5e83c5935 Fix a bunch of errors in API base handler and 
add some verbosity to logging in it
 2021-04-17 18:19:19 +03:00
luukas
2e2d338c9d Fix static handler 404 error 2021-04-17 18:12:23 +03:00
luukas
805f51ffb2 One big bug slapping commit 
Fix bug where arguments would not have default values and would break editing users (panel handler line 507, 508 and 559), fix major typo (panel handler line 569) and fix autobleach logging (base handler lines 35 and 36)
 2021-04-04 21:22:52 +03:00
computergeek125
1e2abff40a Moved server DB code to models, fix autobleach logging, fix redirect bug 2021-04-04 12:48:02 -05:00
Andrew
49a9bd982c Added temporary fix for index out of range execption thrown when adding a server. 2021-04-03 19:21:05 -04:00
computergeek125
f3b1d1e87d cleaned up DB commands a bit to resolve the rest of CRAFTY-CONTROLLER-T-81 2021-04-03 13:18:43 -05:00
computergeek125
54b0578e79 Merge branch 'dev' of https://gitlab.com/crafty-controller/crafty-commander into dev 2021-04-03 12:39:25 -05:00
computergeek125
bd6eed118a Resolves CRAFTY-CONTROLLER-T-81 - error when creating new user 
Also cleans up the panel and server code to handle other states better
 2021-04-03 12:36:01 -05:00
luukas
0b3d20ffbe One monster truck commit for 
add translation API, add fi_FI and en_EN translations, add C and
.properties file support, check if file is binary before sending and
clean up ajax handler
 2021-03-26 15:57:50 +02:00
luukas
85cb28b9ad Fix bug where server wizard would not show 2021-03-22 10:08:58 +02:00
computergeek125
fb08d77a80 General cleanup after merge, hopefully improved roles with backup 2021-03-21 23:44:22 -05:00
computergeek125
506c9bb3c3 Merge branch 'backups-and-stuff' into dev 2021-03-21 23:32:48 -05:00
computergeek125
da97597d52 Merge branch 'dev-Silversthorn' into dev 2021-03-21 23:24:49 -05:00
computergeek125
c690f9113e Merge branch 'macgeek-noshell' into dev 2021-03-21 23:17:36 -05:00
computergeek125
81c60d6dac One monster truck commit for rework and backups 2021-03-21 23:02:18 -05:00
Silversthorn
cd617ad5f3 Users Access to Servers from Roles Working 
Broke Users Servers Link
 2021-03-13 23:12:42 +01:00
computergeek125
c65b4a267e Staff, patreon, and translations all proceedurally generate now 2021-03-13 11:07:04 -06:00
Florian RVT
3f0d1871ff User access to servers operating 2021-03-09 23:17:50 +01:00
Phillip Tarrant
653a4d6bc7 Merge branch 'admin-controls' into 'dev' 
Player controls

See merge request crafty-controller/crafty-commander!26
 2021-03-07 21:30:19 +00:00
Phillip Tarrant
85403c61af Merge branch 'dev' into 'websocket' 
# Conflicts:
#   app/classes/shared/models.py
#   app/classes/shared/tasks.py
 2021-03-07 21:29:57 +00:00
computergeek125
a0448f5408 Theoretically this fixes tasks scheduler 2021-03-06 14:48:02 -06:00
luukas
8eb89dc131 Delete file_edit.html as it is not needed 2021-03-05 11:07:00 +02:00
luukas
1be41b8534 Player controls 2021-03-05 10:58:38 +02:00
luukas
37597f920f Make sure clients are authenticated before sending messages. 
As the system is asynchronous some messages could (?) slip through before the socket is closed when auth fails.
 2021-03-01 19:33:15 +02:00
luukas
9c62099f32 Add authentication to WS, notify user when an activity log gets logged, and more 2021-03-01 02:54:20 +02:00
luukas
a965af5491 Remove unnecessary websocket.html 2021-02-27 14:17:37 +02:00
luukas
7691dc566e Finish WebSockets 2021-02-27 14:05:04 +02:00
luukas
2595e6950d Host stats are now realtime(d) by websockets 2021-02-26 17:39:35 +02:00
Phillip Tarrant
92bcefa8cc Merge branch 'clone_servers' into 'dev' 
Create clone servers button/action

See merge request crafty-controller/crafty-commander!23
 2021-02-21 17:17:34 +00:00
Phillip Tarrant
96dbaf3583 Merge branch 'file_manager_polishing' into 'dev' 
File manager polishing

See merge request crafty-controller/crafty-commander!22
 2021-02-21 17:14:43 +00:00
Phillip Tarrant
abcb097cdb Merge branch 'remove-old-logs' into 'dev' 
"remove old logs" feature

See merge request crafty-controller/crafty-commander!21
 2021-02-21 17:14:03 +00:00
LukasDoesDev
ed0208ab0e Create clone servers button/action 
Can't copy while running
 2021-01-28 20:46:13 +02:00
LukasDoesDev
6b2ef2c451 Remove unnecessary logs, update logs to have more information, add resizing to file editor 2021-01-20 23:10:25 +02:00
LukasDoesDev
bcaac8b9eb I think that the "remove old logs" feature is done 2021-01-20 17:20:42 +02:00
Phillip
19e4a31bf7 fixed console.debug printing - added module auto-installer 2021-01-19 08:56:00 -05:00
Phillip Tarrant
307d14ab77 Merge branch 'macgeek_role_manager' into 'dev' 
Basic role manager

See merge request crafty-controller/crafty-commander!18
 2021-01-19 12:29:26 +00:00
Phillip Tarrant
c154f316b7 Merge branch 'lukas-development' into 'dev' 
File Manager

See merge request crafty-controller/crafty-commander!19
 2021-01-19 12:28:58 +00:00
LukasDoesDev
7e0f592330 Delete code that will crash and change a bit of logging in websocket_handler.py 2021-01-18 21:34:29 +02:00
LukasDoesDev
e9dc45eeda Add auth requirement to AJAX handlers 2021-01-18 17:02:38 +02:00
LukasDoesDev
e3a359bbc6 File Manager: DONE 2021-01-17 19:20:28 +02:00
LukasDoesDev
eb06f1b33b Now can edit files. Also fixed a bunch of bugs. 2021-01-15 21:59:58 +02:00
LukasDoesDev
eba7bff050 Now can see a tree view of the directory the server is in. Will do file editing now. 2021-01-15 14:13:06 +02:00
LukasDoesDev
c08751c7f8 FILES: Got everything working except Tornado seems to escape my HTML output, works if you set the output to the DOM and run the script below it. 2021-01-15 00:55:14 +02:00
Phillip Tarrant
0c5d11c780 Merge branch 'issue_8' into 'dev' 
Time improvements, Issue 8

See merge request crafty-controller/crafty-commander!16
 2021-01-14 14:56:15 +00:00
computergeek125
8131cfd396 Added skeleton role manager 2020-12-27 11:00:26 -05:00
computergeek125
d91361efa5 Updated user manager to support server selection 2020-12-25 22:00:28 -05:00
computergeek125
cf61c3c931 Skeleton user manager added 2020-12-24 17:55:15 -05:00
LukasDoesDev
8cd2d59230 Websockets.. Work in progress! 
websocket.html is just a blank page with the newest javascript helpers
threading working wonderfully! Except my own code.
websocket.html and thte bit from panel_handler.py can be deleted once this is done. It was just because the css and js kept loading for super long
 2020-12-17 15:39:29 +02:00
LukasDoesDev
359a2e1c42 Now server started shows browser time, not server time. 2020-12-16 01:17:41 +02:00
LukasDoesDev
4c9f947aa1 Rework #8 2020-12-14 23:52:46 +02:00
Phillip Tarrant
fb763335d1 removed datatables from vendors as it's outdated and going to use CDN 
added activity logs page
added db_helper method to return rows from db as a dict object.
this is work for issue 9
 2020-12-13 13:42:49 -05:00
Phillip Tarrant
d97712b174 Merge branch 'issue_6' into 'dev' 
Fix Issue 6

See merge request crafty-controller/crafty-commander!12
 2020-12-13 17:24:17 +00:00
MCgamin1738
58b63cb9a4 Add Permissions Check To Import From Zip 2020-12-12 19:35:41 +00:00
MCgamin1738
f59328e4f1 Adding Support For Importing Servers From Zip Files 2020-12-12 17:54:10 +00:00
LukasDoesDev
0ac3f15b8b Start working on the file explorer UI. W.I.P. 🚧 2020-12-12 01:59:52 +02:00
Phillip Tarrant
6ea66c37f5 adding GUI / routing for users admin (eventually roles will be here as well) 2020-12-06 15:42:49 -05:00
Phillip Tarrant
10bd7a74c9 fixed issue where server settings don't get reloaded when changing server config without restarting crafty. Now server settings get repulled from DB after writing new settings on config change 2020-10-07 09:19:47 -04:00
Phillip Tarrant
43ad169aa9 removing print from update 2020-09-23 08:49:19 -04:00
Phillip Tarrant
6951d7cc8a fixed IP not updating, fixed usernames being case sensitive in update query 2020-09-22 23:26:23 -04:00
Phillip Tarrant
635bef867b adding todo: for version data 2020-09-22 21:43:22 -04:00
Phillip Tarrant
7f090b928f changed notify icon - added code to grab remote json from craftycontrol.com for announcements and such - icon turns red if update available 2020-09-22 21:42:41 -04:00
Phillip Tarrant
8e2010af75 added version to bottom of pages 2020-09-22 16:17:17 -04:00
Phillip Tarrant
c896a12b17 Added server_ip to DB, also removed 
max_stats_count as it's not needed
 2020-09-22 12:11:16 -04:00
Phillip Tarrant
7657b77785 adding virtual console ajax to actually send the command 2020-09-21 22:01:16 -04:00
Phillip Tarrant
90ca5c151f import server code done 2020-09-14 16:01:38 -04:00
Phillip Tarrant
f96649613f did some refactoring on loading of servers, fixed bug where server object would be forgotten when new server added 2020-09-14 14:05:17 -04:00
Phillip Tarrant
66d7c6f10a Refactored the server add outside of serverjars.py (since it's going away). Also made it more flexible since we are doing more than just jars now 2020-09-10 11:01:57 -04:00
kevdagoat
e6bf64a41f working statistics api route 2020-09-06 12:58:17 +08:00
kevdagoat
8c36ddad84 add api base handler 2020-09-06 12:13:42 +08:00
Phillip Tarrant
d7fabb3da8 fixed crash detection / auto start checkboxes - found huge issue with crash detection. putting on bug list for later 2020-09-04 14:05:42 -04:00