comparison mercurial/hgweb/hgweb_mod.py @ 36808:0031e972ded2

hgweb: use the parsed application path directly

Previously, we assigned a custom system string with a trailing slash
to wsgirequest.url.

The addition of the trailing slash felt arbitrary and seems to go
against how things typically work in WSGI.

We also want our URLs to be bytes, not system strings.

And, assigning a custom attribute to wsgirequest felt wrong.

This commit fixes all those things by removing the trailing
slash from the app path, changing consumers to use that variable
and to use it without a trailing slash, and removing the custom
attribute from wsgirequest.

We preserve the trailing slash on {url}. Also, makebreadcrumb
strips the trailing slash. So no change to it was needed.

Differential Revision: https://phab.mercurial-scm.org/D2736

36807:1e2194e0ef62

        # determine scheme, port and server name
        # this is needed to create absolute urls
        logourl = self.config('web', 'logourl')
        logoimg = self.config('web', 'logoimg')
        staticurl = (self.config('web', 'staticurl')
                     or pycompat.sysbytes(wsgireq.url) + 'static/')
        if not staticurl.endswith('/'):
            staticurl += '/'

        # some functions for the templater

        sessionvars = webutil.sessionvars(vars, '?')

        if not self.reponame:
            self.reponame = (self.config('web', 'name', '')
                             or wsgireq.env.get('REPO_NAME')
                             or wsgireq.url.strip(r'/') or self.repo.root)

        def websubfilter(text):
            return templatefilters.websub(text, self.websubtable)

        # create the templater
        # TODO: export all keywords: defaults = templatekw.keywords.copy()
        defaults = {
            'url': pycompat.sysbytes(wsgireq.url),
            'logourl': logourl,
            'logoimg': logoimg,
            'staticurl': staticurl,
            'urlbase': req.advertisedbaseurl,
            'repo': self.reponame,
            'encoding': encoding.encoding,
            'motd': motd,
            'sessionvars': sessionvars,
            'pathdef': makebreadcrumb(pycompat.sysbytes(wsgireq.url)),
            'style': style,
            'nonce': self.nonce,
        }
        tres = formatter.templateresources(self.repo.ui, self.repo)
        tmpl = templater.templater.frommapfile(mapfile,

            # hgwebdir may have added CSP header. Since we generate our own,
            # replace it.
            wsgireq.headers = [h for h in wsgireq.headers
                               if h[0] != 'Content-Security-Policy']
            wsgireq.headers.append(('Content-Security-Policy', rctx.csp))

        wsgireq.url = pycompat.sysstr(req.apppath)

        if r'PATH_INFO' in wsgireq.env:
            parts = wsgireq.env[r'PATH_INFO'].strip(r'/').split(r'/')
            repo_parts = wsgireq.env.get(r'REPO_NAME', r'').split(r'/')
            if parts[:len(repo_parts)] == repo_parts:

36808:0031e972ded2

        # determine scheme, port and server name
        # this is needed to create absolute urls
        logourl = self.config('web', 'logourl')
        logoimg = self.config('web', 'logoimg')
        staticurl = (self.config('web', 'staticurl')
                     or req.apppath + '/static/')
        if not staticurl.endswith('/'):
            staticurl += '/'

        # some functions for the templater

        sessionvars = webutil.sessionvars(vars, '?')

        if not self.reponame:
            self.reponame = (self.config('web', 'name', '')
                             or wsgireq.env.get('REPO_NAME')
                             or req.apppath or self.repo.root)

        def websubfilter(text):
            return templatefilters.websub(text, self.websubtable)

        # create the templater
        # TODO: export all keywords: defaults = templatekw.keywords.copy()
        defaults = {
            'url': req.apppath + '/',
            'logourl': logourl,
            'logoimg': logoimg,
            'staticurl': staticurl,
            'urlbase': req.advertisedbaseurl,
            'repo': self.reponame,
            'encoding': encoding.encoding,
            'motd': motd,
            'sessionvars': sessionvars,
            'pathdef': makebreadcrumb(req.apppath),
            'style': style,
            'nonce': self.nonce,
        }
        tres = formatter.templateresources(self.repo.ui, self.repo)
        tmpl = templater.templater.frommapfile(mapfile,

            # hgwebdir may have added CSP header. Since we generate our own,
            # replace it.
            wsgireq.headers = [h for h in wsgireq.headers
                               if h[0] != 'Content-Security-Policy']
            wsgireq.headers.append(('Content-Security-Policy', rctx.csp))

        if r'PATH_INFO' in wsgireq.env:
            parts = wsgireq.env[r'PATH_INFO'].strip(r'/').split(r'/')
            repo_parts = wsgireq.env.get(r'REPO_NAME', r'').split(r'/')
            if parts[:len(repo_parts)] == repo_parts: