Commit Graph

1950 Commits

Author SHA1 Message Date
Zedifus
718e76a01d Merge branch 'dev' into refactor/big-bucket 2024-05-09 21:23:07 +01:00
Zedifus
4227fc8339 Merge branch 'dev' into bugfix/childschedule 2024-05-09 21:09:51 +01:00
Zedifus
39a98f2b5e Merge branch 'dev' into tweak/json-audit-log 2024-05-09 21:03:26 +01:00
Zedifus
6257ea9c43 Merge branch 'dev' into bugfix/login-query 2024-05-09 20:56:19 +01:00
--unset
29fc1f6f1f Refactor for new schema 2024-05-07 20:57:19 -04:00
--unset
54bac87b8a Add comment 2024-05-05 10:13:24 -04:00
--unset
5e778e9fd7 Allow self-hosted repo for server builder jars 2024-05-05 10:12:10 -04:00
--unset
5b58af2226 Refactor add category back. 2024-05-05 09:44:17 -04:00
amcmanu3
76424aba7f Setup forge installs for big bucket 2024-05-04 20:29:11 -04:00
amcmanu3
33f2693bee Refactor/remove paper references 2024-05-04 20:01:13 -04:00
--unset
ef39564c0a Refactor server creation for big bucket 2024-05-04 15:55:52 -04:00
--unset
7967962e3a Refactor backend for big bucket 2024-05-04 15:15:43 -04:00
Username404-59
46f27a35b6 Fix cpu_freq call on obscure systems 2024-05-02 13:17:28 +00:00
amcmanu3
eebf68a376 Front end loading of backup edit page 2024-04-21 11:26:16 -04:00
amcmanu3
f2e00040bd Make backups list page load 2024-04-20 18:15:06 -04:00
amcmanu3
3bba043cf0 Get backup configs 2024-04-20 18:14:45 -04:00
amcmanu3
b898595371 Refactor backup config methods to add/update 2024-04-20 17:30:37 -04:00
amcmanu3
d998d82de0 Fix code quaity issues 2024-04-20 17:04:30 -04:00
amcmanu3
2134c4226d Fix audit log raw 2024-04-20 16:54:33 -04:00
amcmanu3
3fac1a39a8 Setup drop table migrations 2024-04-20 16:21:06 -04:00
amcmanu3
92dfd18dbd Refactor API for new activity log format 2024-04-20 15:47:34 -04:00
amcmanu3
5fe696e269 Merge branch 'dev' into refactor/backups 2024-04-19 16:09:31 -04:00
amcmanu3
a76a2722db Fix child schedule failing to load after del parent 2024-04-19 16:05:35 -04:00
--unset
227d642546 Set audit logging to logfile instead of DB 2024-04-17 18:03:10 -04:00
--unset
89b552a880 Redirect to /login if garbage is in query args 2024-04-16 10:26:32 -04:00
amcmanu3
400f42ba26 Merge branch 'dev' into refactor/api-key-su 2024-04-08 13:42:16 -04:00
Zedifus
20a8366410 Merge branch 'dev' into bugfix/api-perms-request 2024-04-07 00:06:15 +01:00
Iain Powrie
0e8c8d4da8 Merge branch 'sec/bump-orjson' into 'dev'
Bump orjson for CVE-2024-27454

See merge request crafty-controller/crafty-4!747
2024-04-06 22:51:22 +00:00
Zedifus
6313380922 Fix calling of orjson .JSONDecodeError class 2024-04-06 22:54:43 +01:00
Zedifus
057139c7e1 Rerverse order of returned server jars versions
Logic I removed in my refactor, whoops!

