Commit Graph

3861 Commits

Author SHA1 Message Date
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
Iain Powrie
6bf03d5c33 Merge branch 'bugfix/clone-server' into 'dev'
Do not allow users at server limit to clone servers

See merge request crafty-controller/crafty-4!718
2024-02-20 03:15:11 +00:00
Zedifus
0c16e99925 Update changelog !718 2024-02-20 03:10:26 +00:00
Zedifus
5b2890ce9a Merge branch 'dev' into bugfix/clone-server 2024-02-20 03:08:33 +00:00
Iain Powrie
f9dc4083b9 Merge branch 'bugfix/default-json' into 'dev'
Make sure default.json is read from correct loc

See merge request crafty-controller/crafty-4!714
2024-02-20 03:07:51 +00:00
Zedifus
6495e46adc Update changelog !714 2024-02-20 02:59:18 +00:00
Zedifus
5e85707973 Merge branch 'dev' into bugfix/default-json 2024-02-20 02:58:09 +00:00
Andrew
51ef227565 Merge branch 'tweak/fix-bedrock-cert-issues' into 'dev'
Fix bedrock cert issues & Refactor Remote downloads

See merge request crafty-controller/crafty-4!719
2024-02-20 02:53:36 +00:00
Zedifus
d886fe7965 Update changelog !719 2024-02-20 02:48:54 +00:00
amcmanu3
db8ef6d382 Fix modal glitch 2024-02-19 21:45:11 -05: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
Andrew
1211b22183 Merge branch 'sec/bump-crypto' into 'dev'
Bump openssl & cryptography

See merge request crafty-controller/crafty-4!716
2024-02-19 20:43:20 +00:00
Zedifus
07c9620875 Merge branch 'dev' into sec/bump-crypto 2024-02-19 20:34:49 +00:00
Andrew
d19d3a2288 Merge branch 'tweak/appease-black-in-dev' into 'dev'
Fix assorted black issues currently in dev

See merge request crafty-controller/crafty-4!717
2024-02-19 20:27:31 +00:00
Zedifus
0422a2ecdf Fix assorted black issues currently in dev 2024-02-19 20:02:09 +00:00
Zedifus
bbf08a6690 Update changelog !716 2024-02-19 19:58:31 +00:00
Zedifus
c570bdeda0 Bump openssl & cryptography
Resolves:
CVE-2024-0727
CVE-2023-50782
2024-02-19 19:30:51 +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
3bd5de5bf6 update cryptography in requirements.txt too fix vulnerability 2024-02-16 20:36:22 +01:00
Silversthorn
3529c9f7fe Fixing loog messages 2024-02-16 20:27:30 +01:00
Silversthorn
b30d7b627c removing uuid from server model 2024-02-16 20:23:23 +01:00
Silversthorn
12627cec8e Fixed the why it was not working 2024-02-16 20:21:38 +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
bb3901f783 remove forgoten use of migration_uuid 2024-02-16 19:45:08 +01:00
Silversthorn
ccec2a3400 rename migration file to have a more recent one 2024-02-16 19:32:23 +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