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
2,718 Commits 12 Branches 45 Tags 104 MiB
de17278255
Commit Graph

764 Commits

Author SHA1 Message Date
Andrew
1f95ad600c Add return 2022-09-03 13:26:51 -04:00
Andrew
5d688522bd Fix backup logic 2022-09-03 13:23:30 -04:00
Andrew
6559112e1b Fix update logic 2022-09-03 13:16:03 -04:00
Andrew
9a7a1cc5d8 Change elif to else 2022-09-03 12:46:35 -04:00
amcmanu3
99979f668b Fix black formatting 2022-09-01 12:51:54 -04:00
amcmanu3
d5ecfe9128 Add spinner to update button 2022-09-01 12:46:37 -04:00
Iain Powrie
3e370c0ae4 Apply 1 suggestion(s) to 1 file(s) 2022-09-01 14:41:42 +00:00
amcmanu3
2becb657ca Put try/except around creation 2022-08-31 20:01:38 -04:00
amcmanu3
bd38fcd6e4 Add try/except around download 2022-08-31 19:59:46 -04:00
amcmanu3
a07eb58db7 Add bedrock server creation 2022-08-31 19:45:19 -04:00
amcmanu3
b445d085c8 Fix no id on import3 servers 2022-08-31 16:11:49 -04:00
Zedifus
96c4fa3bdd Validate bedrock url before download with urllib 
Even though there will be an incredibly small chance of tampering
this is to make bandit happy
"Bandit Test ID B310"
https://stackoverflow.com/a/53040523/18355876
 2022-08-31 20:04:39 +01:00
Zedifus
0c9e10f18a Fix sec overly permissive file permissions 
775 is too permissive for this  file, '-rwxr--r--' is more than enough
B103: Test for setting permissive file permissions
https://bandit.readthedocs.io/en/latest/plugins/b103_set_bad_file_permissions.html
 2022-08-31 19:50:35 +01:00
Zedifus
fdf1a5a41d Add url helper to bedrock update 2022-08-31 19:46:07 +01:00
Zedifus
9350ed07d7 Add bedrock remote url helper 2022-08-31 19:04:04 +01:00
Andrew
600de2be0c Fix executable backups 
Cleanup after ourselves
 2022-08-31 12:18:52 -04:00
Andrew
266e540374 Add bedrock update support 2022-08-31 11:59:33 -04:00
Zedifus
51d123e9eb Merge branch 'dev' into tweak/support-logs-zip-comment 2022-08-27 19:00:38 +01: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
Zedifus
6f66b77478 Add 'optional' comment to all archival methods 2022-08-27 17:05:13 +01:00
Andrew
27ad78c14d Make admin manager none on fresh install 2022-08-27 11:17:31 -04:00
Andrew
3c14d0f2ee Appease the linter 2022-08-27 10:44:34 -04:00
Zedifus
7d801ac216 Add date and time to log archive 2022-08-26 16:23:08 +01:00
Zedifus
b8b61649b7 Tidy support string creation and include as comment 2022-08-26 15:57:35 +01:00
Zedifus
d3b7ab048d Add comment arg to make_compressed_archive 
This is an optional arg that will add a comment to zip file
 2022-08-26 15:56:31 +01:00
Andrew
037758accb Working live graph 2022-08-22 20:04:40 -04:00
Andrew
9d961215a5 Fix logical bug with shutdown log/console prompts 2022-08-21 13:00:24 -04:00
Andrew
44afc72d3a Add variable shutdown timeouts 2022-08-21 12:41:28 -04:00
Andrew
cafa720bba Fix server quotas. Removed un-used perms columns 2022-08-20 13:00:20 -04:00
amcmanu3
b10523ae0a Add import status to working bedrock 2022-08-17 19:07:56 -04:00
amcmanu3
504ffd57f6 Working zip imports 2022-08-17 18:14:16 -04:00
amcmanu3
b5420c083e Starting zip imports 2022-08-17 17:41:44 -04:00
amcmanu3
eea5e329af Refactor and add import_helpers. 
Working jar imports
 2022-08-17 17:22:03 -04:00
amcmanu3
65c8ca680b Add importing threading to jar servers. 
Refactor "downloading" status
 2022-08-17 14:48:05 -04:00
Zedifus
ab5f587f50 Merge branch 'dev' into tweak/pretzel-backup-list 2022-08-14 18:03:30 +01:00
Zedifus
8c3649d0bb Merge branch 'dev' into bug/pretzel-fresh-install 2022-08-14 17:53:22 +01:00
amcmanu3
f6975912f4 Only list zip files in backups list 2022-08-07 12:19:58 -04:00
amcmanu3
f4660fb36c Make fresh install more efficient 2022-08-07 11:30:00 -04:00
amcmanu3
675912a0b6 Check for number of users in fresh install 2022-08-07 11:04:12 -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
amcmanu3
75c8cdef53 Add names to schedules 2022-08-05 13:52:50 -04:00
amcmanu3
ad318296dc Fix no new_job error 2022-08-04 23:57:22 -04:00
amcmanu3
f69d79b702 Fix indenting on jobs being added 2022-08-04 23:23:56 -04:00
Zedifus
6d08d31d97 Add log lines for update notif 
Co-authored-by: andrew.charles.mcmanus@gmail.com <andrew.charles.mcmanus@gmail.com>
 2022-08-05 03:02:02 +01:00
