| durin42 |
| hg-reviewers |
While we're here, rename a method so abide by our style policy,
since otherwise check-commit would complain.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/hgweb/hgwebdir_mod.py (11 lines) |
| raise RuntimeError("This function is only intended to be " | raise RuntimeError("This function is only intended to be " | ||||
| "called while running as a CGI script.") | "called while running as a CGI script.") | ||||
| wsgicgi.launch(self) | wsgicgi.launch(self) | ||||
| def __call__(self, env, respond): | def __call__(self, env, respond): | ||||
| wsgireq = requestmod.wsgirequest(env, respond) | wsgireq = requestmod.wsgirequest(env, respond) | ||||
| return self.run_wsgi(wsgireq) | return self.run_wsgi(wsgireq) | ||||
| def read_allowed(self, ui, wsgireq): | def readallowed(self, ui, req): | ||||
| """Check allow_read and deny_read config options of a repo's ui object | """Check allow_read and deny_read config options of a repo's ui object | ||||
| to determine user permissions. By default, with neither option set (or | to determine user permissions. By default, with neither option set (or | ||||
| both empty), allow all users to read the repo. There are two ways a | both empty), allow all users to read the repo. There are two ways a | ||||
| user can be denied read access: (1) deny_read is not empty, and the | user can be denied read access: (1) deny_read is not empty, and the | ||||
| user is unauthenticated or deny_read contains user (or *), and (2) | user is unauthenticated or deny_read contains user (or *), and (2) | ||||
| allow_read is not empty and the user is not in allow_read. Return True | allow_read is not empty and the user is not in allow_read. Return True | ||||
| if user is allowed to read the repo, else return False.""" | if user is allowed to read the repo, else return False.""" | ||||
| user = wsgireq.env.get('REMOTE_USER') | user = req.remoteuser | ||||
| deny_read = ui.configlist('web', 'deny_read', untrusted=True) | deny_read = ui.configlist('web', 'deny_read', untrusted=True) | ||||
| if deny_read and (not user or ismember(ui, user, deny_read)): | if deny_read and (not user or ismember(ui, user, deny_read)): | ||||
| return False | return False | ||||
| allow_read = ui.configlist('web', 'allow_read', untrusted=True) | allow_read = ui.configlist('web', 'allow_read', untrusted=True) | ||||
| # by default, allow reading if no allow_read option has been set | # by default, allow reading if no allow_read option has been set | ||||
| if (not allow_read) or ismember(ui, user, allow_read): | if (not allow_read) or ismember(ui, user, allow_read): | ||||
| except ErrorResponse as err: | except ErrorResponse as err: | ||||
| wsgireq.respond(err, ctype) | wsgireq.respond(err, ctype) | ||||
| return tmpl('error', error=err.message or '') | return tmpl('error', error=err.message or '') | ||||
| finally: | finally: | ||||
| tmpl = None | tmpl = None | ||||
| def makeindex(self, wsgireq, tmpl, subdir=""): | def makeindex(self, wsgireq, tmpl, subdir=""): | ||||
| req = wsgireq.req | |||||
| def archivelist(ui, nodeid, url): | def archivelist(ui, nodeid, url): | ||||
| allowed = ui.configlist("web", "allow_archive", untrusted=True) | allowed = ui.configlist("web", "allow_archive", untrusted=True) | ||||
| archives = [] | archives = [] | ||||
| for typ, spec in hgweb_mod.archivespecs.iteritems(): | for typ, spec in hgweb_mod.archivespecs.iteritems(): | ||||
| if typ in allowed or ui.configbool("web", "allow" + typ, | if typ in allowed or ui.configbool("web", "allow" + typ, | ||||
| untrusted=True): | untrusted=True): | ||||
| archives.append({"type": typ, "extension": spec[2], | archives.append({"type": typ, "extension": spec[2], | ||||
| u.warn(_('error reading %s/.hg/hgrc: %s\n') % (path, e)) | u.warn(_('error reading %s/.hg/hgrc: %s\n') % (path, e)) | ||||
| continue | continue | ||||
| def get(section, name, default=uimod._unset): | def get(section, name, default=uimod._unset): | ||||
| return u.config(section, name, default, untrusted=True) | return u.config(section, name, default, untrusted=True) | ||||
| if u.configbool("web", "hidden", untrusted=True): | if u.configbool("web", "hidden", untrusted=True): | ||||
| continue | continue | ||||
| if not self.read_allowed(u, wsgireq): | if not self.readallowed(u, req): | ||||
| continue | continue | ||||
| # update time with local timezone | # update time with local timezone | ||||
| try: | try: | ||||
| r = hg.repository(self.ui, path) | r = hg.repository(self.ui, path) | ||||
| except IOError: | except IOError: | ||||
| u.warn(_('error accessing repository at %s\n') % path) | u.warn(_('error accessing repository at %s\n') % path) | ||||
| continue | continue | ||||
| 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.req.qsparams: | if 'sort' in req.qsparams: | ||||
| sortcolumn = wsgireq.req.qsparams['sort'] | sortcolumn = 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) | ||||