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
1,922 Commits 12 Branches 45 Tags 104 MiB
43a93f35b3
Commit Graph

1346 Commits

Author SHA1 Message Date
Andrew
e435292a52 Fix blank server_detail page for general users 2022-06-17 00:58:18 -04:00
Zedifus
e47cad13f9 Bump version 2022-06-16 18:45:07 +01:00
Iain Powrie
43906d531e Merge branch 'bug/support_logs' into 'dev' 
Bug/support logs

See merge request crafty-controller/crafty-4!354
 2022-06-16 16:56:56 +00:00
amcmanu3
e3d289e6fd Fix support logs download issues 2022-06-16 12:11:21 -04:00
amcmanu3
35518e960f Fix username capital issues once and for all 2022-06-16 09:52:21 -04:00
Andrew
fff186e547 Merge branch 'bugfix/reconnecting-websocket' into 'dev' 
Make the WebSocket automatically reconnect.

See merge request crafty-controller/crafty-4!345
 2022-06-16 13:39:25 +00:00
luukas
581b6734d3
Remove unused server_uuid variables to fix Pylint 2022-06-16 15:31:11 +03:00
Iain Powrie
828af04e1f Merge branch 'master' into 'dev' 
Merging Master into Dev

See merge request crafty-controller/crafty-4!349
 2022-06-16 00:10:03 +00:00
luukas
f39e75616c
Use an exponential backoff algorhithm. 
https://stackoverflow.com/a/37038217/15388424
 2022-06-16 02:37:53 +03:00
Iain Powrie
c22d07d832 Merge branch 'bugfix/getelementbyid-first-dashboard' into 'dev' 
Fix an error when there are no servers

See merge request crafty-controller/crafty-4!346
 2022-06-15 23:30:12 +00:00
Iain Powrie
2ed9e5663d Merge branch 'feature/filemanager-improvements' into 'dev' 
Fix Ace editor saving keybinds and ex-commands

See merge request crafty-controller/crafty-4!341
 2022-06-15 23:24:06 +00:00
luukas
e009ff9819
Use relative paths for the jarfile and logs 2022-06-16 02:10:26 +03:00
luukas
d9c03caa9b
Fix an error when there are no servers 2022-06-16 00:19:48 +03:00
luukas
cd8ebfdcbe
Make the WebSocket automatically reconnect. 
The WebSocket reconnects 5 seconds after the connection's closure.
If the connection reconnection fails it will try to reconnect after
another 5 seconds.
 2022-06-16 00:10:48 +03:00
amcmanu3
8611c7e5e4 Fix win reg import on not windows. 
Replace WindowsError with OSError
 2022-06-15 00:42:29 -04:00
Zedifus
5d4ba079bb Bump version patch/sub 2022-06-15 04:53:49 +01: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
Zedifus
32427c3684 Merge branch 'master' into dev 2022-06-14 12:05:58 +01:00
luukas
c9744554d4
Improve the code for save status 2022-06-14 03:07:26 +03:00
luukas
a67f069709
Fix Ace editor saving keybinds and ex-commands 
* Remove our manual keydown handler and use an Ace builtin function
* Define Vim's :write aka :w ex-command
 2022-06-14 02:45:17 +03:00
luukas
392cf3d4e7
Make the file editor stick to the top of the page 2022-06-14 01:35:43 +03:00
Analicia A
2b0900d95b Correct translation - Dutch - added a space between two words 2022-06-13 21:40:45 +00:00
Zedifus
f1340f4f45 Appease black 2022-06-13 22:35:33 +01:00
luukas
73a6d1cd78
Fix the error message while deleting session.log 2022-06-14 00:30:28 +03:00
Iain Powrie
75d3baccbd Remove deprecated pylint rules 
https://github.com/PyCQA/pylint/pull/3571
https://github.com/PyCQA/pylint/pull/3577
 2022-06-13 21:30:24 +00: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
0ffe6801d8 Fix user email bug on import3 2022-06-13 12:47:42 -04:00
amcmanu3
1655818afc Define the prompt after the init is complete 2022-06-12 20:09:46 -04:00
Andrew
25a1c67c26 Fix black formatting 2022-06-12 17:17:58 -04:00
Andrew
474597d16c Add survery to admin first log 2022-06-12 17:03:42 -04:00
Andrew
9ba7dac723 Merge remote-tracking branch 'origin/master' into dev 2022-06-12 13:24:43 -04:00
Silversthorn
e0d0965931 Fixing Pylint for good 2022-06-12 18:39:05 +02: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
52d53aafe4 Delay wss error message for slower systems 2022-06-12 10:47:12 -04:00
Silversthorn
430f9f9fcf It might do the refresh after a server update 2022-06-12 08:37:24 +02:00
Andrew
51697039cd Merge branch 'bug/server-stats-refresh' into 'dev' 
Make call to controller and not stale object

See merge request crafty-controller/crafty-4!315
 2022-06-11 21:51:35 +00:00
amcmanu3
ddcd3dc5c3 Appease the linter 2022-06-11 17:46:36 -04:00
amcmanu3
e99cacfc53 Make call to controller and not stale object 2022-06-11 17:34:31 -04:00
amcmanu3
d5be8d1531 Update contribution page 2022-06-11 16:36:07 -04: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
luukas
f343db1a30
Fix inconsistency on the jsonschema API endpoint 2022-06-10 00:10:54 +03:00
Silversthorn
538b78db47 Fixing Translations issues loaded in with js 2022-06-09 00:11:21 +02:00
Silversthorn
f23bdd14a2 Fixing an issue with single quotes and translations 2022-06-08 23:56:22 +02:00
Silversthorn
51b1097a96 Fixing Stack when redirected from Unauthorized page 2022-06-08 21:42:25 +02: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
Iain Powrie
0921616285 Merge branch 'bug/fix-3-import' into 'dev' 
Fix version3 imports

See merge request crafty-controller/crafty-4!299
 2022-06-05 20:10:59 +00:00
amcmanu3
e0fb4c6442 Fix version3 imports 2022-06-05 16:02:52 -04:00
Andrew
0df30d2f05 Fix typo in error message 2022-06-04 14:24:12 -04:00
Silversthorn
757959e89d Fixing the last one 2022-06-04 02:20:45 +02:00
Silversthorn
61806b6050 Correction of unused import 2022-06-04 02:13:11 +02:00
Silversthorn
2e5299e521 Improving MOTD 2022-06-04 02:13:00 +02:00
Iain Powrie
ebf00a1900 Merge branch 'secops/pre-beta-security-fixes' into 'dev' 
Pass 2 sec advisory fixes

See merge request crafty-controller/crafty-4!294
 2022-06-03 20:10:17 +00:00
amcmanu3
dd54a5f2c9 Mark update as complete when it fails 2022-06-03 16:04:12 -04:00
amcmanu3
aa44650a05 Fix windows file pathing 2022-06-03 15:53:29 -04:00
amcmanu3
ace79cad2f Remove useless print statements 2022-06-03 15:53:20 -04:00
amcmanu3
0200f1caec Remove useless console logs 2022-06-03 15:53:12 -04:00
amcmanu3
6eb3e541bf Fix player counts on dashboard 2022-06-03 15:21:57 -04:00
Zedifus
4cdd2bf776 Remove unused code 2022-06-03 19:50:58 +01:00
Zedifus
62bdf22618 Change for to forEach loop 
> Fixes ESLint rule ID security/detect-object-injection
 2022-06-03 19:49:51 +01:00
Zedifus
04ffe0eb65 Remove unused function 2022-06-03 18:41:05 +01:00
Zedifus
df86897108 Change for to forEach loop 
> Fixes ESLint rule ID security/detect-object-injection
 2022-06-03 18:33:21 +01:00
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
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
293ae5dbd1 Remove link to non-used jquery item 2022-06-02 13:41:16 -04:00
Andrew
e561e112d4 Refactor jquery-ui to vendors 2022-06-02 13:27:38 -04:00
Andrew
5e48b250fa Fix api v1 bug with list servers 2022-06-02 09:40:43 -04: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
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
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
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
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
Andrew
26b3b8a869 Merge branch 'cleanup/remove-unused-dependencies' into 'dev' 
Remove unused dependencies

See merge request crafty-controller/crafty-4!279
 2022-05-30 13:18:42 +00:00
Silversthorn
37bda32164 Fixing moved functions calls 2022-05-30 07:36:25 +02:00
Silversthorn
2f2c9d8203 Merge branch 'dev' into dev-StatsDBImprovement 2022-05-29 10:30:18 +02:00
Zedifus
ca793807cb Add kofi widget 
Not sure how to remove the background behind the widget :(
 2022-05-29 07:09:39 +01:00
luukas
7885b2c8f7
Fix null writer 2022-05-28 21:11:09 +03:00
luukas
b0e356f999
Fix host stats error messages 2022-05-28 19:43:37 +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
luukas
f2890fa31d
Remove unused dependencies 2022-05-28 18:31:11 +03:00
Zedifus
ccd09e9753 Fix missing escaped chars in submitted translation 2022-05-28 15:17:41 +01:00
Iain Powrie
cfe5f01d78 Update he_IL.json 3.5 
Fix For RTL & Typo Mistakes and orientation & definition of a few words

Thanks thefourcraft
 2022-05-28 14:10:55 +00:00
Silversthorn
3b4253de9b Fixing get_authorized_server 2022-05-26 23:19:59 +02:00
Silversthorn
6fae395185 Fixing issues for latest stats 2022-05-26 15:43:24 +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
39915ef53c Fix critical bad stats push 2022-05-26 06:49:51 -04:00
luukas
47fc398f26
Fix CORS preflight 2022-05-26 00:31:58 +03: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
8ce7a96071
Use a better ANSI escape regex in the API logs 2022-05-25 18:41:41 +03:00
luukas
2e51fa9629
Remove newline characters from API file logs 2022-05-25 18:41:16 +03: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