mirrors/copyparty
1
0
Fork 0
mirror of https://github.com/9001/copyparty.git synced 2025-08-17 17:12:13 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

add rate throttling to uploads too

Browse source
This commit is contained in:
ed 2022-02-06 02:06:59 +01:00
parent ded0567cbf
commit ce776a547c
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
copyparty/httpcli.py
View file

@ -640,7 +640,7 @@ class HttpCli(object):
with ren_open(fn, *open_a, **params) as f: with ren_open(fn, *open_a, **params) as f:
f, fn = f["orz"] f, fn = f["orz"]
path = os.path.join(fdir, fn) path = os.path.join(fdir, fn)
post_sz, sha_hex, sha_b64 = hashcopy(reader, f) post_sz, sha_hex, sha_b64 = hashcopy(reader, f, self.args.s_wr_slp)
if lim: if lim:
lim.nup(self.ip) lim.nup(self.ip)
@ -689,7 +689,8 @@ class HttpCli(object):
def handle_stash(self): def handle_stash(self):
post_sz, sha_hex, sha_b64, remains, path, url = self.dump_to_file() post_sz, sha_hex, sha_b64, remains, path, url = self.dump_to_file()
spd = self._spd(post_sz) spd = self._spd(post_sz)
self.log("{} wrote {}/{} bytes to {}".format(spd, post_sz, remains, path)) m = "{} wrote {}/{} bytes to {} # {}"
self.log(m.format(spd, post_sz, remains, path, sha_b64[:28])) # 21
m = "{}\n{}\n{}\n{}\n".format(post_sz, sha_b64, sha_hex[:56], url) m = "{}\n{}\n{}\n{}\n".format(post_sz, sha_b64, sha_hex[:56], url)
self.reply(m.encode("utf-8")) self.reply(m.encode("utf-8"))
return True return True
@ -921,7 +922,7 @@ class HttpCli(object):
try: try:
f.seek(cstart[0]) f.seek(cstart[0])
post_sz, _, sha_b64 = hashcopy(reader, f) post_sz, _, sha_b64 = hashcopy(reader, f, self.args.s_wr_slp)
if sha_b64 != chash: if sha_b64 != chash:
m = "your chunk got corrupted somehow (received {} bytes); expected vs received hash:\n{}\n{}" m = "your chunk got corrupted somehow (received {} bytes); expected vs received hash:\n{}\n{}"
@ -1114,7 +1115,7 @@ class HttpCli(object):
f, fname = f["orz"] f, fname = f["orz"]
abspath = os.path.join(fdir, fname) abspath = os.path.join(fdir, fname)
self.log("writing to {}".format(abspath)) self.log("writing to {}".format(abspath))
sz, sha_hex, sha_b64 = hashcopy(p_data, f) sz, sha_hex, sha_b64 = hashcopy(p_data, f, self.args.s_wr_slp)
if sz == 0: if sz == 0:
raise Pebkac(400, "empty files in post") raise Pebkac(400, "empty files in post")
@ -1332,7 +1333,7 @@ class HttpCli(object):
raise Pebkac(400, "expected body, got {}".format(p_field)) raise Pebkac(400, "expected body, got {}".format(p_field))
with open(fsenc(fp), "wb", 512 * 1024) as f: with open(fsenc(fp), "wb", 512 * 1024) as f:
sz, sha512, _ = hashcopy(p_data, f) sz, sha512, _ = hashcopy(p_data, f, self.args.s_wr_slp)
if lim: if lim:
lim.nup(self.ip) lim.nup(self.ip)

4
copyparty/util.py
View file

@ -1164,13 +1164,15 @@ def yieldfile(fn):
yield buf yield buf
def hashcopy(fin, fout): def hashcopy(fin, fout, slp=0):
hashobj = hashlib.sha512() hashobj = hashlib.sha512()
tlen = 0 tlen = 0
for buf in fin: for buf in fin:
tlen += len(buf) tlen += len(buf)
hashobj.update(buf) hashobj.update(buf)
fout.write(buf) fout.write(buf)
if slp:
time.sleep(slp)
digest = hashobj.digest()[:33] digest = hashobj.digest()[:33]
digest_b64 = base64.urlsafe_b64encode(digest).decode("utf-8") digest_b64 = base64.urlsafe_b64encode(digest).decode("utf-8")