bug https und requests #2

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

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):

localhost.pem

@@ -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-----

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()