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
4,019 Commits 12 Branches 45 Tags 104 MiB
bb6b516647
Commit Graph

1005 Commits

Author SHA1 Message Date
bobsfriend12
014805fc31 add offline page,change sw location 2023-03-06 23:38:04 +00:00
bobsfriend12
8844d8c989 update manifest and add service worker 2023-03-05 21:00:09 -06:00
amcmanu3
d06de3ef76 Remove un-needed imports 2023-03-04 22:45:45 -05:00
amcmanu3
1804d35156 Add error checking on cron validation 2023-03-04 22:45:31 -05:00
amcmanu3
c02472fb16 Send schdules via API 2023-03-04 20:10:10 -05:00
amcmanu3
343b4c9da8 Merge branch 'dev' into refactor/remote-comms-api 2023-03-04 12:54:53 -05:00
Zedifus
c1c99f315b Merge branch 'dev' into bugfix/master-server-dir 2023-03-04 15:20:14 +00:00
amcmanu3
ed028ec66d Add auth check on get 2023-03-03 19:14:44 -05:00
amcmanu3
71e9da50da Better format for finish 2023-03-03 18:47:36 -05:00
amcmanu3
1288b6afe6 Add and remove schdules through api 2023-03-03 18:23:44 -05:00
amcmanu3
3edf5d0a41 remove unused import 2023-03-03 17:32:27 -05:00
amcmanu3
c23bfdea8c Cleanup index 2023-03-03 17:31:29 -05:00
amcmanu3
7f11494d36 Remove server detail route from panel_handler 2023-03-03 17:17:13 -05:00
amcmanu3
40bbc2e790 Remove print statement 2023-03-03 17:16:44 -05:00
amcmanu3
317ed3e667 only allow basic users rights to edit some fields 2023-03-03 17:16:20 -05:00
amcmanu3
a373943ae6 Cleanup ajax handler 
send audit log entry on stdin call
 2023-03-02 13:24:49 -05:00
amcmanu3
c0381da880 Fix bug with unloaded server delete 2023-03-01 14:59:30 -05:00
amcmanu3
ec1076fbce Cleanup ajax handler 2023-03-01 14:40:02 -05:00
amcmanu3
c51d940234 Allow unloaded servers to be deleted API 2023-03-01 14:38:14 -05:00
amcmanu3
566463cd55 Fix bug where "servers" was not appended 2023-03-01 14:22:33 -05:00
amcmanu3
efb9c9844f Fix bug where failed server could not delete 2023-03-01 13:35:36 -05:00
amcmanu3
c0bca38319 Cleanup ajax a bit more 2023-03-01 13:27:06 -05:00
amcmanu3
cd475e0cf5 Use API to send remote commands to server 2023-03-01 13:04:51 -05:00
amcmanu3
1f95b22dce Add check for migration before starting a server 2023-02-20 15:37:51 -05:00
Zedifus
c27e1e667d Merge branch 'dev' into tweak/java-check 2023-02-17 00:19:27 +00:00
Zedifus
5dea17a7cb Merge branch 'dev' into enhancement/add-storage-to-dash 2023-02-17 00:00:00 +00:00
Zedifus
34f1acd3e2 Appease black 2023-02-16 23:29:06 +00:00
amcmanu3
a423cee40b Check for java on forge server creation 2023-02-14 13:59:53 -05:00
amcmanu3
dd317a3460 Only support changing server dir in non-docker env 2023-02-12 12:29:05 -05:00
Andrew
1e7d035119 Appease the linter 2023-02-11 15:42:18 -08:00
Andrew
72a2ff4c40 Merge branch 'dev' into 
enhancement/add-storage-to-dash
 2023-02-11 15:36:33 -08:00
Zedifus
c151e5f3a7 Merge branch 'dev' into tweak/master-server-dir-config 2023-02-11 19:47:01 +00:00
Zedifus
fa6f17e347 Merge branch 'dev' into enhancement/ignored-exits 2023-02-11 18:33:48 +00:00
Zedifus
5b383d9fa9 Merge branch 'dev' into feature/upload-progress 2023-02-11 18:10:32 +00:00
amcmanu3
1b1c960cb6 Add helper to get all mounts. 
Default storage monitoring to all mounts
 2023-02-10 15:17:36 -05:00
