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

Fix line length CQ

Browse Source
This commit is contained in:
Zedifus 2022-06-15 04:11:40 +01:00
parent cda2120579
commit 1cfc926b16
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/classes/shared/helpers.py
View File

@ -104,7 +104,8 @@ class Helpers:
@staticmethod @staticmethod
def which_java(): def which_java():
# Adapted from LeeKamentsky's https://github.com/LeeKamentsky/python-javabridge/blob/master/javabridge/locate.py # Adapted from LeeKamentsky >>>
# https://github.com/LeeKamentsky/python-javabridge/blob/master/javabridge/locate.py
jdk_key_paths = ( jdk_key_paths = (
"SOFTWARE\\JavaSoft\\JDK", "SOFTWARE\\JavaSoft\\JDK",
"SOFTWARE\\JavaSoft\\Java Development Kit", "SOFTWARE\\JavaSoft\\Java Development Kit",

6
app/classes/shared/server.py
View File

@ -236,7 +236,8 @@ class ServerInstance:
self.server_command = Helpers.cmdparse(self.settings["execution_command"]) self.server_command = Helpers.cmdparse(self.settings["execution_command"])
if self.helper.is_os_windows() and self.server_command[0] == "java": if self.helper.is_os_windows() and self.server_command[0] == "java":
logger.info( logger.info(
"Detected nebulous java in start command. Replacing with full java path." "Detected nebulous java in start command. "
"Replacing with full java path."
) )
which_java_raw = self.helper.which_java() which_java_raw = self.helper.which_java()
java_path = which_java_raw + "\\bin\\java" java_path = which_java_raw + "\\bin\\java"
@ -246,7 +247,8 @@ class ServerInstance:
self.server_command[0] = java_path self.server_command[0] = java_path
else: else:
logger.critcal( logger.critcal(
"Possible attack detected. User attempted to exec java binary from server directory." "Possible attack detected. User attempted to exec "
"java binary from server directory."
) )
return return
self.server_path = Helpers.get_os_understandable_path(self.settings["path"]) self.server_path = Helpers.get_os_understandable_path(self.settings["path"])