Andrew McManus
c48fa435fe
Fixed bug where update would not happen once server was shut down if server was running when button was pressed.
2021-07-24 21:32:16 -04: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
918364d08a
Remove accidental line I added in 736924c8
2021-05-27 21:42:43 +03:00
luukas
55d63c1f7a
Add translation file caching, show file read error (if any) and fix a typo in the Finnish translation.
2021-05-27 21:39:46 +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
e71b6ce0b1
Fix __init__ being defined 2 times in cmd.py MainPrompt
2021-04-18 13:03:21 +03:00
luukas
23ce45724a
Create universal exit function so exiting code can be in one place.
2021-04-18 00:24:54 +03:00
luukas
736924c839
Fix uptime negative time error by saving it as UTC from the start.
2021-04-18 00:20:23 +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
d501260ef9
Updated error info per CRAFTY-CONTROLLER-T-57
2021-04-03 13:29:21 -05: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
680cb1885e
Moved to semver
2021-03-22 00:05:45 -05:00
computergeek125
02a05b41c9
quickfix stats
2021-03-21 23:48:06 -05: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
1d3880207f
Merge branch 'mcmanus-ping-port-patched' into dev
2021-03-21 23:23:27 -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
computergeek125
b957d73acb
Fixed critical bug where servers were abandoned at exit
2021-03-13 09:24:17 -06:00
Andrew
287d45a1bc
Port/ip-get patched
...
Patched super user in panel_handler
2021-03-13 09:29:05 -05:00
Florian RVT
3f0d1871ff
User access to servers operating
2021-03-09 23:17:50 +01:00
Andrew
03d7cfae80
Port/ip-get patched
...
Patched super user in panel_handler
Working issue is the server doesn not reload settings from DB after value changes in table.
!!CAUTION LOTS OF PRINT STATEMENTS!!
2021-03-09 16:57:45 -05:00
Andrew
58f6949fad
Port/ip-get patched
...
Working issue is the socket will only work for 25565.
!!CAUTION LOTS OF PRINT STATEMENTS!!
2021-03-08 22:01:42 -05: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
458456a716
try fix merge conflict
2021-03-05 11:35:05 +02:00
luukas
06a5f4713e
fix merge conflict in tasks.py
2021-03-05 11:30:18 +02: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
a25ad9295d
Fix typo that errors out when importing a server
2021-03-01 19:18:56 +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
computergeek125
d2c81eafe0
These are not the typos you're looking for
2021-02-13 06:02:27 +00:00
computergeek125
90465410f8
Forgot to start the process. You saw nothing
2021-02-13 06:00:28 +00:00
computergeek125
7b03dd3da4
forward-port the noshell branch from 3.x
2021-02-13 05:47:30 +00:00
LukasDoesDev
ed0208ab0e
Create clone servers button/action
...
Can't copy while running
2021-01-28 20:46:13 +02: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
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
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
Phillip Tarrant
30b65d0d48
Merge branch 'macgeek_issue10' into 'dev'
...
WSL Fix, issue 10
See merge request crafty-controller/crafty-commander!17
2021-01-14 14:56:51 +00: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
LukasDoesDev
9e66f46c2e
2 bug fixes
...
1st: Footer had padding in credits.html, caused by missing closing div tag.
2nd: Java VM errors when memory is a float. Server wizard should convert from gigabytes to megabytes (Trello card)
2021-01-13 16:48:04 +02: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
8bba57d950
Added exception handler if the initial request fails
2020-12-25 15:40:55 -05:00
computergeek125
cf61c3c931
Skeleton user manager added
2020-12-24 17:55:15 -05:00
computergeek125
1239822761
Fixed logic inversion that resolves #10
2020-12-19 08:44:04 -05:00
computergeek125
d30cbb8563
Merge branch 'macgeek_wslfix' into dev
2020-12-19 08:41:36 -05:00
computergeek125
8795a1eaf5
Fixed crash on CPU speed reading for certain systems
2020-12-19 08:39:31 -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
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
Phillip Tarrant
5270bdcc3d
Merge branch 'issue_4_server_cascade' into 'dev'
...
patches for issue #4 :
See merge request crafty-controller/crafty-commander!8
2020-12-11 14:56:11 +00:00
Phillip Tarrant
6b686c5b47
patches for issue #4 :
...
biggest issue causing the cascade was building crash detection in check_running method
that method is called everywhere, so when called (sometimes 5 times at the same time) it tries to restart the server over and over
i created a new detect_crash method that will now look for crashes and removed all crash detection from check_running method
also added the remove_watcher_thread method to remove the old scheduled task watching the older server.
2020-12-11 09:52:36 -05:00
MCgamin1738
102f63c771
Move session.lock, Database And config.json To Config Folder
2020-12-11 12:59:48 +00: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
2eeee9d6c4
fixed bug where tables/default settings were firing each restart
2020-09-22 15:00:05 -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
fbc8e7fc2a
fixed broken return / redirect after downloading jar and adding server
2020-09-10 12:03:18 -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
1f184d3e94
fix future fustration :)
2020-09-06 12:37:56 +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
Phillip Tarrant
568e1e8f41
finished server config page v1 - wanna add more later, but that's for alter
2020-09-04 12:35:06 -04:00
Phillip Tarrant
77021a5c0b
starting server config tab
2020-09-04 00:02:03 -04:00
Phillip Tarrant
9ded6a1a4b
added max_log_lines to config.json, added server_logs subpage, split server details top part to it's own include
2020-09-03 22:49:20 -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
ab1772397d
added version string to page footer
...
created/working on server details subpages.
added "may take a few seconds" to cmd
error page is now available to panel
created server_id_exists function
more error checking around database returns from db_helper
starting styling / backend for virtual terminal
2020-09-01 13:29:39 -04:00
Phillip Tarrant
c5bf170a33
added audit logging, and commands logging, command handler and other stuff
2020-08-31 16:16:45 -04:00
Phillip Tarrant
d1906751e5
Moved server to shared in prep for plugins
2020-08-31 13:53:46 -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
79532ffc6b
fixing merge conflict
2020-08-31 11:30:41 -04:00
Phillip Tarrant
c7e28e5b77
fixed server id not being correct for stop/restart on dashboard
2020-08-31 11:29:32 -04:00
kevdagoat
3d5f6828c0
fix setup wizard bug
2020-08-30 16:41:12 +08: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
c829d495de
Worked on dashboard - made a blank page template - started credits page
2020-08-27 23:21:55 -04:00
Phillip Tarrant
cbb4ac72cc
added command prompt, changed main loop to our do_exit in cmd
2020-08-27 18:53:04 -04:00
Phillip Tarrant
14f05f6946
fixed server_port bug in server builder
2020-08-27 18:36:18 -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
637407cc78
adding memory percent
2020-08-25 09:29:11 -04:00
Phillip Tarrant
7d91c9b636
fixed delay in stats recording on load
2020-08-24 19:16:33 -04:00
Phillip Tarrant
d0720958f9
Error handling if server was deleted without crafty knowing
...
start/stop server functions complete
expanding out online/max/motd etc in db for easier parsing
fixed issue of servers loosing their name from 3.2
finished restart button
added fontawesome 5
2020-08-24 19:11:17 -04:00
Phillip Tarrant
a958b6dea0
populating dashboard with real data
2020-08-24 13:08:17 -04:00
Phillip Tarrant
a0fcda018c
Fixed errand print statement
...
Re-init all servers when adding a server
server builder tested well. Next is importing a server
2020-08-23 22:17:36 -04:00
Phillip Tarrant
6ec2f1c6ac
part 1 of the server builder complete
2020-08-23 18:43:28 -04:00
Phillip Tarrant
a6c1a885d6
finished redirect woes, adding server handler, made 404 and default pages pretty
2020-08-19 13:54:10 -04:00
Phillip Tarrant
81d5ff05e8
fixed endless redirect issue on non-existant paths
2020-08-19 13:21:19 -04:00
Phillip Tarrant
de98e5727c
Implimenting default.json search for user/pass creation
2020-08-18 21:50:24 -04:00
Phillip Tarrant
203441045f
Added crafty specific stuff to config.ini
2020-08-18 21:04:43 -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
