fix 01 #2

README.md

@@ -19,7 +19,7 @@
 	<code>
 	git  clone && cd  webport
 	 </code>
-<li>Запустите его ./start<li>
+<li>Запустите <b> make run </b><li>
 <li> Скачайте клиент и запустите.
 </li>
 <!--<li>Откройте в браузере localhost:8080 ну или IP адресс и порт указаный  в файле config.json</li>-->

core/handler.py

@@ -7,12 +7,12 @@ import os
 from utils.utils import get_list_overlays, load_config, write_config, sort_install_pkg
 from utils.package import search
 from utils.findfsdb import on_find 
-from src.route import Router
+from core.route import Router
 from io import BytesIO
 #repl = '<?xml version=\'1.0\' encoding=\'utf-8\'?>\n<!DOCTYPE repositories SYSTEM "http://www.gentoo.org/dtd/repositories.dtd">'
 class Handler(BaseHTTPRequestHandler):
 	def get_data(self):
-		length = int(self.headers['content-length'])
+		#length = int(self.headers['content-length'])
 		data = self.rfile.read(length)
 		return(str(data))
 
@@ -26,16 +26,20 @@ class Handler(BaseHTTPRequestHandler):
 		pass
 
 	def do_GET(self):
-		length = int(self.headers['content-length'])
-		self.headers['Access-Control-Allow-Origin', '*']
-		self.headers['Access-Control-Allow-Methods', 'GET']
-		self.headers['Access-Control-Allow-Headers', 'X-Requested-With,content-type']
-		self.headers['Access-Control-Allow-Credentials', true]
-		self.r_t =""
+		
 		#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  = ""
+		#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.end_headers()
 		if self.path =="/":
 			#print("data:\t" + self.get_data())

core/route.py

@@ -2,17 +2,18 @@
 #!/usr/bin/env python3
 from io import StringIO ## for Python 3
 from http.server import BaseHTTPRequestHandler
-from jwt import genaratorSecretsToken
+from .jwt import genaratorSecretsToken
 import json
 class Router(BaseHTTPRequestHandler):
 	def __int__(self):
 		self.p_list = []
 		self.r_t  = ""
 		length = int(self.headers['content-length'])
-		self.setHeader['Access-Control-Allow-Origin', '*']
-		self.setHeaders['Access-Control-Allow-Methods', 'GET']
-		self.setHeaders['Access-Control-Allow-Headers', 'X-Requested-With,content-type']
-		self.setHeaders['Access-Control-Allow-Credentials', true]
+		# Not work code
+		#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()
 
 	def route(self, metod, url):
@@ -21,7 +22,7 @@ class Router(BaseHTTPRequestHandler):
 		else:
 			return self.r_404()
 			#return false
-	def get(self, url, handler)":"
+	def get(self, url, handler):
 		pass
 
 	def post(self, url,  handler):

localhost.pem

