r4sas/PBinCLI
1
1
Fork 1
mirror of https://github.com/r4sas/PBinCLI synced 2025-01-09 14:28:06 +00:00
Code Issues Releases Wiki Activity

Merge pull request #5 from otaku/master

Browse Source 
Add DEFLATE compression support
This commit is contained in:
R4SAS 2018-04-04 20:59:49 +03:00 committed by GitHub
commit b679e68f31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pbincli/actions.py
View File

@ -1,4 +1,4 @@
import json, hashlib, ntpath, os, sys import json, hashlib, ntpath, os, sys, zlib
import pbincli.actions, pbincli.settings import pbincli.actions, pbincli.settings
from sjcl import SJCL from sjcl import SJCL
@ -17,6 +17,15 @@ def path_leaf(path):
return tail or ntpath.basename(head) return tail or ntpath.basename(head)
def decompress(s):
return zlib.decompress(bytearray(map(ord, b64decode(s.encode('utf-8')).decode('utf-8'))), -zlib.MAX_WBITS)
def compress(s):
co = zlib.compressobj(wbits=-zlib.MAX_WBITS)
b = co.compress(s) + co.flush()
return b64encode(''.join(map(chr, b)).encode('utf-8'))
def send(args): def send(args):
if args.stdin: if args.stdin:
text = args.stdin.read() text = args.stdin.read()
@ -44,7 +53,7 @@ def send(args):
if args.debug: print("Password:\t{}".format(password)) if args.debug: print("Password:\t{}".format(password))
# Encrypting text (comment) # Encrypting text (comment)
cipher = SJCL().encrypt(text.encode("UTF-8"), password, mode='gcm') cipher = SJCL().encrypt(compress(text.encode('utf-8')), password, mode='gcm')
# TODO: should be implemented in upstream # TODO: should be implemented in upstream
for k in ['salt', 'iv', 'ct']: cipher[k] = cipher[k].decode() for k in ['salt', 'iv', 'ct']: cipher[k] = cipher[k].decode()
@ -63,10 +72,10 @@ def send(args):
file = "data:" + mime[0] + ";base64," + b64encode(contents).decode() file = "data:" + mime[0] + ";base64," + b64encode(contents).decode()
filename = path_leaf(args.file) filename = path_leaf(args.file)
cipherfile = SJCL().encrypt(file.encode("utf-8"), password, mode='gcm') cipherfile = SJCL().encrypt(compress(file.encode('utf-8')), password, mode='gcm')
# TODO: should be implemented in upstream # TODO: should be implemented in upstream
for k in ['salt', 'iv', 'ct']: cipherfile[k] = cipherfile[k].decode() for k in ['salt', 'iv', 'ct']: cipherfile[k] = cipherfile[k].decode()
cipherfilename = SJCL().encrypt(filename.encode("utf-8"), password, mode='gcm') cipherfilename = SJCL().encrypt(compress(filename.encode('utf-8')), password, mode='gcm')
for k in ['salt', 'iv', 'ct']: cipherfilename[k] = cipherfilename[k].decode() for k in ['salt', 'iv', 'ct']: cipherfilename[k] = cipherfilename[k].decode()
request['attachment'] = json.dumps(cipherfile, ensure_ascii=False).replace(' ','') request['attachment'] = json.dumps(cipherfile, ensure_ascii=False).replace(' ','')
@ -132,11 +141,11 @@ def get(args):
if args.debug: print("Text:\t{}\n".format(data)) if args.debug: print("Text:\t{}\n".format(data))
text = SJCL().decrypt(data, password) text = SJCL().decrypt(data, password)
print("{}\n".format(text.decode())) print("{}\n".format(decompress(text.decode())))
check_writable("paste.txt") check_writable("paste.txt")
with open("paste.txt", "wb") as f: with open("paste.txt", "wb") as f:
f.write(text) f.write(decompress(text.decode()))
f.close f.close
if 'attachment' in result and 'attachmentname' in result: if 'attachment' in result and 'attachmentname' in result:
@ -150,9 +159,9 @@ def get(args):
attachmentf = SJCL().decrypt(cipherfile, password) attachmentf = SJCL().decrypt(cipherfile, password)
attachmentname = SJCL().decrypt(cipherfilename, password) attachmentname = SJCL().decrypt(cipherfilename, password)
attachment = str(attachmentf.split(',', 1)[1:]) attachment = decompress(attachmentf.decode('utf-8')).decode('utf-8').split(',', 1)[1]
file = b64decode(attachment) file = b64decode(attachment)
filename = attachmentname filename = decompress(attachmentname.decode('utf-8')).decode('utf-8')
print("Filename:\t{}\n".format(filename)) print("Filename:\t{}\n".format(filename))