This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8874

hgweb: simplify staticfile() now that we always pass it a single directory
ClosedPublic

Authored by martinvonz on Aug 4 2020, 2:59 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG9a5c4875a88c: hgweb: simplify staticfile() now that we always pass it a single directory
Summary

I didn't realize this further simplifications enabled by D8786 until
now.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

Diff 22287

mercurial/hgweb/common.py

Content-Type is guessed using the mimetypes module. Content-Type is guessed using the mimetypes module.
Return an empty string if fname is illegal or file not found. Return an empty string if fname is illegal or file not found.
""" """
if not ispathsafe(fname): if not ispathsafe(fname):
return return
fpath = os.path.join(*fname.split(b'/')) fpath = os.path.join(*fname.split(b'/'))
if isinstance(directory, bytes): path = os.path.join(directory, fpath)
directory = [directory]
for d in directory:
path = os.path.join(d, fpath)
if os.path.exists(path):
break
try: try:
os.stat(path) os.stat(path)
ct = pycompat.sysbytes( ct = pycompat.sysbytes(
mimetypes.guess_type(pycompat.fsdecode(path))[0] or r"text/plain" mimetypes.guess_type(pycompat.fsdecode(path))[0] or r"text/plain"
) )
with open(path, b'rb') as fh: with open(path, b'rb') as fh:
data = fh.read() data = fh.read()

mercurial/hgweb/hgwebdir_mod.py

if virtual.startswith(b'static/'): if virtual.startswith(b'static/'):
fname = virtual[7:] fname = virtual[7:]
else: else:
fname = req.qsparams[b'static'] fname = req.qsparams[b'static']
static = self.ui.config(b"web", b"static", untrusted=False) static = self.ui.config(b"web", b"static", untrusted=False)
if not static: if not static:
tp = self.templatepath or templater.templatedir() tp = self.templatepath or templater.templatedir()
if tp is not None: if tp is not None:
static = [os.path.join(tp, b'static')] static = os.path.join(tp, b'static')
staticfile(static, fname, res) staticfile(static, fname, res)
return res.sendresponse() return res.sendresponse()
# top-level index # top-level index
repos = dict(self.repos) repos = dict(self.repos)

mercurial/hgweb/webcommands.py

@webcommand(b'static') @webcommand(b'static')
def static(web): def static(web):
fname = web.req.qsparams[b'file'] fname = web.req.qsparams[b'file']
# a repo owner may set web.static in .hg/hgrc to get any file # a repo owner may set web.static in .hg/hgrc to get any file
# readable by the user running the CGI script # readable by the user running the CGI script
static = web.config(b"web", b"static", untrusted=False) static = web.config(b"web", b"static", untrusted=False)
if not static: if not static:
tp = web.templatepath or templater.templatedir() tp = web.templatepath or templater.templatedir()
static = [os.path.join(tp, b'static')] static = os.path.join(tp, b'static')
staticfile(static, fname, web.res) staticfile(static, fname, web.res)
return web.res.sendresponse() return web.res.sendresponse()
@webcommand(b'graph') @webcommand(b'graph')
def graph(web): def graph(web):
""" """