Iain Powrie
3200c72571
Merge branch 'secops/pre-beta-security-fixes' into 'dev'
...
pre beta release security fixes
See merge request crafty-controller/crafty-4!289
2022-06-03 15:36:28 +00:00
Zedifus
eaecb2f09b
Replace standard pseudo-random generators
...
Resolves: `Bandit ID B311`
[Standard pseudo-random generators are not suitable for security/cryptographic purposes.]
2022-06-03 14:05:26 +01:00
Iain Powrie
ba28369222
Bump PyJWT version to resolve CVE-2022-29217
2022-06-03 11:58:43 +00:00
Iain Powrie
18ab2cd76d
Drop to less permissive mask for bedrock imports
...
`Owner` of the file (which should be us) can r-w-e
`Group` of the file can r-w
`World` can do nothing.
Sticky bit is still set.
2022-06-03 11:42:20 +00:00
Iain Powrie
f8ad3c3ffc
Merge branch 'dev' into 'master'
...
Fix jquery-ui refactor and non-used references
See merge request crafty-controller/crafty-4!291
2022-06-02 17:47:43 +00:00
Andrew
2c6b5f88ec
Merge branch 'bug/jquery-vector-404' into 'dev'
...
Remove link to non-used jquery item
See merge request crafty-controller/crafty-4!292
2022-06-02 17:44:46 +00:00
Andrew
293ae5dbd1
Remove link to non-used jquery item
2022-06-02 13:41:16 -04:00
Iain Powrie
d9054cc10e
Merge branch 'refactor/jquery-ui' into 'dev'
...
Refactor jquery-ui to vendors
See merge request crafty-controller/crafty-4!290
2022-06-02 17:33:30 +00:00
Andrew
e561e112d4
Refactor jquery-ui to vendors
2022-06-02 13:27:38 -04:00
Craft Breadth
a0ed862a51
Merge branch 'dev' into 'master'
...
Crafty Controller 4.0 Beta 1 🎉
See merge request crafty-controller/crafty-4!237
2022-06-02 16:46:41 +00:00
Iain Powrie
e22cdc3da8
Merge branch 'bug/api-bug-cleanup' into 'dev'
...
Fix api v1 bug with list servers
See merge request crafty-controller/crafty-4!288
2022-06-02 14:03:27 +00:00
Andrew
5e48b250fa
Fix api v1 bug with list servers
2022-06-02 09:40:43 -04:00
Iain Powrie
3c7c753baa
Merge branch 'bug/pretzel-bug-cleanup' into 'dev'
...
Bug/pretzel bug cleanup
See merge request crafty-controller/crafty-4!287
2022-06-02 13:04:43 +00:00
Andrew
98b364cd3e
Fix support logs validation
2022-06-02 08:57:36 -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
5970895268
Fix resetting api_key
2022-06-02 08:23:28 -04:00
Andrew
fae4ff12ea
Fix general user support logs
2022-06-02 08:23:18 -04:00
Andrew
50872e2bb5
Remove active tasks when server is deleted
2022-06-02 07:34:34 -04:00
Andrew
b793016c03
Redefine how servers are served to panel_handler
2022-06-02 07:34:17 -04:00
Andrew
f2dec0c52b
Reset secret key on fresh start when db dumped
2022-06-02 07:33:43 -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
ea2dd5b78f
Add self to parameters for non-static function
2022-06-01 18:31:31 -04:00
Andrew
74597a406b
Merge branch 'dev-StatsDBImprovement' into 'dev'
...
Dev stats db improvement
See merge request crafty-controller/crafty-4!281
2022-06-01 22:29:34 +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
Iain Powrie
7f4bd6eac7
Merge branch 'experimental/lukas-codebase-improvements' into 'dev'
...
Fix Finnish translations
See merge request crafty-controller/crafty-4!285
2022-06-01 20:49:16 +00:00
luukas
6474663a64
Fix Finnish translations
2022-06-01 23:25:53 +03:00
Andrew
9864cecff1
Merge branch 'experimental/lukas-codebase-improvements' into 'dev'
...
Lukas's codebase improvements
See merge request crafty-controller/crafty-4!277
2022-06-01 20:22:47 +00:00
luukas
89b6e239bc
Merge branch 'dev' into experimental/lukas-codebase-improvements
2022-06-01 22:35:11 +03:00
Andrew
b88752f62f
Merge branch 'bug/tempdir-cleanup' into 'dev'
...
Remove temporary directory on backup completion
See merge request crafty-controller/crafty-4!284
2022-06-01 19:21:56 +00:00
Andrew
28ffbe4627
Remove unnecessary pass
2022-06-01 15:20:16 -04:00
Andrew
3946a926bf
Remove print statement
2022-06-01 15:17:13 -04:00
Andrew
fdc88451b9
Add exception for permissions in helpers check
2022-06-01 15:11:37 -04:00
Zedifus
de96844276
Remove useless return from a_backup_server
...
(Pylint R1711)
2022-06-01 18:34:04 +01:00
Zedifus
256c6567fd
Remove temporary directory on backup completion
...
When running backups, the temporary directory wasn't being properly removed.
Added logic to remove the temporary directory upon backup completion,
cleaned up the try/except a bit.
2022-06-01 18:28:24 +01:00
luukas
45a1b835fb
Fix server error checking in API stdin endpoint
2022-06-01 14:17:33 +03:00
Andrew
180a22f545
Merge branch 'darthleo-missing-jquery-reinstation' into 'dev'
...
Add jquery back to the main base.html template.
See merge request crafty-controller/crafty-4!282
2022-05-31 21:50:02 +00:00
DarthLeo1000YT
d486fdd4c8
add jquery back to the main base.html template.
2022-05-30 20:57:19 -04:00
luukas
e0b0e52bd5
Add stdin route for the API
2022-05-31 00:11:17 +03:00
Silversthorn
ec2d967419
Fixing Commands to server
2022-05-30 22:49:42 +02:00
Silversthorn
150e8e5794
Renaming Server in shared to ServerInstance
2022-05-30 22:40:34 +02:00
Silversthorn
f89f94c44a
Merge branch 'dev' into dev-StatsDBImprovement
2022-05-30 22:16:42 +02:00
Silversthorn
f597a26e5b
Trying to fix stuff
2022-05-30 22:05:36 +02:00
Silversthorn
18bf7ebd01
Updating Argon2-cffi and psutil
2022-05-30 19:56:21 +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
luukas
290c398198
Add command queue stdin commands back
2022-05-30 18:23:37 +03:00