amcmanu3
6d0ec12a6f Fix typos in server-config form. Fix whitespace 2023-02-10 14:48:19 -05:00
amcmanu3
87fdb1627c Add feature - ignore exit codes on crash detection 2023-02-10 14:02:26 -05:00
amcmanu3
f381562b3b Make monitored mount points user configurable 2023-02-05 19:05:20 -05:00
amcmanu3
b224103778 Add storage to the dashboard 2023-02-05 16:47:12 -05:00
amcmanu3
42b564de1c Fix error codes 2023-02-01 17:16:08 -05:00
amcmanu3
bb482b8381 Use response text for errors on uploads. 
Overhaul
 2023-02-01 17:09:39 -05:00
amcmanu3
6e0805a8a1 Lol uncomment the fix 2023-01-31 13:14:01 -05:00
amcmanu3
ed30cbd4cb Refactor public handler keys 2023-01-31 13:11:28 -05:00
amcmanu3
683c9cecba Add background key to server_handler page_data 2023-01-31 13:11:03 -05:00
amcmanu3
863ded782a Add move servers dir functionality 2023-01-30 15:23:10 -05:00
Zedifus
5699aa40e8 Merge branch 'dev' into enhancement/auto_log-dash 2023-01-29 23:35:34 +00:00
amcmanu3
3f3595acb4 Sort config.json in alphabetical order 2023-01-29 18:21:04 -05:00
amcmanu3
2d9529ba0c Add cookie secret to DB 
Allow users to reset cookie and api secret
Add Crafty row to table on fresh install
Change inserts to updates for crafty settings table.
 2023-01-29 16:54:02 -05:00
Zedifus
52459a4cf6 Merge branch 'dev' into enhancement/config-json 2023-01-29 19:26:43 +00:00
Zedifus
14d444b90c Merge branch 'dev' into tweak/server-stats-db-hidden 2023-01-29 18:59:29 +00:00
Silversthorn
8b62814f17 Add Default redirection to Dashboard to prevent login if the user is connected 2023-01-28 16:43:27 +01:00
Silversthorn
d01dfe40db Merge branch 'dev' into enhancement/config-json 2023-01-28 01:37:41 +01:00
amcmanu3
afdb9d9386 Use ignored_names as class variable in helpers 2023-01-27 17:36:23 -05:00
Zedifus
e217c63fdf Merge branch 'dev' into bug/ReworkDefautPublicHandler 2023-01-27 19:59:12 +00:00
Zedifus
b5d259bce7 Merge branch 'dev' into feature/backup-echo 2023-01-27 19:39:05 +00:00
Zedifus
84592c178e Merge branch 'dev' into refactor/scheduled-task-queue 2023-01-27 19:30:03 +00:00
Zedifus
e8d2414815 Merge branch 'dev' into bugfix/schedule-restore 2023-01-27 19:05:50 +00:00
Zedifus
e61941613a Merge branch 'dev' into dev-transparent-login 2023-01-27 18:40:01 +00:00
Silversthorn
bc2776c666 Be good with the linter 2023-01-26 22:26:41 +01:00
Silversthorn
d97a792987 Remove public page to use direct login as status one 
Rework HTTP Handler as we redirect all trafic to HTTPS
 2023-01-25 23:26:04 +01:00
Andrew
248a5a63a9 Include option for after command 2023-01-21 13:13:02 -05:00
Silversthorn
0a418363b0 Improving Display of Panel Config Pages 2023-01-21 12:29:08 +01:00
Andrew
cf9ad77879 Add option to run command before backup 2023-01-20 17:35:30 -05:00
amcmanu3
dfa2f5fb1e Remove antequeted code after moving from db 2023-01-19 11:28:00 -05:00
Silversthorn
35d33ef51c Improving config_json form and Fixing disabled languages 2023-01-18 22:01:23 +01:00
Andrew
33b9026e8e Fix delete. Remove secondary selection box 2023-01-18 14:40:01 -05:00
Andrew
0d85b55c06 Allow file paths with symbols for background 2023-01-18 14:35:35 -05:00
Silversthorn
7984ca8157 Add Personalized Transparency for Login Page's Form 2023-01-17 20:40:16 +01:00
Andrew
2e25ed84c5 Remove print statements 2023-01-16 14:30:55 -05:00
Andrew
1802a7e7ef Add backup preservation 
Add update job to bedrock
 2023-01-16 14:15:45 -05:00
Andrew
944d01ab19 Fix schedule restores 2023-01-16 11:20:15 -05:00
Andrew
8d8b065e41 Working config.json from page 2023-01-15 18:57:22 -05:00
Andrew
bea48d9059 Add better formatting for lists. 2023-01-10 14:12:33 -05:00
Andrew
5d3dbc6f9c Fix security 2023-01-09 19:01:05 -05:00
Andrew
4f4ec16a9b Make config editable from Crafty 2023-01-09 18:52:45 -05:00
Andrew
199c8a4fe6 Fix local java server imports 2023-01-08 00:32:08 -05:00
Andrew
88cd991b7e Fix bug where server_path variable was still used 
I'm dumb and I fixed a bug I created.
 2022-12-22 20:59:45 -05:00
Zedifus
5c10dd884f Merge branch 'dev' into bug/windows-path-java-override 2022-12-21 16:04:28 +00:00
amcmanu3
262ec80db8 Remove print statement 2022-12-19 17:47:31 -05:00
amcmanu3
9004feff37 Fix windows slash escape java override 2022-12-19 17:44:04 -05:00
Andrew
a1e8b7afe7 Make server directories non-configurable 2022-12-17 12:21:15 -05:00
Andrew
8c6bb38224 Fix location of loop check. 2022-12-15 18:58:10 -05:00
Andrew
551020f738 Create our own check function 2022-12-14 14:54:52 -05:00
Andrew
9f939ae40e Trying one more thing 2022-12-14 12:24:00 -05:00
Andrew
6f510976f0 Attempting to add method for posixpath 2022-12-14 12:21:04 -05:00
Andrew
ac1b94d35b Change Path return PosixPath to purepath 2022-12-14 12:02:38 -05:00
Zedifus
0bdd01f668 Merge branch 'dev' into bug/server-import-copy-loop 2022-12-07 14:32:03 +00:00
Zedifus
94d7b9901c Merge branch 'dev' into bug/public-backgrounds 2022-12-07 14:09:30 +00:00
Andrew
98da08bde6 Appease the linter 2022-12-06 15:11:36 -05:00
Andrew
55c527bfdb Be sure a user cannot server import crafty dir 2022-12-06 15:09:11 -05:00
Andrew
b133a7bdea Fix background key not on public pages 2022-12-03 20:48:22 -05:00
Andrew
0c9ee0e0e0 Fix plus sign in path bug with downloads & uploads 2022-11-30 20:28:24 -05:00
Andrew
206dc956cf Make background available to all public pages 
Move background to top of html for better loading
 2022-11-30 19:53:10 -05:00
Andrew
6a693fd2ca Merge branch 'feature/custom-login-background' of gitlab.com:crafty-controller/crafty-4 into feature/custom-login-background 2022-11-30 18:14:42 -05:00
Andrew
9bd0bd2f7e Make the zedifus changes. 2022-11-30 18:14:37 -05:00
Zedifus
4543fcd03f Merge branch 'dev' into feature/custom-login-background 2022-11-30 21:08:53 +00:00
Andrew
b2182919ff Fix dir does not exist. 2022-11-30 15:51:12 -05:00
amcmanu3
46740f7cbf Fix type error on delete 2022-11-09 14:20:37 -05:00
amcmanu3
bf0255a26b Add custom login image feature 2022-11-09 14:13:35 -05:00
Andrew
a66b95e607 Fix no port on bedrock server creation 2022-10-28 22:16:10 -04:00
Andrew
3f4d232910 Add log filtering 
known bug: when adding more than 4 items to js array
 2022-10-12 23:29:20 -04:00
Zedifus
fbb6dad524 Merge branch 'dev' into tweak/themes 2022-10-08 18:12:37 +01:00
Zedifus
c1374b5c7f Merge branch 'dev' into bug/port-constraint 2022-10-05 22:12:14 +01:00
amcmanu3
ad41960338 Appease the linter 2022-10-04 16:23:29 -04:00
amcmanu3
3681f52856 Fix scheduled task disable 2022-10-04 16:07:08 -04:00
Andrew
2e212cc788 Add port constraint for all server creation & api 2022-10-04 15:55:52 -04:00
Andrew
f558388a0f Update themes to include all colors 2022-10-04 13:31:37 -04:00
Zedifus
0ab8a2d80e Merge branch 'dev' into bug/websocket-clients 2022-10-02 21:16:31 +01:00
Andrew
5f8c0dab4c Merge branch 'dev' into 'feature/upload-import' 
# Conflicts:
#   app/frontend/templates/server/wizard.html
 2022-10-02 19:10:05 +00:00
