Merge branch 'master' of https://git.calculate-linux.org/serkus/webport

Makefile

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

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",

core/handler.py

@@ -14,7 +14,7 @@ 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">'
 
-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())

utils/utils.py

@@ -181,25 +181,25 @@ 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 = {}
@@ -219,3 +219,4 @@ def scan_config_portage():
     #config = {'portage': pf}
     #print("config:\t" + str(config))
     return Config
+"""