| durin42 |
| hg-reviewers |
hgwebdir s kind of large. Let's make the class smaller by
moving things that don't need to be there.
| 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 (46 lines) |
| if u.port: | if u.port: | ||||
| port = u.port | port = u.port | ||||
| path = u.path or "" | path = u.path or "" | ||||
| if not path.startswith('/'): | if not path.startswith('/'): | ||||
| path = '/' + path | path = '/' + path | ||||
| return name, pycompat.bytestr(port), path | return name, pycompat.bytestr(port), path | ||||
| def readallowed(ui, req): | |||||
| """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 | |||||
| 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 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 | |||||
| if user is allowed to read the repo, else return False.""" | |||||
| user = req.remoteuser | |||||
| deny_read = ui.configlist('web', 'deny_read', untrusted=True) | |||||
| if deny_read and (not user or ismember(ui, user, deny_read)): | |||||
| return False | |||||
| allow_read = ui.configlist('web', 'allow_read', untrusted=True) | |||||
| # by default, allow reading if no allow_read option has been set | |||||
| if not allow_read or ismember(ui, user, allow_read): | |||||
| return True | |||||
| return False | |||||
| class hgwebdir(object): | class hgwebdir(object): | ||||
| """HTTP server for multiple repositories. | """HTTP server for multiple repositories. | ||||
| Given a configuration, different repositories will be served depending | Given a configuration, different repositories will be served depending | ||||
| on the request path. | on the request path. | ||||
| Instances are typically used as WSGI applications. | Instances are typically used as WSGI applications. | ||||
| """ | """ | ||||
| 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 readallowed(self, ui, req): | |||||
| """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 | |||||
| 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 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 | |||||
| if user is allowed to read the repo, else return False.""" | |||||
| user = req.remoteuser | |||||
| deny_read = ui.configlist('web', 'deny_read', untrusted=True) | |||||
| if deny_read and (not user or ismember(ui, user, deny_read)): | |||||
| return False | |||||
| allow_read = ui.configlist('web', 'allow_read', untrusted=True) | |||||
| # by default, allow reading if no allow_read option has been set | |||||
| if (not allow_read) or ismember(ui, user, allow_read): | |||||
| return True | |||||
| return False | |||||
| 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 | ||||
| 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.readallowed(u, req): | if not 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 | ||||