Zedifus
59174110ab Remove print statement 
Co-authored-by: andrew.charles.mcmanus@gmail.com <andrew.charles.mcmanus@gmail.com>
 2022-08-05 02:38:43 +01:00
Zedifus
ff0faffc08 Add update check to 12hr schedule 
Co-authored-by: andrew.charles.mcmanus@gmail.com <andrew.charles.mcmanus@gmail.com>
 2022-08-05 02:37:21 +01:00
Zedifus
1e6df269ac Merge branch 'dev' into feature/crafty-version-check 2022-08-05 01:53:40 +01:00
Zedifus
a0b599bbd2 Merge branch 'dev' into enhancement/pretzel-next-run 2022-08-05 01:27:18 +01:00
Zedifus
da6a3e3688 Merge branch 'dev' into bug/server-creation-api 2022-08-05 00:33:58 +01:00
Zedifus
6c901e5e3e Merge branch 'dev' into bug/pretzel-backup-restart 2022-08-05 00:20:20 +01:00
Iain Powrie
5353cd854f Change sleep from 60 to 3 2022-08-04 23:18:01 +00:00
amcmanu3
18a0b95d29 Fix lint issues 2022-08-04 18:34:43 -04:00
amcmanu3
6c0cd54e7e Add next run to schedule info 2022-08-04 18:15:59 -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
ad0d47c357 Check for server backup on restart 2022-07-30 14:47:07 -04:00
Andrew
af009a96d9 Fix bug where no java reg path found stack 2022-07-30 13:17:01 -04:00
Zedifus
99ae7e01a1 Tidy import naming 
This will allow for previous variable naming
 2022-07-21 00:39:29 +01:00
Zedifus
ebe5d6815c Add helper for remote version check 2022-07-20 23:53:31 +01:00
Zedifus
31fe66776c Merge branch 'dev' into incident/log-file-issues 2022-07-18 22:03:03 +01:00
Zedifus
4f3fc40e5b Merge branch 'dev' into tweak/support-logs 2022-07-18 21:52:36 +01:00
amcmanu3
f265b070c0 Fix log file path issue for support log/log delete 2022-07-18 14:55:12 -04:00
Andrew
31ee894603 Add platform & crafty version info to support logs 2022-07-17 16:37:10 -04:00
Andrew
2ddc1e7c96 Remove server.props requirement 2022-07-16 19:05:00 -04:00
luukas
875767e16c
Merge branch 'dev' into feature/ajax-schedule-enabled 2022-07-13 15:48:09 +03:00
amcmanu3
f1d11bfb0d Remove tempdir from packaging logs. 2022-07-05 21:35:43 -04:00
amcmanu3
ea24215e21 Remove default backup dir location 2022-07-05 14:55:17 -04:00
amcmanu3
70dfc28574 Fix unable to restore backup on external meduim 2022-07-05 14:45:13 -04:00
Zedifus
48cd5916ed Revert internal comment 
Must've changed this accidentally
 2022-06-24 03:56:31 +01:00
Zedifus
9a6625ccaa Merge branch 'dev' into bugfix/handle-none-java-return 2022-06-24 03:45:36 +01:00
Andrew
118924eeaa Fix one more stop where this as an issue 2022-06-23 21:57:50 -04:00
Zedifus
cf25249a9d Fix path issue with update-alternatives 
Sometimes it can be in /sbin,
if it is we return `None` which broke upstream frontend.
Returning an empty list to resolve this.
 2022-06-24 02:28:05 +01:00
Andrew
b4749f8caf Fix 2 bugs: Stats startup after backup 
Server java version path bug
 2022-06-23 19:34:27 -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
Zedifus
610b94dd59 Merge branch 'dev' into tweak/file-enhancements 2022-06-21 20:41:09 +01:00
Zedifus
bad7a8d625 Merge branch 'dev' into feature/java-selection 2022-06-21 04:29:37 +01:00
Zedifus
8e646df58c Add Java detect for win, and hook up to front end 2022-06-20 23:44:33 +01: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
e820ba058a Add prototype helper (linux only) 2022-06-20 18:05:39 +01:00
Iain Powrie
1de2ea1b5c Merge branch 'bug/-1-stats-showing-on-dashboard' into 'dev' 
Fix -1 showing on dashboard when offline

See merge request crafty-controller/crafty-4!365
 2022-06-18 21:27:05 +00:00
