991 Commits

Author	SHA1	Message	Date
Zedifus	aa2ba4f8cf	Merge branch 'dev' into refactor/config-json	2023-01-29 20:00:09 +00:00
amcmanu3	8ee274a927	Remove config.json from repo. ... Remove version checking. Move master config to helpers. Add config.json when not found on start.	2023-01-29 14:54:25 -05:00
Zedifus	14d444b90c	Merge branch 'dev' into tweak/server-stats-db-hidden	2023-01-29 18:59:29 +00:00
amcmanu3	e0541b1ec0	Change file tree doesn't reload on upload/delete	2023-01-28 19:10:27 -05:00
amcmanu3	afdb9d9386	Use ignored_names as class variable in helpers	2023-01-27 17:36:23 -05:00
Zedifus	e217c63fdf	Merge branch 'dev' into bug/ReworkDefautPublicHandler	2023-01-27 19:59:12 +00:00
Zedifus	b5d259bce7	Merge branch 'dev' into feature/backup-echo	2023-01-27 19:39:05 +00:00
Zedifus	84592c178e	Merge branch 'dev' into refactor/scheduled-task-queue	2023-01-27 19:30:03 +00:00
Andrew	8a5cc6d1e6	Set up back end for master server dir	2023-01-26 19:21:39 -05:00
Silversthorn	4248174041	Fixing Double Migration at Startup	2023-01-25 23:20:45 +01:00
Andrew	58f6448784	Move sleep into shutdown block	2023-01-21 13:16:01 -05:00
Andrew	248a5a63a9	Include option for after command	2023-01-21 13:13:02 -05:00
Andrew	cf9ad77879	Add option to run command before backup	2023-01-20 17:35:30 -05:00
amcmanu3	7ee86f3ce1	Fix logic issue	2023-01-19 12:06:29 -05:00
amcmanu3	dfa2f5fb1e	Remove antequeted code after moving from db	2023-01-19 11:28:00 -05:00
amcmanu3	efd3bef029	Use queues for scheduled task disapatch	2023-01-19 11:27:33 -05:00
amcmanu3	6dfabab4af	Set backup filename to use same time as schedule	2023-01-17 10:27:55 -05:00
Andrew	4031b74e00	Hide server stats db from users	2023-01-09 16:34:12 -05:00
Andrew	52ef76e15b	Replace google ping for ntp for usability in china	2023-01-03 10:14:10 -08:00
Zedifus	205d111251	Merge branch 'dev' into bug/unzip-logic	2023-01-02 22:48:42 +00:00
Zedifus	aaffe69cb3	Merge branch 'dev' into bug/nested-reaction	2023-01-02 22:10:22 +00:00
Zedifus	c80d357f13	Fix CodeQuality, line length	2023-01-02 20:59:29 +00:00
Andrew	4922998b14	Remove extra task definition	2023-01-02 14:34:08 -05:00
Andrew	985178b993	Update zip import status	2023-01-02 14:26:42 -05:00
Andrew	872489d125	Remove useless block in unzip method ... This was causing an error.	2023-01-02 12:20:18 -05:00
Andrew	9ebdbbf5af	Fix bug where nested reaction tasks would stack	2023-01-01 23:13:07 -05:00
Silversthorn	9dac0b5d85	Adding Forge Installer Compaptibility with old versions	2022-12-22 19:32:56 +01:00
Andrew	d5cc4529b0	Add try/except for not finding run file	2022-12-21 21:55:21 -05:00
amcmanu3	fbc506f2fd	Fix issues after merge conflicts	2022-12-19 17:15:26 -05:00
Andrew	3ab57f116c	Merge branch 'dev' into 'refactor/config-json' ... # Conflicts: # app/classes/shared/helpers.py	2022-12-19 22:13:10 +00:00
Andrew	6572dc5e10	Appease the linter	2022-12-16 18:47:36 -05:00
Andrew	551020f738	Create our own check function	2022-12-14 14:54:52 -05:00
Zedifus	4543fcd03f	Merge branch 'dev' into feature/custom-login-background	2022-11-30 21:08:53 +00:00
Andrew	e8564566ed	Appease the linter	2022-11-19 18:21:10 -05:00
Silversthorn	b4dca8b27f	Merge branch 'feature/forge-install' of gitlab.com:crafty-controller/crafty-4 into feature/forge-install	2022-11-19 23:20:26 +01:00
Silversthorn	004049f6da	Using Regex to Extract Infos from Forge Scripts	2022-11-19 23:20:21 +01:00
Andrew	32cdde0616	Fix failed imports	2022-11-19 16:13:44 -05:00
Andrew	e42af36103	Make sure import status persists through install	2022-11-19 14:41:15 -05:00
Andrew	ad4603aafb	Add automated forge server creation installs	2022-11-19 13:45:18 -05:00
amcmanu3	bf0255a26b	Add custom login image feature	2022-11-09 14:13:35 -05:00
Zedifus	48b8b9d084	Merge branch 'dev' into refactor/config-json	2022-10-23 21:30:41 +01:00
Zedifus	1f842574c4	Merge branch 'dev' into tweak/stats-clients	2022-10-22 20:26:18 +01:00
Andrew	23b3e642a0	Only collect server stats when clients	2022-10-20 15:33:51 -04:00
Andrew	c2f5daf8e9	Remove feature for modded servers	2022-10-20 15:05:58 -04:00
Andrew	2d5d263852	Automatically set update url for server creation	2022-10-20 14:58:43 -04:00
Andrew	51f507c4f8	Add comments	2022-10-13 12:25:29 -07:00
Andrew	3f2e50a5dd	Add config compare to not overwrite user changes	2022-10-13 12:17:31 -07:00
Zedifus	0721c0d7d4	Strip meta from sem version	2022-10-08 18:34:38 +01:00
Zedifus	fbb6dad524	Merge branch 'dev' into tweak/themes	2022-10-08 18:12:37 +01:00
Zedifus	c1374b5c7f	Merge branch 'dev' into bug/port-constraint	2022-10-05 22:12:14 +01:00
Zedifus	522adb765c	Appease lint ... Major - R1705: Unnecessary "else" after "return", remove the "else" and de-indent the code inside it	2022-10-05 22:02:17 +01:00
amcmanu3	3681f52856	Fix scheduled task disable	2022-10-04 16:07:08 -04:00
Andrew	2e212cc788	Add port constraint for all server creation & api	2022-10-04 15:55:52 -04:00
Andrew	f558388a0f	Update themes to include all colors	2022-10-04 13:31:37 -04:00
Andrew	352a3e12e7	Fix minor bugs with uploads import	2022-10-02 15:54:13 -04:00
Andrew	5f8c0dab4c	Merge branch 'dev' into 'feature/upload-import' ... # Conflicts: # app/frontend/templates/server/wizard.html	2022-10-02 19:10:05 +00:00
Andrew	a21bb36f7c	Make it so a user cannot upload anything but zip ... TODO add better feedback than "error"	2022-09-27 23:07:44 -04:00
Andrew	f090bf8c6f	Add task to check for old files every 12 hours	2022-09-27 22:57:24 -04:00
Andrew	a5a81aa22a	Add themes to users page/base	2022-09-26 21:23:47 -04:00
amcmanu3	63347f956b	Fix logical issues surrounding Gravatar fetch	2022-09-19 20:00:15 -04:00
Zedifus	0829331534	Appease Minor and Major lint issues in !464	2022-09-19 23:49:16 +01:00
Zedifus	532409a08d	Merge branch 'dev' into bug/start-nonetype	2022-09-19 22:57:42 +01:00
Zedifus	518eb6af23	Merge branch 'dev' into bug/gravatar-fetch	2022-09-19 22:18:11 +01:00
Andrew	f5cdd9f573	Check to "which java" doesn't return none	2022-09-19 11:13:35 -04:00
Andrew	67d465b94c	Add debug logging	2022-09-12 15:36:13 -04:00
Andrew	82c0452f55	Add pfp caching for users	2022-09-12 15:34:47 -04:00
Andrew	6a6376ea8a	appease the linter	2022-09-07 16:52:27 -04:00
Andrew	d45e32013b	Fix backup exclusion issue	2022-09-07 16:51:41 -04:00
Andrew	296a5a46de	Add comments. Debug logging	2022-09-07 16:01:42 -04:00
amcmanu3	011b66e1df	Fix server startup after update	2022-09-04 19:06:07 -04:00
amcmanu3	76a499f5a4	Fix start server after updates ... Fix update notifs	2022-09-04 17:50:08 -04:00
Zedifus	385ceb9655	Merge branch 'dev' into tweak/password-reset	2022-09-04 21:41:27 +01:00
Zedifus	7f95f7085d	Merge branch 'dev' into feature/bedrock-creation	2022-09-04 21:12:47 +01:00
Zedifus	88d3facc80	Merge branch 'dev' into enhancement/bedrock-update-support	2022-09-04 21:03:31 +01:00
amcmanu3	ceab737667	Update requirement checking for password reset	2022-09-04 14:22:25 -04:00
amcmanu3	a6148a7d8a	Make password username lowercase	2022-09-04 13:33:22 -04:00
Andrew	dd56b4be37	update updates	2022-09-03 13:42:30 -04:00
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
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
Silversthorn	16bbac7fd6	Moving Server Stats DB to Server Folder	2022-04-28 22:40:15 +02:00
Andrew	77bbde149a	Fix fresh install side effects from DB rework	2022-04-17 13:27:00 -04:00
Andrew	fc1304d729	Fix file size bug when destination does not exist	2022-04-17 13:00:05 -04:00
Andrew	704ffc2742	Fix file unzip	2022-04-14 20:03:19 -04:00
luukas	1aa0d65cf7	Merge branch feature/external-frontend to feature/api-v2 without the frontend	2022-04-14 15:33:53 +03:00
Zedifus	92c8fc04f3	Refactor to standardize class/variable naming ✨	2022-04-14 03:10:25 +01:00
Andrew	ed60e55ffe	Add try catch around process kill	2022-04-12 21:52:53 -04:00
Andrew	64d2e5fedd	Appease the linter	2022-04-12 19:54:35 -04:00
Andrew	e555274409	Add critical log message for None Backup path	2022-04-12 19:27:18 -04:00
Andrew	73b3571606	Appease the linter	2022-04-12 19:22:57 -04:00
Andrew	316d0aa17a	Fix error thrown on task execution	2022-04-12 18:57:18 -04:00
Andrew	705da450e7	Fix bug where roles could not be deleted.	2022-04-12 17:58:59 -04:00
Andrew	ec6421b62c	Disable Backups when no path	2022-04-12 17:37:20 -04:00
computergeek125	d417950eae	fix fstrings, refactored console to static	2022-04-11 20:34:46 -05:00
Zedifus	19f2429a4c	Fix formatting to comply with ⬛Black	2022-04-11 11:08:36 +01:00
computergeek125	42ca4bb973	Refactored the yes to not pass objects in import ... Merge Conflicts ᴙ Us	2022-04-11 00:23:55 -05:00
computergeek125	119c34535c	Removed fn, reduced queries in login flow	2022-04-10 17:46:07 -05:00
amcmanu3	711d415335	Remove queue	2022-04-10 18:04:16 -04:00
Andrew	b1ed9ba2bd	Add API routes from 3.x ... Enhance security for permissions on API requests Fix bug where server permissions and crafty permissions were flipped upon making a new token Fix bug where new secret key would be created every time Crafty was started. Fix bug where DB locks will occur with concurrent writes to the DB.	2022-04-10 19:39:31 +00:00
Zedifus	db70f9ae20	Fix W0221 emptyline override ... Package advises override, see !233 for doc reference.	2022-04-02 02:49:48 +01:00
Andrew	822a3707b2	Add sleep to realtime - Reduce CPU load.	2022-03-26 19:10:04 -04:00
Zedifus	09bba7fdb0	Further fix files to conform with ⚫Black pylintrc ... Mostly just breaking up strings and comments into new lines Some strings dont require 'f' but keeping in for readability with the rest of the concatinated string	2022-03-23 06:16:22 +00:00
Zedifus	2a512d7273	Fix files to conform with new ⚫Black pylintrc ... Mostly just breaking up strings and comments into new lines Some strings dont require 'f' but keeping in for readability with the rest of the concatinated string	2022-03-23 06:06:13 +00:00
Zedifus	e06fe8a52a	⬛Black codebase ... Apply black formatting to codebase	2022-03-23 02:50:12 +00:00
xithical	4177ca882c	Put encoding arg in its proper location for maximum linter appeasal	2022-03-20 12:19:11 -05:00
xithical	1279784cc7	Appease the linter again	2022-03-20 12:14:51 -05:00
xithical	bf6d0d0368	Appease the linter	2022-03-20 12:01:14 -05:00
xithical	cda7b59a12	Fix how memory args are passed in importing from 3	2022-03-18 23:06:04 -05:00