1795 Commits

Author	SHA1	Message	Date
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
Zedifus	60e377a2e1	Refine Mattermost embed formatting	2023-09-28 21:30:48 +01:00
Andrew	9a88563916	Swap server ID for name in send.	2023-09-28 15:54:56 -04:00
Andrew	13214e9e86	Fix authentication issues on webhook get/post	2023-09-28 14:57:18 -04:00
Zedifus	409d7618dd	Refactor Webhooks to WebhookFactory ... To save having a massive class lets go modular	2023-09-28 19:17:47 +01:00
Zedifus	1ea0d692d0	Add mattermost webhook dispatcher ... Refactor common variables abit	2023-09-28 04:00:49 +01:00
Zedifus	2bb5fa4fa2	Refine discord webhook post ... To better feedback dispatch outcome	2023-09-28 02:48:22 +01:00
Zedifus	a387c12769	Rework discord webhook dispatcher	2023-09-28 02:08:11 +01:00
Andrew	628c234400	Refactor management classname	2023-09-27 17:35:44 -04:00
Zedifus	f9218ae157	Merge branch 'dev' into feature/discord-webhooks	2023-09-27 21:57:13 +01:00
Andrew	6af4f7b196	Remove print statement	2023-09-27 16:13:02 -04:00
Andrew	6c396fdf11	Fix backup restore	2023-09-26 21:08:11 -04:00
Andrew	f74194f0e5	Fix backups status not showing up	2023-09-26 21:07:56 -04:00
Zedifus	65bea2a11a	Merge branch 'dev' into feature/discord-webhooks	2023-09-21 23:42:04 +01:00
Andrew	6c1508f061	Remove extra handler	2023-09-19 18:35:41 -04:00
Silversthorn	1bf8f3bf44	Merge branch 'dev' into bugfix/issue_255_status_page_update	2023-09-19 22:08:49 +02:00
Silversthorn	e9439ca154	Changing history units to hours	2023-09-19 21:46:31 +02:00
Zedifus	c0f07747a5	Merge branch 'dev' into tweak/refresh-handler	2023-09-19 19:24:55 +01:00
Andrew	8c2cfacb4e	Use Jar naming schema for refresh	2023-09-08 20:27:47 -04:00
Silversthorn	99ef2db016	Adding host stats to the API	2023-09-06 23:28:46 +02:00
Andrew	096de18c2c	Merge branch 'dev' into feature/discord-webhooks	2023-09-05 20:39:20 -04:00
Silversthorn	083e7b2f3f	Fixing Little Rename Issue	2023-09-05 23:16:53 +02:00
Silversthorn	618094aa3e	Removing useless BaseWebSocketHandler	2023-09-05 23:08:40 +02:00
Silversthorn	a0b069c9ef	Reverting Public/Auth websocket	2023-09-05 23:00:52 +02:00
Silversthorn	c7ea7fbc6b	Appease Black	2023-09-05 20:37:52 +02:00
Silversthorn	02b7cb8205	appease linter	2023-09-05 20:27:02 +02:00
Silversthorn	2d77c456ca	Merge branch 'dev' into bugfix/issue_255_status_page_update	2023-09-05 20:05:12 +02:00
Wout Bouckaert	23ff88e013	🖤 Format	2023-09-04 21:59:24 -06:00
Wout Bouckaert	751beaa7eb	Replace all instances of bleach with nh3. ... Using latest version of nh3.	2023-09-04 20:44:44 -06:00
amcmanu3	2c14a3fd2c	Appease the linter	2023-09-04 21:39:40 -04:00
amcmanu3	514bf8453f	Appease sonar	2023-09-04 21:21:59 -04:00
amcmanu3	3c5560d3e2	Merge branch 'dev' into feature/arcadia-notifications	2023-09-04 20:38:33 -04:00
amcmanu3	4051d98f8f	Appease the linter	2023-09-04 20:28:55 -04:00
Zedifus	e543389ead	Merge branch 'dev' into refactor/remote-comms-patch-2	2023-09-05 01:13:50 +01:00
amcmanu3	84a24687d0	Appease the linter	2023-09-04 19:38:20 -04:00
amcmanu3	9d26a8ff8d	Make sonar changes	2023-09-04 19:22:11 -04:00
Iain Powrie	81d6357596	Revert "Merge branch 'refractor/remove-bleach' into 'dev'" ... This reverts merge request !616	2023-09-04 23:13:13 +00:00
amcmanu3	3cb18f2da4	Make if more comprehensive	2023-09-04 18:44:17 -04:00
amcmanu3	24f9b64d59	Add default photo variable to appease sonar	2023-09-04 18:42:29 -04:00
amcmanu3	73c4adbdbf	Appease the linter	2023-09-04 18:24:10 -04:00
amcmanu3	e716198af4	Appease the linter	2023-09-04 18:19:29 -04:00
amcmanu3	4cd8e540f7	Revert "Poll notifications on an hourly schedule" ... This reverts commit 98720aa072.	2023-09-04 17:46:22 -04:00
amcmanu3	98720aa072	Poll notifications on an hourly schedule	2023-09-04 17:30:47 -04:00
amcmanu3	6574a557ff	Remove ajax handler references	2023-09-04 14:12:27 -04:00
amcmanu3	52d0d5fc09	Remove ajax handler	2023-09-04 13:54:59 -04:00