Newest -> oldest
2024-04-06 22:01:37 +01:00
Zedifus
a2dc3a8a45 Merge branch 'dev' into bugfix/uuid-server-clone 2024-04-06 21:37:53 +01:00
amcmanu3
4f469f3df1 Do not allow clone while server is running 2024-04-06 16:24:55 -04:00
Zedifus
1b9646cd0f Merge branch 'dev' into tweak/server-jars-domain-swap 2024-04-06 21:06:11 +01:00
Zedifus
c1c5b5b989 Merge branch 'dev' into bugfix/backup-restore-uuid 2024-04-06 20:52:14 +01:00
Zedifus
7c3eae66fc Merge branch 'dev' into bugfix/fixing-rework-id-issue 2024-04-06 20:25:16 +01:00
Zedifus
20d5f85602 Increase max versions returned 2024-04-06 20:20:45 +01:00
amcmanu3
afb7575398 Fix API perms request returning stack 2024-04-06 15:05:26 -04:00
amcmanu3
9bed7092d6 Check for API permission as well as user permission 2024-04-06 13:42:41 -04:00
Zedifus
cc67ebef76 A further clean up and refactor of server jars cache logic
Reordered code, and tidy'd based on DRY (Don't Repeat Yourself)
2024-04-06 01:38:45 +01:00
Zedifus
0fab5cd0f3 Refactor for temporary hardcoded types, use new health check response.
api.serverjars.com not providing fetchTypes route currently,
Will revert when available.
NOTE: New api does not incl Spigot / Bukkit. Announce this.
2024-04-05 20:01:37 +01:00
amcmanu3
432421f362 Fix server clones following uuid migration 2024-04-01 17:02:27 -04:00
amcmanu3
089b49c85e Disable crafty perms user does not have access to 2024-03-25 13:04:09 -04:00
amcmanu3
c13ac6a53c Merge branch 'dev' into refactor/api-key-su 2024-03-25 12:36:43 -04:00
amcmanu3
3639ab9260 Catch more specific exception 2024-03-24 17:56:10 -04:00
amcmanu3
25b64e353c Fix backup restores after uuid server IDs 2024-03-24 17:55:58 -04:00
Silversthorn
3edfd4320d Replacing server_id=0 to server_id=None for AuditLog 2024-03-24 20:39:10 +01:00
Silversthorn
8f8feef6de Solution is disabling update if already done 2024-03-23 12:11:43 +01:00
Silversthorn
d39f93bfa5 trying loading only the diff migrations at constructor 2024-03-23 11:25:05 +01:00
amcmanu3
912785b280 Remove http references from codebase 2024-03-21 18:10:39 -04:00
Zedifus
1a58ccd45a Merge branch 'dev' into remove/http-handler 2024-03-18 23:35:50 +00:00
amcmanu3
0a572fba92 Refactor API keys "super user" to "full access" 2024-03-17 12:50:11 -04:00
amcmanu3
6eea6a15d7 Remove http port from config 2024-03-15 14:49:31 -04:00
amcmanu3
c9a46a1f9b Remove http handler from codebase 2024-03-15 14:47:30 -04:00
amcmanu3
9704016c54 Update schema for str uuid 2024-03-13 17:47:07 -04:00
Zedifus
dbe5581e5a Appease Black 2024-03-10 22:52:23 +00:00
Silversthorn
36de32e5b1 Trying to appease lint one more time 2024-03-10 13:15:17 +00:00
Silversthorn
ae7d0991e4 Fixint lint issue 2024-03-10 12:59:04 +00:00
Silversthorn
1e2ec6b643 Removing the up_one in the constructor to prevent running all migration each time we got a new one. It's handled by migration.up() function. This function was not creating fake migrations. 2024-03-10 12:49:35 +00:00
amcmanu3
a4da773d25 Remove print statements 2024-03-09 12:49:59 -05:00
amcmanu3
99ccaa925f Add backups to page 2024-03-08 23:23:36 -05:00
amcmanu3
eec9432118 Update migration
Add backup return function
2024-03-08 23:22:54 -05:00
amcmanu3
1a8d351fbd Remove print statements 2024-03-08 22:45:08 -05:00
amcmanu3
548a439f14 Initial commit for backup migration.
Kind of broken :/
2024-03-08 22:06:33 -05:00
amcmanu3
0c517868b4 Merge branch 'dev' into refactor/backups 2024-03-08 16:23:45 -05:00
Iain Powrie
ff9654266c Merge branch 'bugfix/backup-webhook' into 'dev'
Alert webhook AFTER backup has finished

See merge request crafty-controller/crafty-4!727
2024-03-08 00:33:57 +00:00
Iain Powrie
d9311455eb Merge branch 'bugfix/fix-def-pass-len-check' into 'dev'
Fix default password min length check, crashing crafty on fresh install

See merge request crafty-controller/crafty-4!725
2024-03-07 23:49:26 +00:00
amcmanu3
0cd3acca13 Alert webhook AFTER backup has finished 2024-03-07 11:06:39 -05:00
Zedifus
e0bb2eaaa0 Merge branch 'dev' into refactor/server_ids 2024-03-03 01:32:44 +00:00
Zedifus
8d08084ac2 Change target of min pass length check to 'int' of pass length
Fixes default password min length check, crashing crafty on fresh install
2024-03-03 01:10:48 +00:00
Zedifus
3d5a370040 Merge branch 'dev' into bugfix/bedrock-download 2024-03-02 23:59:48 +00:00
Zedifus
f98dbb9332 Merge branch 'dev' into bugfix/password-encode 2024-03-02 23:16:40 +00:00
Zedifus
49fce1b5c4 Merge branch 'dev' into bugfix/fix-forge-install 2024-03-02 22:51:44 +00:00
amcmanu3
9f524ff113 Too many www's 2024-03-02 17:00:52 -05:00
amcmanu3
6e28da4195 Fix bedrock url 2024-03-02 16:53:17 -05:00
Silversthorn
303de39226 Merge branch 'dev' into refactor/server_ids 2024-02-21 23:00:21 +01:00
amcmanu3
4df7858da6 Fix code quality issues 2024-02-21 00:04:07 -05:00
amcmanu3
900ec15e4c Fix bug where you cannot get to config with unloaded server 2024-02-20 22:30:32 -05:00
amcmanu3
f4f4f9e0b6 Remove extraneous error messaging 2024-02-20 18:50:32 -05:00
amcmanu3
f6242d6507 Remove username regex 2024-02-20 18:47:00 -05:00
amcmanu3
647e3b1111 Remove encoding 2024-02-20 17:32:34 -05:00
Zedifus
9de08973b6 Fix minor lint issues (formatting) 2024-02-20 03:26:15 +00:00
Zedifus
5b2890ce9a Merge branch 'dev' into bugfix/clone-server 2024-02-20 03:08:33 +00:00
Zedifus
5e85707973 Merge branch 'dev' into bugfix/default-json 2024-02-20 02:58:09 +00:00
amcmanu3
975dd2f967 Allow super users to clone to their hearts desire
Add same roles for cloned server
2024-02-19 21:45:05 -05:00
Zedifus
25a46a250b Make paper url fetching more robust
Resolves traceback:
build = self.get_paper_build(server, version).get("build")
AttributeError: 'NoneType' object has no attribute 'get'
2024-02-20 02:27:54 +00:00
amcmanu3
fcb8b02907 Black codebase 2024-02-19 21:14:28 -05:00
amcmanu3
842e576b5c Refactor minimum password length 2024-02-19 21:14:15 -05:00
amcmanu3
bfa0c72412 Appease black 2024-02-19 20:52:35 -05:00
amcmanu3
d5c009960b Clean up forgot to purge 2024-02-19 20:46:19 -05:00
amcmanu3
5712d56e0e Needed to plunge some errors 2024-02-19 20:43:59 -05:00
amcmanu3
dfe9aeb212 Remove the stinky 2024-02-19 20:40:07 -05:00
amcmanu3
c2c10d4609 Separate errors for unicode/binascii 2024-02-19 20:39:24 -05:00
amcmanu3
1a7c76dca7 Add unicode except 2024-02-19 20:35:36 -05:00
amcmanu3
1cf773bd40 Update error message 2024-02-19 20:32:25 -05:00
Zedifus
aec58fdca3 Refactor Crafty remote file downloads 2024-02-20 01:19:39 +00:00
amcmanu3
aac35b14d9 Change login payload 2024-02-19 20:18:47 -05:00
amcmanu3
d168a7f8f0 Remove max password length 2024-02-19 19:19:30 -05:00
Silversthorn
c118ba7337 Merge branch 'dev' into refactor/server_ids 2024-02-20 00:32:38 +01:00
amcmanu3
e053f4a750 Check server creation for clone server call 2024-02-19 18:07:17 -05:00
Zedifus
0422a2ecdf Fix assorted black issues currently in dev 2024-02-19 20:02:09 +00:00
amcmanu3
166e3c5088 Black codebase 2024-02-19 12:03:02 -05:00
Andrew
f6bb6eafcd Add default path password check
Change decode to utf-8
2024-02-17 23:08:23 -05:00
Andrew
d673908ce4 Encode password base64 to server 2024-02-17 22:33:50 -05:00
Silversthorn
b30d7b627c removing uuid from server model 2024-02-16 20:23:23 +01:00
Silversthorn
90e0777b9b try to revert back to old migrate history if failed 2024-02-16 20:04:12 +01:00
Silversthorn
875c9058b0 there were still use -_- 2024-02-16 19:46:22 +01:00
Silversthorn
ad6e53a5d1 Adding all migration steps to a migration.py file 2024-02-16 19:29:14 +01:00
Andrew
879aa8c54c Make sure default.json is read from correct loc 2024-02-15 07:15:53 -05:00
amcmanu3
e59b624025 Move backup path from servers to backup
Add uuid field to backups
2024-02-08 20:25:32 -05:00
Silversthorn
a7f7a50ae0 really fixing the bug 2024-02-09 00:22:42 +01:00
Silversthorn
1b05562a9e Fix Forge Install bug for 1.20, 1.20.1 and 1.20.2 2024-02-09 00:10:26 +01:00
Silversthorn
2eb0eb59ef Merge branch 'dev' into refactor/server_ids 2024-02-03 21:12:39 +01:00
Zedifus
c49258d573 Merge branch 'dev' into tweak/anti-lockout 2024-02-02 22:07:30 +00:00
Zedifus
559e5f44ee Merge branch 'dev' into tweak/http-timeout 2024-02-02 20:41:59 +00:00
Zedifus
a3236d72fd Correct nh3 no-member exemptions affected by black formatting 2024-02-02 20:36:04 +00:00
Zedifus
ef691eda5c Add exclude for E1101: Module 'nh3' has no 'clean' member
--False Positive--
Issue tracking (fix planned for pylint 4.0.0)
https://github.com/messense/nh3/issues/18
https://github.com/pylint-dev/pylint/issues/8756
2024-02-02 19:51:17 +00:00
Silversthorn
0a3512a18e Merge branch 'dev' into refactor/server_ids 2024-02-02 20:50:08 +01:00
Andrew
5c37b0e0fd Add auth logging 2024-02-01 00:08:34 -05:00
Andrew
d53404285c Remove ability to move to create server 2024-01-31 23:06:37 -05:00
Andrew
ecee8b494c Raise exception for anti-lockout-username 2024-01-31 22:15:40 -05:00
Andrew
aec14a6713 Do not allow user to create anti-lockout-user 2024-01-31 22:01:04 -05:00
Andrew
403ff47186 Merge branch 'dev' into tweak/http-timeout 2024-01-31 19:19:47 -05:00
Andrew
dc5490cdcb Merge branch 'dev' into feature/anti-lockout 2024-01-31 19:18:55 -05:00
Andrew
ccf67002cd Remove print statement 2024-01-31 19:17:13 -05:00
computergeek125
a26159f510 Added timeout to http calls, switched get to head 2024-01-31 01:33:39 -06:00
Silversthorn
56d37989e5 Merge branch 'dev' into refactor/server_ids 2024-01-30 21:19:07 +01:00
Zedifus
bc6da9ac87 Merge branch 'dev' into bugfix/audit-server-id 2024-01-28 23:47:30 +00:00
Zedifus
fffea68cba Merge branch 'dev' into bugfix/server-files-feedback 2024-01-28 23:28:36 +00:00
amcmanu3
02fbc5056d Redirect 404 on non-existant page 2024-01-28 17:15:20 -05:00
Andrew
a112bc3e57 Set time to UTC for schedule
remove prints
2024-01-28 16:51:54 -05:00
amcmanu3
ec5e291a98 Fix bug where del fail would give no feedback 2024-01-28 16:21:27 -05:00
amcmanu3
e399d57f47 Fix no server id in audit log 2024-01-28 16:20:08 -05:00
amcmanu3
5422915335 Delete user on logout 2024-01-28 13:44:44 -05:00
amcmanu3
854a9643e5 Fix bug where panel_config would always be loaded 2024-01-28 12:58:18 -05:00
amcmanu3
6e776d6383 Allow http to be disabled by config.json 2024-01-28 12:15:00 -05:00
amcmanu3
bb18400b90 Fix schedule firing too early 2024-01-26 15:29:25 -05:00
amcmanu3
9fed45d147 Only allow access to panel config 2024-01-26 15:29:12 -05:00
amcmanu3
665997c34c Print to terminal not file 2024-01-22 19:51:57 -05:00
amcmanu3
f800933799 Fix typo 2024-01-16 23:09:04 -05:00
amcmanu3
ba8737f007 Refactor subpage perm checks
Fix bug where subpages people don't still have access to are retained
2024-01-16 19:21:00 -05:00
amcmanu3
d82ee0fa31 start schedule 2024-01-16 18:01:22 -05:00
amcmanu3
3d4153f941 Add lockout user for forgot password
Hide lockout user from users list
2024-01-16 15:36:14 -05:00
Zedifus
94a63767f7 Merge branch 'dev' into bugfix/unicode-terminal 2024-01-16 19:46:31 +00:00
Zedifus
c72b209070 Merge branch 'dev' into feature/proxy-stats 2024-01-16 19:24:39 +00:00
Zedifus
3c5288abfc Merge branch 'dev' into bugfix/server-id-stack 2024-01-16 19:00:42 +00:00
amcmanu3
0b520aae80 Fix misc sonarcube finding 2024-01-16 13:53:50 -05:00
amcmanu3
7d7ae02beb Add parameter to version call 2024-01-16 13:50:05 -05:00
Zedifus
01a7c2e238 Merge branch 'dev' into feature/paper-builds 2024-01-16 18:23:18 +00:00
Zedifus
12bb29ac2d Merge branch 'dev' into tweak/forge-fix 2024-01-16 18:02:57 +00:00
Andrew
589a11f43c Allow omission of player stats from total 2024-01-13 16:43:16 -05:00