Zedifus
7cc8503941 Merge branch 'dev' into enhancement/themes 2022-10-02 19:52:56 +01:00
Zedifus
f9a918e014 Merge branch 'dev' into bug/api-stdin 2022-10-02 19:40:13 +01:00
Andrew
cb064f95df Fix set size changed during iteration 2022-10-02 14:29:36 -04:00
Andrew
a21bb36f7c Make it so a user cannot upload anything but zip 
TODO add better feedback than "error"
 2022-09-27 23:07:44 -04:00
Andrew
ab344cbff4 Add zip upload to bedrock servers 2022-09-27 22:49:52 -04:00
Andrew
b9bd654e58 Add upload import functionality. 
Update gitignore
 2022-09-27 22:06:22 -04:00
Andrew
8e1534e268 Add arguments to API routes 2022-09-26 21:31:44 -04:00
Andrew
a5a81aa22a Add themes to users page/base 2022-09-26 21:23:47 -04:00
Andrew
046943c250 Fix bug with API stdin 2022-09-25 12:14:01 -04:00
Andrew
eaa68751b2 Fix type error on interval check. 2022-09-25 11:17:44 -04:00
Andrew
e2c846205b self.clients was already a set. cannot subscript 2022-09-22 21:42:58 -04:00
Zedifus
3209f69d14 Merge branch 'dev' of gitlab.com:crafty-controller/crafty-4 into dev 2022-09-20 23:22:00 +01:00
Zedifus
03a54d0249 Override 'unsubscriptable-object' pylint rule 
False positive from 'self' use
 2022-09-20 23:21:57 +01:00
amcmanu3
ff8ddb0f6e Fix cron edit traceback. 
Do not allow day to be greater than 30
 2022-09-20 17:52:11 -04:00
Zedifus
2b36fbd448 Merge branch 'dev' into tweak/reaction-schedules 2022-09-19 22:50:55 +01:00
Zedifus
48b3c26f42 Merge branch 'dev' into bug/websocket-client-list-size 2022-09-19 22:40:23 +01:00
Zedifus
d3cfdd4a78 Merge branch 'dev' into bug/unloaded-server-config 2022-09-19 22:33:30 +01:00
Zedifus
518eb6af23 Merge branch 'dev' into bug/gravatar-fetch 2022-09-19 22:18:11 +01:00
Zedifus
d2d812edb7 Merge branch 'dev' into tweak/backup-restore 2022-09-19 22:11:53 +01:00
Andrew
9ecf912a98 Make default option be selected option in edit 2022-09-16 13:15:07 -04:00
amcmanu3
187860056c Create set from list for client list size change 2022-09-16 13:09:10 -04:00
Andrew
a3c1d9e051 Fix typo in panel handler for unloaded config 2022-09-14 13:13:32 -04:00
Andrew
82c0452f55 Add pfp caching for users 2022-09-12 15:34:47 -04:00
amcmanu3
2b35da71fc Fix logic with gravatar email 2022-09-09 15:04:45 -04:00
amcmanu3
375df0c27d Only check for gravatar if internet 2022-09-09 15:00:08 -04:00
amcmanu3
e14e795b47 Add schedules to backup restore 
Persist execution command
 2022-09-09 14:49:31 -04:00
Andrew
7437944988 Fix & issues 2022-09-07 15:56:18 -04:00
Andrew
df7d10886e Fix & with bleach 2022-09-07 14:55:40 -04:00
amcmanu3
1b2fef06fb Fix critical bug with unloaded servers 2022-09-05 23:15:07 -04:00
Zedifus
0bce6f432a Merge branch 'dev' into enhancement/metrics-range 2022-09-04 21:25:45 +01:00
amcmanu3
e9c74be057 Add ability to change metrics scale 2022-09-04 16:21:33 -04:00
amcmanu3
a07eb58db7 Add bedrock server creation 2022-08-31 19:45:19 -04:00
amcmanu3
b274f0d3b0 Remove update url from config 2022-08-31 19:36:43 -04:00
Andrew
0f820433f1 Remove log path from config for bedrock 2022-08-31 12:39:52 -04:00
Zedifus
fdb98cf1f8 Merge branch 'dev' into feature/pretzel-metrics-graph 2022-08-27 18:00:36 +01:00
Zedifus
b0b04a6495 Merge branch 'dev' into feature/pretzel-variable-shutdown-timeout 2022-08-27 17:50:50 +01:00
Zedifus
1b4777fbab Merge branch 'dev' into feature/pretzel-users-roles-manager 2022-08-27 17:25:49 +01:00
Andrew
4225de55e8 Add server metrics graph 2022-08-21 17:04:23 -04:00
Andrew
44afc72d3a Add variable shutdown timeouts 2022-08-21 12:41:28 -04:00
amcmanu3
02b6c3b545 Fix logical issues with panel handler 2022-08-20 20:58:46 -04:00
Andrew
0672b9378a Add more secure logic to add/edit users 2022-08-20 18:51:35 -04:00
Andrew
cbbb9f9fd2 Fix clone server not taking into account quotas 2022-08-20 13:45:10 -04:00
Andrew
cafa720bba Fix server quotas. Removed un-used perms columns 2022-08-20 13:00:20 -04:00
Andrew
7a68e08a64 Working role manger super user 
TODO: Remove maanger after user is deleted
 2022-08-20 09:31:33 -04:00