@@ -1,49 +1,49 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC24OsZuIHP36cw
-Kn//ueFoGL0jMeswtAOcwIesw2D1wmh+cuQxuXuoNRjGOmB2C0/5qBitMd0LkrLf
-dyFJWM2Pamp5ai1TEU+CKcyN0TrPlmh+CQpDAFkdYv1Ci/30zgsCaT2dZyyRHQH+
-gWS9nR8gPiGEb6oVEJYADKi1JySErqwsDtglEx6SSfWfplwqjvYy8ps8ciagefq+
-mzTp8g3ChFEOu/Jyk2LaTAc76jFThPLF4p6G069WlYrZegoklxUE20ll75MKlytv
-5xcoN5aeNIehgwoBmrR+uKOdrBIgwJQDzOLAGxhP3tglxUQxO9QBFihKt7RI0wRQ
-VXGNCVtbAgMBAAECggEBAJXjDo3MLYkEk/DkRHiCDv7Ul+BKv6rxP6ywGAM/Ny72
-IdLRs7oVfgZFToLZwcm+R9QlM+Rv4+3iVHzXFQ8am5AZ9h6BKZjVrUbPn3n0rLEL
-Y6U5H5H+rQtq4Iw0VPbaESfuvbNOprZhAgtoXfsS1joE8k+rfck6CNcNiRDAfivH
-4166A8SJdevmazrN8X60R9tu6Mtvd7SvRijljL+NcYS7W9871cJ09UU6vVgUCAbg
-gmboXK+anBgn2i7yf82yLoFjG71kzm7j+6gCOry72j1dhJFmw3WdNo6Iw6RYkqkp
-uB9zX391wHzxaiMNdieGcQ1KSTkpJMsAxL2WF2MTI1ECgYEA2mvnu8PpX11c4lrr
-Wcf+1ZJdlmRngJiSB8tjNIxDexDQGiekXWKLNSznXEgX70ugTRJ5Xexv1yhaZSgP
-RO0MlV0HLG4RjL6XWDWnHVl6YXjznrcjiZZUOLN6rHKwMs5MvqE2WLWRqYQBodLl
-1bkdLGwoecaEWQL50aWYLB59wB0CgYEA1leSK+n9E/LvRZKGWnKgHCEqJ6wM4hTf
-18ObpAi4/IH2tOJFNQHzJvdGg/QItDqepeALsrNsn/UYwRkwNkFvbUofJLcfokn3
-juvoP+Q7GeW5YnjoYGY9PwxDSJM75M3hTVH8Wuux6lFZqAmwMeONO3Fgmy2+cnuD
-9tyY2r6Xn9cCgYAIvslIe0+cweA2L+28aoWJh5K3ss1yGKnAJiSStgr9om6ynWO3
-WXq5ZlLdHwXWTvDcJSE24YCY3MTByBjUaalXUaI35TBOslLc9Uj7o9mCjZUzhaGm
-oJ4+pvECdpUXc6se9tV2N87dOqvWDtuk8wR4AtycA5bI+ZWHD1pIafAfAQKBgQCe
-PTJVpz5GfwA0bbMwjRU1Dyru9O7h7aU/xlJeLG5dRJlc+vs64gCf0MhHXF8cp3Y+
-YYRhXmMgSDMJQ847D93yYllRorwA9PiFlBX3LUiQmu9dCoQLvw8SP7xglQoPpgri
-KVfTy9OieIJnMxfYDPVUYCSBC6lhHVzUYBGc1D5eKwKBgALM7YQQEddJR11jdAjk
-f2lqtSISod0/rO5PGiBfxr3Cb4aZ2TAU4Pte2fJ5VD1I0NBIJBa6E0xse7T+Lqwr
-0JeryHzaXZLddoGmhtULo2ZscdkuWzJXElOygZVYXG1WirHKHACTJ8DyO1FmKMFt
-x19pBTCbrde489wZc+DlrAD+
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC/ZkDPIgr/P3cV
+6cSHOwY7u4XmWRr4i+ApVDnMrSp2Hr3FIJTDOKuRbyelrCuGgQ6Mj7LwBy6SpVTX
+4k3Bfi0is0zpdeA/Al8ZA7hAUJzjCjgCbofDQX+I3nRCACFVZWBsvRkJ3VAsTIRO
+w06ajGDyDjpYj3iRw/Nhds/Y0gKHpW/hqogkQepvcI6Ogvp6I3nJ/cDNcSLZ4m4d
+Ew90SsgZ0RqgJd/wF53l+ZjtBv/0nGlnUFE0HA0eJ0WagH/YeBEWB2ckRqvkkyQ+
+jcuYztHHKye5d30nnLGD5iDDktuQLPlJMUCW+zJoae4mql0PQuJI4hLFANKnAPM7
+VjShYofJAgMBAAECggEBAJA3Vtv79bdQNcXAJ8IRemflq0XenBDtLFFX0lljnVv1
+W94953mVqMjjrUcLDJzDf5fv6s8rSi9a/ivQq/AAx7eezHQYyogPnGI3yExFsYDt
+QTir2gYIwzT5ETZt7K/wvBATB9vD81X9ra+/P+n5nk6k49e4+wsyT59/q6reyuMz
+OgQEai2gX1pr9WRjhymycaK2h4bXPMGma/kGVjeMKzLYD0n3LOKaBQiTHxk3PuhV
+g907YGnD7vWYeWeC2G7e7ZCOHniRfqOWcyX3PHJewwCkaSpUUQY052FwyhW5OVzb
+ivVbtmGrqkX/oyUqbEI1R2k6eYv6s7EfJll6nONj2wECgYEA4vIO7QmTUo0YdfIk
+W1eSJawxCLpk7dWKNcLwFEaajy+UBMhVI1LvUQkMlfrDX37BzH8kqFysqtEy3xyi
+sF90YHEXIw1BI877kWdI2ZB1YQekRU+XLbw1z6BDcXCTvzhH6Bp2JiQKraGe/Zow
+rOQSkzaumWwlD2Tvxq9y21yTE2ECgYEA1+czuWklm0vhzfJK6efBVRXEvplwO5X+
+RCTPgRYhI+icBHCJ9o8CokZDK0my4kPtmKrlwLF24GXaIH60ei3KQzl3iWIgADzX
+TyzBJAVA2uhe86GvxNf8Ixa+1Q1QedmX1YtTxLYFx35Vex4h3wJ60A0FzXPwdwFA
+BrQvViXctWkCgYAQ4MOvaUjlmMy66Nk/WdHqr1WuOn6LGZh/yxGj0GRqRbWSbXu3
+dtGJi0y+Urn4/ipXlRUa2FmXEpvf7/dBerfi/EYmOzQe/6PB+pZ2Z8HzB2h2Jyct
+JZQy7s5VP3QdgogGgQFMcN3CcAStA6yfDw86l5SAoIRZEr6qXh4Cpm3hwQKBgF1j
+iKAet0GhZR7sOzNKJ/ph3CSFwmJD0yQuuAMiS1t49mOFOmgIHB+NPOiwjEwLDe8H
+nTHokX8nD18W74IZ5G+HoAkxBJ6Vspxww2qNSyxlbwz7V0hSFKIo6IrHo5PRZzfb
+eHSSN5W/M8J5mjUYoX704xmnmNAhHkzIC+G7puhhAoGAAfLkc2U1PEIwiy4clDMm
+z2c410ALbGSNlIk+Y8QvGeWetPkzYYInaxqZphOpjRYS9UxeRMKDOT2jn+/y2Xdn
+pf2NlH1PLFfJ53FXE5eDpumnHJrLM+cXgl5I0CzRXYbC56sTjLdf72M8yghgh+i8
+aDiIfgtZvsSYSYlpbZRv3rY=
 -----END PRIVATE KEY-----
 -----BEGIN CERTIFICATE-----
