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

1958 Commits

Author SHA1 Message Date
amcmanu3
3c4b513a44 Use json.loads in the update function 2024-06-14 18:17:50 -04:00
Analicia Abernathy
6e7b250292 Merge branch 'refactor/backups' of gitlab.com:crafty-controller/crafty-4 into refactor/backups 2024-06-14 14:17:00 -05:00
amcmanu3
f5874d701a Add password error to not display password in plain text 2024-06-13 17:09:00 -04:00
amcmanu3
038a280ae1 Merge branch 'refactor/backups' into refactor/upload-api 2024-06-13 16:17:49 -04:00
amcmanu3
d4503f1887 Use backup_location variable 2024-06-13 16:06:04 -04:00
amcmanu3
6ff561f40b Fix default backup config 2024-06-13 15:54:47 -04:00
Andrew
4aad365811 Add a thread dump to support logs 2024-06-08 12:24:04 -04:00
Andrew
44ab4b8b75 Merge branch 'refactor/backups' into refactor/upload-api 2024-06-07 14:08:23 -04:00
Andrew
8dd82f4111 Set backups to live in a directory with the backup id 2024-06-07 14:08:05 -04:00
amcmanu3
682999f7f6 Standardize header naming 2024-06-02 13:02:40 -04:00
amcmanu3
bb6b516647 Fix bug where full access gives minimal access 2024-06-01 22:16:46 -04:00
amcmanu3
f28f689841 Do not allow slashes in server names 2024-05-31 15:31:42 -04:00
amcmanu3
c3560acbd1 Account for str valid_tokens_from 2024-05-31 12:45:29 -04:00
Andrew
251df92528 Appease the linter 2024-05-29 19:32:27 -04:00
Andrew
2898917b64 Remove print statements 2024-05-29 19:30:07 -04:00
Andrew
9ec0044458 Use UTC for tokens_valid_from in user config 2024-05-29 13:21:50 -10:00
Andrew
c8b607c08a Remove unnecessary imports 2024-05-28 21:49:41 -04:00
Andrew
d8ad8f5e09 Fix role selection on user creation. 
Security improvements
 2024-05-28 17:14:05 -04:00
Andrew
0aae82448b Add comments 2024-05-28 15:39:44 -04:00
amcmanu3
407ca4c0bb Add logging 2024-05-27 19:48:35 -04:00
amcmanu3
3fd763eebd Check hashes 2024-05-27 19:12:39 -04:00
amcmanu3
9b7ddbfe1e Check for server dir on server_upload 2024-05-27 15:19:23 -04:00
amcmanu3
3b7a463184 Remove stream_size_GB option 2024-05-26 23:42:25 -04:00
amcmanu3
95ef72d809 All file uploads using API 2024-05-26 23:31:06 -04:00
amcmanu3
96f0ee62ac Fix upload imports 2024-05-26 23:18:12 -04:00
amcmanu3
45aacb97c8 Refactor upload route 
Import uploads broke
 2024-05-26 23:08:43 -04:00
amcmanu3
7c8781e09e Merge branch 'refactor/backups' into refactor/upload-api 2024-05-26 21:01:00 -04:00
amcmanu3
9ebaf38553 Fix files methods 2024-05-26 20:59:58 -04:00
amcmanu3
c30d17cbf8 Chunked uploads 2024-05-26 20:54:06 -04:00
amcmanu3
b8681c0fce Security check when posting task config 2024-05-26 18:37:20 -04:00
amcmanu3
772910dc6f Set backup schedules 2024-05-26 18:03:57 -04:00
amcmanu3
217435283b Restore backup/clone 2024-05-26 17:10:20 -04:00
amcmanu3
a46129f20c Lint 2024-05-26 15:41:01 -04:00
amcmanu3
d24f56f4a5 Use self as first argument 2024-05-26 15:39:52 -04:00
amcmanu3
79adf29c62 Remove failed status after success 2024-05-26 15:38:38 -04:00
amcmanu3
daa511ef2a Remove print statements 2024-05-26 15:20:18 -04:00
amcmanu3
708f57537c View backup error 2024-05-26 15:10:03 -04:00
amcmanu3
7c50b7cfa5 Add percentage to both pages 2024-05-26 13:59:08 -04:00
amcmanu3
1b073a2401 Backup statuses 
Default backups
 2024-05-26 13:45:13 -04:00
amcmanu3
bf196b68c0 Fix more lint 2024-05-25 22:25:29 -04:00
amcmanu3
74ef9e0a13 Fix backup file downloads 2024-05-25 22:19:14 -04:00
amcmanu3
5d82d79afd Add backup configs/remove backup configs 2024-05-25 22:10:35 -04:00
amcmanu3
3cf4ebf073 Backups are editable! 2024-05-25 16:33:28 -04:00
amcmanu3
b061ebf5e5 Use zip note 2024-05-25 15:12:55 -04:00
amcmanu3
334d4b69c8 Allow three arguments on server actions 2024-05-25 15:12:46 -04:00
amcmanu3
97de58f31d Add action ID to tasks 2024-05-25 15:12:28 -04:00
amcmanu3
41147266ad Fix issue with backup compression 2024-05-25 15:11:58 -04:00
amcmanu3
d55e7c9e64 Remove repeated code 2024-05-25 14:40:21 -04:00
amcmanu3
60d3ee1aa8 Working default backup 2024-05-25 14:40:14 -04:00
amcmanu3
f8626633cf Add action ID option to schedules 2024-05-25 13:51:40 -04:00
Andrew
64116a6cf3 Remove backup enabled column 2024-05-15 21:37:56 -04:00
--unset
6ca396854d Merge branch 'dev' into refactor/backups 2024-05-15 21:01:16 -04:00
--unset
b1a7142dc0 Fix role permissions 2024-05-10 22:56:50 -04:00
--unset
88fd46282d Add expected return variable 2024-05-10 19:31:20 -04:00
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