Change spaces used for indentation into tabs
Colin Kuebler
parent
6ac6ab5b30
commit
46cb505bfc
|
|
@ -19,8 +19,8 @@ import os
|
|||
import signal
|
||||
|
||||
def exit_cleanly(signal, frame):
|
||||
print("Received SIGINT, exiting...")
|
||||
exit(0)
|
||||
print("Received SIGINT, exiting...")
|
||||
exit(0)
|
||||
|
||||
signal.signal(signal.SIGINT, exit_cleanly)
|
||||
|
||||
|
|
@ -37,8 +37,8 @@ import json
|
|||
jsonstr = lambda j : json.dumps(j, separators=(',', ':'))
|
||||
|
||||
def file_as_bytes(file_name):
|
||||
with open(file_name, 'rb') as file:
|
||||
return file.read()
|
||||
with open(file_name, 'rb') as file:
|
||||
return file.read()
|
||||
|
||||
file_md5 = ""
|
||||
file_sha256 = ""
|
||||
|
|
@ -46,215 +46,215 @@ file_hmac = ""
|
|||
file_len = ""
|
||||
|
||||
def get_file_stats(file_name):
|
||||
#Calculate file hashes and size
|
||||
global file_md5
|
||||
global file_sha256
|
||||
global file_hmac
|
||||
global file_len
|
||||
file = file_as_bytes(file_name)
|
||||
file_md5 = hashlib.md5(file).hexdigest()
|
||||
file_sha256 = hashlib.sha256(file).hexdigest().upper()
|
||||
file_hmac = hmac.HMAC(options.secKey.encode(), file_sha256.encode(), 'sha256').hexdigest().upper()
|
||||
file_len = str(os.path.getsize(file_name))
|
||||
#Calculate file hashes and size
|
||||
global file_md5
|
||||
global file_sha256
|
||||
global file_hmac
|
||||
global file_len
|
||||
file = file_as_bytes(file_name)
|
||||
file_md5 = hashlib.md5(file).hexdigest()
|
||||
file_sha256 = hashlib.sha256(file).hexdigest().upper()
|
||||
file_hmac = hmac.HMAC(options.secKey.encode(), file_sha256.encode(), 'sha256').hexdigest().upper()
|
||||
file_len = str(os.path.getsize(file_name))
|
||||
|
||||
from time import time
|
||||
timestamp = lambda : int(time())
|
||||
|
||||
class FilesHandler(tornado.web.StaticFileHandler):
|
||||
def parse_url_path(self, url_path):
|
||||
if not url_path or url_path.endswith('/'):
|
||||
url_path = url_path + str('index.html')
|
||||
return url_path
|
||||
def parse_url_path(self, url_path):
|
||||
if not url_path or url_path.endswith('/'):
|
||||
url_path = url_path + str('index.html')
|
||||
return url_path
|
||||
|
||||
class MainHandler(tornado.web.RequestHandler):
|
||||
def get(self):
|
||||
self.write("You are connected to vtrust-flash")
|
||||
def get(self):
|
||||
self.write("You are connected to vtrust-flash")
|
||||
|
||||
class JSONHandler(tornado.web.RequestHandler):
|
||||
activated_ids = {}
|
||||
def get(self):
|
||||
self.post()
|
||||
def reply(self, result=None, encrypted=False):
|
||||
ts = timestamp()
|
||||
if encrypted:
|
||||
answer = {
|
||||
'result': result,
|
||||
't': ts,
|
||||
'success': True }
|
||||
answer = jsonstr(answer)
|
||||
payload = b64encode(AES.new(options.secKey.encode(), AES.MODE_ECB).encrypt(pad(answer))).decode()
|
||||
signature = "result=%s||t=%d||%s" % (payload, ts, options.secKey)
|
||||
signature = hashlib.md5(signature.encode()).hexdigest()[8:24]
|
||||
answer = {
|
||||
'result': payload,
|
||||
't': ts,
|
||||
'sign': signature }
|
||||
else:
|
||||
answer = {
|
||||
't': ts,
|
||||
'e': False,
|
||||
'success': True }
|
||||
if result:
|
||||
answer['result'] = result
|
||||
answer = jsonstr(answer)
|
||||
self.set_header("Content-Type", "application/json;charset=UTF-8")
|
||||
self.set_header('Content-Length', str(len(answer)))
|
||||
self.set_header('Content-Language', 'zh-CN')
|
||||
self.write(answer)
|
||||
print("reply", answer)
|
||||
def post(self):
|
||||
uri = str(self.request.uri)
|
||||
a = str(self.get_argument('a', 0))
|
||||
encrypted = str(self.get_argument('et', 0)) == '1'
|
||||
gwId = str(self.get_argument('gwId', 0))
|
||||
payload = self.request.body[5:]
|
||||
print()
|
||||
print(self.request.method, uri)
|
||||
print(self.request.headers)
|
||||
if payload:
|
||||
try:
|
||||
decrypted_payload = unpad(AES.new(options.secKey.encode(), AES.MODE_ECB).decrypt(binascii.unhexlify(payload))).decode()
|
||||
if decrypted_payload[0] != "{":
|
||||
raise ValueError("payload is not JSON")
|
||||
print("payload", decrypted_payload)
|
||||
except:
|
||||
print("payload", payload.decode())
|
||||
activated_ids = {}
|
||||
def get(self):
|
||||
self.post()
|
||||
def reply(self, result=None, encrypted=False):
|
||||
ts = timestamp()
|
||||
if encrypted:
|
||||
answer = {
|
||||
'result': result,
|
||||
't': ts,
|
||||
'success': True }
|
||||
answer = jsonstr(answer)
|
||||
payload = b64encode(AES.new(options.secKey.encode(), AES.MODE_ECB).encrypt(pad(answer))).decode()
|
||||
signature = "result=%s||t=%d||%s" % (payload, ts, options.secKey)
|
||||
signature = hashlib.md5(signature.encode()).hexdigest()[8:24]
|
||||
answer = {
|
||||
'result': payload,
|
||||
't': ts,
|
||||
'sign': signature }
|
||||
else:
|
||||
answer = {
|
||||
't': ts,
|
||||
'e': False,
|
||||
'success': True }
|
||||
if result:
|
||||
answer['result'] = result
|
||||
answer = jsonstr(answer)
|
||||
self.set_header("Content-Type", "application/json;charset=UTF-8")
|
||||
self.set_header('Content-Length', str(len(answer)))
|
||||
self.set_header('Content-Language', 'zh-CN')
|
||||
self.write(answer)
|
||||
print("reply", answer)
|
||||
def post(self):
|
||||
uri = str(self.request.uri)
|
||||
a = str(self.get_argument('a', 0))
|
||||
encrypted = str(self.get_argument('et', 0)) == '1'
|
||||
gwId = str(self.get_argument('gwId', 0))
|
||||
payload = self.request.body[5:]
|
||||
print()
|
||||
print(self.request.method, uri)
|
||||
print(self.request.headers)
|
||||
if payload:
|
||||
try:
|
||||
decrypted_payload = unpad(AES.new(options.secKey.encode(), AES.MODE_ECB).decrypt(binascii.unhexlify(payload))).decode()
|
||||
if decrypted_payload[0] != "{":
|
||||
raise ValueError("payload is not JSON")
|
||||
print("payload", decrypted_payload)
|
||||
except:
|
||||
print("payload", payload.decode())
|
||||
|
||||
if gwId == "0":
|
||||
print("WARNING: it appears this device does not use an ESP82xx and therefore cannot install ESP based firmware")
|
||||
if gwId == "0":
|
||||
print("WARNING: it appears this device does not use an ESP82xx and therefore cannot install ESP based firmware")
|
||||
|
||||
# Activation endpoints
|
||||
if(a == "s.gw.token.get"):
|
||||
print("Answer s.gw.token.get")
|
||||
answer = {
|
||||
"gwApiUrl": "http://" + options.addr + "/gw.json",
|
||||
"stdTimeZone": "-05:00",
|
||||
"mqttRanges": "",
|
||||
"timeZone": "-05:00",
|
||||
"httpsPSKUrl": "https://" + options.addr + "/gw.json",
|
||||
"mediaMqttUrl": options.addr,
|
||||
"gwMqttUrl": options.addr,
|
||||
"dstIntervals": [] }
|
||||
if encrypted:
|
||||
answer["mqttsUrl"] = options.addr
|
||||
answer["mqttsPSKUrl"] = options.addr
|
||||
answer["mediaMqttsUrl"] = options.addr
|
||||
answer["aispeech"] = options.addr
|
||||
self.reply(answer)
|
||||
os.system("pkill -f smartconfig/main.py")
|
||||
# Activation endpoints
|
||||
if(a == "s.gw.token.get"):
|
||||
print("Answer s.gw.token.get")
|
||||
answer = {
|
||||
"gwApiUrl": "http://" + options.addr + "/gw.json",
|
||||
"stdTimeZone": "-05:00",
|
||||
"mqttRanges": "",
|
||||
"timeZone": "-05:00",
|
||||
"httpsPSKUrl": "https://" + options.addr + "/gw.json",
|
||||
"mediaMqttUrl": options.addr,
|
||||
"gwMqttUrl": options.addr,
|
||||
"dstIntervals": [] }
|
||||
if encrypted:
|
||||
answer["mqttsUrl"] = options.addr
|
||||
answer["mqttsPSKUrl"] = options.addr
|
||||
answer["mediaMqttsUrl"] = options.addr
|
||||
answer["aispeech"] = options.addr
|
||||
self.reply(answer)
|
||||
os.system("pkill -f smartconfig/main.py")
|
||||
|
||||
elif(".active" in a):
|
||||
print("Answer s.gw.dev.pk.active")
|
||||
# first try extended schema, otherwise minimal schema
|
||||
schema_key_count = 1 if gwId in self.activated_ids else 20
|
||||
# record that this gwId has been seen
|
||||
self.activated_ids[gwId] = True
|
||||
schema = jsonstr([
|
||||
{"mode":"rw","property":{"type":"bool"},"id":1,"type":"obj"}] * schema_key_count)
|
||||
answer = {
|
||||
"schema": schema,
|
||||
"uid": "00000000000000000000",
|
||||
"devEtag": "0000000000",
|
||||
"secKey": options.secKey,
|
||||
"schemaId": "0000000000",
|
||||
"localKey": "0000000000000000" }
|
||||
self.reply(answer)
|
||||
print("TRIGGER UPGRADE IN 10 SECONDS")
|
||||
protocol = "2.2" if encrypted else "2.1"
|
||||
os.system("sleep 10 && ./mq_pub_15.py -i %s -p %s &" % (gwId, protocol))
|
||||
elif(".active" in a):
|
||||
print("Answer s.gw.dev.pk.active")
|
||||
# first try extended schema, otherwise minimal schema
|
||||
schema_key_count = 1 if gwId in self.activated_ids else 20
|
||||
# record that this gwId has been seen
|
||||
self.activated_ids[gwId] = True
|
||||
schema = jsonstr([
|
||||
{"mode":"rw","property":{"type":"bool"},"id":1,"type":"obj"}] * schema_key_count)
|
||||
answer = {
|
||||
"schema": schema,
|
||||
"uid": "00000000000000000000",
|
||||
"devEtag": "0000000000",
|
||||
"secKey": options.secKey,
|
||||
"schemaId": "0000000000",
|
||||
"localKey": "0000000000000000" }
|
||||
self.reply(answer)
|
||||
print("TRIGGER UPGRADE IN 10 SECONDS")
|
||||
protocol = "2.2" if encrypted else "2.1"
|
||||
os.system("sleep 10 && ./mq_pub_15.py -i %s -p %s &" % (gwId, protocol))
|
||||
|
||||
# Upgrade endpoints
|
||||
elif(".updatestatus" in a):
|
||||
print("Answer s.gw.upgrade.updatestatus")
|
||||
self.reply(None, encrypted)
|
||||
# Upgrade endpoints
|
||||
elif(".updatestatus" in a):
|
||||
print("Answer s.gw.upgrade.updatestatus")
|
||||
self.reply(None, encrypted)
|
||||
|
||||
elif(".upgrade" in a) and encrypted:
|
||||
print("Answer s.gw.upgrade.get")
|
||||
answer = {
|
||||
"auto": 3,
|
||||
"size": file_len,
|
||||
"type": 0,
|
||||
"pskUrl": "http://" + options.addr + "/files/upgrade.bin",
|
||||
"hmac": file_hmac,
|
||||
"version": "9.0.0" }
|
||||
self.reply(answer, encrypted)
|
||||
elif(".upgrade" in a) and encrypted:
|
||||
print("Answer s.gw.upgrade.get")
|
||||
answer = {
|
||||
"auto": 3,
|
||||
"size": file_len,
|
||||
"type": 0,
|
||||
"pskUrl": "http://" + options.addr + "/files/upgrade.bin",
|
||||
"hmac": file_hmac,
|
||||
"version": "9.0.0" }
|
||||
self.reply(answer, encrypted)
|
||||
|
||||
elif(".device.upgrade" in a):
|
||||
print("Answer tuya.device.upgrade.get")
|
||||
answer = {
|
||||
"auto": True,
|
||||
"type": 0,
|
||||
"size": file_len,
|
||||
"version": "9.0.0",
|
||||
"url": "http://" + options.addr + "/files/upgrade.bin",
|
||||
"md5": file_md5 }
|
||||
self.reply(answer, encrypted)
|
||||
elif(".device.upgrade" in a):
|
||||
print("Answer tuya.device.upgrade.get")
|
||||
answer = {
|
||||
"auto": True,
|
||||
"type": 0,
|
||||
"size": file_len,
|
||||
"version": "9.0.0",
|
||||
"url": "http://" + options.addr + "/files/upgrade.bin",
|
||||
"md5": file_md5 }
|
||||
self.reply(answer, encrypted)
|
||||
|
||||
elif(".upgrade" in a):
|
||||
print("Answer s.gw.upgrade")
|
||||
answer = {
|
||||
"auto": 3,
|
||||
"fileSize": file_len,
|
||||
"etag": "0000000000",
|
||||
"version": "9.0.0",
|
||||
"url": "http://" + options.addr + "/files/upgrade.bin",
|
||||
"md5": file_md5 }
|
||||
self.reply(answer, encrypted)
|
||||
elif(".upgrade" in a):
|
||||
print("Answer s.gw.upgrade")
|
||||
answer = {
|
||||
"auto": 3,
|
||||
"fileSize": file_len,
|
||||
"etag": "0000000000",
|
||||
"version": "9.0.0",
|
||||
"url": "http://" + options.addr + "/files/upgrade.bin",
|
||||
"md5": file_md5 }
|
||||
self.reply(answer, encrypted)
|
||||
|
||||
# Misc endpoints
|
||||
elif(".log" in a):
|
||||
print("Answer atop.online.debug.log")
|
||||
answer = True
|
||||
self.reply(answer, encrypted)
|
||||
# Misc endpoints
|
||||
elif(".log" in a):
|
||||
print("Answer atop.online.debug.log")
|
||||
answer = True
|
||||
self.reply(answer, encrypted)
|
||||
|
||||
elif(".timer" in a):
|
||||
print("Answer s.gw.dev.timer.count")
|
||||
answer = {
|
||||
"devId": gwId,
|
||||
"count": 0,
|
||||
"lastFetchTime": 0 }
|
||||
self.reply(answer, encrypted)
|
||||
elif(".timer" in a):
|
||||
print("Answer s.gw.dev.timer.count")
|
||||
answer = {
|
||||
"devId": gwId,
|
||||
"count": 0,
|
||||
"lastFetchTime": 0 }
|
||||
self.reply(answer, encrypted)
|
||||
|
||||
elif(".config.get" in a):
|
||||
print("Answer tuya.device.dynamic.config.get")
|
||||
answer = {
|
||||
"validTime": 1800,
|
||||
"time": timestamp(),
|
||||
"config": {} }
|
||||
self.reply(answer, encrypted)
|
||||
elif(".config.get" in a):
|
||||
print("Answer tuya.device.dynamic.config.get")
|
||||
answer = {
|
||||
"validTime": 1800,
|
||||
"time": timestamp(),
|
||||
"config": {} }
|
||||
self.reply(answer, encrypted)
|
||||
|
||||
# Catchall
|
||||
else:
|
||||
print("Answer generic ({})".format(a))
|
||||
self.reply(None, encrypted)
|
||||
# Catchall
|
||||
else:
|
||||
print("Answer generic ({})".format(a))
|
||||
self.reply(None, encrypted)
|
||||
|
||||
|
||||
def main():
|
||||
parse_command_line()
|
||||
get_file_stats('../files/upgrade.bin')
|
||||
app = tornado.web.Application(
|
||||
[
|
||||
(r"/", MainHandler),
|
||||
(r"/gw.json", JSONHandler),
|
||||
(r"/d.json", JSONHandler),
|
||||
('/files/(.*)', FilesHandler, {'path': str('../files/')}),
|
||||
(r".*", tornado.web.RedirectHandler, {"url": "http://" + options.addr + "/", "permanent": False}),
|
||||
],
|
||||
#template_path=os.path.join(os.path.dirname(__file__), "templates"),
|
||||
#static_path=os.path.join(os.path.dirname(__file__), "static"),
|
||||
debug=options.debug,
|
||||
)
|
||||
try:
|
||||
app.listen(options.port, options.addr)
|
||||
print("Listening on " + options.addr + ":" + str(options.port))
|
||||
tornado.ioloop.IOLoop.current().start()
|
||||
except OSError as err:
|
||||
print("Could not start server on port " + str(options.port))
|
||||
if err.errno == 98: # EADDRINUSE
|
||||
print("Close the process on this port and try again")
|
||||
else:
|
||||
print(err)
|
||||
parse_command_line()
|
||||
get_file_stats('../files/upgrade.bin')
|
||||
app = tornado.web.Application(
|
||||
[
|
||||
(r"/", MainHandler),
|
||||
(r"/gw.json", JSONHandler),
|
||||
(r"/d.json", JSONHandler),
|
||||
('/files/(.*)', FilesHandler, {'path': str('../files/')}),
|
||||
(r".*", tornado.web.RedirectHandler, {"url": "http://" + options.addr + "/", "permanent": False}),
|
||||
],
|
||||
#template_path=os.path.join(os.path.dirname(__file__), "templates"),
|
||||
#static_path=os.path.join(os.path.dirname(__file__), "static"),
|
||||
debug=options.debug,
|
||||
)
|
||||
try:
|
||||
app.listen(options.port, options.addr)
|
||||
print("Listening on " + options.addr + ":" + str(options.port))
|
||||
tornado.ioloop.IOLoop.current().start()
|
||||
except OSError as err:
|
||||
print("Could not start server on port " + str(options.port))
|
||||
if err.errno == 98: # EADDRINUSE
|
||||
print("Close the process on this port and try again")
|
||||
else:
|
||||
print(err)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
main()
|
||||
|
|
|
|||
|
|
@ -12,100 +12,100 @@ from binascii import hexlify, unhexlify
|
|||
IDENTITY_PREFIX = "BAohbmd6aG91IFR1"
|
||||
|
||||
def listener(host, port):
|
||||
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||
sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
|
||||
sock.bind((host, port))
|
||||
sock.listen(1)
|
||||
return sock
|
||||
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||
sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
|
||||
sock.bind((host, port))
|
||||
sock.listen(1)
|
||||
return sock
|
||||
|
||||
def client(host, port):
|
||||
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||
sock.connect((host, port))
|
||||
return sock
|
||||
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||
sock.connect((host, port))
|
||||
return sock
|
||||
|
||||
def gen_psk(identity, hint):
|
||||
print("ID: %s" % hexlify(identity))
|
||||
# sometimes the device only sends part of the prefix
|
||||
# since it is always the same, we can correct it
|
||||
if identity[1:17] != IDENTITY_PREFIX:
|
||||
print("Prefix: %s" % identity[1:17])
|
||||
identity = IDENTITY_PREFIX + identity[17:]
|
||||
key = md5(hint[-16:]).digest()
|
||||
iv = md5(identity).digest()
|
||||
cipher = AES.new(key, AES.MODE_CBC, iv)
|
||||
psk = cipher.encrypt(identity[:32])
|
||||
print("PSK: %s" % hexlify(psk))
|
||||
return psk
|
||||
print("ID: %s" % hexlify(identity))
|
||||
# sometimes the device only sends part of the prefix
|
||||
# since it is always the same, we can correct it
|
||||
if identity[1:17] != IDENTITY_PREFIX:
|
||||
print("Prefix: %s" % identity[1:17])
|
||||
identity = IDENTITY_PREFIX + identity[17:]
|
||||
key = md5(hint[-16:]).digest()
|
||||
iv = md5(identity).digest()
|
||||
cipher = AES.new(key, AES.MODE_CBC, iv)
|
||||
psk = cipher.encrypt(identity[:32])
|
||||
print("PSK: %s" % hexlify(psk))
|
||||
return psk
|
||||
|
||||
|
||||
class PskFrontend():
|
||||
def __init__(self, listening_host, listening_port, host, port):
|
||||
self.listening_port = listening_port
|
||||
self.listening_host = listening_host
|
||||
self.host = host
|
||||
self.port = port
|
||||
def __init__(self, listening_host, listening_port, host, port):
|
||||
self.listening_port = listening_port
|
||||
self.listening_host = listening_host
|
||||
self.host = host
|
||||
self.port = port
|
||||
|
||||
self.server_sock = listener(listening_host, listening_port)
|
||||
self.sessions = []
|
||||
self.hint = '1dHRsc2NjbHltbGx3eWh5' '0000000000000000'
|
||||
self.server_sock = listener(listening_host, listening_port)
|
||||
self.sessions = []
|
||||
self.hint = '1dHRsc2NjbHltbGx3eWh5' '0000000000000000'
|
||||
|
||||
|
||||
|
||||
def readables(self):
|
||||
readables = [self.server_sock]
|
||||
for (s1, s2) in self.sessions:
|
||||
readables.append(s1)
|
||||
readables.append(s2)
|
||||
return readables
|
||||
|
||||
def new_client(self, s1):
|
||||
try:
|
||||
ssl_sock = sslpsk.wrap_socket(s1,
|
||||
server_side = True,
|
||||
ssl_version=ssl.PROTOCOL_TLSv1_2,
|
||||
ciphers='PSK-AES128-CBC-SHA256',
|
||||
psk=lambda identity: gen_psk(identity, self.hint),
|
||||
hint=self.hint)
|
||||
def readables(self):
|
||||
readables = [self.server_sock]
|
||||
for (s1, s2) in self.sessions:
|
||||
readables.append(s1)
|
||||
readables.append(s2)
|
||||
return readables
|
||||
|
||||
def new_client(self, s1):
|
||||
try:
|
||||
ssl_sock = sslpsk.wrap_socket(s1,
|
||||
server_side = True,
|
||||
ssl_version=ssl.PROTOCOL_TLSv1_2,
|
||||
ciphers='PSK-AES128-CBC-SHA256',
|
||||
psk=lambda identity: gen_psk(identity, self.hint),
|
||||
hint=self.hint)
|
||||
|
||||
s2 = client(self.host, self.port)
|
||||
self.sessions.append((ssl_sock, s2))
|
||||
except Exception as e:
|
||||
print("could not establish sslpsk socket:", e)
|
||||
def data_ready_cb(self, s):
|
||||
if s == self.server_sock:
|
||||
_s, frm = s.accept()
|
||||
print("new client on port %d from %s:%d"%(self.listening_port, frm[0], frm[1]))
|
||||
self.new_client(_s)
|
||||
s2 = client(self.host, self.port)
|
||||
self.sessions.append((ssl_sock, s2))
|
||||
except Exception as e:
|
||||
print("could not establish sslpsk socket:", e)
|
||||
def data_ready_cb(self, s):
|
||||
if s == self.server_sock:
|
||||
_s, frm = s.accept()
|
||||
print("new client on port %d from %s:%d"%(self.listening_port, frm[0], frm[1]))
|
||||
self.new_client(_s)
|
||||
|
||||
for (s1, s2) in self.sessions:
|
||||
if s == s1 or s == s2:
|
||||
c = s1 if s == s2 else s2
|
||||
try:
|
||||
buf = s.recv(4096)
|
||||
if len(buf) > 0:
|
||||
c.send(buf)
|
||||
else:
|
||||
s1.shutdown(socket.SHUT_RDWR)
|
||||
s2.shutdown(socket.SHUT_RDWR)
|
||||
self.sessions.remove((s1,s2))
|
||||
except:
|
||||
self.sessions.remove((s1,s2))
|
||||
|
||||
for (s1, s2) in self.sessions:
|
||||
if s == s1 or s == s2:
|
||||
c = s1 if s == s2 else s2
|
||||
try:
|
||||
buf = s.recv(4096)
|
||||
if len(buf) > 0:
|
||||
c.send(buf)
|
||||
else:
|
||||
s1.shutdown(socket.SHUT_RDWR)
|
||||
s2.shutdown(socket.SHUT_RDWR)
|
||||
self.sessions.remove((s1,s2))
|
||||
except:
|
||||
self.sessions.remove((s1,s2))
|
||||
|
||||
|
||||
def main():
|
||||
gateway = '10.42.42.1'
|
||||
proxies = [PskFrontend(gateway, 443, gateway, 80), PskFrontend(gateway, 8886, gateway, 1883)]
|
||||
gateway = '10.42.42.1'
|
||||
proxies = [PskFrontend(gateway, 443, gateway, 80), PskFrontend(gateway, 8886, gateway, 1883)]
|
||||
|
||||
|
||||
while True:
|
||||
readables = []
|
||||
for p in proxies:
|
||||
readables = readables + p.readables()
|
||||
r,_,_ = select.select(readables, [], [])
|
||||
for s in r:
|
||||
for p in proxies:
|
||||
p.data_ready_cb(s)
|
||||
while True:
|
||||
readables = []
|
||||
for p in proxies:
|
||||
readables = readables + p.readables()
|
||||
r,_,_ = select.select(readables, [], [])
|
||||
for s in r:
|
||||
for p in proxies:
|
||||
p.data_ready_cb(s)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
main()
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@ bold=$(tput bold)
|
|||
normal=$(tput sgr0)
|
||||
screen_minor=$(screen --version | cut -d . -f 2)
|
||||
if [ "$screen_minor" -gt 5 ]; then
|
||||
screen_with_log="sudo screen -L -Logfile"
|
||||
screen_with_log="sudo screen -L -Logfile"
|
||||
elif [ "$screen_minor" -eq 5 ]; then
|
||||
screen_with_log="sudo screen -L"
|
||||
screen_with_log="sudo screen -L"
|
||||
else
|
||||
screen_with_log="sudo screen -L -t"
|
||||
screen_with_log="sudo screen -L -t"
|
||||
fi
|
||||
. ./config.txt
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue