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

more aggressively no-cache

Browse source
This commit is contained in:
ed 2021-09-15 20:49:02 +02:00
parent 5849c446ed
commit 44e5c82e6d
1 changed files with 13 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
copyparty/httpcli.py
View file

@ -22,13 +22,12 @@ except:
from .__init__ import E, PY2, WINDOWS, ANYWIN, unicode from .__init__ import E, PY2, WINDOWS, ANYWIN, unicode
from .util import * # noqa # pylint: disable=unused-wildcard-import from .util import * # noqa # pylint: disable=unused-wildcard-import
from .bos import bos from .bos import bos
from .authsrv import AuthSrv, Lim from .authsrv import AuthSrv
from .szip import StreamZip from .szip import StreamZip
from .star import StreamTar from .star import StreamTar
NO_CACHE = {"Cache-Control": "no-cache"} NO_CACHE = {"Cache-Control": "no-cache"}
NO_STORE = {"Cache-Control": "no-store; max-age=0"}
class HttpCli(object): class HttpCli(object):
@ -54,7 +53,10 @@ class HttpCli(object):
self.bufsz = 1024 * 32 self.bufsz = 1024 * 32
self.hint = None self.hint = None
self.absolute_urls = False self.absolute_urls = False
self.out_headers = {"Access-Control-Allow-Origin": "*"} self.out_headers = {
"Access-Control-Allow-Origin": "*",
"Cache-Control": "no-store; max-age=0",
}
def log(self, msg, c=0): def log(self, msg, c=0):
ptn = self.asrv.re_pwd ptn = self.asrv.re_pwd
@ -352,8 +354,7 @@ class HttpCli(object):
).encode("utf-8", "replace") ).encode("utf-8", "replace")
if use302: if use302:
h = {"Location": "/" + vpath, "Cache-Control": "no-cache"} self.reply(html, status=302, headers={"Location": "/" + vpath})
self.reply(html, status=302, headers=h)
else: else:
self.reply(html, status=status) self.reply(html, status=status)
@ -1389,8 +1390,8 @@ class HttpCli(object):
# #
# send reply # send reply
if not is_compressed and "cache" not in self.uparam: if is_compressed or "cache" in self.uparam:
self.out_headers.update(NO_CACHE) self.out_headers.pop("Cache-Control")
self.out_headers["Accept-Ranges"] = "bytes" self.out_headers["Accept-Ranges"] = "bytes"
self.send_headers( self.send_headers(
@ -1607,7 +1608,7 @@ class HttpCli(object):
mtpq=vs["mtpq"], mtpq=vs["mtpq"],
url_suf=suf, url_suf=suf,
) )
self.reply(html.encode("utf-8"), headers=NO_STORE) self.reply(html.encode("utf-8"))
return True return True
def scanvol(self): def scanvol(self):
@ -1921,11 +1922,7 @@ class HttpCli(object):
if not self.can_read: if not self.can_read:
if is_ls: if is_ls:
ret = json.dumps(ls_ret) ret = json.dumps(ls_ret)
self.reply( self.reply(ret.encode("utf-8", "replace"), mime="application/json")
ret.encode("utf-8", "replace"),
mime="application/json",
headers=NO_STORE,
)
return True return True
if not stat.S_ISDIR(st.st_mode): if not stat.S_ISDIR(st.st_mode):
@ -1935,7 +1932,7 @@ class HttpCli(object):
raise Pebkac(403) raise Pebkac(403)
html = self.j2(tpl, **j2a) html = self.j2(tpl, **j2a)
self.reply(html.encode("utf-8", "replace"), headers=NO_STORE) self.reply(html.encode("utf-8", "replace"))
return True return True
for k in ["zip", "tar"]: for k in ["zip", "tar"]:
@ -2094,11 +2091,7 @@ class HttpCli(object):
ls_ret["files"] = files ls_ret["files"] = files
ls_ret["taglist"] = taglist ls_ret["taglist"] = taglist
ret = json.dumps(ls_ret) ret = json.dumps(ls_ret)
self.reply( self.reply(ret.encode("utf-8", "replace"), mime="application/json")
ret.encode("utf-8", "replace"),
mime="application/json",
headers=NO_STORE,
)
return True return True
j2a["files"] = dirs + files j2a["files"] = dirs + files
@ -2112,5 +2105,5 @@ class HttpCli(object):
j2a["css"] = self.args.css_browser j2a["css"] = self.args.css_browser
html = self.j2(tpl, **j2a) html = self.j2(tpl, **j2a)
self.reply(html.encode("utf-8", "replace"), headers=NO_STORE) self.reply(html.encode("utf-8", "replace"))
return True return True