From e3bb8a33279d6d13c3f650f71ca6008a7dee1417 Mon Sep 17 00:00:00 2001
From: serkus01 <7erkus@gmail.com>
Date: Sat, 8 Jan 2022 22:51:38 +0900
Subject: [PATCH] bug https und  requests  #2

---
 Makefile                              |   5 ++-
 core/__pycache__/route.cpython-39.pyc | Bin 3709 -> 3631 bytes
 core/route.py                         |   8 ++---
 localhost.pem                         |  49 --------------------------
 server.py                             |  27 +++++++-------
 5 files changed, 21 insertions(+), 68 deletions(-)
 delete mode 100644 localhost.pem

diff --git a/Makefile b/Makefile
index 21fa2db..06b8b16 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,10 @@
 #!/bin/bash
 
 run:
-	#make cert &&
-	python3 server.py 
+	python server.py 
 
  testToken:
-	python3   core/jwt.py
+	python3  core/jwt.py
 
 cert:
 	openssl req -new -x509 -keyout localhost.pem -out localhost.pem -nodes -days 365
diff --git a/core/__pycache__/route.cpython-39.pyc b/core/__pycache__/route.cpython-39.pyc
index 5ee2e40e9b551a3784cc1a7a2beede1524834bd2..33b6c15363ba4d9ee72ac393a062b2c8d085acd3 100644
GIT binary patch
delta 1174
zcmZ{j&rcIU6vt<_+wHbx3n~aH<%hKVSP;<gLl0_1W6%WApeDGQY#Mfu5^P~+8x0!u
zV7zc5W1{~;y{Pf($)gD-9v%M%C3-jd-Y&mNag+V*o1O3bv2Wh~$-K>2dCN)=xW2sn
zmVdWyeQrJv3-KDjh(kT%Xdd;n=Vbl&iz{CC2C;L>m?@Qg#^)%AwlB0bxG%yjjsotH
z$HXNb1=7IQJObX@v?6vyey8bFg(_XJrTGfsb%e+<t-D2;u3IP;eAmUAgaIJbpvH$4
zt%0_yBrAIE0?T`h3yunO+=3-vMQ+JA`e~Wcd$o!oPwClV6<y|qqF<v0FJ*Wock<HB
zcCdvGAT%wX>2ql;o;M?EGNhx|nu3fqJ5QpIa&737MzkU_2Zm@fW~Vw~$EG}v4~-|`
z;UuOC!VlUi_I?v=skmTUJI7%uu*rn3HiTy|BtIJO=^<H+ja&`#2dObK??&VheTaU5
zigI`K#Hg)@Nu&3fU-Cj>4{G*y^Ji>!pmY0WB@%cXEJaaHu9#;#cJzF3+cS)5;j&L|
znCG&)n*B{g4OTfRznVwnM7(!bYikaUitp(8vcFJO=UV)(i81X6Z<Cwx)=bz>)Xgwa
zUh=EdJ&D!9opXYA%omoJ(m9NjO;wDul`<369vcaN_%N2%hzNX#&^n;{u)QO<<*#I`
zTuWX~kN!u<2jq|Br|b2wtu&wWaWHICX(bVijxyLo7ze?3@+!Tw%!>RZ#xqeIj*X)8
zRbThFZY(lwH_CCV`)LZbO$eND-hnuV=t5)>I8XZ~#Hn|~!Gix#Okl5vQ8a=WLku9!
wAa;i(u!1AT9~OsCbfINZQ*K%p`dh$uB8v}v9tBJ3i=tHID5!}c@1(l^0dyAK4gdfE

delta 1282
zcmZ`&%}*0S6rb6zZc7)@@)4nmP(EC=e54?HkQft#2`B_L!Nz3Mbf?m$wm7qm2055u
z<ivr@KhPd~P(nN#6OZ1FI(I#K^<?6_-CByp-Ry7P%>Leczj^cKApSdUWh^U#<TL;B
zTc*BmeHwrXt4bg!ja`&hc2N$y*i~Mc`#)c2caetD-S?245XM@$;t`s~;L>=&RvRC?
zERDx#8#&0u60vV9+o-D65JsN1gR1&ADi}44k&9$Z<*q<>h`-1EH$(?1xy}a3xP&sH
zv&tr+!gQQ`DepOsh&YURetuTRLSv+ulVjL%vc(Kzj#KB~@n|27N(Hbz=I;?3@P^EH
z!%7$KrLaaj0nRib##hw`@$+)-p{m@rC*>B@onX{<a82c3)TCnT+|UwZZQjyP7;f2F
zymcR9Fhv65>sofcUmCVSp}aH>a1H=SbWnoOH)+1)wFTs#wUr)UUYpQs`iqgF_DJm^
zzUu3X2}!gu4a1<&Q*ua0mh-Gp!qx&nL`wo3UZ5XuoeoZV(&5|2A@1dqq0}8ewXYw7
z(s6(>fC&Kb7CLoir)O;~$frLcUfB(Z7lG4S^|zt*OQ6wTtgF7q$y6YX@fq{_V3SX$
z{(1&6V=$fId*(voi1Tm#fCDNQ`Mw$BI6QvDwUsn<l$X{r6>sC1&ZY1p)32pUhxkEw
zARd$wcx!}Jirz8ykMLHqc|@`txqOibjmoCBu?SJ}v_jZ%kG+UD)d$l2=Jb81VS0l4
zpuDMv{IFwyFLm7Rzw#d<P4YJ#A6L8OZ=raUUX_Mz3Z=~a{u2gyE<1tIW?rF{H%W=6
zAf5^2pkoBi9oyZ9=$vBr@L$o<6x=g<7T^NFFu(}FC;+q*odjrU5WZsdEYHB=9Kbw4
z5@11suo^cxONvFuX-V4!6#sw?X+i5T$Y$awuUR)I;C`jm!ZVNR(h^#Ml}i+uEg}5A
Ji*c)S_z&Is^c4UA

diff --git a/core/route.py b/core/route.py
index cfe56e4..cac474f 100644
--- a/core/route.py
+++ b/core/route.py
@@ -17,8 +17,8 @@ class Router(BaseHTTPRequestHandler):
 		#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()
-		super().__init__(self._setRoutes)
+		#self.end_headers()
+		#super().__init__(self, self.setRoutes())
 
 	def _set_response(self):
 		self.send_response(200)
@@ -29,7 +29,7 @@ class Router(BaseHTTPRequestHandler):
 		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))
