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
4,035 Commits 12 Branches 45 Tags 104 MiB
1a9ee2cbc1
Commit Graph

1839 Commits

Author SHA1 Message Date
Silversthorn
2eb0eb59ef Merge branch 'dev' into refactor/server_ids 2024-02-03 21:12:39 +01:00
Zedifus
c49258d573 Merge branch 'dev' into tweak/anti-lockout 2024-02-02 22:07:30 +00:00
Zedifus
559e5f44ee Merge branch 'dev' into tweak/http-timeout 2024-02-02 20:41:59 +00:00
Zedifus
a3236d72fd Correct nh3 no-member exemptions affected by black formatting 2024-02-02 20:36:04 +00:00
Zedifus
ef691eda5c Add exclude for E1101: Module 'nh3' has no 'clean' member 
--False Positive--
Issue tracking (fix planned for pylint 4.0.0)
https://github.com/messense/nh3/issues/18
https://github.com/pylint-dev/pylint/issues/8756
 2024-02-02 19:51:17 +00:00
Silversthorn
0a3512a18e Merge branch 'dev' into refactor/server_ids 2024-02-02 20:50:08 +01:00
Andrew
5c37b0e0fd Add auth logging 2024-02-01 00:08:34 -05:00
Andrew
d53404285c Remove ability to move to create server 2024-01-31 23:06:37 -05:00
Andrew
ecee8b494c Raise exception for anti-lockout-username 2024-01-31 22:15:40 -05:00
Andrew
aec14a6713 Do not allow user to create anti-lockout-user 2024-01-31 22:01:04 -05:00
Andrew
403ff47186 Merge branch 'dev' into tweak/http-timeout 2024-01-31 19:19:47 -05:00
Andrew
dc5490cdcb Merge branch 'dev' into feature/anti-lockout 2024-01-31 19:18:55 -05:00
Andrew
ccf67002cd Remove print statement 2024-01-31 19:17:13 -05:00
computergeek125
a26159f510 Added timeout to http calls, switched get to head 2024-01-31 01:33:39 -06:00
Silversthorn
56d37989e5 Merge branch 'dev' into refactor/server_ids 2024-01-30 21:19:07 +01:00
Zedifus
bc6da9ac87 Merge branch 'dev' into bugfix/audit-server-id 2024-01-28 23:47:30 +00:00
Zedifus
fffea68cba Merge branch 'dev' into bugfix/server-files-feedback 2024-01-28 23:28:36 +00:00
amcmanu3
02fbc5056d Redirect 404 on non-existant page 2024-01-28 17:15:20 -05:00
Andrew
a112bc3e57 Set time to UTC for schedule 
remove prints
 2024-01-28 16:51:54 -05:00
amcmanu3
ec5e291a98 Fix bug where del fail would give no feedback 2024-01-28 16:21:27 -05:00
amcmanu3
e399d57f47 Fix no server id in audit log 2024-01-28 16:20:08 -05:00
amcmanu3
5422915335 Delete user on logout 2024-01-28 13:44:44 -05:00
amcmanu3
854a9643e5 Fix bug where panel_config would always be loaded 2024-01-28 12:58:18 -05:00
amcmanu3
6e776d6383 Allow http to be disabled by config.json 2024-01-28 12:15:00 -05:00
amcmanu3
bb18400b90 Fix schedule firing too early 2024-01-26 15:29:25 -05:00
amcmanu3
9fed45d147 Only allow access to panel config 2024-01-26 15:29:12 -05:00
amcmanu3
665997c34c Print to terminal not file 2024-01-22 19:51:57 -05:00
amcmanu3
f800933799 Fix typo 2024-01-16 23:09:04 -05:00
amcmanu3
ba8737f007 Refactor subpage perm checks 
Fix bug where subpages people don't still have access to are retained
 2024-01-16 19:21:00 -05:00
amcmanu3
d82ee0fa31 start schedule 2024-01-16 18:01:22 -05:00
amcmanu3
3d4153f941 Add lockout user for forgot password 
Hide lockout user from users list
 2024-01-16 15:36:14 -05:00
Zedifus
94a63767f7 Merge branch 'dev' into bugfix/unicode-terminal 2024-01-16 19:46:31 +00:00
Zedifus
c72b209070 Merge branch 'dev' into feature/proxy-stats 2024-01-16 19:24:39 +00:00
Zedifus
3c5288abfc Merge branch 'dev' into bugfix/server-id-stack 2024-01-16 19:00:42 +00:00
amcmanu3
0b520aae80 Fix misc sonarcube finding 2024-01-16 13:53:50 -05:00
amcmanu3
7d7ae02beb Add parameter to version call 2024-01-16 13:50:05 -05:00
Zedifus
01a7c2e238 Merge branch 'dev' into feature/paper-builds 2024-01-16 18:23:18 +00:00
Zedifus
12bb29ac2d Merge branch 'dev' into tweak/forge-fix 2024-01-16 18:02:57 +00:00
Andrew
589a11f43c Allow omission of player stats from total 2024-01-13 16:43:16 -05:00
amcmanu3
78b2feab01 Remove update url for paper builds 2024-01-12 14:46:25 -05:00
amcmanu3
96d5ce58d2 Get jars direct frrom paper 2024-01-12 11:23:35 -05:00
amcmanu3
5f2236563b Fix bug where invalid server Id leads to stack 2024-01-11 19:53:22 -05:00
amcmanu3
cd3b8d4d9c Fix update urls 2024-01-11 19:35:08 -05:00
amcmanu3
e274b0c677 Implement paper builds using mineacademy API 
Big shoutout to zed for fnding this
 2024-01-11 19:20:50 -05:00
amcmanu3
9d319b7460 Fix unicode chars in terminal w/ texitiowrapper 2024-01-11 16:11:08 -05:00
Silversthorn
dc09f47871 Fixing issues for forge installation for versions >= 1.20 2024-01-03 21:10:33 +01:00
Andrew
60ac3bf630 Check type in extra so we don't iterate thru str 2023-12-29 12:11:29 -05:00
Andrew
a67f53a4c9 Fix bukkit and downstream fork MOTD crash 2023-12-28 18:34:35 -05:00
Zedifus
a564fac8cd Merge branch 'dev' into refactor/server_ids 2023-12-13 02:52:02 +00:00
Andrew
2cab7de6af Make watcher log debug 2023-12-07 18:03:31 -05:00
Andrew
d2b738f857 Add queue logging 2023-12-07 18:02:54 -05:00
Andrew
7037d857d7 Black codebase 2023-12-07 11:05:26 -05:00
Zedifus
e17af9dea5 Increase entropy of password 
With reduced symbols increasing length for better entropy
 2023-12-07 15:36:07 +00:00
Zedifus
1e68abac70 Reduce number of symbols to avoid issues 
Limit the symbols used in the character string to avoid potential
problems with certain characters.
 2023-12-07 15:32:18 +00:00
Zedifus
53b12e245f Merge branch 'dev' into sec/admin-creation 2023-12-07 15:09:11 +00:00
Zedifus
2d07dbbd9c Merge branch 'dev' into bugfix/backup-dir 2023-12-07 13:52:17 +00:00
Zedifus
342a4f6599 Merge branch 'dev' into tweak/backup-delete 2023-12-07 13:45:15 +00:00
Zedifus
ba187374d4 Merge branch 'dev' into bugfix/no-file-error 2023-12-07 12:55:20 +00:00
Zedifus
7879baff75 Merge branch 'dev' into bugfix/superuser-password-edit 2023-12-07 12:34:56 +00:00
Zedifus
b2035eef60 Fix sonar findings 2023-12-07 11:29:18 +00:00
amcmanu3
621afb4eec Fix bug where servers are created without bu dir 2023-12-04 23:37:53 -05:00
amcmanu3
42e4bb7e3c Give better feedback when backup delete fails 2023-12-04 11:01:01 -05:00
amcmanu3
09241bdc54 Appease the linter 2023-11-30 12:22:40 -05:00
amcmanu3
ca02c9d575 Add user-based translation to startup 2023-11-30 12:14:09 -05:00
amcmanu3
b60e6933dd Add broadcast to non-admin function 2023-11-30 12:12:16 -05:00
amcmanu3
fb41bc2443 Prevent stack for general user on boot 2023-11-30 01:05:00 -05:00
amcmanu3
90ed32738f Add translations 2023-11-30 00:55:26 -05:00
amcmanu3
3840cc3863 Fix bug where no file error doesn't show up 2023-11-29 22:28:18 -05:00
amcmanu3
74c0e8b23a Fix bug where su cannot edit general user password 2023-11-29 21:30:29 -05:00
amcmanu3
9e98c97eb8 Merge branch 'dev' into enhancement/crafty-loading 2023-11-29 21:24:05 -05:00
Zedifus
4b9c6cfd71 Fix sonar finding 
Use the opposite operator ("not in") instead.
Boolean checks should not be inverted python:S1940
 2023-11-28 02:22:25 +00:00
Zedifus
966d359a9a Remove unused imports from pass gen refactor 2023-11-26 21:45:48 +00:00
Andrew
e5cec247dc Remove class declaration in helpers 2023-11-26 14:48:36 -05:00
Zedifus
06c18169f1 Merge branch 'dev' into sec/admin-creation 2023-11-25 20:59:26 +00:00
Zedifus
fb4adfb22e Fix black finding 2023-11-25 20:47:45 +00:00
Zedifus
7045118cd2 Refactor password generator to be OWASP compliant 2023-11-25 20:42:18 +00:00
Iain Powrie
67ed35a6b0 Merge branch 'JonathanAlKass-master-patch-25467' into 'dev' 
removed ".decoder" from orjson in crafty-4/app/classes/web/routes/api/roles/index.py: line 113

See merge request crafty-controller/crafty-4!674
 2023-11-25 20:20:38 +00:00
Zedifus
f131ca62ff Merge branch 'dev' into refactor/remove-api-v1 2023-11-25 19:50:47 +00:00
Zedifus
911f373474 Merge branch 'dev' into critical/security 2023-11-25 19:29:46 +00:00
JonathanAlKass
62b095c38f removed ".decoder" from orjson in line 113 2023-11-21 06:30:45 +00:00
amcmanu3
131337c7d0 Appease the linter 2023-11-13 18:16:08 -05:00
amcmanu3
63d84ed1bb Remove clean from password input 2023-11-13 17:23:15 -05:00
amcmanu3
2fd66420c4 Add terminal message 2023-11-13 17:23:02 -05:00
amcmanu3
de39b041cb Fix comment 2023-11-13 16:03:53 -05:00
amcmanu3
623d6f5855 Use string library instead of monolithic arrays 
up max length to 25
 2023-11-13 16:02:50 -05:00
amcmanu3
91e62c647e Create text file in config folder with init creds 2023-11-13 14:14:13 -05:00
Silversthorn
586b2038b6 Fixing warnings 2023-11-10 23:16:04 +01:00
amcmanu3
98efec1417 Remove API v1 2023-11-05 15:48:43 -05:00
amcmanu3
7e18cc8d1b Schedule json dump to logfile every 5 minutes 2023-11-05 14:17:50 -05:00
amcmanu3
ca0546a5f4 Add auth log for sessions 2023-11-05 13:46:21 -05:00
amcmanu3
bfbb130db9 Add logs to API 2023-11-05 13:33:30 -05:00
amcmanu3
e9105ffbe4 Log authentication attempts 2023-11-05 13:26:27 -05:00
amcmanu3
5546118517 Remove password max length 2023-11-05 13:25:39 -05:00
amcmanu3
ecb40ee2ec Retain tab when navigating back to server_details 2023-11-05 11:09:57 -05:00
amcmanu3
4152e2be69 Only show server inits to admins 2023-11-03 16:55:41 -04:00
amcmanu3
28b3a4f8f3 Add loading screen while servers init 2023-11-03 16:41:23 -04:00
Silversthorn
aa7f47a4f4 Reworking id to use uuid 2023-11-01 18:44:56 +01:00
amcmanu3
645542b459 Move from 418 (i am a teapot) to 424 missing dep 2023-10-29 18:49:31 -04:00
amcmanu3
76e8b01335 Fix notifications not showing up/being reset 2023-10-29 18:37:30 -04:00
Zedifus
170750466c Remove Custom from WebhookFactory Registry 
Wven when commented out, it's still present in front end selection
 2023-10-29 13:45:03 +00:00
Andrew
9710d64072 Fix logical issue with get files perms check 2023-10-20 15:41:39 -05:00
amcmanu3
761936a308 Fix creation bug 2023-10-18 16:40:38 -04:00
amcmanu3
4f507f0cda Use more definied error 2023-10-18 16:25:28 -04:00
amcmanu3
f06d297ecd Fix task quick edit 2023-10-18 16:24:42 -04:00
amcmanu3
312ed5295b Fix quick disable button on schedules list 2023-10-18 16:03:43 -04:00
amcmanu3
44c2aaada3 Remove external references from front end deps 
use secure transfer for jsonschema reference
 2023-10-18 14:55:16 -04:00
Zedifus
ec5236c250 Add https to adaptive card 
python:S5332
 2023-10-18 19:10:53 +01:00
amcmanu3
6bc45b86e5 Merge branch 'dev' into tweak/user-edit 2023-10-08 22:44:53 -04:00
amcmanu3
cd04b87705 Appease the linter 2023-10-08 22:39:05 -04:00
amcmanu3
2d32e3ad2a Fix user edits | retain crafty perms 
Move password/username edit to bootbox
 2023-10-08 22:13:55 -04:00
Iain Powrie
99f17c1532 Merge branch 'feature/openmetrics-implementation' into 'dev' 
Implementation of OpenMetrics

