fix handler server

Makefile

@@ -1,7 +1,8 @@
 #!/bin/bash
 
 run:
-	make cert && python3 server.py 
+	#make cert &&
+	python3 server.py 
 
  testToken:
 	python3   core/jwt.py

core/route.py

@@ -1,7 +1,7 @@
 # -*- codding: utf-8 -*-
 #!/usr/bin/env python3
 from io import StringIO ## for Python 3
-from requests import  requests as ReqServer
+#from requests import  requests as ReqServer
 from http.server import BaseHTTPRequestHandler
 from .jwt import genaratorSecretsToken
 import json
@@ -9,7 +9,8 @@ class Router(BaseHTTPRequestHandler):
 	def __int__(self):
 		self.P_list = []
 		self.Response = ""
-		length = int(self.headers['content-length'])
+		self.Routes =[]
+		#length = int(self.headers['content-length'])
 		# Not work code
 		#self.send_header['Access-Control-Allow-Origin', '*']
 		#self.send_header['Access-Control-Allow-Methods', 'GET']
@@ -17,21 +18,30 @@ class Router(BaseHTTPRequestHandler):
 		#self.send_header['Access-Control-Allow-Credentials', true]
 		self.end_headers()
 		#super().__int__(self.setRoutes)
+	def _set_response(self):
+		self.send_response(200)
+		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 setRoutes(self, []):
-		pass
+	def setRoutes(self,  ListRoutes =[]):
+		self.Routes = ListRoutes
 
 	def route(self, metod, url, handler):
 		print(url)
 
-		if self.path in route:
-			if metod== 'GET' or  metod == 'get':
+		if self.path in self.Routes.url:
+			if metod == 'GET' or  metod == 'get':
 				self.get(url=url,handler=handler)
-			return true
-			elif metod =='POST' or metod ='post':
+			#return true
+			elif metod == 'POST' or metod == 'post':
 				self.post(url=url, handler=handler)
-			elif metod == 'HEAD' or metod =='head':
+			elif metod == 'HEAD' or metod == 'head':
 				self.head() 
+			else:
+				self.r_404()
 		else:
 			return self.r_404()
 			#return false

localhost.pem

@@ -1,49 +1,49 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDvdjLFe3pV/FKL
-Xa1BDzJk2P8v2VQRZU4m6KHNKj7i11QqUqKXzWvj3wLRoWX5LcLg0UKfTOPp5KXE
-MlmmwV8loiIIKOWZ/5R6MJaI8Tdgy8hDT3buXUHWDlmsJoOX56Ymm5UiyvopioNR
-RN1GXfmFWbZNsL3mP5o/CS4MM4l0RKrNCCxVuxv46mId+Fp5m2mI9F132PEaS9BM
-e/7P0f+H3VXvGKq3M0YNOpzPXJER39lxp7njko0OolfUXpIxZZLJcwHiedhQOkT6
-ENDkTBtIFA26v1DhpTvTyKpelgmFDdnej8BgAYYfj2b7xLL4U+WeZe5OmnDClDbG
-tgLUqCirAgMBAAECggEAEUK/3iRMaS5K9OjHuEzUIRjTLCvKN4bJ31wdbaCB7+/9
-jR9vwOl5wW8t0NaFdzSpO3NaDgmI1C87E61dcPu3VAsf0N7BzhvyI+ykrTJV/5Aw
-20k7FWt7d2aJaDNOgQCdpWLJmTxwU9Y8KPuBx7S2a7pPvcHjrlkfUTPkMdT1L4Av
-6j7H5/r/IQLL6sW6SIwPaEFSPOmSk5Lv0wAOe7rJnXavZGMOeZG9dR4Cd3Hr1Lf+
-kQMJX0vIKmu+6u2OGpykE2/T/Wlx5BHyAG0jxSk1CuEXiwouriH8Puu79EnRpXWe
-P3LDXd8zDGZQVGVqQF+3tj4A/2CL704XZhpZtYoU4QKBgQD+skmNT0hDSEyQc3TE
-rLdejpEDWSAJ5q/gfN/rvxl4kV5zdHtV+Dpk7xb3tq2uzUBibH9Oz/0ScqY5Ft6w
-R0d2t+zDLRVI8pxwjAMC6Gg40UOUl58C4Izw4dCCY1VVnTrL6OQKeS6N1xsVde/Y
-aVNj4LQMEn5Sw8tNbVX5RBlA9QKBgQDwr/MtuVbulTMev+J4oWkjrBimTOdRkkDt
-idFRgV62oz3PBTY2XWqEZ29RkBmSWvWPPkwOLKqIy+USBd+jCyJMnqTXBwkfbr/3
-atlWNGm57J58Ya2K5faQsc7Qn65/fMg7bC/I8U557jTEQvkgehX2QS2ysDZiEVEc
-R0nv/gk/HwKBgQCSmlcB8r+6krQXdY2h43TNBazsy3FIobNcuSQ+00m6/5npRQP1
-MSOTk5eZ0FnawyQrQx5oZAncg4ewVryppO26pRWwJpQY4CUyFzVoiBPtmG6Y6klJ
-46zcvm5BjyHAXPdKBey1JpmoZUeeq7r5y26HkACy7jYuN6sfDy8sgokyvQKBgQDp
-9J4U3Au8bhr60Np7F6rzmd18CVTw3ZFvVH+7El3WemciTJad0cAwY7q5NbElqnT3
-gD69qH0767YHBt6TxcbZY3wn6BbeDvFatun7+Yary21iyi++zDoX/D5kXFNqaQjZ
-ehgY4za9Hub7v34aK5IdhM2+27qBKQQG0OT1+6FRUQKBgQC/QCfJ8WiS6hPvLULq
-BVy7yM9/lVtxVp5J5jtSXoSNfrOTRO9pjlTJg/ifCXL2oWor1ToXD7dw5udJT/VL
-aZGOBm7FZUDMllKfdjX7f0mgpa+aMjBUzdC4Em8Uq64eKrAcyRHA0XSqbDgtseqr
-C59EHclLwzvKjrWc+ZemIcK2FA==
+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-----
-MIIDazCCAlOgAwIBAgIUUa4VtDR2Ltlut9IGDTON8RiKGZgwDQYJKoZIhvcNAQEL
+MIIDazCCAlOgAwIBAgIUQU1itEiJKDZTUZMRzvMrPsypx6gwDQYJKoZIhvcNAQEL
 BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
-GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yMjAxMDIxMDUxMDNaFw0yMzAx
-MDIxMDUxMDNaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw
+GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yMjAxMDIxMDU5NDhaFw0yMzAx
+MDIxMDU5NDhaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw
 HwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDvdjLFe3pV/FKLXa1BDzJk2P8v2VQRZU4m6KHNKj7i
-11QqUqKXzWvj3wLRoWX5LcLg0UKfTOPp5KXEMlmmwV8loiIIKOWZ/5R6MJaI8Tdg
-y8hDT3buXUHWDlmsJoOX56Ymm5UiyvopioNRRN1GXfmFWbZNsL3mP5o/CS4MM4l0
-RKrNCCxVuxv46mId+Fp5m2mI9F132PEaS9BMe/7P0f+H3VXvGKq3M0YNOpzPXJER
-39lxp7njko0OolfUXpIxZZLJcwHiedhQOkT6ENDkTBtIFA26v1DhpTvTyKpelgmF
-Ddnej8BgAYYfj2b7xLL4U+WeZe5OmnDClDbGtgLUqCirAgMBAAGjUzBRMB0GA1Ud
-DgQWBBQDAFm/YDIqTJ04ygzfhJPOcv9fUjAfBgNVHSMEGDAWgBQDAFm/YDIqTJ04
-ygzfhJPOcv9fUjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQC1
-k2kwVd1Ef2qCcGRU+85iXc4ys8ZlyLKgcsoKt/S6nuLFEZG4KZnEdsfqmtu0c4Jw
-d2oI+tTw4p7/4vgtUiToUf+DO8UAcrtXW8LbGmVW9r5/5wwjV5K5WI6K0R0/4lTS
-6TQIeXoXTx8xoLAYI091CVdCz8rRj/yClNxJQRPNCzUayxsDm9d8E4A9d5uYwfQh
-bN97cNqNiHupj3ppV3cdwiCmV2xlpgUXbhI0ZFEUFuYZ3g9KOzqWKgiO/hdjet5Y
-IeRAdEgIz8WAquJmCxIOstqKUhioxbRM8ib6KWVjOk47EMN1VU5bANaCv8HoYZww
-76rq6VEju2NxaTWUL2OI
+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,6 +1,7 @@
 # -*- coding: UTF-8 -*-
 #!/usr/bin/env pyton3 
 from http.server import  HTTPServer
+import logging
 #from core.handler import Handler as Handler
 import os, sys, json, ssl	
 from core.route import Router
@@ -29,7 +30,7 @@ def run():
 	except KeyboardInterrupt:
 		pass
 
-	server = HTTPServer(('', config['PORT']), Router([{"/":""}, {"overlays":""}]))  # Handler)
+	server = HTTPServer(('', config['PORT']), Router([{'url':"/"}, {'url':"/overlays"}]))  # Handler)
 	#print ('Started HTTP Server on port ' , config['PORT'])
 	
 	server.socket = ssl.wrap_socket(server.socket,
@@ -39,7 +40,12 @@ def run():
 	print ('Started HTTP Server on port ' , config['PORT'])
 	print("https://localhost:8000")
 	
-	server.serve_forever()
+	try:
+		httpd.serve_forever()
+	except KeyboardInterrupt:
+		pass
+	httpd.server_close()
+	logging.info('Stopping httpd...\n')
 	
 if  __name__ == '__main__':
 	run()