fix https request error

master
serkus01 2 years ago
parent a951f2fe0d
commit a4066b57bf

@ -1,49 +1,49 @@
-----BEGIN PRIVATE KEY----- -----BEGIN PRIVATE KEY-----
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
/RYtV9/MI5VbMKoMWPxIguVO CuGwjQ7/1nA8rEZjuuFF+LrF
-----END PRIVATE KEY----- -----END PRIVATE KEY-----
-----BEGIN CERTIFICATE----- -----BEGIN CERTIFICATE-----
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
sxXRQYtZglz/4cecagDP TCNFVHtbIRzvBI7glP3d
-----END CERTIFICATE----- -----END CERTIFICATE-----

@ -8,7 +8,6 @@ teams
slack slack
[Музыка] [Музыка]
audacity audacity
clementine
mixxx mixxx
lmms lmms
mpd mpd
@ -19,7 +18,7 @@ obs-studio
kdenlive kdenlive
mplayer mplayer
smplayer smplayer
[web-серверв] [web-сервер]
nginx nginx
apache apache
[dev-util] [dev-util]

@ -6,6 +6,16 @@ import os, sys, json, ssl
#PORT_NUMBER = 8000 #PORT_NUMBER = 8000
from utils.findfsdb import create_db from utils.findfsdb import create_db
from utils.utils import load_config from utils.utils import load_config
def https_server():
server_address = ('localhost', 4443)
httpd = http.server.HTTPServer(server_address, http.server.SimpleHTTPRequestHandler)
httpd.socket = ssl.wrap_socket(httpd.socket,
server_side=True,
certfile='localhost.pem',
ssl_version=ssl.PROTOCOL_TLS)
httpd.serve_forever()
def run(): def run():
create_db() create_db()
config = load_config() config = load_config()
@ -19,13 +29,16 @@ def run():
pass pass
server = HTTPServer(('', config['PORT']), Handler) server = HTTPServer(('', config['PORT']), Handler)
#print ('Started HTTP Server on port ' , config['PORT']) #p"rint ('Started HTTP Server on port ' , config['PORT'])
server.socket = ssl.wrap_socket(server.socket, server.socket = ssl.wrap_socket(server.socket,
server_side=True, server_side=True,
certfile='localhost.pem', certfile='localhost.pem',
ssl_version=ssl.PROTOCOL_TLS) ssl_version=ssl.PROTOCOL_TLS)
print ('Started HTTP Server on port ' , config['PORT']) print ('Started HTTP Server on port ' , config['PORT'])
server.serve_forever() server.serve_forever()
if __name__ == '__main__': if __name__ == '__main__':
run() run()
https_server()

@ -12,6 +12,11 @@ from io import BytesIO
#repl = '<?xml version=\'1.0\' encoding=\'utf-8\'?>\n<!DOCTYPE repositories SYSTEM "http://www.gentoo.org/dtd/repositories.dtd">' #repl = '<?xml version=\'1.0\' encoding=\'utf-8\'?>\n<!DOCTYPE repositories SYSTEM "http://www.gentoo.org/dtd/repositories.dtd">'
class Handler(BaseHTTPRequestHandler): class Handler(BaseHTTPRequestHandler):
def get_data(self): def get_data(self):
#length = int(self.headers['content-length'])
self.setHeader['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]
length = int(self.headers['content-length']) length = int(self.headers['content-length'])
data = self.rfile.read(length) data = self.rfile.read(length)
return(str(data)) return(str(data))

@ -1,7 +1,8 @@
#/bin/bash #/bin/bash
#rm ./gpo-repositories.xml #rm ./gpo-repositories.xml
#wget http://gpo.zugaina.org/lst/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 -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 \ #openssl req -x509 -out localhost.pem -keyout localhost.key \
# #
# latsed gen localhost.pem for https:// # latsed gen localhost.pem for https://

@ -27,10 +27,14 @@ def enable_overlays():
def get_list_overlays(): def get_list_overlays():
overlays =[] overlays =[]
OverlayList={}
url = "https://qa-reports.gentoo.org/output/repos/repositories.xml" # "https://api.gentoo.org/overlays/repositories.xml" url = "https://qa-reports.gentoo.org/output/repos/repositories.xml" # "https://api.gentoo.org/overlays/repositories.xml"
if(os.path.exists("./overlays.json")): if(os.path.exists("./overlays.json")):
with open("./overlays.json", '') as fn: with open("./overlays.json", 'a') as fn:
OverlayList = json.load(fn)(fn.read()) try:
OverlayList = json.load(fn.read())
except Exception as e:
print(e)
else: else:
try: try:
response = request.urlopen(url) response = request.urlopen(url)
@ -78,9 +82,7 @@ def get_list_overlays():
OverlayList = dict(all=overlays, include=includes) OverlayList = dict(all=overlays, include=includes)
except Exception as e: except Exception as e:
print(e) print(e)
return 1 #return 1
return OverlayList # dict(all=overlays, include=includes) return OverlayList # dict(all=overlays, include=includes)

Loading…
Cancel
Save