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

Replace all instances of bleach with nh3.

Browse Source 
Using latest version of nh3.
This commit is contained in:
Wout Bouckaert 2023-09-04 20:44:44 -06:00
parent 44653f1a67
commit 751beaa7eb
No known key found for this signature in database
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/classes/web/base_handler.py
View File

@ -2,7 +2,7 @@ import logging
import re import re
import typing as t import typing as t
import orjson import orjson
import bleach import nh3
import tornado.web import tornado.web
from app.classes.models.crafty_permissions import EnumPermissionsCrafty from app.classes.models.crafty_permissions import EnumPermissionsCrafty
@ -101,7 +101,7 @@ class BaseHandler(tornado.web.RequestHandler):
if type(text) in self.nobleach: if type(text) in self.nobleach:
logger.debug("Auto-bleaching - bypass type") logger.debug("Auto-bleaching - bypass type")
return text return text
return bleach.clean(text) return nh3.clean(text)
def get_argument( def get_argument(
self, self,

10
app/classes/web/panel_handler.py
View File

@ -7,7 +7,7 @@ import json
import logging import logging
import threading import threading
import urllib.parse import urllib.parse
import bleach import nh3
import requests import requests
import tornado.web import tornado.web
import tornado.escape import tornado.escape
@ -67,7 +67,7 @@ class PanelHandler(BaseHandler):
) in self.controller.crafty_perms.list_defined_crafty_permissions(): ) in self.controller.crafty_perms.list_defined_crafty_permissions():
argument = int( argument = int(
float( float(
bleach.clean( nh3.clean(
self.get_argument(f"permission_{permission.name}", "0") self.get_argument(f"permission_{permission.name}", "0")
) )
) )
@ -79,7 +79,7 @@ class PanelHandler(BaseHandler):
q_argument = int( q_argument = int(
float( float(
bleach.clean(self.get_argument(f"quantity_{permission.name}", "0")) nh3.clean(self.get_argument(f"quantity_{permission.name}", "0"))
) )
) )
if q_argument: if q_argument:
@ -479,7 +479,7 @@ class PanelHandler(BaseHandler):
template = "panel/dashboard.html" template = "panel/dashboard.html"
elif page == "server_detail": elif page == "server_detail":
subpage = bleach.clean(self.get_argument("subpage", "")) subpage = nh3.clean(self.get_argument("subpage", ""))
server_id = self.check_server_id() server_id = self.check_server_id()
if server_id is None: if server_id is None:
@ -1284,7 +1284,7 @@ class PanelHandler(BaseHandler):
template = "panel/panel_edit_user_apikeys.html" template = "panel/panel_edit_user_apikeys.html"
elif page == "remove_user": elif page == "remove_user":
user_id = bleach.clean(self.get_argument("id", None)) user_id = nh3.clean(self.get_argument("id", None))
if ( if (
not superuser not superuser

14
app/classes/web/public_handler.py
View File

@ -1,5 +1,5 @@
import logging import logging
import bleach import nh3
from app.classes.shared.helpers import Helpers from app.classes.shared.helpers import Helpers
from app.classes.models.users import HelperUsers from app.classes.models.users import HelperUsers
@ -28,8 +28,8 @@ class PublicHandler(BaseHandler):
# self.clear_cookie("user_data") # self.clear_cookie("user_data")
def get(self, page=None): def get(self, page=None):
error = bleach.clean(self.get_argument("error", "Invalid Login!")) error = nh3.clean(self.get_argument("error", "Invalid Login!"))
error_msg = bleach.clean(self.get_argument("error_msg", "")) error_msg = nh3.clean(self.get_argument("error_msg", ""))
page_data = { page_data = {
"version": self.helper.get_version_string(), "version": self.helper.get_version_string(),
@ -82,8 +82,8 @@ class PublicHandler(BaseHandler):
) )
def post(self, page=None): def post(self, page=None):
error = bleach.clean(self.get_argument("error", "Invalid Login!")) error = nh3.clean(self.get_argument("error", "Invalid Login!"))
error_msg = bleach.clean(self.get_argument("error_msg", "")) error_msg = nh3.clean(self.get_argument("error_msg", ""))
page_data = { page_data = {
"version": self.helper.get_version_string(), "version": self.helper.get_version_string(),
@ -100,8 +100,8 @@ class PublicHandler(BaseHandler):
if self.request.query: if self.request.query:
next_page = "/login?" + self.request.query next_page = "/login?" + self.request.query
entered_username = bleach.clean(self.get_argument("username")) entered_username = nh3.clean(self.get_argument("username"))
entered_password = bleach.clean(self.get_argument("password")) entered_password = nh3.clean(self.get_argument("password"))
# pylint: disable=no-member # pylint: disable=no-member
try: try:

2
requirements.txt
View File

@ -1,7 +1,7 @@
apscheduler==3.8.1 apscheduler==3.8.1
argon2-cffi==21.3 argon2-cffi==21.3
bleach==4.1 nh3==0.2.14
cached_property==1.5.2 cached_property==1.5.2
colorama==0.4 colorama==0.4
croniter==1.3.5 croniter==1.3.5