This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2781

hgweb: perform all parameter lookup via qsparams
ClosedPublic

Authored by indygreg on Mar 10 2018, 3:57 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG3d60a22e27f5: hgweb: perform all parameter lookup via qsparams
Summary

I think I managed to update all call sites using wsgirequest.form
to use parsedrequest.qsparams.

Since behavior of qsparams is to retrieve last value, behavior will
change if a parameter was specified multiple times. But I think this
is acceptable.

I'm not a fan of the req.req.qsparams pattern. And some of the
modified code could be written better. But I was aiming for a
straight port with this change. Cleanup can come later.

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.

Event Timeline

indygreg created this revision.Mar 10 2018, 3:57 PM
durin42 accepted this revision.Mar 12 2018, 5:05 PM
This revision is now accepted and ready to land.Mar 12 2018, 5:05 PM
Closed by commit rHG3d60a22e27f5: hgweb: perform all parameter lookup via qsparams (authored by indygreg). · Explain WhyMar 12 2018, 5:32 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 6917

mercurial/hgweb/hgweb_mod.py

if req.havepathinfo: if req.havepathinfo:
query = req.dispatchpath query = req.dispatchpath
else: else:
query = req.querystring.partition('&')[0].partition(';')[0] query = req.querystring.partition('&')[0].partition(';')[0]
# translate user-visible url structure to internal structure # translate user-visible url structure to internal structure
args = query.split('/', 2) args = query.split('/', 2)
if 'cmd' not in wsgireq.form and args and args[0]: if 'cmd' not in req.qsparams and args and args[0]:
cmd = args.pop(0) cmd = args.pop(0)
style = cmd.rfind('-') style = cmd.rfind('-')
if style != -1: if style != -1:
req.qsparams['style'] = cmd[:style] req.qsparams['style'] = cmd[:style]
cmd = cmd[style + 1:] cmd = cmd[style + 1:]
# avoid accepting e.g. style parameter as command # avoid accepting e.g. style parameter as command
if util.safehasattr(webcommands, cmd): if util.safehasattr(webcommands, cmd):
for a in args: for a in args:
req.qsparams.add('file', a) req.qsparams.add('file', a)
ua = req.headers.get('User-Agent', '') ua = req.headers.get('User-Agent', '')
if cmd == 'rev' and 'mercurial' in ua: if cmd == 'rev' and 'mercurial' in ua:
req.qsparams['style'] = 'raw' req.qsparams['style'] = 'raw'
if cmd == 'archive': if cmd == 'archive':
fn = wsgireq.form['node'][0] fn = req.qsparams['node']
for type_, spec in rctx.archivespecs.iteritems(): for type_, spec in rctx.archivespecs.iteritems():
ext = spec[2] ext = spec[2]
if fn.endswith(ext): if fn.endswith(ext):
wsgireq.form['node'] = [fn[:-len(ext)]] wsgireq.form['node'] = [fn[:-len(ext)]]
req.qsparams['node'] = fn[:-len(next)] req.qsparams['node'] = fn[:-len(ext)]
wsgireq.form['type'] = [type_] wsgireq.form['type'] = [type_]
req.qsparams['type'] = type_ req.qsparams['type'] = type_
else: else:
cmd = wsgireq.form.get('cmd', [''])[0] cmd = req.qsparams.get('cmd', '')
# process the web interface request # process the web interface request
try: try:
tmpl = rctx.templater(wsgireq, req) tmpl = rctx.templater(wsgireq, req)
ctype = tmpl('mimetype', encoding=encoding.encoding) ctype = tmpl('mimetype', encoding=encoding.encoding)
ctype = templater.stringify(ctype) ctype = templater.stringify(ctype)
# check read permissions non-static content # check read permissions non-static content
if cmd != 'static': if cmd != 'static':
self.check_perm(rctx, wsgireq, None) self.check_perm(rctx, wsgireq, None)
if cmd == '': if cmd == '':
wsgireq.form['cmd'] = [tmpl.cache['default']] wsgireq.form['cmd'] = [tmpl.cache['default']]
req.qsparams['cmd'] = tmpl.cache['default'] req.qsparams['cmd'] = tmpl.cache['default']
cmd = wsgireq.form['cmd'][0] cmd = req.qsparams['cmd']
# Don't enable caching if using a CSP nonce because then it wouldn't # Don't enable caching if using a CSP nonce because then it wouldn't
# be a nonce. # be a nonce.
if rctx.configbool('web', 'cache') and not rctx.nonce: if rctx.configbool('web', 'cache') and not rctx.nonce:
caching(self, wsgireq) # sets ETag header or raises NOT_MODIFIED caching(self, wsgireq) # sets ETag header or raises NOT_MODIFIED
if cmd not in webcommands.__all__: if cmd not in webcommands.__all__:
msg = 'no such method: %s' % cmd msg = 'no such method: %s' % cmd
raise ErrorResponse(HTTP_BAD_REQUEST, msg) raise ErrorResponse(HTTP_BAD_REQUEST, msg)

