serkus
/
webport
1
0
Fork 1
Code Issues 3 Pull Requests Releases Wiki Activity

fix routes

Browse Source
pull/1/head
serkus01 2 years ago
parent e3bb8a3327
commit ae11990e63
8 changed files with 114 additions and 28 deletions
Show Stats Download Patch File Download Diff File

BIN
core/__pycache__/handler.cpython-39.pyc
View File

Binary file not shown.

BIN
core/__pycache__/route.cpython-39.pyc
View File

Binary file not shown.

5
core/handler.py
Unescape View File

@ -3,6 +3,7 @@
import json
#from BaseHTTPServer import BaseHTTPRequestHandler,HTTPServer
from http.server import BaseHTTPRequestHandler
import logging
import os
from utils.utils import get_list_overlays, load_config, write_config, sort_install_pkg
from utils.package import search
@ -94,9 +95,10 @@ class Handler(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()
#self.end_headers()
self.end_headers()
if self.path =="/":
#print("data:\t" + self.get_data())
"""
@ -186,6 +188,7 @@ class Handler(BaseHTTPRequestHandler):
# Send the html message
#self.wfile.write(bytes(self.r_t, "utf-8"))
def response(self):
try:
return self.wfile.write(BytesIO(self.r_t).getvalue())
except TypeError:

70
core/route.py
Unescape View File

@ -6,19 +6,39 @@ from http.server import BaseHTTPRequestHandler
import logging
from .jwt import genaratorSecretsToken
import json
class Router(BaseHTTPRequestHandler):
class Route():
def __init__(self):
self.P_list = []
self.Response = ""
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']
#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, self.setRoutes())
routes = self.setRoutes()
super().__init__(self.setRoutes)
def add(self, url, **opts):
pass
def find(self, url, handler):
if url in self.routes:
handler()
else:
return 1
class RouterOld(BaseHTTPRequestHandler):
#def __init__(self):
#self.P_list = []
#self.Response = ""
#self.Routes =[]
#self.r_t =""
#length = int(self.headers['content-length'])
# 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()
#super().__init__(self, self.setRoutes())
def _set_response(self):
self.send_response(200)
@ -28,10 +48,15 @@ class Router(BaseHTTPRequestHandler):
#self.send_header['Access-Control-Allow-Credentials', true]
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))
#logging.info("GET request,\nPath: %s\nHeaders:\n%s\n", str(self.path), str(self.headers))
#print(str(self.path), str(self.headers))
self.r_t = str(self.path), str(self.headers)
return self.response()
def do_POST(self):
logging.info("GET request,\nPath: %s\nHeaders:\n%s\n", str(self.path), str(self.headers))
logging.info("GET request,\nPath: %s\nHeaders:\n%s\n", str(self.path), str(self.headers))
self._set_response()
print(str(self.path), str(self.headers))
def do_HEAD(self):
@ -39,11 +64,20 @@ class Router(BaseHTTPRequestHandler):
def do_REQUEST(self):
print("do_REQUEST:\n")
print(str(self.path), str(self.headers))
def setRoutes(self, ListRoutes =[]):
self.r_t = str(self.path), str(self.headers)
return self.response()
def _setRoutes(self, ListRoutes =[]):
self.Routes = ListRoutes
def response(self):
try:
return self.wfile.write(BytesIO(self.r_t).getvalue())
except TypeError:
#print("TypeError")
return self.wfile.write(bytes(self.r_t, 'UTF-8'))
def route(self, metod, url, handler):
print(url)

49
localhost.pem
Unescape View File

@ -0,0 +1,49 @@
-----BEGIN PRIVATE KEY-----
MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCiRdhvvZaLqUMj
Q440SCeBqweAIZn9Ns8lU8TBc7X0moqm95hE1NNLy6GApajQaiwc2R1+3Q6TIt+q
qitX9ACb3PzFxV+lHwja1yN6MAnlXBRpkzOfOiCDcwAnGfj9Jg/bAFKr2Ffd8G1g
KzyTJd6msLM/D16AtGm+4tKaiF83iygOSo2NYY7v4tkMIRnsYkl9Fc8WGeyKLal4
JPetGZcLVqhSFaKfYtjI2hQmJKJXz/KOxcle1edQlIxYerfpWyUA/IVAdPnUQnyW
agfN96QnsICJBkkdNx/yMOOxrf2flyk4N5OUCQqaMXSySRIb2aOlAmmX1ncRD383
E5NXgw0hAgMBAAECggEAGY9s5zTyyK7xr1VNyfhvmKIq/UjNq6/9cwC95kbmq0/I
dUJczsLDQZYiq1Pswl9m8WhVmA0T5aNBne1OBH2ftu1ZN4G+bhD0YRwwL2fvtxwI
7xRLtlH+mxX7OS2DJcTgDHwBiaX7OS9M2zAUS41Ug+cjZNRz60v/uBycVdETRnk5
qB5wWjS8WvfF58j+c0gwrLJ/F6RT89xJclrFgfuH46R7use39eNxsOXgrG8I0vdm
oNSjhoL2T97nuSMNrtBeyXkZA28FtT332LNI0DoIYSwhXt4V6lqdb5dksnms6B64
CtapEGhFLigspaQkbQMi51iReMB45AaWZMsQlvKAEQKBgQDSxmKumyZNWXz5z+m8
bOEPQ+OFVAMNw/vo4gk28rY1dm9UvOXSgpyXgfypEye+gG2n7dQ80vYx4oEys/bG
Xl1JPAqvT7/Gm6CTxHIWFJiPR0b3mpUlKlYEq96PicUkIN1KHHeotyjHlobQbjac
XmvuHgLuZCqw1HeYfTPQVaGgBQKBgQDFF0wfHCoU1Sk3gXt7csq1Oq4dXVITUY8J
2fpTxHSk+yQAGlJKO32HrDRMvL6Dnwj5wODGq+bt+dABlJM/vMlkyaJxKzUvJcsS
1oDldfJfXiFn7IvBT+/RS094Pd9K4Y8wPKP4rJWHIGZZoCGV7NrmsRhPQAW0Ucje
bwtMnd0vbQKBgQC2sRf16irv3oIR8eHR3bnRxnFeLmybMOWXfNyp0QSYIHjtRPIb
XfSm6hd64UyQtbbWWLGequiUYpTDwvNCC6bmBHHqdMBwQJKVoi+U7fMyNYDQux9N
YH3AfMxjM/I5l3bXdwdMqL1jChj+bplNPhZlBYRa512NegvTk6omiSKXlQKBgFEC
5H0dHIb3nzt7c4AojP21IwBa7XOXYI4SFPz9kVyHBiMsroporY5o0A6CvmRnqE7Q
YxQGcKN8vW0I3wWh2b4dyzFtKy04AaK6nLy0oG1myaBn8IIDE3YZ2I56ECA9Wpff
NR7wAX5LaQaJ9YQkmU2dmXppvG6D92bGigRyFwp5AoGADQXNbykdJ6lyVzCini7S
WKVquPGL0+qWhMEtV463LW0krY5d1yWVAABxRmXFVXtd5SX+P9WK4MQuzPy7q+aP
RVbnLd2EFi6pRFkMi1lIqDn41LTQ8Yn7H3SlNYznU0lTzB1TvSghp565x9HaNjCn
vVtF2Dj7g5/t0Lhjfdy+nMg=
-----END PRIVATE KEY-----
-----BEGIN CERTIFICATE-----
MIIDazCCAlOgAwIBAgIUBNG3ld17EHy92UGnYoRsloYsYNgwDQYJKoZIhvcNAQEL
BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yMjAxMDkwMTU4MzJaFw0yMzAx
MDkwMTU4MzJaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw
HwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwggEiMA0GCSqGSIb3DQEB
AQUAA4IBDwAwggEKAoIBAQCiRdhvvZaLqUMjQ440SCeBqweAIZn9Ns8lU8TBc7X0
moqm95hE1NNLy6GApajQaiwc2R1+3Q6TIt+qqitX9ACb3PzFxV+lHwja1yN6MAnl
XBRpkzOfOiCDcwAnGfj9Jg/bAFKr2Ffd8G1gKzyTJd6msLM/D16AtGm+4tKaiF83
iygOSo2NYY7v4tkMIRnsYkl9Fc8WGeyKLal4JPetGZcLVqhSFaKfYtjI2hQmJKJX
z/KOxcle1edQlIxYerfpWyUA/IVAdPnUQnyWagfN96QnsICJBkkdNx/yMOOxrf2f
lyk4N5OUCQqaMXSySRIb2aOlAmmX1ncRD383E5NXgw0hAgMBAAGjUzBRMB0GA1Ud
DgQWBBSYseUqgTfd5fZ3lPzC7io6W/J08DAfBgNVHSMEGDAWgBSYseUqgTfd5fZ3
lPzC7io6W/J08DAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCD
HkJMGxGWDZxh+6+fu5A0XMGocywBAHpCjAHhLYyJhkJaYEu/NtPLHErJJ5W34SsA
DavG2JRgiGaSfIlwFQA98G9kWv5nj5rtK7L7dSmzouUBfk89zvtqLjPv7cV5MF+h
R5fUnJQU49gNh3tRFNRiAl9OCTS/vaPsROg0QqnZEaxcyPpU0YXYzr8nRDIXNDXD
sCRcg7Cq5J7DLRm2CTlqv9FNBJu+eJ+HFhvRxS2c6egNEafQ3wtRN0ZV+s4DO3tb
5xhtOvEI9G0mIk6DT2StHSuVn7ZuR/dhXYLJByKxW/V87Wu2rsRRNzqVyMTEw1pN
aH+n4cw4XQzTW8VWgm7g
-----END CERTIFICATE-----

1
overlays.json
View File

File diff suppressed because one or more lines are too long

1
pkgs.json
View File

File diff suppressed because one or more lines are too long

16
server.py
Unescape View File

@ -3,7 +3,7 @@
'__autor__' =='serkus'
from http.server import HTTPServer, SimpleHTTPRequestHandler, BaseHTTPRequestHandler
import logging
#from core.handler import Handler as Handler
from core.handler import Handler as Handler
import os, sys, json, ssl
from core.route import Router
#PORT_NUMBER = 8000
@ -17,7 +17,7 @@ def https_server():
server_side=True,
certfile='localhost.pem',
ssl_version=ssl.PROTOCOL_TLS)
#httpd.serve_forever()
httpd.serve_forever()
def run():
create_db()
@ -31,20 +31,18 @@ def run():
except KeyboardInterrupt:
pass
# Handler)
server = HTTPServer(('', config['PORT']), Router)
server = HTTPServer(('', config['PORT']),Handler)
#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:" + str(config['PORT']))
try:
server.serve_forever()
httpd.serve_forever()
#httpd.serve_forever()
except KeyboardInterrupt:
pass
httpd.server_close()

Write Preview
Loading…
Cancel
Save