See merge request crafty-controller/crafty-4!624
 2023-10-08 22:11:27 +00:00
Silversthorn
bcbafe2278 Fixed the last one ? 2023-10-08 22:19:36 +02:00
Silversthorn
814aaeb1d2 Appease the linter 2023-10-08 22:02:13 +02:00
Zedifus
9ddd21da82 Merge branch 'dev' into bugfix/server-upload 2023-10-08 19:07:51 +01:00
amcmanu3
89b0e1ed02 fix typo for upload dir 2023-10-08 10:57:59 -04:00
amcmanu3
0296b09547 Move Crafty server upload to /import/upload 2023-10-08 10:54:28 -04:00
Silversthorn
5947d4ebbf Merge branch 'dev' into feature/openmetrics-implementation 2023-10-08 00:06:34 +02:00
Silversthorn
72a5f1661c Resolve Conflicts from Merge branch 'dev' into feature/openmetrics-implementation 2023-10-07 23:55:58 +02:00
Silversthorn
f49475c15a Removing unused imports 2023-10-07 23:52:06 +02:00
Silversthorn
49914c7f14 Improve OpenMetrics Registries Work 2023-10-07 23:50:56 +02:00
amcmanu3
4eb15db30f Use controller on update user call 2023-10-07 15:21:33 -04:00
amcmanu3
529b3a159c Appease the linter 2023-10-07 13:55:36 -04:00
amcmanu3
882f241181 Appease black 2023-10-07 13:13:35 -04:00
amcmanu3
42bdf2994d Move callback to unbound 2023-10-07 13:06:26 -04:00
amcmanu3
60ae98ef97 Merge branch 'dev' into maintenance/bump-dependencies 2023-10-07 12:02:46 -04:00
amcmanu3
f42f4cf2b6 Bump multiple dep versions 
Refactor zoneinfonotfounderror
 2023-10-07 11:59:46 -04:00
Zedifus
66e74b6c04 Merge branch 'dev' into bugfix/reaction-of-reaction 2023-10-07 16:09:32 +01:00
Zedifus
ecba6f1bf0 Merge branch 'dev' into tweak/logging 2023-10-07 15:42:15 +01:00
Zedifus
7738103691 Add discord embed designer to payload construct docstring 2023-10-06 19:25:30 +01:00
Zedifus
d10de65c5a Add missing bot_name params in webhook docstrings 2023-10-06 19:20:53 +01:00
Zedifus
baf9b5baa4 Add teams adaptive card webhook provider 2023-10-06 00:22:34 +01:00
Zedifus
74386ad960 Add slack webhook provider 2023-10-05 23:12:38 +01:00
amcmanu3
7a410a2b0e Fix bug reaction schedule could be child of parent 2023-10-05 17:48:55 -04:00
amcmanu3
447e04cb8e Add log message on restart 2023-10-05 16:22:42 -04:00
amcmanu3
6d938cabc8 Set some stats logging to debug 
Add stop server logging
 2023-10-04 12:45:23 -04:00
amcmanu3
345bffbab6 Add logging statements to callbacks 2023-10-04 11:45:53 -04:00
Andrew
bfad335495 Comment callback 2023-09-28 20:03:39 -04:00
Andrew
197818c4ac Fix general exception 2023-09-28 20:00:48 -04:00
Andrew
e51b2bd0de Add bot_name to send call 2023-09-28 19:26:32 -04:00
Andrew
19d72e5766 Refactor test webhooks with data 2023-09-28 19:26:21 -04:00
Andrew
a62252ed15 Allow custom bot naming 2023-09-28 19:15:01 -04:00
Andrew
6a81a5b337 Add accent color option 2023-09-28 19:07:03 -04:00
Andrew
c410650ae2 Add kill server watcher option 2023-09-28 17:47:36 -04:00
Andrew
4bf77d2e7a Only fire when enabled 2023-09-28 17:47:19 -04:00
Andrew
c1b5dbc090 Add translations (english) 2023-09-28 17:47:03 -04:00
Andrew
89ffd40fd1 Merge branch 'feature/discord-webhooks' of gitlab.com:crafty-controller/crafty-4 into feature/discord-webhooks 2023-09-28 17:19:39 -04:00
Andrew
1b20520ac5 Add support for jar_update, send_command 2023-09-28 17:19:37 -04:00
Andrew
5cdf114fd5 Add callbacks to method calls 2023-09-28 17:18:07 -04:00
Andrew
bd1b67e83b Make webhook edit page data method calls 2023-09-28 17:17:49 -04:00
Andrew
f742a5026c Refactor naming to match method calls 2023-09-28 17:17:27 -04:00