pull in calc

Makefile

@@ -2,7 +2,7 @@
 
 run:
 	#make cert &&
-	python3 server.py 
+	python server.py 
 
 testToken:
 	python core/jwt.py

core/handler.py

@@ -9,7 +9,7 @@ from utils.utils import get_list_overlays, load_config, write_config, sort_insta
 from utils.package import search
 from utils.findfsdb import on_find 
 from core.route import Router
-from genaratorSecretsToken import jwt
+from core.jwt import genaratorSecretsToken
 import logging
 from io import BytesIO
 #repl = '<?xml version=\'1.0\' encoding=\'utf-8\'?>\n<!DOCTYPE repositories SYSTEM "http://www.gentoo.org/dtd/repositories.dtd">'
@@ -74,7 +74,7 @@ def get_settings_app():
     return str(json.dumps(load_config()))
 
 class Handler(BaseHTTPRequestHandler):
-    self.Response = Null
+    #self.Response = ""
     def _set_response(self):
         self.send_response(200)
         self.send_header['Access-Control-Allow-Origin', '*']
@@ -111,10 +111,8 @@ class Handler(BaseHTTPRequestHandler):
             self.redorect '/auth' for self.auth 
 
         """
-        if self.path =="/":
-            self.r_t = main()
-            self.response()
-            
+        post_data = urllib.parse.parse_qs(self.rfile.read(content_length)) # <--- Gets the data itself
+        self.r_t = route(metod='POST', url=self.path, params=post_data, handler='main')
         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",
@@ -141,7 +139,7 @@ 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)
@@ -154,13 +152,9 @@ class Handler(BaseHTTPRequestHandler):
         # 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())
-            self.r_t = main()
-            self.response()
+            self.send_response(403)
+        
 
         elif self.path == '/ovelays':
             #  Return List repositories
@@ -220,11 +214,10 @@ class Handler(BaseHTTPRequestHandler):
 
             #self.r_t = str(sort_inatll_pkg())
             self.r_t = str(json.dumps(scan_config_portage()))
-
+        
         else:
             #Return Error 404
-            self.send_response(404)
-            
+            self.send_response(404)       
             self.end_headers()
             print(str(self.client_address[0]) +"\t" + str(404))
 

core/route.py

@@ -47,20 +47,6 @@ class RouterOld(BaseHTTPRequestHandler):
         #self.send_header['Access-Control-Allow-Credentials', true]
         self.end_headers()
 
-    def do_GET(self):
-        # logging.info("GET request,\nPath: %s\nHeaders:\n%s\n", str(self.path), str(self.headers))
-        # print(str(self.path), str(self.headers))
-        self.r_t = str(self.path), str(self.headers)
-        return self.response()
-
-    def do_POST(self):
-        logging.info("GET request,\nPath: %s\nHeaders:\n%s\n", str(self.path), str(self.headers))
-        self._set_response()
-        print(str(self.path), str(self.headers))
-
-    def do_HEAD(self):
-        pass
-
     def do_REQUEST(self):
         print("do_REQUEST:\n")
         print(str(self.path), str(self.headers))
@@ -77,7 +63,7 @@ class RouterOld(BaseHTTPRequestHandler):
             #print("TypeError")
             return self.wfile.write(bytes(self.r_t, 'UTF-8'))
 
-    def route(self, metod, url, handler):
+    def route(self, metod, url, params,  handler):
         print(url)
         metod = metod.lower()
         if self.path in self.Routes.url:
@@ -107,7 +93,7 @@ class RouterOld(BaseHTTPRequestHandler):
         #do_HEAD()
         pass
     
-    def __isAuth(self, auth):
+    def __isAuth(selt, auth):
         pass
 
     def getToken(self, authResult):
@@ -140,3 +126,11 @@ class RouterOld(BaseHTTPRequestHandler):
         else:
             self.send_response(404)
             self.end_headers()
+
+"""
+    def do_GET(self):
+        pass
+    
+    def do_POST(self):
+        pass
+"""

server.py

@@ -11,7 +11,7 @@ from utils.findfsdb import create_db
 from utils.utils import load_config
 
 def https_server():
-    https_server_address  = ('', 4443)
+    https_server_address = ('', 4443)
     httpd = HTTPServer(https_server_address, SimpleHTTPRequestHandler)
     httpd.socket = ssl.wrap_socket(httpd.socket,
                                     server_side = True,
@@ -33,14 +33,14 @@ def run():
         pass
     
     # server = HTTPServer(('', config['PORT']), Router)
-    server = HTTPServer(('', config['PORT']), Handler)
+    server = HTTPServer(('', config['Server']['PORT']), Handler)
     # print('Started HTTP Server on port', config['PORT'])
     
     server.socket = ssl.wrap_socket(server.socket,
                                     server_side = True,
                                     certfile = 'localhost.pem',
                                     ssl_version = ssl.PROTOCOL_TLS)
-    print('Started HTTP Server on port', config['PORT'])
+    print('Started HTTP Server on port', config['Server']['PORT'])
     print("https://localhost:8000")
     
     try:

utils/utils.py

@@ -3,7 +3,7 @@
 '__autor__' == 'serkus'
 import os, sys, json
 from urllib import request
-from package import search
+from utils.package import search
 # import xml
 import xml.etree.ElementTree as ET
 
@@ -189,7 +189,7 @@ def ScanTreePortage():
                     try:
                         #ver = int(f.replace('.ebuild', '').split('-')[-1][0])
                         for pn in f.replace('.ebuild', '').split('-')[:-1]:
-                        pkg_name = pkg_name + pn + "-"
+                            pkg_name = pkg_name + pn + "-"
                     except TypeError:
                         for pn in f.replace('.ebuild', '').split('-')[:-2]:
                             pkg_name = pkg_name + pn + "-"