Andrew
478dfdc6ef Fix -1 showing on dashboard when offline 2022-06-18 17:18:21 -04:00
Andrew
9bbf316494 Check for Oracle Java before changing start string 2022-06-17 19:11:03 -04:00
Andrew
a2ad23548c Check for Oracle Java before changing start string 2022-06-17 19:08:57 -04:00
luukas
b4770bc9a0
Use indent=4 instead of indent=True 
`indent=True` is equivalent to `indent=1`
You can test this by executing `'foo' * True`, `'foo' * 1` and
`'foo' * 4` in a Python REPL.
 2022-06-18 01:30:50 +03:00
luukas
5bfd564ef4
Use with-blocks when opening files 2022-06-18 01:27:55 +03:00
amcmanu3
e3d289e6fd Fix support logs download issues 2022-06-16 12:11:21 -04:00
luukas
e009ff9819
Use relative paths for the jarfile and logs 2022-06-16 02:10:26 +03:00
amcmanu3
8611c7e5e4 Fix win reg import on not windows. 
Replace WindowsError with OSError
 2022-06-15 00:42:29 -04:00
Zedifus
00466719ea Exempt R1717 consideration 2022-06-15 04:52:19 +01:00
Zedifus
0f82ba3084 Line exempt E0602 
It's not an undefined var it's the Base class for I/O related errors.
False positive.
 2022-06-15 04:44:19 +01:00
Zedifus
5f8dbd4dc7 Fix C0113 & Exempting R0201 Line as self required. 2022-06-15 04:27:27 +01:00
Zedifus
9ed5cc3c5a Fix pylint R1724 2022-06-15 04:15:46 +01:00
Zedifus
1cfc926b16 Fix line length CQ 2022-06-15 04:11:40 +01:00
amcmanu3
cda2120579 Fix window java issue causing no stats 2022-06-14 22:33:02 -04:00
amcmanu3
17ef71046c Merge branch 'master' into dev 2022-06-14 15:49:32 -04:00
amcmanu3
0f43dd627a Fix uppercase usernames imported from 3. 
Uppercase usernames will break logic on three.
They need to be lowered before they are imported.
 2022-06-14 15:43:29 -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
luukas
73a6d1cd78
Fix the error message while deleting session.log 2022-06-14 00:30:28 +03:00
luukas
0d664cfae5
Remove a useless session.log warning 
This fixes an error being sent when session.log doesn't exist.
This usually occurs when the logs directory is deleted.
 2022-06-14 00:16:49 +03:00
amcmanu3
55f7ab1d35 Fix traceback on crash detection startup 2022-06-13 16:13:18 -04:00
amcmanu3
e644380b64 Allow users with capital letter to reset password 2022-06-13 16:06:36 -04:00
Andrew
7e7557f530 Merge branch 'bug/import-user-error' into 'bug/tz-fallback' 
Bug/import user error

See merge request crafty-controller/crafty-4!332
 2022-06-13 19:21:07 +00:00
amcmanu3
074e9f33a8 Fix import3 2022-06-13 15:14:41 -04:00
amcmanu3
8f5cdbb0c5 Fix crafty3 -4 import users 2022-06-13 15:07:12 -04:00
amcmanu3
4019f0365e Fix user import issues 2022-06-13 14:45:01 -04:00
Zedifus
6962662ce5 Fix black 2022-06-13 19:41:25 +01:00
amcmanu3
033bf05279 Appease black 2022-06-13 14:31:53 -04:00
amcmanu3
b3f167ab62 Add fallback for tz not being found 2022-06-13 14:29:25 -04:00
amcmanu3
1655818afc Define the prompt after the init is complete 2022-06-12 20:09:46 -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
Andrew
c924663ab3 Fix stack on server stop 2022-06-10 19:04:34 -04:00
Andrew
41cf247c5a Appease black 2022-06-10 18:31:48 -04:00
Andrew
4a15a2331e Fix error when stats job does not exist on kill 2022-06-10 18:29:47 -04:00
amcmanu3
d7606f4cc6 Fix user permissions issue 2022-06-06 17:04:45 -04:00
Andrew
8e23ba5bdb Fix backup error if excluded dir doesn't exists. 2022-06-06 00:05:16 -04:00
amcmanu3
e0fb4c6442 Fix version3 imports 2022-06-05 16:02:52 -04:00
amcmanu3
dd54a5f2c9 Mark update as complete when it fails 2022-06-03 16:04:12 -04:00
amcmanu3
ace79cad2f Remove useless print statements 2022-06-03 15:53:20 -04: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
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
Andrew
98b364cd3e Fix support logs validation 2022-06-02 08:57:36 -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
f2dec0c52b Reset secret key on fresh start when db dumped 2022-06-02 07:33:43 -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
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
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
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
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
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
Silversthorn
37bda32164 Fixing moved functions calls 2022-05-30 07:36:25 +02:00
luukas
7885b2c8f7
Fix null writer 2022-05-28 21:11:09 +03:00