Commit Graph

619 Commits

Author SHA1 Message Date
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
luukas
0df5fedf2b
Add try-excepts for host stats 2022-05-28 19:32:54 +03:00
luukas
d1beb2f125
Redirect stderr to null during psutil's import.
On some systems /proc might be unavailable and psutil would freak out
printing several exceptions to stderr but strangely not raising the
exceptions for upper scope to handle
2022-05-28 19:00:25 +03:00
Silversthorn
3b4253de9b Fixing get_authorized_server 2022-05-26 23:19:59 +02:00
Silversthorn
99b28efd33 Merge branch 'dev' into dev-StatsDBImprovement 2022-05-26 15:39:52 +02:00
Silversthorn
be1930c7c7 fixing server shutdown gracefull exit 2022-05-26 15:28:54 +02:00
Silversthorn
2b484d5a07 fixing download jar 2022-05-26 15:20:21 +02:00
Silversthorn
056856cf98 Fixing Helpers issue 2022-05-26 15:02:47 +02:00
Silversthorn
8423cc24c1 I'm breaking/fixing stuff 2022-05-26 14:50:20 +02:00
Andrew
b0b9936df7 Merge branch 'bugfix/stats-db-select' into 'dev'
Get rid of the stats database proxy

See merge request crafty-controller/crafty-4!276
2022-05-25 18:29:23 +00:00
Andrew
b293164e12 Add crash detection to realtime stats 2022-05-25 14:26:13 -04:00
luukas
3956d9c699
Remove stdin sending from command_watcher
Reasons:
* It's unused in our program
* It can be a start to security vulnerabilities.
  I've seen many routes add commands to `Commands` without validation.
2022-05-25 17:44:09 +03:00
Silversthorn
5a1353373a trying something new 2022-05-25 15:54:35 +02:00
luukas
ca450f21ed
Document set_passwd and threads prompt commands
Help messages:
set_passwd: Set a user's password. Example: set_passwd admin
threads: Get all of the Python threads used by Crafty
2022-05-25 16:25:49 +03:00
luukas
8e13b4e11d
Simplify helpers setting methods 2022-05-25 16:21:34 +03:00
luukas
4e84eee5a5
Rename server stats variables to server_stats 2022-05-25 16:15:51 +03:00
luukas
83018c6860
Calculate the min stats date with timedelta
This is more correct than just using days.
I've also tested this working in a completely separate Peewee project.
2022-05-25 16:14:42 +03:00
luukas
a937a94ac8
Use a better variable name for stat disappear date
* Rename occurences of `last_week` with `minimum_to_exist`
2022-05-25 14:49:17 +03:00
luukas
0d62223982 Merge branch 'dev' into bugfix/api-v2-bugfixes 2022-05-23 20:20:49 +03:00
luukas
8f8b2aa22f
Simplify MainPrompt.emptyline. 2022-05-21 02:04:03 +03:00
luukas
b49bca3279
Use a tab character in the threads prompt command
https://i.imgur.com/jy0Rlgm.png
2022-05-21 01:57:40 +03:00
luukas
b724fc500d
Improve the startup process 2022-05-21 01:53:17 +03:00
luukas
eff7aefb6e
Use local date and time formatting for Console 2022-05-21 01:41:48 +03:00
luukas
02f5318f76
Merge branch 'dev' into merge/pretzel-lukas-cleanup-nosquash 2022-05-20 22:04:41 +03:00
luukas
dba3fafa87
Use shorthand for Controller.check_system_user
This reduced the code from 4 lines to 1 line.

The code
    if <condition>:
        return True
    else:
        return False
can be shortened to
    return <condition>
2022-05-20 13:31:30 +03:00
luukas
48948423c9
Fix various things in create_api_server 2022-05-20 01:33:02 +03:00
luukas
7a7c7501e6 Use relative path for latest.log 2022-05-19 17:27:36 +03:00
luukas
87085cec3c Fix an IndexError in get_lang_page 2022-05-19 01:10:06 +03:00
Andrew
b7780682d5 Merge branch 'dev' into 'merge/api-v2'
# Conflicts:
#   app/classes/controllers/crafty_perms_controller.py
2022-05-18 21:56:39 +00:00
amcmanu3
d235d0b70b Add error for no user 2022-05-18 17:37:07 -04:00
amcmanu3
49965bf31f Add explaination to password fail. 2022-05-18 17:22:39 -04:00
luukas
559a345f25 Merge branch 'dev' into merge/api-v2 2022-05-18 01:49:19 +03:00
amcmanu3
e12814d0b0 Appease the linter 2022-05-17 16:01:37 -04:00
luukas
821ed7ef5d Make get_server_obj raise an error
Reason being: There is nothing that checks if it returns False
2022-05-17 21:43:15 +03:00
luukas
42af86b6f7 Merge branch 'dev' into experimental/lukas-cleanup 2022-05-17 21:21:47 +03:00
amcmanu3
a2b711b5ac Add password reset to Crafty Console 2022-05-16 15:39:10 -04:00
luukas
e7e337bea1 Improve the start_server function 2022-05-16 18:16:04 +03:00
Andrew
7d8515321b Revert bad changes for schedules 2022-05-15 15:59:55 -05:00
Andrew
4f6a90eb6a Remove unused import 2022-05-15 14:05:23 -05:00
Andrew
490fc86d4e Cleanup server schedule on delete 2022-05-15 14:00:24 -05:00
Andrew
e161e2cf0b Add cleanup method for server stats on delete 2022-05-15 13:28:02 -05:00
Andrew
0f19c0c787 Realtime server stats all the time 2022-05-15 13:16:28 -05:00
Andrew
984f4cc4d6 Change Files Aesthetic 2022-05-15 12:38:48 -05:00
luukas
930c6936d9 Add more advanced role APIs 2022-05-10 02:08:49 +03:00
luukas
721c9cfe12 Add the server creation endpoint 2022-05-05 14:02:23 +03:00
luukas
53459d83dc Merge branch 'feature/api-v2' into merge/api-v2 2022-05-05 03:32:09 +03:00