-MIIDazCCAlOgAwIBAgIUWaS9hCEaFWkn2zmhw2P88poO2oQwDQYJKoZIhvcNAQEL
+MIIDazCCAlOgAwIBAgIUEwg7pKIxliWek3WHMIM3p9ZlZecwDQYJKoZIhvcNAQEL
 BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
-GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yMTEyMjcwMjMyNThaFw0yMjEy
-MjcwMjMyNThaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw
+GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yMjAxMDExMzQ2NDBaFw0yMzAx
+MDExMzQ2NDBaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw
 HwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQC24OsZuIHP36cwKn//ueFoGL0jMeswtAOcwIesw2D1
-wmh+cuQxuXuoNRjGOmB2C0/5qBitMd0LkrLfdyFJWM2Pamp5ai1TEU+CKcyN0TrP
-lmh+CQpDAFkdYv1Ci/30zgsCaT2dZyyRHQH+gWS9nR8gPiGEb6oVEJYADKi1JySE
-rqwsDtglEx6SSfWfplwqjvYy8ps8ciagefq+mzTp8g3ChFEOu/Jyk2LaTAc76jFT
-hPLF4p6G069WlYrZegoklxUE20ll75MKlytv5xcoN5aeNIehgwoBmrR+uKOdrBIg
-wJQDzOLAGxhP3tglxUQxO9QBFihKt7RI0wRQVXGNCVtbAgMBAAGjUzBRMB0GA1Ud
-DgQWBBRjrXFnHUP06kXkJs/N98QK8tF5LTAfBgNVHSMEGDAWgBRjrXFnHUP06kXk
-Js/N98QK8tF5LTAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQA+
-c73pQjwfQzyCAvFaQ6paOSA4Xqzpkf8dH2kwUuxwbme1DONS0uaJ8BGqQHUkWzI8
-4+E5MBgmIwKANIpw4L1SAkjFSXiFgr20R11EGxLeT6VI8P+/o6Ab+R/yswnuQ9CS
-LOFXJXkjwv69uGA9U6Rz1tgbaxwOfEH9ybYB1y3BVq5+f0egk8cMD9Ysqg4FVKiG
-jLTVH3DBATBmky6pqkj0n5LZ38rIinxlXOhBG81mu9ApsgsyDfWDFkarS0bSn7Vm
-09QCpsIOi+Z9Oc+tXLH4WjT49EQKIalUV8me97V/70pZZ4lQjb/G/AEQozQYZjjF
-xcoP4B/TtYgSGZDH3Ny/
+AQUAA4IBDwAwggEKAoIBAQC/ZkDPIgr/P3cV6cSHOwY7u4XmWRr4i+ApVDnMrSp2
+Hr3FIJTDOKuRbyelrCuGgQ6Mj7LwBy6SpVTX4k3Bfi0is0zpdeA/Al8ZA7hAUJzj
+CjgCbofDQX+I3nRCACFVZWBsvRkJ3VAsTIROw06ajGDyDjpYj3iRw/Nhds/Y0gKH
+pW/hqogkQepvcI6Ogvp6I3nJ/cDNcSLZ4m4dEw90SsgZ0RqgJd/wF53l+ZjtBv/0
+nGlnUFE0HA0eJ0WagH/YeBEWB2ckRqvkkyQ+jcuYztHHKye5d30nnLGD5iDDktuQ
+LPlJMUCW+zJoae4mql0PQuJI4hLFANKnAPM7VjShYofJAgMBAAGjUzBRMB0GA1Ud
+DgQWBBSdwRgatcI4v+mAkZx0LdBjEQU8cTAfBgNVHSMEGDAWgBSdwRgatcI4v+mA
+kZx0LdBjEQU8cTAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCs
+HI7K4ausvUu5LYMVvhiHSbFTRuUm93EaNF9Kte1r9Yyb03DG3/+B4uH/e4/iExbd
+0ebHLfG7K7rr9Gy2AfBvsVCoo5gTHdxw/EOs6qAj2tpbkS3qJ6yX+lwKNX4sWaE3
+Q8CbKN4tyhkS4nkU7yfKxEY59UK4dP2Psw/HES3O0YbkXIRAJAOcvoqfyqAhZOTl
+4Gb23RXJMizCnUAHTuVfWbeQz2x4VUVkTlK3+oB54qYGLZ75V3T8GTWYT2K18gzc
+pjuQ25LeGpM/M56XQKFgn+X7HPgCNquQx4ZdcTDlAdDorwCWFHiOeHUX6xerrffn
+45JpoD24RNVyzd6qkG9F
 -----END CERTIFICATE-----

server.py

@@ -8,7 +8,7 @@ from utils.findfsdb import create_db
 from utils.utils import load_config
 
 def https_server():
-	server_address = ('localhost', 4443)
+	server_address = ('localhost', 443)
 	httpd = http.server.HTTPServer(server_address, http.server.SimpleHTTPRequestHandler)
 	httpd.socket = ssl.wrap_socket(httpd.socket,
 									server_side=True,

start

@@ -1,8 +1,8 @@
 #/bin/bash 
 #rm  ./gpo-repositories.xml
 #wget http://gpo.zugaina.org/lst/gpo-repositories.xml && 
-#openssl req -new -x509 -keyout localhost.pem -out localhost.pem -nodes -days 365
-openssl req -new -x509 -keyout localhost.pem -out localhost.pem -days 365 -nodes
+openssl req -new -x509 -keyout localhost.pem -out localhost.pem -nodes -days 365
+#openssl req -new -x509 -keyout localhost.pem -out localhost.pem -days 365 -nodes
 #openssl req -x509 -out localhost.pem -keyout localhost.key \
 #
 # latsed  gen localhost.pem  for https://