Commit Graph

132 Commits

Author SHA1 Message Date
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
4d636cce1b add working zip import selection functionality 2022-01-09 22:49:03 -05:00
Andrew
deeff1717b adding tempdir back 2022-01-09 22:27:43 -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
a1c67009c4 Remove crafty_managed.txt from showing up in files listing in crafty. managed.txt will still show up in dir. 2022-01-09 02:07:18 -05:00
Andrew
74b416b93f Fix rename value showing up as null 2022-01-09 00:09:18 -05:00
Andrew
7dd24b6b15 Improved File Loading, Fixed Port checking 2022-01-08 23:03:45 +00:00
Andrew
5d6cbf6a4f add port checking stuff 2021-12-21 17:39:24 -05:00
Andrew
c9908a3e0f Add sorting to filelist 2021-12-21 17:36:49 -05:00
Andrew
460472fe9d Fix weird caching thing causing slow folder opening on files 2021-12-21 17:33:59 -05:00
Andrew
3e2d2c89ee hotfix for failed scandir 2021-12-21 16:11:48 -05:00
Andrew
3ed304c378 Add fix for port checker. We'll see if this works this time. 2021-12-21 15:58:48 -05:00
Andrew
2afecf8fab Add improved file functions.
Add sort in filenames
2021-12-21 15:04:32 -05:00
Andrew
bc164fef67 Add timeout to telnet. 2021-12-10 04:52:37 +00:00
Quentin
12153b1207 Merge branch 'fix/exit-code-tweak' into 'dev'
removed old exit handling logic

See merge request crafty-controller/crafty-commander!109
2021-12-06 05:50:48 +00:00
Quentin B
b2dc1521d6 removed old exit handling logic 2021-12-05 23:01:44 -05:00
Andrew
73fbf19088 Add fix for windows Administrator lockout 2021-11-29 22:21:19 +00:00
Andrew
79284a9094 Add potential fix for windows admin lockout 2021-11-29 16:56:17 -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
97ddc1b964 Merge branch 'pretzel-patches' into 'dev'
# Conflicts:
#   app/classes/shared/server.py
2021-11-23 22:12:06 +00: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
f20d41242d Adding Helpers for Path
Correcting a MVC update missing function
2021-11-21 11:52:29 +01:00
Andrew
aeb6b774f4 Fixes tryexceptpass for helpers and panel handler. 2021-11-17 17:23:14 -05:00
computergeek125
64ec33ff52 Resolved subprocess issues with windows
- Repaired introduced bug where backslashes in the far path weren't
   handled properly
- Resolved latent subprocess issue where stdout would fail to send
  websocket notifications when a a windows \r\n was emitted