Andrew
552a2e26c2 Working role managers. 
TODO: Add super user select option
 2022-08-20 08:49:38 -04:00
Andrew
bd64f0d2ae Initial commit for role managers 2022-08-20 08:32:39 -04:00
amcmanu3
f75286e112 Fix logical issue in panel_handler 2022-08-19 15:14:42 -04:00
amcmanu3
c1d16522d0 Add manager field to users 2022-08-19 13:09:59 -04:00
amcmanu3
b10523ae0a Add import status to working bedrock 2022-08-17 19:07:56 -04:00
amcmanu3
65c8ca680b Add importing threading to jar servers. 
Refactor "downloading" status
 2022-08-17 14:48:05 -04:00
Zedifus
e2a4e096a2 Merge branch 'dev' into bug/backup-reload 2022-08-14 18:36:27 +01:00
Andrew
1545c1415c Reload backup page on front end 2022-08-12 20:24:11 -04:00
Andrew
be7a816f78 Fix reaction tasks not firing 
Fix delay not being accurate
 2022-08-07 01:30:59 -04:00
Zedifus
c5d049830e Merge branch 'dev' into bug/unloaded-servers 2022-08-06 01:10:16 +01:00
amcmanu3
5cbb8f7018 Fix broken unloaded servers 2022-08-05 20:04:34 -04:00
Zedifus
3e3c0ff946 Merge branch 'dev' into enhancement/pretzel-schedules 2022-08-06 00:20:31 +01:00
Zedifus
13a0500e86 Switch to v2 credits schema 2022-08-05 23:38:32 +01:00
amcmanu3
b039eec857 First commit for unloaded server. Working Frontend 2022-08-05 17:56:44 -04:00
amcmanu3
3c8614f378 Fix traceback when editing schedule 2022-08-05 16:01:26 -04:00
amcmanu3
75c8cdef53 Add names to schedules 2022-08-05 13:52:50 -04:00
Zedifus
390d995f53 Add flashing frontend notification 
Co-authored-by: andrew.charles.mcmanus@gmail.com <andrew.charles.mcmanus@gmail.com>
 2022-08-05 02:56:26 +01:00
Andrew
4f4798d44a Add serverjars cache refresh 2022-08-03 15:38:44 -04:00
Andrew
d1bdb6198b Fix server creation with serverjars API 
By accident this adds some modded support.

TODO: Cleanup javascript in wizard.
Fix naming on selects in wizard
 2022-08-02 21:08:53 -04:00
Andrew
9616ffb0a1 Fix bug where SU status wouldn't stick on creation 
Clean up SU user edit logic
 2022-07-19 11:21:22 -04:00
amcmanu3
383194cf66 Fix servers being out of order on creation page. 2022-07-18 17:12:43 -04:00
Zedifus
374454f11c Merge branch 'dev' into bug/fix-issue-#106 2022-07-18 21:17:41 +01:00
Zedifus
b7b4c7ac11 Merge branch 'dev' into bug/fix-issue-#106 2022-07-18 21:17:16 +01:00
Zedifus
523e51a0ae Merge branch 'dev' into Fix-Pylint-no-self-use 2022-07-18 21:09:51 +01:00
Silversthorn
98fa8e8940 Giving json to auth_data 2022-07-18 20:57:04 +02:00
Silversthorn
bc16e0df2b Revert "Revert changes on base_handler, fixing things in the api methods" 
This reverts commit f863357633.
 2022-07-18 20:53:49 +02:00
Silversthorn
f863357633 Revert changes on base_handler, fixing things in the api methods 2022-07-17 12:17:45 +02:00
Silversthorn
b6d6b9c0a4 Remove unused elements and move get_players to py file instead of html file 2022-07-17 10:57:25 +02:00
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