mercurial/hgweb/hgwebdir_mod.py

def run_wsgi(self, wsgireq): def run_wsgi(self, wsgireq):
profile = self.ui.configbool('profiling', 'enabled') profile = self.ui.configbool('profiling', 'enabled')
with profiling.profile(self.ui, enabled=profile): with profiling.profile(self.ui, enabled=profile):
for r in self._runwsgi(wsgireq): for r in self._runwsgi(wsgireq):
yield r yield r
def _runwsgi(self, wsgireq): def _runwsgi(self, wsgireq):
req = wsgireq.req
try: try:
self.refresh() self.refresh()
csp, nonce = cspvalues(self.ui) csp, nonce = cspvalues(self.ui)
if csp: if csp:
wsgireq.headers.append(('Content-Security-Policy', csp)) wsgireq.headers.append(('Content-Security-Policy', csp))
virtual = wsgireq.env.get("PATH_INFO", "").strip('/') virtual = wsgireq.env.get("PATH_INFO", "").strip('/')
tmpl = self.templater(wsgireq, nonce) tmpl = self.templater(wsgireq, nonce)
ctype = tmpl('mimetype', encoding=encoding.encoding) ctype = tmpl('mimetype', encoding=encoding.encoding)
ctype = templater.stringify(ctype) ctype = templater.stringify(ctype)
# a static file # a static file
if virtual.startswith('static/') or 'static' in wsgireq.form: if virtual.startswith('static/') or 'static' in req.qsparams:
if virtual.startswith('static/'): if virtual.startswith('static/'):
fname = virtual[7:] fname = virtual[7:]
else: else:
fname = wsgireq.form['static'][0] fname = req.qsparams['static']
static = self.ui.config("web", "static", None, static = self.ui.config("web", "static", None,
untrusted=False) untrusted=False)
if not static: if not static:
tp = self.templatepath or templater.templatepaths() tp = self.templatepath or templater.templatepaths()
if isinstance(tp, str): if isinstance(tp, str):
tp = [tp] tp = [tp]
static = [os.path.join(p, 'static') for p in tp] static = [os.path.join(p, 'static') for p in tp]
staticfile(static, fname, wsgireq) staticfile(static, fname, wsgireq)
reverse=descending) reverse=descending)
for row, parity in zip(rows, paritygen(self.stripecount)): for row, parity in zip(rows, paritygen(self.stripecount)):
row['parity'] = parity row['parity'] = parity
yield row yield row
self.refresh() self.refresh()
sortable = ["name", "description", "contact", "lastchange"] sortable = ["name", "description", "contact", "lastchange"]
sortcolumn, descending = sortdefault sortcolumn, descending = sortdefault
if 'sort' in wsgireq.form: if 'sort' in wsgireq.req.qsparams:
sortcolumn = wsgireq.form['sort'][0] sortcolum = wsgireq.req.qsparams['sort']
descending = sortcolumn.startswith('-') descending = sortcolumn.startswith('-')
if descending: if descending:
sortcolumn = sortcolumn[1:] sortcolumn = sortcolumn[1:]
if sortcolumn not in sortable: if sortcolumn not in sortable:
sortcolumn = "" sortcolumn = ""
sort = [("sort_%s" % column, sort = [("sort_%s" % column,
"%s%s" % ((not descending and column == sortcolumn) "%s%s" % ((not descending and column == sortcolumn)

mercurial/hgweb/webcommands.py

the specified changeset identifier is shown. If ``{revision}`` is not the specified changeset identifier is shown. If ``{revision}`` is not
defined, the default is ``tip``. This form is equivalent to the defined, the default is ``tip``. This form is equivalent to the
``changelog`` handler. ``changelog`` handler.
For URLs of the form ``/log/{revision}/{file}``, the history for a specific For URLs of the form ``/log/{revision}/{file}``, the history for a specific
file will be shown. This form is equivalent to the ``filelog`` handler. file will be shown. This form is equivalent to the ``filelog`` handler.
""" """
if 'file' in req.form and req.form['file'][0]: if req.req.qsparams.get('file'):
return filelog(web, req, tmpl) return filelog(web, req, tmpl)
else: else:
return changelog(web, req, tmpl) return changelog(web, req, tmpl)
@webcommand('rawfile') @webcommand('rawfile')
def rawfile(web, req, tmpl): def rawfile(web, req, tmpl):
guessmime = web.configbool('web', 'guessmime') guessmime = web.configbool('web', 'guessmime')
path = webutil.cleanpath(web.repo, req.form.get('file', [''])[0]) path = webutil.cleanpath(web.repo, req.req.qsparams.get('file', ''))
if not path: if not path:
content = manifest(web, req, tmpl) content = manifest(web, req, tmpl)
req.respond(HTTP_OK, web.ctype) req.respond(HTTP_OK, web.ctype)
return content return content
try: try:
fctx = webutil.filectx(web.repo, req) fctx = webutil.filectx(web.repo, req)
except error.LookupError as inst: except error.LookupError as inst:
handler. handler.
If ``path`` is a file, information about that file will be shown via If ``path`` is a file, information about that file will be shown via
the ``filerevision`` template. the ``filerevision`` template.
If ``path`` is not defined, information about the root directory will If ``path`` is not defined, information about the root directory will
be rendered. be rendered.
""" """
path = webutil.cleanpath(web.repo, req.form.get('file', [''])[0]) path = webutil.cleanpath(web.repo, req.req.qsparams.get('file', ''))
if not path: if not path:
return manifest(web, req, tmpl) return manifest(web, req, tmpl)
try: try:
return _filerevision(web, req, tmpl, webutil.filectx(web.repo, req)) return _filerevision(web, req, tmpl, webutil.filectx(web.repo, req))
except error.LookupError as inst: except error.LookupError as inst:
try: try:
return manifest(web, req, tmpl) return manifest(web, req, tmpl)
except ErrorResponse: except ErrorResponse:
parity=next(parity), parity=next(parity),
changelogtag=showtags, changelogtag=showtags,
files=files, files=files,
**pycompat.strkwargs(webutil.commonentry(web.repo, ctx))) **pycompat.strkwargs(webutil.commonentry(web.repo, ctx)))
if count >= revcount: if count >= revcount:
break break
query = req.form['rev'][0] query = req.req.qsparams['rev']
revcount = web.maxchanges revcount = web.maxchanges
if 'revcount' in req.form: if 'revcount' in req.req.qsparams:
try: try:
revcount = int(req.form.get('revcount', [revcount])[0]) revcount = int(req.req.qsparams.get('revcount', revcount))
revcount = max(revcount, 1) revcount = max(revcount, 1)
tmpl.defaults['sessionvars']['revcount'] = revcount tmpl.defaults['sessionvars']['revcount'] = revcount
except ValueError: except ValueError:
pass pass
lessvars = copy.copy(tmpl.defaults['sessionvars']) lessvars = copy.copy(tmpl.defaults['sessionvars'])
lessvars['revcount'] = max(revcount // 2, 1) lessvars['revcount'] = max(revcount // 2, 1)
lessvars['rev'] = query lessvars['rev'] = query
morevars = copy.copy(tmpl.defaults['sessionvars']) morevars = copy.copy(tmpl.defaults['sessionvars'])
morevars['revcount'] = revcount * 2 morevars['revcount'] = revcount * 2
morevars['rev'] = query morevars['rev'] = query
mode, funcarg = getsearchmode(query) mode, funcarg = getsearchmode(query)
if 'forcekw' in req.form: if 'forcekw' in req.req.qsparams:
showforcekw = '' showforcekw = ''
showunforcekw = searchfuncs[mode][1] showunforcekw = searchfuncs[mode][1]
mode = MODE_KEYWORD mode = MODE_KEYWORD
funcarg = query funcarg = query
else: else:
if mode != MODE_KEYWORD: if mode != MODE_KEYWORD:
showforcekw = searchfuncs[MODE_KEYWORD][1] showforcekw = searchfuncs[MODE_KEYWORD][1]
else: else:
The ``revcount`` query string argument defines the maximum numbers of The ``revcount`` query string argument defines the maximum numbers of
changesets to render. changesets to render.
For non-searches, the ``changelog`` template will be rendered. For non-searches, the ``changelog`` template will be rendered.
""" """
query = '' query = ''
if 'node' in req.form: if 'node' in req.req.qsparams:
ctx = webutil.changectx(web.repo, req) ctx = webutil.changectx(web.repo, req)
symrev = webutil.symrevorshortnode(req, ctx) symrev = webutil.symrevorshortnode(req, ctx)
elif 'rev' in req.form: elif 'rev' in req.req.qsparams:
return _search(web, req, tmpl) return _search(web, req, tmpl)
else: else:
ctx = web.repo['tip'] ctx = web.repo['tip']
symrev = 'tip' symrev = 'tip'
def changelist(): def changelist():
revs = [] revs = []
if pos != -1: if pos != -1:
revs = web.repo.changelog.revs(pos, 0) revs = web.repo.changelog.revs(pos, 0)
curcount = 0 curcount = 0
for rev in revs: for rev in revs:
curcount += 1 curcount += 1
if curcount > revcount + 1: if curcount > revcount + 1:
break break
entry = webutil.changelistentry(web, web.repo[rev], tmpl) entry = webutil.changelistentry(web, web.repo[rev], tmpl)
entry['parity'] = next(parity) entry['parity'] = next(parity)
yield entry yield entry
if shortlog: if shortlog:
revcount = web.maxshortchanges revcount = web.maxshortchanges
else: else:
revcount = web.maxchanges revcount = web.maxchanges
if 'revcount' in req.form: if 'revcount' in req.req.qsparams:
try: try:
revcount = int(req.form.get('revcount', [revcount])[0]) revcount = int(req.req.qsparams.get('revcount', revcount))
revcount = max(revcount, 1) revcount = max(revcount, 1)
tmpl.defaults['sessionvars']['revcount'] = revcount tmpl.defaults['sessionvars']['revcount'] = revcount
except ValueError: except ValueError:
pass pass
lessvars = copy.copy(tmpl.defaults['sessionvars']) lessvars = copy.copy(tmpl.defaults['sessionvars'])
lessvars['revcount'] = max(revcount // 2, 1) lessvars['revcount'] = max(revcount // 2, 1)
morevars = copy.copy(tmpl.defaults['sessionvars']) morevars = copy.copy(tmpl.defaults['sessionvars'])
directory for the ``tip`` changeset will be shown. directory for the ``tip`` changeset will be shown.
Because this handler can only show information for directories, it Because this handler can only show information for directories, it
is recommended to use the ``file`` handler instead, as it can handle both is recommended to use the ``file`` handler instead, as it can handle both
directories and files. directories and files.
The ``manifest`` template will be rendered for this handler. The ``manifest`` template will be rendered for this handler.
""" """
if 'node' in req.form: if 'node' in req.req.qsparams:
ctx = webutil.changectx(web.repo, req) ctx = webutil.changectx(web.repo, req)
symrev = webutil.symrevorshortnode(req, ctx) symrev = webutil.symrevorshortnode(req, ctx)
else: else:
ctx = web.repo['tip'] ctx = web.repo['tip']
symrev = 'tip' symrev = 'tip'
path = webutil.cleanpath(web.repo, req.form.get('file', [''])[0]) path = webutil.cleanpath(web.repo, req.req.qsparams.get('file', ''))
mf = ctx.manifest() mf = ctx.manifest()
node = ctx.node() node = ctx.node()
files = {} files = {}
dirs = {} dirs = {}
parity = paritygen(web.stripecount) parity = paritygen(web.stripecount)
if path and path[-1:] != "/": if path and path[-1:] != "/":
This handler is registered under both the ``/diff`` and ``/filediff`` This handler is registered under both the ``/diff`` and ``/filediff``
paths. ``/diff`` is used in modern code. paths. ``/diff`` is used in modern code.
""" """
fctx, ctx = None, None fctx, ctx = None, None
try: try:
fctx = webutil.filectx(web.repo, req) fctx = webutil.filectx(web.repo, req)
except LookupError: except LookupError:
ctx = webutil.changectx(web.repo, req) ctx = webutil.changectx(web.repo, req)
path = webutil.cleanpath(web.repo, req.form['file'][0]) path = webutil.cleanpath(web.repo, req.req.qsparams['file'])
if path not in ctx.files(): if path not in ctx.files():
raise raise
if fctx is not None: if fctx is not None:
path = fctx.path() path = fctx.path()
ctx = fctx.changectx() ctx = fctx.changectx()
basectx = ctx.p1() basectx = ctx.p1()
a split or side-by-side diff rather than a unified diff. a split or side-by-side diff rather than a unified diff.
The ``context`` query string argument can be used to control the lines of The ``context`` query string argument can be used to control the lines of
context in the diff. context in the diff.
The ``filecomparison`` template is rendered. The ``filecomparison`` template is rendered.
""" """
ctx = webutil.changectx(web.repo, req) ctx = webutil.changectx(web.repo, req)
if 'file' not in req.form: if 'file' not in req.req.qsparams:
raise ErrorResponse(HTTP_NOT_FOUND, 'file not given') raise ErrorResponse(HTTP_NOT_FOUND, 'file not given')
path = webutil.cleanpath(web.repo, req.form['file'][0]) path = webutil.cleanpath(web.repo, req.req.qsparams['file'])
parsecontext = lambda v: v == 'full' and -1 or int(v) parsecontext = lambda v: v == 'full' and -1 or int(v)
if 'context' in req.form: if 'context' in req.req.qsparams:
context = parsecontext(req.form['context'][0]) context = parsecontext(req.req.qsparams['context'])
else: else:
context = parsecontext(web.config('web', 'comparisoncontext', '5')) context = parsecontext(web.config('web', 'comparisoncontext', '5'))
def filelines(f): def filelines(f):
if f.isbinary(): if f.isbinary():
mt = mimetypes.guess_type(f.path())[0] mt = mimetypes.guess_type(f.path())[0]
if not mt: if not mt:
mt = 'application/octet-stream' mt = 'application/octet-stream'
The ``filelog`` template will be rendered. The ``filelog`` template will be rendered.
""" """
try: try:
fctx = webutil.filectx(web.repo, req) fctx = webutil.filectx(web.repo, req)
f = fctx.path() f = fctx.path()
fl = fctx.filelog() fl = fctx.filelog()
except error.LookupError: except error.LookupError:
f = webutil.cleanpath(web.repo, req.form['file'][0]) f = webutil.cleanpath(web.repo, req.req.qsparams['file'])
fl = web.repo.file(f) fl = web.repo.file(f)
numrevs = len(fl) numrevs = len(fl)
if not numrevs: # file doesn't exist at all if not numrevs: # file doesn't exist at all
raise raise
rev = webutil.changectx(web.repo, req).rev() rev = webutil.changectx(web.repo, req).rev()
first = fl.linkrev(0) first = fl.linkrev(0)
if rev < first: # current rev is from before file existed if rev < first: # current rev is from before file existed
raise raise
frev = numrevs - 1 frev = numrevs - 1
while fl.linkrev(frev) > rev: while fl.linkrev(frev) > rev:
frev -= 1 frev -= 1
fctx = web.repo.filectx(f, fl.linkrev(frev)) fctx = web.repo.filectx(f, fl.linkrev(frev))
revcount = web.maxshortchanges revcount = web.maxshortchanges
if 'revcount' in req.form: if 'revcount' in req.req.qsparams:
try: try:
revcount = int(req.form.get('revcount', [revcount])[0]) revcount = int(req.req.qsparams.get('revcount', revcount))
revcount = max(revcount, 1) revcount = max(revcount, 1)
tmpl.defaults['sessionvars']['revcount'] = revcount tmpl.defaults['sessionvars']['revcount'] = revcount
except ValueError: except ValueError:
pass pass
lrange = webutil.linerange(req) lrange = webutil.linerange(req)
lessvars = copy.copy(tmpl.defaults['sessionvars']) lessvars = copy.copy(tmpl.defaults['sessionvars'])
lessvars['revcount'] = max(revcount // 2, 1) lessvars['revcount'] = max(revcount // 2, 1)
morevars = copy.copy(tmpl.defaults['sessionvars']) morevars = copy.copy(tmpl.defaults['sessionvars'])
morevars['revcount'] = revcount * 2 morevars['revcount'] = revcount * 2
patch = 'patch' in req.form patch = 'patch' in req.req.qsparams
if patch: if patch:
lessvars['patch'] = morevars['patch'] = req.form['patch'][0] lessvars['patch'] = morevars['patch'] = req.req.qsparams['patch']
descend = 'descend' in req.form descend = 'descend' in req.req.qsparams
if descend: if descend:
lessvars['descend'] = morevars['descend'] = req.form['descend'][0] lessvars['descend'] = morevars['descend'] = req.req.qsparams['descend']
count = fctx.filerev() + 1 count = fctx.filerev() + 1
start = max(0, count - revcount) # first rev on this page start = max(0, count - revcount) # first rev on this page
end = min(count, start + revcount) # last rev on this page end = min(count, start + revcount) # last rev on this page
parity = paritygen(web.stripecount, offset=start - end) parity = paritygen(web.stripecount, offset=start - end)
repo = web.repo repo = web.repo
revs = fctx.filelog().revs(start, end - 1) revs = fctx.filelog().revs(start, end - 1)
The optional ``path`` URL parameter controls content to include in the The optional ``path`` URL parameter controls content to include in the
archive. If omitted, every file in the specified revision is present in the archive. If omitted, every file in the specified revision is present in the
archive. If included, only the specified file or contents of the specified archive. If included, only the specified file or contents of the specified
directory will be included in the archive. directory will be included in the archive.
No template is used for this handler. Raw, binary content is generated. No template is used for this handler. Raw, binary content is generated.
""" """
type_ = req.form.get('type', [None])[0] type_ = req.req.qsparams.get('type')
allowed = web.configlist("web", "allow_archive") allowed = web.configlist("web", "allow_archive")
key = req.form['node'][0] key = req.req.qsparams['node']
if type_ not in web.archivespecs: if type_ not in web.archivespecs:
msg = 'Unsupported archive type: %s' % type_ msg = 'Unsupported archive type: %s' % type_
raise ErrorResponse(HTTP_NOT_FOUND, msg) raise ErrorResponse(HTTP_NOT_FOUND, msg)
if not ((type_ in allowed or if not ((type_ in allowed or
web.configbool("web", "allow" + type_))): web.configbool("web", "allow" + type_))):
msg = 'Archive type not allowed: %s' % type_ msg = 'Archive type not allowed: %s' % type_
raise ErrorResponse(HTTP_FORBIDDEN, msg) raise ErrorResponse(HTTP_FORBIDDEN, msg)
reponame = re.sub(br"\W+", "-", os.path.basename(web.reponame)) reponame = re.sub(br"\W+", "-", os.path.basename(web.reponame))
cnode = web.repo.lookup(key) cnode = web.repo.lookup(key)
arch_version = key arch_version = key
if cnode == key or key == 'tip': if cnode == key or key == 'tip':
arch_version = short(cnode) arch_version = short(cnode)
name = "%s-%s" % (reponame, arch_version) name = "%s-%s" % (reponame, arch_version)
ctx = webutil.changectx(web.repo, req) ctx = webutil.changectx(web.repo, req)
pats = [] pats = []
match = scmutil.match(ctx, []) match = scmutil.match(ctx, [])
file = req.form.get('file', None) file = req.req.qsparams.get('file')
if file: if file:
pats = ['path:' + file[0]] pats = ['path:' + file]
match = scmutil.match(ctx, pats, default='path') match = scmutil.match(ctx, pats, default='path')
if pats: if pats:
files = [f for f in ctx.manifest().keys() if match(f)] files = [f for f in ctx.manifest().keys() if match(f)]
if not files: if not files:
raise ErrorResponse(HTTP_NOT_FOUND, raise ErrorResponse(HTTP_NOT_FOUND,
'file(s) not found: %s' % file[0]) 'file(s) not found: %s' % file)
mimetype, artype, extension, encoding = web.archivespecs[type_] mimetype, artype, extension, encoding = web.archivespecs[type_]
headers = [ headers = [
('Content-Disposition', 'attachment; filename=%s%s' % (name, extension)) ('Content-Disposition', 'attachment; filename=%s%s' % (name, extension))
] ]
if encoding: if encoding:
headers.append(('Content-Encoding', encoding)) headers.append(('Content-Encoding', encoding))
req.headers.extend(headers) req.headers.extend(headers)
req.respond(HTTP_OK, mimetype) req.respond(HTTP_OK, mimetype)
archival.archive(web.repo, req, cnode, artype, prefix=name, archival.archive(web.repo, req, cnode, artype, prefix=name,
matchfn=match, matchfn=match,
subrepos=web.configbool("web", "archivesubrepos")) subrepos=web.configbool("web", "archivesubrepos"))
return [] return []
@webcommand('static') @webcommand('static')
def static(web, req, tmpl): def static(web, req, tmpl):
fname = req.form['file'][0] fname = req.req.qsparams['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("web", "static", None, untrusted=False) static = web.config("web", "static", None, untrusted=False)
if not static: if not static:
tp = web.templatepath or templater.templatepaths() tp = web.templatepath or templater.templatepaths()
if isinstance(tp, str): if isinstance(tp, str):
tp = [tp] tp = [tp]
static = [os.path.join(p, 'static') for p in tp] static = [os.path.join(p, 'static') for p in tp]
The ``graphtop`` query string argument can specify the starting changeset The ``graphtop`` query string argument can specify the starting changeset
for producing ``jsdata`` variable that is used for rendering graph in for producing ``jsdata`` variable that is used for rendering graph in
JavaScript. By default it has the same value as ``revision``. JavaScript. By default it has the same value as ``revision``.
This handler will render the ``graph`` template. This handler will render the ``graph`` template.
""" """
if 'node' in req.form: if 'node' in req.req.qsparams:
ctx = webutil.changectx(web.repo, req) ctx = webutil.changectx(web.repo, req)
symrev = webutil.symrevorshortnode(req, ctx) symrev = webutil.symrevorshortnode(req, ctx)
else: else:
ctx = web.repo['tip'] ctx = web.repo['tip']
symrev = 'tip' symrev = 'tip'
rev = ctx.rev() rev = ctx.rev()
bg_height = 39 bg_height = 39
revcount = web.maxshortchanges revcount = web.maxshortchanges
if 'revcount' in req.form: if 'revcount' in req.req.qsparams:
try: try:
revcount = int(req.form.get('revcount', [revcount])[0]) revcount = int(req.req.qsparams.get('revcount', revcount))
revcount = max(revcount, 1) revcount = max(revcount, 1)
tmpl.defaults['sessionvars']['revcount'] = revcount tmpl.defaults['sessionvars']['revcount'] = revcount
except ValueError: except ValueError:
pass pass
lessvars = copy.copy(tmpl.defaults['sessionvars']) lessvars = copy.copy(tmpl.defaults['sessionvars'])
lessvars['revcount'] = max(revcount // 2, 1) lessvars['revcount'] = max(revcount // 2, 1)
morevars = copy.copy(tmpl.defaults['sessionvars']) morevars = copy.copy(tmpl.defaults['sessionvars'])
morevars['revcount'] = revcount * 2 morevars['revcount'] = revcount * 2
graphtop = req.form.get('graphtop', [ctx.hex()])[0] graphtop = req.req.qsparams.get('graphtop', ctx.hex())
graphvars = copy.copy(tmpl.defaults['sessionvars']) graphvars = copy.copy(tmpl.defaults['sessionvars'])
graphvars['graphtop'] = graphtop graphvars['graphtop'] = graphtop
count = len(web.repo) count = len(web.repo)
pos = rev pos = rev
uprev = min(max(0, count - 1), rev + revcount) uprev = min(max(0, count - 1), rev + revcount)
downrev = max(0, rev - revcount) downrev = max(0, rev - revcount)
is defined, that help topic will be rendered. If not, an index of is defined, that help topic will be rendered. If not, an index of
available help topics will be rendered. available help topics will be rendered.
The ``help`` template will be rendered when requesting help for a topic. The ``help`` template will be rendered when requesting help for a topic.
``helptopics`` will be rendered for the index of help topics. ``helptopics`` will be rendered for the index of help topics.
""" """
from .. import commands, help as helpmod # avoid cycle from .. import commands, help as helpmod # avoid cycle
topicname = req.form.get('node', [None])[0] topicname = req.req.qsparams.get('node')
if not topicname: if not topicname:
def topics(**map): def topics(**map):
for entries, summary, _doc in helpmod.helptable: for entries, summary, _doc in helpmod.helptable:
yield {'topic': entries[0], 'summary': summary} yield {'topic': entries[0], 'summary': summary}
early, other = [], [] early, other = [], []
primary = lambda s: s.partition('|')[0] primary = lambda s: s.partition('|')[0]
for c, e in commands.table.iteritems(): for c, e in commands.table.iteritems():

mercurial/hgweb/webutil.py

def __len__(self): def __len__(self):
return len(self.siblings) return len(self.siblings)
def difffeatureopts(req, ui, section): def difffeatureopts(req, ui, section):
diffopts = patch.difffeatureopts(ui, untrusted=True, diffopts = patch.difffeatureopts(ui, untrusted=True,
section=section, whitespace=True) section=section, whitespace=True)
for k in ('ignorews', 'ignorewsamount', 'ignorewseol', 'ignoreblanklines'): for k in ('ignorews', 'ignorewsamount', 'ignorewseol', 'ignoreblanklines'):
v = req.form.get(k, [None])[0] v = req.req.qsparams.get(k)
if v is not None: if v is not None:
v = util.parsebool(v) v = util.parsebool(v)
setattr(diffopts, k, v if v is not None else True) setattr(diffopts, k, v if v is not None else True)
return diffopts return diffopts
def annotate(req, fctx, ui): def annotate(req, fctx, ui):
diffopts = difffeatureopts(req, ui, 'annotate') diffopts = difffeatureopts(req, ui, 'annotate')
except error.RepoError: except error.RepoError:
man = repo.manifestlog._revlog man = repo.manifestlog._revlog
ctx = repo[man.linkrev(man.rev(man.lookup(changeid)))] ctx = repo[man.linkrev(man.rev(man.lookup(changeid)))]
return ctx return ctx
def changectx(repo, req): def changectx(repo, req):
changeid = "tip" changeid = "tip"
if 'node' in req.form: if 'node' in req.req.qsparams:
changeid = req.form['node'][0] changeid = req.req.qsparams['node']
ipos = changeid.find(':') ipos = changeid.find(':')
if ipos != -1: if ipos != -1:
changeid = changeid[(ipos + 1):] changeid = changeid[(ipos + 1):]
elif 'manifest' in req.form: elif 'manifest' in req.req.qsparams:
changeid = req.form['manifest'][0] changeid = req.req.qsparams['manifest']
return changeidctx(repo, changeid) return changeidctx(repo, changeid)
def basechangectx(repo, req): def basechangectx(repo, req):
if 'node' in req.form: if 'node' in req.req.qsparams:
changeid = req.form['node'][0] changeid = req.req.qsparams['node']
ipos = changeid.find(':') ipos = changeid.find(':')
if ipos != -1: if ipos != -1:
changeid = changeid[:ipos] changeid = changeid[:ipos]
return changeidctx(repo, changeid) return changeidctx(repo, changeid)
return None return None
def filectx(repo, req): def filectx(repo, req):
if 'file' not in req.form: if 'file' not in req.req.qsparams:
raise ErrorResponse(HTTP_NOT_FOUND, 'file not given') raise ErrorResponse(HTTP_NOT_FOUND, 'file not given')
path = cleanpath(repo, req.form['file'][0]) path = cleanpath(repo, req.req.qsparams['file'])
if 'node' in req.form: if 'node' in req.req.qsparams:
changeid = req.form['node'][0] changeid = req.req.qsparams['node']
elif 'filenode' in req.form: elif 'filenode' in req.req.qsparams:
changeid = req.form['filenode'][0] changeid = req.req.qsparams['filenode']
else: else:
raise ErrorResponse(HTTP_NOT_FOUND, 'node or filenode not given') raise ErrorResponse(HTTP_NOT_FOUND, 'node or filenode not given')
try: try:
fctx = repo[changeid][path] fctx = repo[changeid][path]
except error.RepoError: except error.RepoError:
fctx = repo.filectx(path, fileid=changeid) fctx = repo.filectx(path, fileid=changeid)
return fctx return fctx
def linerange(req): def linerange(req):
linerange = req.form.get('linerange') linerange = req.req.qsparams.getall('linerange')
if linerange is None: if not linerange:
return None return None
if len(linerange) > 1: if len(linerange) > 1:
raise ErrorResponse(HTTP_BAD_REQUEST, raise ErrorResponse(HTTP_BAD_REQUEST,
'redundant linerange parameter') 'redundant linerange parameter')
try: try:
fromline, toline = map(int, linerange[0].split(':', 1)) fromline, toline = map(int, linerange[0].split(':', 1))
except ValueError: except ValueError:
raise ErrorResponse(HTTP_BAD_REQUEST, raise ErrorResponse(HTTP_BAD_REQUEST,
parent=lambda **x: parents(ctx, rev - 1), parent=lambda **x: parents(ctx, rev - 1),
child=lambda **x: children(ctx, rev + 1), child=lambda **x: children(ctx, rev + 1),
changelogtag=showtags, changelogtag=showtags,
files=files, files=files,
) )
return entry return entry
def symrevorshortnode(req, ctx): def symrevorshortnode(req, ctx):
if 'node' in req.form: if 'node' in req.req.qsparams:
return templatefilters.revescape(req.form['node'][0]) return templatefilters.revescape(req.req.qsparams['node'])
else: else:
return short(ctx.node()) return short(ctx.node())
def changesetentry(web, req, tmpl, ctx): def changesetentry(web, req, tmpl, ctx):
'''Obtain a dictionary to be used to render the "changeset" template.''' '''Obtain a dictionary to be used to render the "changeset" template.'''
showtags = showtag(web.repo, tmpl, 'changesettag', ctx.node()) showtags = showtag(web.repo, tmpl, 'changesettag', ctx.node())
showbookmarks = showbookmark(web.repo, tmpl, 'changesetbookmark', showbookmarks = showbookmark(web.repo, tmpl, 'changesetbookmark',

tests/hgweberror.py

# A dummy extension that installs an hgweb command that throws an Exception. # A dummy extension that installs an hgweb command that throws an Exception.
from __future__ import absolute_import from __future__ import absolute_import
from mercurial.hgweb import ( from mercurial.hgweb import (
webcommands, webcommands,
) )
def raiseerror(web, req, tmpl): def raiseerror(web, req, tmpl):
'''Dummy web command that raises an uncaught Exception.''' '''Dummy web command that raises an uncaught Exception.'''
# Simulate an error after partial response. # Simulate an error after partial response.
if 'partialresponse' in req.form: if 'partialresponse' in req.req.qsparams:
req.respond(200, 'text/plain') req.respond(200, 'text/plain')
req.write('partial content\n') req.write('partial content\n')
raise AttributeError('I am an uncaught error!') raise AttributeError('I am an uncaught error!')
def extsetup(ui): def extsetup(ui):
setattr(webcommands, 'raiseerror', raiseerror) setattr(webcommands, 'raiseerror', raiseerror)
webcommands.__all__.append('raiseerror') webcommands.__all__.append('raiseerror')