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,120 Commits 12 Branches 45 Tags 104 MiB
a73063f279
Commit Graph

790 Commits

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