+		print(str(self.path), str(self.headers))
 	def do_POST(self):
 		logging.info("GET request,\nPath: %s\nHeaders:\n%s\n", str(self.path), str(self.headers))	
 		print(str(self.path), str(self.headers))	
@@ -41,7 +41,7 @@ class Router(BaseHTTPRequestHandler):
 		print(str(self.path), str(self.headers))	
 
 		
-	def _setRoutes(self, ListRoutes =[]):
+	def setRoutes(self, ListRoutes =[]):
 		self.Routes = ListRoutes
 
 	def route(self, metod, url, handler):
diff --git a/localhost.pem b/localhost.pem
deleted file mode 100644
index 2c1874d..0000000
--- a/localhost.pem
+++ /dev/null
@@ -1,49 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC0MgLWStEm5aNe
-HkdiNdTYKxu9HOYSIlRBhxdJwwt9+a7VqkyW/TcYgynJ6cwhL22SeEuM1nDqYWVq
-Z+CJdUiBdQZtkar7LKUibAl2TZbmosrbPAYN7akM9lwfu4OBnauYX0LqfRjrPPZm
-ymlRzs6nscw0dpdr+RzpXNv8Kb7XvYplMtC9wM6HU0JfJch+Uiz17fVaAHMlV5KS
-qcv5wHOf8QmFaBUuycwM53GKOXC45MNIOWMrNyZk/tR4rDNT26UvHlxnk7KbFCTM
-up1pRUHHs1C2V0oWR990KNdkkMuJssYEqcAl2yxFZc1nbzbn9Gy5fsHM3g8k7dhG
-9bSBLIJXAgMBAAECggEBALC25v9e6hR6WieADENtRWolhJOG1r5r+jM1F4qYBBos
-FeCmnWvpsfGRGBdS+ISG7a8Z2AWre5rvnzSl4JcNdOi4anBjzcl7tAq45uKlHtra
-RZSRHeLk8seqhxf7nfEsPk81BPvPaPOxmneeA4FeDl54yCmfL8qMyGS3U2nNSsJp
-EOmBkECfEXaDff4TlFOp/SE1tRsf+7/WP0jOJfipFXiYrc8xp2aT39ZUYRMr+/Bz
-7T4d1AmyprDxc+ZtDnuOGUKqKZEUVFXN0+Gxs1DRCBXhL7oObedt+BMLvtbodYqt
-HYmUojdoyT8nuPu+mUJJeubf9BwMltvmqQ5yMfO5o4kCgYEA7e4QNcD1LkJvJE5C
-70H88fKUqAmmH+tmmXwCm6jHZUhB9Nf35uQxtL4oeE3WxpjNwr7xJQTMjsL4xyiH
-UYPNyIlYI7+ooR6+xoIq+q/wDi9+AceGLWRP0BZ1L8GEaRbRztOQtLtj2jHl+93s
-Ja7699un5QSNZBpEgfK4elSFQCMCgYEAweFyddL4opfKz4Ih30HYJiQC3N3fi6Xs
-kC0wHB9g74W1W0h0uSR7fZDXXFaJ1pZbi4ocQ6439Qj3mAa0BjpitRaH+dhNQUA6
-MlbazSNm/JNtaY8lNESXtsbu0yJVDA3U/tQjhmgr+yL0N5I8mQAFSSFdrwEaleOm
-ChNVP3jpfj0CgYEAmlLrWLJLVTHp/NZ2O9HFSvlYypVXlySMa8kvt98FVgBEJ5dd
-R/mC9ATTIxT51d6Ot1458xTlyUNVMXhsLMcc1pGfBbDuo3LZstADKI6tWcYcKPNN
-aGvECOhIIi2WwML4WvqGxXM2FPSAg5kx7k9MoS9r+vO08dTH0rGoTlA8DZkCgYAL
-I12FAVLBXIENPMefYNP/FPCJKcHu7uBRRBdQdkkGWaMalGYIQN1LUGfe6SXQCyFF
-OfD3vml+jT5UIIZ1GSOUja/QHaoKhpsRS0YUpOUEu598gfm8L/ibSoBr5rwGDkFf
-RmaoERH9wntPOfp7O7ISCnWsWR7i34opaATsuZCIbQKBgAy+FyRTL//8BK2PWM2P
-sNRhxe8Ighawu5gZBZPDwRt83z5uAsIDKLEUEi38fZypQIW5+Wmgxar7nyOZRINT
-x8DAsUZw1lTgm5uHXWz5vMhMCPp8keVuQIl6tTVmFFICK0t9ZMm2VVo5uOqYEFZ9
-GZ5wOj6gLLVlNIGb+qMfrx3a
------END PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIIDazCCAlOgAwIBAgIUQU1itEiJKDZTUZMRzvMrPsypx6gwDQYJKoZIhvcNAQEL
-BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
-GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yMjAxMDIxMDU5NDhaFw0yMzAx
-MDIxMDU5NDhaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw
-HwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQC0MgLWStEm5aNeHkdiNdTYKxu9HOYSIlRBhxdJwwt9
-+a7VqkyW/TcYgynJ6cwhL22SeEuM1nDqYWVqZ+CJdUiBdQZtkar7LKUibAl2TZbm
-osrbPAYN7akM9lwfu4OBnauYX0LqfRjrPPZmymlRzs6nscw0dpdr+RzpXNv8Kb7X
-vYplMtC9wM6HU0JfJch+Uiz17fVaAHMlV5KSqcv5wHOf8QmFaBUuycwM53GKOXC4
-5MNIOWMrNyZk/tR4rDNT26UvHlxnk7KbFCTMup1pRUHHs1C2V0oWR990KNdkkMuJ
-ssYEqcAl2yxFZc1nbzbn9Gy5fsHM3g8k7dhG9bSBLIJXAgMBAAGjUzBRMB0GA1Ud
-DgQWBBRts35B5sJw1cSSqjbmhPSOFDFUJTAfBgNVHSMEGDAWgBRts35B5sJw1cSS
-qjbmhPSOFDFUJTAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAl
-2Woa4UwxFCCJTVz+elKFCmjMboSq9W/p0t+ylKDm+JvcFjJSdMdbwNSlHAG7Kz91
-S0EQDxDV2ORP3+byoVhuLo43Ss2V929a73wI9/mEOLWTKLH5lJFliuhQP3ILV96G
-3Cd/4qHEW1SS1z/vB9jIMfxq9MDwW+rw+wAvVlv6F/gBFTA1SDvMeljWkKYUAGpo
-MgqE5gJ195eClVsiDbJbhQfuN4UYCPXKMMQVs+K8gJhD/+hnjzEBzhfhhAX4cLHl
-6Ygg8tEwGjFZ6yiMBB7IwMasBZH/LA9LCbBKZ0/h5TdIHUa2v3ILQqS47CfcIC01
-SBYgOG7RcTYEJDsMF3Af
------END CERTIFICATE-----
diff --git a/server.py b/server.py
index 531ebb0..a0473ce 100755
--- a/server.py
+++ b/server.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 #!/usr/bin/env pyton3
 '__autor__' =='serkus'
