From 23cd383abd1678b1c3c67e3ded2108302e90f095 Mon Sep 17 00:00:00 2001 From: serkus01 <7erkus@gmail.com> Date: Tue, 1 Feb 2022 09:36:50 +0900 Subject: [PATCH 1/2] fix handler.py und utils.ScanTreePortage --- Makefile | 2 +- config.json | 2 +- core/__pycache__/handler.cpython-38.pyc | Bin 0 -> 5325 bytes core/handler.py | 19 ++++++++----- utils/utils.py | 35 ++++++++++++------------ 5 files changed, 32 insertions(+), 26 deletions(-) create mode 100644 core/__pycache__/handler.cpython-38.pyc diff --git a/Makefile b/Makefile index 647eec7..272f21a 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ run: #make cert && - python server.py + python3 server.py testToken: python core/jwt.py diff --git a/config.json b/config.json index 221b863..99f03ee 100644 --- a/config.json +++ b/config.json @@ -5,7 +5,7 @@ "THEME": "default" }, "Portage":{ - "rootPth":"/etc/portage", + "rootPath":"/etc/portage", "make.conf":"/etc/portage/make.conf/custom", "package.use":"/etc/portage/package.use/custom", "package.accept_keywords":"/etc/portage/package.accept_keywords/custom", diff --git a/core/__pycache__/handler.cpython-38.pyc b/core/__pycache__/handler.cpython-38.pyc new file mode 100644 index 0000000000000000000000000000000000000000..664f6d054092cf5525345a97d189e94028243f22 GIT binary patch literal 5325 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 literal 0 HcmV?d00001 diff --git a/core/handler.py b/core/handler.py index d301098..97c3910 100755 --- a/core/handler.py +++ b/core/handler.py @@ -14,7 +14,7 @@ import logging from io import BytesIO #repl = '\n' -def login(Auth={user='demo', password='demo'}): +def login(user='demo', password='demo'): if auth(): return(generatoSecretsToken()) else: @@ -101,7 +101,11 @@ class Handler(BaseHTTPRequestHandler): def do_POST(self): """ - if request return Token: -> run hanlerFunc: + if request return Token: + self.r_t = main() + self.response() + + -> run hanlerFunc: else: self.send_response("403") self.redorect '/auth' for self.auth @@ -114,7 +118,7 @@ class Handler(BaseHTTPRequestHandler): self.get_data =() post_data = urllib.parse.parse_qs(self.rfile.read(content_length)) # <--- Gets the data itself logging.info("POST request,\nPath: %s\nHeaders:\n%s\n\nBody:\n%s\n", - str(self.path), str(self.headers), post_data.decode('utf-8') + str(self.path), str(self.headers), post_data.decode('utf-8')) print("do_POST:\n") print(str(self.path), str(self.headers)) return(post_data) @@ -137,20 +141,21 @@ class Handler(BaseHTTPRequestHandler): def do_GET(self): print("do_GET:\n") print(str(self.path), str(self.headers)) - + selt # print(Router.parse_url(self)) # print("data:\t" + self.rfile.read()) # request = Router.parse_url(self) #self.send_response(200) - self.p_list = [] - self.r_t = "" + ##self.p_list = [] + ##self.r_t = "" # length = int(self.headers['content-length']) # self.send_header(['Access-Control-Allow-Origin', '*'], # self.send_header(['Access-Control-Allow-Methods', 'GET'], # self.send_header(['Access-Control-Allow-Headers', 'X-Requested-With,content-type']) # self.send_header(['Access-Control-Allow-Credentials', true]) # self.end_headers() - + self.send_response(403) + if self.path == "/": # path root -> Return all DATA - (All Tree Portage) config.json as Json # print("data:\t" + self.get_data()) diff --git a/utils/utils.py b/utils/utils.py index 8a2a7fa..30c8c3d 100755 --- a/utils/utils.py +++ b/utils/utils.py @@ -181,26 +181,26 @@ def ScanTreePortage(): DirsRoot = [ "/var/db/repos", "/usr/portage"] ListTree = [] for p in DirsRoot: - for d, dirs, files in os.walk(p): - for f in files: - if f.endswith('.ebuild'): - #print(d +"/" + f) - pkg_name = "" - try: - #ver = int(f.replace('.ebuild', '').split('-')[-1][0]) - for pn in f.replace('.ebuild', '').split('-')[:-1]: - pkg_name = pkg_name + pn + "-" - except TypeError: - for pn in f.replace('.ebuild', '').split('-')[:-2]: - pkg_name = pkg_name + pn + "-" - except Exception as e: - print(e) - #str(d.split("/")[-2] +"/" + d.split("/")[-1]) - ListTree.append(pkg_name) + for d, dirs, files in os.walk(p): + for f in files: + if f.endswith('.ebuild'): + #print(d +"/" + f) + pkg_name = "" + try: + #ver = int(f.replace('.ebuild', '').split('-')[-1][0]) + for pn in f.replace('.ebuild', '').split('-')[:-1]: + pkg_name = pkg_name + pn + "-" + except TypeError: + for pn in f.replace('.ebuild', '').split('-')[:-2]: + pkg_name = pkg_name + pn + "-" + except Exception as e: + print(e) + #str(d.split("/")[-2] +"/" + d.split("/")[-1]) + ListTree.append(pkg_name) #d, ListTree, f for in os.walk('/usr/portage') and d, ListTree, f for in os.walk("/var/db/repos") return ListTree - +""" def scan_config_portage(): Dirs_root = ["/var/db/repos", "/usr/portage"] Config = {} @@ -220,3 +220,4 @@ def scan_config_portage(): #config = {'portage': pf} #print("config:\t" + str(config)) return Config +""" \ No newline at end of file From 92a51690d1a517a192ad054af6e0cc6876d105b8 Mon Sep 17 00:00:00 2001 From: serkus01 <7erkus@gmail.com> Date: Tue, 1 Feb 2022 09:56:51 +0900 Subject: [PATCH 2/2] fix handler.py und utils.ScanTreePortage #2 --- utils/utils.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/utils/utils.py b/utils/utils.py index 30c8c3d..1da3c42 100755 --- a/utils/utils.py +++ b/utils/utils.py @@ -181,20 +181,20 @@ def ScanTreePortage(): DirsRoot = [ "/var/db/repos", "/usr/portage"] ListTree = [] for p in DirsRoot: - for d, dirs, files in os.walk(p): - for f in files: - if f.endswith('.ebuild'): - #print(d +"/" + f) - pkg_name = "" - try: - #ver = int(f.replace('.ebuild', '').split('-')[-1][0]) - for pn in f.replace('.ebuild', '').split('-')[:-1]: - pkg_name = pkg_name + pn + "-" - except TypeError: - for pn in f.replace('.ebuild', '').split('-')[:-2]: - pkg_name = pkg_name + pn + "-" - except Exception as e: - print(e) + for d, dirs, files in os.walk(p): + for f in files: + if f.endswith('.ebuild'): + #print(d +"/" + f) + pkg_name = "" + try: + #ver = int(f.replace('.ebuild', '').split('-')[-1][0]) + for pn in f.replace('.ebuild', '').split('-')[:-1]: + pkg_name = pkg_name + pn + "-" + except TypeError: + for pn in f.replace('.ebuild', '').split('-')[:-2]: + pkg_name = pkg_name + pn + "-" + except Exception as e: + print(e) #str(d.split("/")[-2] +"/" + d.split("/")[-1]) ListTree.append(pkg_name) #d, ListTree, f for in os.walk('/usr/portage') and d, ListTree, f for in os.walk("/var/db/repos")