more fixes
This commit is contained in:
parent
3672661be8
commit
c0ce566675
2
proxy.py
2
proxy.py
|
@ -3,4 +3,4 @@ import requests
|
||||||
while 1:
|
while 1:
|
||||||
req = requests.get('http://10.29.55.48:8000/queue').text
|
req = requests.get('http://10.29.55.48:8000/queue').text
|
||||||
resp = requests.get(f'http://localhost:4242{req}')
|
resp = requests.get(f'http://localhost:4242{req}')
|
||||||
requests.post('http://10.29.55.48:8000/done?user=1', data=str(resp.status_code) + ' ' + resp.text)
|
requests.post('http://10.29.55.48:8000/done?user=1234', data=str(resp.status_code) + ' ' + resp.text)
|
||||||
|
|
|
@ -32,8 +32,8 @@ class HTTPRequestHandler(BaseHTTPRequestHandler):
|
||||||
elif "petname" in p:
|
elif "petname" in p:
|
||||||
petname = petname_to_pubkey[p['user'][0]][p["petname"][0]]
|
petname = petname_to_pubkey[p['user'][0]][p["petname"][0]]
|
||||||
print(f"http://{pubkey_to_server[petname]}/tunnel?pubkey={petname}&path={p['path'][0]}")
|
print(f"http://{pubkey_to_server[petname]}/tunnel?pubkey={petname}&path={p['path'][0]}")
|
||||||
get(f"http://{pubkey_to_server[petname]}/tunnel?pubkey={petname}&path={p['path'][0]}")
|
res = get(f"http://{pubkey_to_server[petname]}/tunnel?pubkey={petname}&path={p['path'][0]}").text
|
||||||
|
self.wfile.write(res)
|
||||||
elif func == "getinbox":
|
elif func == "getinbox":
|
||||||
user = p['user'][0]
|
user = p['user'][0]
|
||||||
self.wfile.write(str(Fetch(user)).encode('utf-8'))
|
self.wfile.write(str(Fetch(user)).encode('utf-8'))
|
||||||
|
@ -89,6 +89,8 @@ class HTTPRequestHandler(BaseHTTPRequestHandler):
|
||||||
print('Not implemented')
|
print('Not implemented')
|
||||||
|
|
||||||
self.send_response(200)
|
self.send_response(200)
|
||||||
|
self.send_header('Content-type', 'text/plain')
|
||||||
|
self.end_headers()
|
||||||
|
|
||||||
|
|
||||||
server = ThreadingHTTPServer(("0.0.0.0", int(argv[1])), HTTPRequestHandler)
|
server = ThreadingHTTPServer(("0.0.0.0", int(argv[1])), HTTPRequestHandler)
|
||||||
|
|
Loading…
Reference in a new issue