Commit Graph

363 Commits

Author SHA1 Message Date
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