Fierelier
/
fstream
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix Python 3.4 compatibility

This commit is contained in:
Fierelier 2024-03-29 23:24:22 +01:00
parent 374cc6a32b
commit bfc45eb4e1
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/broadcast.py
View File

@ -29,7 +29,7 @@ def perr(rtn,cmd = None,op = None):
raise exc
def pcallStr(*args,**kwargs):
proc = subprocess.Popen(*args,**kwargs, stdout=subprocess.PIPE)
proc = subprocess.Popen(*args, stdout=subprocess.PIPE, **kwargs)
response = proc.stdout.read().decode("utf-8").strip("\n")
rtn = proc.wait()
perr(rtn,args[0])

9
client/fstream.py
View File

@ -29,7 +29,10 @@ sslIgnoreCert = defGet(os.environ,"fstream_ssl_ignoreCert","0") == "1"
connection = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
connection.setsockopt(socket.SOL_SOCKET,socket.SO_REUSEADDR,1)
connection.setsockopt(socket.IPPROTO_TCP,socket.TCP_NODELAY,1)
connection.setsockopt(socket.IPPROTO_TCP,socket.IP_TOS,0x10) # IPTOS_LOWDELAY
try:
connection.setsockopt(socket.IPPROTO_TCP,socket.IP_TOS,0x10) # IPTOS_LOWDELAY
except Exception:
pass
unbufferedStdout = os.fdopen(sys.stdout.fileno(),"wb",0) # Make unbuffered stdout
def listToCommand(lst):
@ -91,8 +94,10 @@ def main():
eprint("Performing SSL handshake...")
if sys.version_info >= (3,10):
proto = ssl.PROTOCOL_TLS_CLIENT
else:
elif sys.version_info >= (3,5):
proto = ssl.PROTOCOL_TLS
else:
proto = ssl.PROTOCOL_TLSv1_2
ctx = ssl.SSLContext(proto)
if sslIgnoreCert:

7
client/util/fstream-util-pipe_to_aes.py
View File

@ -20,8 +20,10 @@ sp = pUp(s)
# script start
try:
from Cryptodome.Cipher import AES
from Cryptodome import Random
except:
from Crypto.Cipher import AES
from Crypto import Random
bufferSize = int(os.environ["fstream_aesbuffer"])
unbufferedStdout = os.fdopen(sys.stdout.fileno(),"wb",0) # Make unbuffered stdout
@ -32,6 +34,7 @@ pw = pw[:32]
while True:
data = sys.stdin.buffer.read(bufferSize)
if len(data) != bufferSize: sys.exit(0)
cipher = AES.new(pw, AES.MODE_CBC)
unbufferedStdout.write(cipher.iv)
iv = Random.get_random_bytes(AES.block_size)
cipher = AES.new(pw, AES.MODE_CBC, iv=iv)
unbufferedStdout.write(iv)
unbufferedStdout.write(cipher.encrypt(data))

2
client/watch.py
View File

@ -29,7 +29,7 @@ def perr(rtn,cmd = None,op = None):
raise exc
def pcallStr(*args,**kwargs):
proc = subprocess.Popen(*args,**kwargs, stdout=subprocess.PIPE)
proc = subprocess.Popen(*args,stdout=subprocess.PIPE,**kwargs)
response = proc.stdout.read().decode("utf-8").strip("\n")
rtn = proc.wait()
perr(rtn,args[0])