| durin42 |
| hg-reviewers |
hgwebdir_mod hasn't received as much porting effort. So we had to
do some minor plumbing to get it to match hgweb_mod and to support
the new response object.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/hgweb/common.py (6 lines) | |||
| M | mercurial/hgweb/hgwebdir_mod.py (11 lines) | |||
| M | mercurial/hgweb/webcommands.py (5 lines) |
| for part in parts: | for part in parts: | ||||
| if (part in ('', pycompat.oscurdir, pycompat.ospardir) or | if (part in ('', pycompat.oscurdir, pycompat.ospardir) or | ||||
| pycompat.ossep in part or | pycompat.ossep in part or | ||||
| pycompat.osaltsep is not None and pycompat.osaltsep in part): | pycompat.osaltsep is not None and pycompat.osaltsep in part): | ||||
| return False | return False | ||||
| return True | return True | ||||
| def staticfile(directory, fname, req): | def staticfile(directory, fname, res): | ||||
| """return a file inside directory with guessed Content-Type header | """return a file inside directory with guessed Content-Type header | ||||
| fname always uses '/' as directory separator and isn't allowed to | fname always uses '/' as directory separator and isn't allowed to | ||||
| contain unusual path components. | contain unusual path components. | ||||
| 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('/')) | fpath = os.path.join(*fname.split('/')) | ||||
| if isinstance(directory, str): | if isinstance(directory, str): | ||||
| directory = [directory] | directory = [directory] | ||||
| for d in directory: | for d in directory: | ||||
| path = os.path.join(d, fpath) | path = os.path.join(d, fpath) | ||||
| if os.path.exists(path): | if os.path.exists(path): | ||||
| break | break | ||||
| try: | try: | ||||
| os.stat(path) | os.stat(path) | ||||
| ct = mimetypes.guess_type(pycompat.fsdecode(path))[0] or "text/plain" | ct = mimetypes.guess_type(pycompat.fsdecode(path))[0] or "text/plain" | ||||
| with open(path, 'rb') as fh: | with open(path, 'rb') as fh: | ||||
| data = fh.read() | data = fh.read() | ||||
| req.respond(HTTP_OK, ct, body=data) | res.headers['Content-Type'] = ct | ||||
| res.setbodybytes(data) | |||||
| return res | |||||
| except TypeError: | except TypeError: | ||||
| raise ErrorResponse(HTTP_SERVER_ERROR, 'illegal filename') | raise ErrorResponse(HTTP_SERVER_ERROR, 'illegal filename') | ||||
| except OSError as err: | except OSError as err: | ||||
| if err.errno == errno.ENOENT: | if err.errno == errno.ENOENT: | ||||
| raise ErrorResponse(HTTP_NOT_FOUND) | raise ErrorResponse(HTTP_NOT_FOUND) | ||||
| else: | else: | ||||
| raise ErrorResponse(HTTP_SERVER_ERROR, | raise ErrorResponse(HTTP_SERVER_ERROR, | ||||
| encoding.strtolocal(err.strerror)) | encoding.strtolocal(err.strerror)) | ||||
| 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 | req = wsgireq.req | ||||
| res = wsgireq.res | |||||
| try: | try: | ||||
| self.refresh() | self.refresh() | ||||
| csp, nonce = cspvalues(self.ui) | csp, nonce = cspvalues(self.ui) | ||||
| if csp: | if csp: | ||||
| res.headers['Content-Security-Policy'] = 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) | ||||
| # Global defaults. These can be overridden by any handler. | |||||
| res.status = '200 Script output follows' | |||||
| res.headers['Content-Type'] = ctype | |||||
| # a static file | # a static file | ||||
| if virtual.startswith('static/') or 'static' in req.qsparams: | 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 = req.qsparams['static'] | 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) | |||||
| return [] | staticfile(static, fname, res) | ||||
| return res.sendresponse() | |||||
| # top-level index | # top-level index | ||||
| repos = dict(self.repos) | repos = dict(self.repos) | ||||
| if (not virtual or virtual == 'index') and virtual not in repos: | if (not virtual or virtual == 'index') and virtual not in repos: | ||||
| wsgireq.respond(HTTP_OK, ctype) | wsgireq.respond(HTTP_OK, ctype) | ||||
| return self.makeindex(wsgireq, tmpl) | return self.makeindex(wsgireq, tmpl) | ||||
| # 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] | ||||
| staticfile(static, fname, req) | |||||
| return [] | staticfile(static, fname, web.res) | ||||
| return web.res | |||||
| @webcommand('graph') | @webcommand('graph') | ||||
| def graph(web, req, tmpl): | def graph(web, req, tmpl): | ||||
| """ | """ | ||||
| /graph[/{revision}] | /graph[/{revision}] | ||||
| ------------------- | ------------------- | ||||
| Show information about the graphical topology of the repository. | Show information about the graphical topology of the repository. | ||||