diff --git a/localhost.pem b/localhost.pem index cb78848..ae58455 100644 --- a/localhost.pem +++ b/localhost.pem @@ -1,49 +1,49 @@ -----BEGIN PRIVATE KEY----- -MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDNuiknW16t+6Im -Oga/O59CGUWfG9iEYncPuzh745tLf2HfsYXfMgfcGcbasPkX45ViGOUUX83PbYvO -L+crs2Aqnq1KxD9YMbTJmRWHDXRUTFMoVg73UJZCsu0SSdAUOeVVJeqXQQQkIBl9 -OGZdsQYTLR1r54iyuAzdurTPoV+L+BQLeu8KvwrtLPg21zwDRgN3sG36vok0/7GA -6sYuVNoOwAx6qlYf3CksthuJZiI4G7yAnJ3Uq8oMGsDLcQ7xiWVACKWGonsEQWsa -NnMb9vPYYcjWQFrm46RGfmWMXpWtMB5SJYUAkvKqfP1EcGBZwV0IXkBzSY4UnJBo -kNN3h0lXAgMBAAECggEADjUjDnLC8SUFp7ouKRrG/tub8UcNBud97XoyhmvLl8Uu -TzKFWkqsPEkTcJr0OPAgquupNmT/Y6nfE9g/EMeMhqT6tsUi0sZsA9gsom0NcZzr -yUdYNUA9gFG3CaJLWno9GkpKDzQQQyZsXDd+6k2Fa+GbvI365MzNJqr0PbqZTKMv -i6BnGtkMv4we3TLLxJUk/bzePUgWW+Re8InVc7nMYasVFhTkncEIdjIJrLqQ9VJo -HuJt5IOlgflUyw6xVzxsWVZfs3QdQPX6bgBvAHaUW80KICpXy1ecF/FCWec7oQlt -WU3LG77twMNSJI2y0NWEfN6LNz6a0kzdkbzRpAYQUQKBgQD0yzqXJYcL/L8pvVEh -f0eAGslXY+eKL9SMnPC0DdyRizPq374x6E3tZK06Oaq87+LO2qG1KQv7zZV/C8DO -mS6py4m5TE60TJKQUCX34snr0j+/TH5mm27/E5AjwMrl41/Zp+T+ZbYduODubdJ3 -vMwtwSHOrAqsRTwPuKmZuV2tkwKBgQDXJRq+p46r/EIBFGj5250jKE7TC6255wlF -3xGZ5pe5yASQ2n/XmGjj7XNWWgM/R1px0UaLhA6NjwR6ZupC83YExeeA/vKQBImr -2Ar+n3a95/Z9FTaWa2PvUhOSRh0os+u8Tx9bauVYL22DQA66p5KUKcP2Xy55r0R0 -jHkw3xkvrQKBgQCcSNe6QeJLW+zsCAsxGKKcff2Hhqf/iHPp5hSiz6q/XSEjVf+G -u2ptInaaEtEX2Qtzxw+wqmkVNPa56tYI0LGDBAiEvdwNrklwS0tCTI9fuJasWnjk -p12hCmte+CpRxO2f91nytRslNLCeaI0TlvzARWqBGUOjInyrCNl25GqTcwKBgGP2 -7pVVn3oUDMsZo6ksvLegO/fdvkvZqLpZaoE63pbI9C4mCC6xt1LoeqXNzyJw0fp+ -hau/oU9u+2KwPPr8yoJvPiD21NfL8/fvuzQR/gdBJ4t49tMvdNC3LzbQ8y19Y/Qs -Q2KjqYqvBtBsTCu4Pugu+8mW8i5CHKmWt5zYnIhFAoGBAIv+v3fuMrJLntKtCpxs -sm+2ghf1US9nl86cLsMxo5MwB/aogVyOhuascYQFDxUcYDYoFqkc+SqhWrfwkbfi -s0U0PxubirtzqhFIIMg4oVZTZ/n/dh9LVwA1czLfwl8nI9w5rSOnR2vhy72WZPiI -/RYtV9/MI5VbMKoMWPxIguVO +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDAJYowx9PDtMtm +7pFdah83+LH49fiML6qzFzGsYBLsf8rNMm9VYPZRzLD/kXFtZATnKrKJqqgJnPYg +Wzfm2KNv8RlK6UW2ApPJZDwwaHpuaZS6TrSWdXLOQ/r8Q8w01n4jo909FTQ/5dNb +83yCOHUKR/x7IH704bez2fUkYzu4Z8xFE2iyvbC1q4Mmux5XdrahdelM5+jBIEVZ +CpKsYzcboEmsSQ+bUT7akcjZ7EFpqZHPYi+qS3Y2Xs1pKr6SWu2Tm0Enog88iIou +txFu/Rt888xkGs5oJT7cn47BsuOBmmT8vPnr6cJUC+2TyNFHJeaPSzR+Qcleg138 +U97ZBDWnAgMBAAECggEAaOHU3a2l1PTR9jyQ0nnD0qyIkQnKgtLeDWXCsoG6sqdK +ztkR1nvX2GyvzMDaNkjbOEehLu4dTSoFW0IPcI2eINNs5+wPJjuf6dUx2YaeFbjB ++zRM9LflU9vdm2dyhwDx14hxkg8J9zr/NPjiZL5mfJcwpRDm28p9mMmHOzaDebMU +iq+sB8A4qayryhPF4Ha5OK0g5eP6QyBaDm96ujbUdF1qorOPmhz/6lQGzYmSEZuW +uwMAngP16Cd/4yZ31lTcaoFWo7sYTt0Kc0+EDLGLdo5Sp/J9Vrd08nakgtzxtdsA +iQjlW0wYULietNbvnShweupdBjtpqGQw1hknESZeCQKBgQDmbI3x0o0y2a1h67y+ +qsutUZYT4UzfhmMX/lEdKO2aFAhQALfYNK4u9kD8gt4s4wTbJ1AwbAWBfw7+XqrX +gWxm4DYtQ7JeLnAXJhC/vM8N6Ou908QfC2BogFG3GM3M/BuJbA4/EVCHDfMgCkBK +PKW8HTaHqwCa+68VNUe6moCyJQKBgQDVeVeF+sI7iT4laywsiMojvokujupVTKsI +6MHwIXGSjwa9TnaV/Lo/gdFPFmyjacjmcQpvgMPOV/ANBg9p8Nhodoo7WW+5Ok+2 +9yVReQElg9/NMmP42v31+GCZXkYHhf+fyfNnze3FWszi8DErCFp4JxPPQ4+6k/5g +KXtFAquQ2wKBgQCKbttUVieoTiihNKxfbGMTTHm6ldfGTomIJ6z5tNYShEh+MABD +b1raMe3XBpSOKRGIzHSbsroYE4qhfaRr9oB2yesihJJLjOCgt6jGWJuYgr/meqxP +7ljMT5NISimSJkAw7m8cqr1TdikDrcT0FL2JZ4+UMEMb2WtVdX4TeLEq1QKBgQCw +uMk6AwM0okMuWvCw1XTx7lRGlM1tXBDjSTzz+9u3hmv/36rQM+5DkMakAF5jUbmc ++8u1zxVKBwaU4YV1IIsmv6tjwoB5CMrhHuxn7BKE6g0mJCca5sADFmFx1deHdujN +cTPtpU7HaIng/RLXGw06Fq+Rj862mLmnBfAkizdYrQKBgHoQEx6d+U5+Uubdt/1m +1asm1+DTWDNr4sjJTJtg9v0s1nQBUPltSrIdNf/h9Wy61BMaFtjX6IyD02SFP3FN +G8JVTbXSEgPQx+h0vuV633zJtg3BWBbqC7OIqvony+P8ksyHL2WGJLFsTl1Y4ybl +CuGwjQ7/1nA8rEZjuuFF+LrF -----END PRIVATE KEY----- -----BEGIN CERTIFICATE----- -MIIDazCCAlOgAwIBAgIUe3qghwF+lM7kvaVe88KG8lIYuk8wDQYJKoZIhvcNAQEL +MIIDazCCAlOgAwIBAgIUa+/4ylxqeJhzgKotQtTxOTqbzqkwDQYJKoZIhvcNAQEL BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM -GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yMTExMjQxMjQ5MjFaFw0yMjEx -MjQxMjQ5MjFaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw +GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yMTEyMDgwMzA0MjNaFw0yMjEy +MDgwMzA0MjNaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw HwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwggEiMA0GCSqGSIb3DQEB -AQUAA4IBDwAwggEKAoIBAQDNuiknW16t+6ImOga/O59CGUWfG9iEYncPuzh745tL -f2HfsYXfMgfcGcbasPkX45ViGOUUX83PbYvOL+crs2Aqnq1KxD9YMbTJmRWHDXRU -TFMoVg73UJZCsu0SSdAUOeVVJeqXQQQkIBl9OGZdsQYTLR1r54iyuAzdurTPoV+L -+BQLeu8KvwrtLPg21zwDRgN3sG36vok0/7GA6sYuVNoOwAx6qlYf3CksthuJZiI4 -G7yAnJ3Uq8oMGsDLcQ7xiWVACKWGonsEQWsaNnMb9vPYYcjWQFrm46RGfmWMXpWt -MB5SJYUAkvKqfP1EcGBZwV0IXkBzSY4UnJBokNN3h0lXAgMBAAGjUzBRMB0GA1Ud -DgQWBBT7PTD6DEGkFkPk89i8RV7tm4XYazAfBgNVHSMEGDAWgBT7PTD6DEGkFkPk -89i8RV7tm4XYazAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAl -o3HI9HLn+Q+DyAyijXWbyAeFFRVC5dpfuwYIxvgj6afNAI3v56L2H28jS7h+gQRn -OEtGH6h68W57MP6u0xf5wJN3LFQe6xSaqcj9CTfB6ZdOet3wUrsv2o5XeNKW5JsD -ky4ggZBrt4uVZgPgAO7P8fDPCTqOy2hAxUN6/SIcFcG6Zq/veUa+n4kZXWO/S6/T -dd1XCYZAWqs1h0ELCaWE7y8O7/VU/0xE8bd50F0KevbEiSwf3TlKJ2jSM0VRD/Vv -XFKsb43ODw59LPVkrv7a94YOVBkbIDV+Cqx2h79msyixeyGQPNKdeYVobv8N0R44 -sxXRQYtZglz/4cecagDP +AQUAA4IBDwAwggEKAoIBAQDAJYowx9PDtMtm7pFdah83+LH49fiML6qzFzGsYBLs +f8rNMm9VYPZRzLD/kXFtZATnKrKJqqgJnPYgWzfm2KNv8RlK6UW2ApPJZDwwaHpu +aZS6TrSWdXLOQ/r8Q8w01n4jo909FTQ/5dNb83yCOHUKR/x7IH704bez2fUkYzu4 +Z8xFE2iyvbC1q4Mmux5XdrahdelM5+jBIEVZCpKsYzcboEmsSQ+bUT7akcjZ7EFp +qZHPYi+qS3Y2Xs1pKr6SWu2Tm0Enog88iIoutxFu/Rt888xkGs5oJT7cn47BsuOB +mmT8vPnr6cJUC+2TyNFHJeaPSzR+Qcleg138U97ZBDWnAgMBAAGjUzBRMB0GA1Ud +DgQWBBSyo5MO4iZSpGGLRORkuNnBoF9HKjAfBgNVHSMEGDAWgBSyo5MO4iZSpGGL +RORkuNnBoF9HKjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBY +UX4bZfVTWHZqeX3Dm5+TYCbYfElGNaDwwnbtwcyiYCekK03es0hpeUUqbRrAJ5yS +Xek2BeY9qV4IbOlth0315PBVoMpe3M2raaV+CCej68eB8qt8SSoUJmJmfWf1Vbc9 +uWtgG/5J2ZUZ01sc2J7320SLTwYg7Ldl/zEQMVYdmtvGo9jdgqx6gXwuiyKgahrc +l/XeMkOcB8tStiHM/fR0uFMVmRlJzuDI9PaBWA1i7PdOvdcSl7+Z6mfHXCasYjg4 +agKSZw8shz8T5G2ql8beMZ+i6sXPdRSY+LmoVj73j7X1BK4xa3BofSuxi5IGYci9 +TCNFVHtbIRzvBI7glP3d -----END CERTIFICATE----- diff --git a/recovers.txt b/recovers.txt index cb260c2..096894f 100644 --- a/recovers.txt +++ b/recovers.txt @@ -8,7 +8,6 @@ teams slack [Музыка] audacity -clementine mixxx lmms mpd @@ -19,7 +18,7 @@ obs-studio kdenlive mplayer smplayer -[web-серверв] +[web-сервер] nginx apache [dev-util] diff --git a/server.py b/server.py index 31f5afc..eb1b8a9 100755 --- a/server.py +++ b/server.py @@ -6,6 +6,16 @@ import os, sys, json, ssl #PORT_NUMBER = 8000 from utils.findfsdb import create_db 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(): create_db() config = load_config() @@ -19,13 +29,16 @@ def run(): pass 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_side=True, certfile='localhost.pem', ssl_version=ssl.PROTOCOL_TLS) print ('Started HTTP Server on port ' , config['PORT']) + server.serve_forever() if __name__ == '__main__': - run() \ No newline at end of file + run() + https_server() \ No newline at end of file diff --git a/src/__pycache__/handler.cpython-39.pyc b/src/__pycache__/handler.cpython-39.pyc index dbf3cc2..a307354 100644 Binary files a/src/__pycache__/handler.cpython-39.pyc and b/src/__pycache__/handler.cpython-39.pyc differ diff --git a/src/handler.py b/src/handler.py index f2601d9..fdcf91f 100755 --- a/src/handler.py +++ b/src/handler.py @@ -12,6 +12,11 @@ from io import BytesIO #repl = '\n' class Handler(BaseHTTPRequestHandler): 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']) data = self.rfile.read(length) return(str(data)) diff --git a/start b/start index 4a92023..c6b0ee4 100755 --- a/start +++ b/start @@ -1,7 +1,8 @@ #/bin/bash #rm ./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 \ # # latsed gen localhost.pem for https:// diff --git a/utils/__pycache__/utils.cpython-39.pyc b/utils/__pycache__/utils.cpython-39.pyc index 058160e..cffc8e7 100644 Binary files a/utils/__pycache__/utils.cpython-39.pyc and b/utils/__pycache__/utils.cpython-39.pyc differ diff --git a/utils/utils.py b/utils/utils.py index 8f6af11..000d227 100755 --- a/utils/utils.py +++ b/utils/utils.py @@ -27,10 +27,14 @@ def enable_overlays(): def get_list_overlays(): overlays =[] + OverlayList={} url = "https://qa-reports.gentoo.org/output/repos/repositories.xml" # "https://api.gentoo.org/overlays/repositories.xml" if(os.path.exists("./overlays.json")): - with open("./overlays.json", '') as fn: - OverlayList = json.load(fn)(fn.read()) + with open("./overlays.json", 'a') as fn: + try: + OverlayList = json.load(fn.read()) + except Exception as e: + print(e) else: try: response = request.urlopen(url) @@ -78,9 +82,7 @@ def get_list_overlays(): OverlayList = dict(all=overlays, include=includes) except Exception as e: print(e) - return 1 - - + #return 1 return OverlayList # dict(all=overlays, include=includes)