-from http.server import  HTTPServer, SimpleHTTPRequestHandler
+from http.server import  HTTPServer, SimpleHTTPRequestHandler, BaseHTTPRequestHandler
 import logging
 #from core.handler import Handler as Handler
 import os, sys, json, ssl	
@@ -11,13 +11,13 @@ from utils.findfsdb import create_db
 from utils.utils import load_config
 
 def https_server():
-	server_address = ('localhost', 4443)
-	httpd = HTTPServer(server_address, SimpleHTTPRequestHandler)
+	https_server_address = ('', 4443)
+	httpd = HTTPServer(https_server_address, SimpleHTTPRequestHandler)
 	httpd.socket = ssl.wrap_socket(httpd.socket,
 									server_side=True,
 									certfile='localhost.pem',                           
 									ssl_version=ssl.PROTOCOL_TLS)
-	httpd.serve_forever()
+	#httpd.serve_forever()
 
 def run():
 	create_db()
@@ -30,26 +30,29 @@ def run():
 		print("KeyError")
 	except KeyboardInterrupt:
 		pass
-
-	server = HTTPServer(('', config['PORT']), Router)  # Handler)
+	# Handler)
+	server = HTTPServer(('', config['PORT']), Router)  
 	#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)
+	#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("https://localhost:8000")
+	print("https://localhost:" + str(config['PORT']))
 	
 	try:
 		server.serve_forever()
+		httpd.serve_forever()
+		#httpd.serve_forever()
 	except KeyboardInterrupt:
 		pass
 	httpd.server_close()
 	logging.info('Stopping httpd...\n')
 	
 if  __name__ == '__main__':
-	https_server()
+	#https_server()
 	run()
+	https_server()
 	
 	
\ No newline at end of file