2021-11-14 18:17:23 -06: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
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
Silversthorn
e381ebe239 Merge branch 'dev' into dev-Silversthorn-MVC 2021-09-25 22:58:01 +02:00
computergeek125
4f320e69a5 Added string to array command parser 2021-09-25 14:29:03 -05:00
computergeek125
f10db73fa5 Set TCP timeout to a more reasonable value 2021-09-25 12:26:10 -05:00
computergeek125
6fe8debeba Set TCP timeout to a more reasonable value 2021-09-25 12:25:27 -05:00
Zedifus
d93038a70d Fix unhandled exception with port check function 2021-09-24 22:20:13 +01:00
Silversthorn
186dcdc616 Merge branch 'dev-Silversthorn' into dev-Silversthorn-MVC 2021-09-21 21:12:56 +02:00
Andrew
2528c123f2 Adds port/internet connection checks.
Checks when crafty starts for internet and a port forward for Crafty's https port.
Checks on server launch for internet connection and for port forwarding for executed server.
2021-09-13 13:10:34 -04:00
Silversthorn
70ca82a086 Rework architecture for better MVC 2021-09-09 00:01:10 +02: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
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
Andrew
90d59faf5b This is broken right now. Trying to add unzip function 2021-08-19 16:50:18 -04:00
xithical
c20ffb522d Merge branch 'dev' into 'xithical'
# Conflicts:
#   app/classes/shared/server.py
2021-08-18 23:30:45 +00: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
luukas
f8aad8b33d Add database migrations! 2021-08-18 18:11:53 +03:00
Scott R
096a38ae54 Redoing shutil zip after merging new DB things
Merged from Pretzel for DB change things and needed to readd code for shutil for zipping
2021-08-13 23:28:41 -05:00
Andrew
118fc7936f Improved text highlighting for papermc servers. Need to still figure out what's going on with some random characters showing up. 2021-08-12 10:16:19 -04:00
luukas
4bac56e84a Use stdout for virtual terminal. WebSockets seem to be "laggy". 2021-08-10 23:17:56 +03:00
luukas
801d79fdca Fix Crafty version string 2021-07-30 22:50:33 +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
9049e44803 Fix logging on import errors 2021-04-17 23:34:13 +03:00
computergeek125
d501260ef9 Updated error info per CRAFTY-CONTROLLER-T-57 2021-04-03 13:29:21 -05:00
computergeek125
680cb1885e Moved to semver 2021-03-22 00:05:45 -05:00
computergeek125
81c60d6dac One monster truck commit for rework and backups 2021-03-21 23:02:18 -05:00
computergeek125
c65b4a267e Staff, patreon, and translations all proceedurally generate now 2021-03-13 11:07:04 -06:00
luukas
1be41b8534 Player controls 2021-03-05 10:58:38 +02: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
1bf3b381ac Add icons to file tree 2021-01-23 00:50:56 +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
9fb80a5062 added float_to_string for server memory configs 2021-01-19 09:17:29 -05: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
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
75fb8fc920 (Maybe) fix potential code injection attack 2021-01-15 14:33:17 +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
computergeek125
1239822761 Fixed logic inversion that resolves #10 2020-12-19 08:44:04 -05:00
MCgamin1738
58b63cb9a4 Add Permissions Check To Import From Zip 2020-12-12 19:35:41 +00:00
MCgamin1738
7acb044bd8 Fixing SEC_ERROR_REUSED_ISSUER_AND_SERIAL 2020-12-11 19:08:09 +00:00
Phillip Tarrant
1542f2559a adding creation of app/config/db directory to helper so if it's not there,it will be created
bug introduced by commit 102f63c7
2020-12-11 10:14:48 -05:00
MCgamin1738
102f63c771 Move session.lock, Database And config.json To Config Folder 2020-12-11 12:59:48 +00: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
adf8d3f51a many new things,
regexit sub function created
virtual console now has colors
fixed error with login function auditing None instead of 0
other things I can't remember atm
2020-09-01 21:30:39 -04:00
Phillip Tarrant
d6c894c3d9 Creation of Command model, moved controler to shared in prep for plugins 2020-08-31 13:46:25 -04:00
Phillip Tarrant
f0618b073b finished credits and contribute section - with setting to disable contribute link 2020-08-28 14:38:42 -04:00
Phillip Tarrant
d2d403e144 complete rewrite of stats pulling, fixed default.json, changed the config file and handling 2020-08-27 18:30:56 -04:00
Phillip Tarrant
6ec2f1c6ac part 1 of the server builder complete 2020-08-23 18:43:28 -04:00
Phillip Tarrant
de98e5727c Implimenting default.json search for user/pass creation 2020-08-18 21:50:24 -04:00
Phillip Tarrant
ad541347af scheduler, version change, database work, controller init servers, etc etc 2020-08-16 22:47:53 -04:00
Phillip Tarrant
25affba2e6 got login working 2020-08-13 10:38:36 -04:00
Phillip Tarrant
85a69954ea building out databases and config files 2020-08-12 21:33:36 -04:00
Phillip Tarrant
2f12f95ab2 first huge commit 2020-08-11 20:36:09 -04:00