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

Use a better ANSI escape regex in the API logs

Browse Source
This commit is contained in:
luukas 2022-05-25 18:41:41 +03:00
parent 2e51fa9629
commit 8ce7a96071
No known key found for this signature in database
GPG Key ID: CC4915E8D71FC044
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/classes/web/routes/api/servers/server/logs.py
View File

@ -8,6 +8,8 @@ from app.classes.web.base_api_handler import BaseApiHandler
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
ansi_escape = re.compile(r"\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])")
class ApiServersServerLogsHandler(BaseApiHandler): class ApiServersServerLogsHandler(BaseApiHandler):
def get(self, server_id: str): def get(self, server_id: str):
@ -56,9 +58,7 @@ class ApiServersServerLogsHandler(BaseApiHandler):
for line in raw_lines: for line in raw_lines:
try: try:
if not disable_ansi_strip: if not disable_ansi_strip:
line = re.sub( line = ansi_escape.sub("", line)
"(\033\\[(0;)?[0-9]*[A-z]?(;[0-9])?m?)|(> )", "", line
)
line = re.sub("[A-z]{2}\b\b", "", line) line = re.sub("[A-z]{2}\b\b", "", line)
line = html.escape(line) line = html.escape(line)