| durin42 |
| hg-reviewers |
We're trying to remove `wsgirequest`. The permissions hooks don't
do anything they can't do with our new request type. So let's
pass that in.
This was the last use of `wsgirequest` in the wire protocol code!
.. api::
hgweb.hgweb_mod.permhooks no longer take a ``wsgirequest`` instance as an argument.
| Lint Skipped |
| Unit Tests Skipped |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/hgweb/common.py (7 lines) | |||
| M | mercurial/hgweb/hgweb_mod.py (4 lines) | |||
| M | mercurial/wireprotoserver.py (5 lines) | |||
| M | tests/test-http-bundle1.t (2 lines) | |||
| M | tests/test-http.t (4 lines) | |||
| M | tests/test-largefiles-wireproto.t (2 lines) |
| """ | """ | ||||
| return userlist == ['*'] or username in userlist | return userlist == ['*'] or username in userlist | ||||
| def checkauthz(hgweb, req, op): | def checkauthz(hgweb, req, op): | ||||
| '''Check permission for operation based on request data (including | '''Check permission for operation based on request data (including | ||||
| authentication info). Return if op allowed, else raise an ErrorResponse | authentication info). Return if op allowed, else raise an ErrorResponse | ||||
| exception.''' | exception.''' | ||||
| user = req.env.get(r'REMOTE_USER') | user = req.remoteuser | ||||
| deny_read = hgweb.configlist('web', 'deny_read') | deny_read = hgweb.configlist('web', 'deny_read') | ||||
| if deny_read and (not user or ismember(hgweb.repo.ui, user, deny_read)): | if deny_read and (not user or ismember(hgweb.repo.ui, user, deny_read)): | ||||
| raise ErrorResponse(HTTP_UNAUTHORIZED, 'read not authorized') | raise ErrorResponse(HTTP_UNAUTHORIZED, 'read not authorized') | ||||
| allow_read = hgweb.configlist('web', 'allow_read') | allow_read = hgweb.configlist('web', 'allow_read') | ||||
| if allow_read and (not ismember(hgweb.repo.ui, user, allow_read)): | if allow_read and (not ismember(hgweb.repo.ui, user, allow_read)): | ||||
| raise ErrorResponse(HTTP_UNAUTHORIZED, 'read not authorized') | raise ErrorResponse(HTTP_UNAUTHORIZED, 'read not authorized') | ||||
| if op == 'pull' and not hgweb.allowpull: | if op == 'pull' and not hgweb.allowpull: | ||||
| raise ErrorResponse(HTTP_UNAUTHORIZED, 'pull not authorized') | raise ErrorResponse(HTTP_UNAUTHORIZED, 'pull not authorized') | ||||
| elif op == 'pull' or op is None: # op is None for interface requests | elif op == 'pull' or op is None: # op is None for interface requests | ||||
| return | return | ||||
| # enforce that you can only push using POST requests | # enforce that you can only push using POST requests | ||||
| if req.env[r'REQUEST_METHOD'] != r'POST': | if req.method != 'POST': | ||||
| msg = 'push requires POST request' | msg = 'push requires POST request' | ||||
| raise ErrorResponse(HTTP_METHOD_NOT_ALLOWED, msg) | raise ErrorResponse(HTTP_METHOD_NOT_ALLOWED, msg) | ||||
| # require ssl by default for pushing, auth info cannot be sniffed | # require ssl by default for pushing, auth info cannot be sniffed | ||||
| # and replayed | # and replayed | ||||
| scheme = req.env.get('wsgi.url_scheme') | if hgweb.configbool('web', 'push_ssl') and req.urlscheme != 'https': | ||||
| if hgweb.configbool('web', 'push_ssl') and scheme != 'https': | |||||
| raise ErrorResponse(HTTP_FORBIDDEN, 'ssl required') | raise ErrorResponse(HTTP_FORBIDDEN, 'ssl required') | ||||
| deny = hgweb.configlist('web', 'deny_push') | deny = hgweb.configlist('web', 'deny_push') | ||||
| if deny and (not user or ismember(hgweb.repo.ui, user, deny)): | if deny and (not user or ismember(hgweb.repo.ui, user, deny)): | ||||
| raise ErrorResponse(HTTP_UNAUTHORIZED, 'push not authorized') | raise ErrorResponse(HTTP_UNAUTHORIZED, 'push not authorized') | ||||
| allow = hgweb.configlist('web', 'allow-push') | allow = hgweb.configlist('web', 'allow-push') | ||||
| if not (allow and ismember(hgweb.repo.ui, user, allow)): | if not (allow and ismember(hgweb.repo.ui, user, allow)): | ||||
| # hgwebdir may have added CSP header. Since we generate our own, | # hgwebdir may have added CSP header. Since we generate our own, | ||||
| # replace it. | # replace it. | ||||
| wsgireq.headers = [h for h in wsgireq.headers | wsgireq.headers = [h for h in wsgireq.headers | ||||
| if h[0] != 'Content-Security-Policy'] | if h[0] != 'Content-Security-Policy'] | ||||
| wsgireq.headers.append(('Content-Security-Policy', rctx.csp)) | wsgireq.headers.append(('Content-Security-Policy', rctx.csp)) | ||||
| res.headers['Content-Security-Policy'] = rctx.csp | res.headers['Content-Security-Policy'] = rctx.csp | ||||
| handled = wireprotoserver.handlewsgirequest( | handled = wireprotoserver.handlewsgirequest( | ||||
| rctx, wsgireq, req, res, self.check_perm) | rctx, req, res, self.check_perm) | ||||
| if handled: | if handled: | ||||
| return res.sendresponse() | return res.sendresponse() | ||||
| 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] | ||||
| try: | try: | ||||
| tmpl = rctx.templater(req) | tmpl = rctx.templater(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, req, None) | ||||
| if cmd == '': | if cmd == '': | ||||
| req.qsparams['cmd'] = tmpl.cache['default'] | req.qsparams['cmd'] = tmpl.cache['default'] | ||||
| cmd = req.qsparams['cmd'] | 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: | ||||
| # This method exists mostly so that extensions like remotefilelog can | # This method exists mostly so that extensions like remotefilelog can | ||||
| # disable a kludgey legacy method only over http. As of early 2018, | # disable a kludgey legacy method only over http. As of early 2018, | ||||
| # there are no other known users, so with any luck we can discard this | # there are no other known users, so with any luck we can discard this | ||||
| # hook if remotefilelog becomes a first-party extension. | # hook if remotefilelog becomes a first-party extension. | ||||
| def iscmd(cmd): | def iscmd(cmd): | ||||
| return cmd in wireproto.commands | return cmd in wireproto.commands | ||||
| def handlewsgirequest(rctx, wsgireq, req, res, checkperm): | def handlewsgirequest(rctx, req, res, checkperm): | ||||
| """Possibly process a wire protocol request. | """Possibly process a wire protocol request. | ||||
| If the current request is a wire protocol request, the request is | If the current request is a wire protocol request, the request is | ||||
| processed by this function. | processed by this function. | ||||
| ``wsgireq`` is a ``wsgirequest`` instance. | |||||
| ``req`` is a ``parsedrequest`` instance. | ``req`` is a ``parsedrequest`` instance. | ||||
| ``res`` is a ``wsgiresponse`` instance. | ``res`` is a ``wsgiresponse`` instance. | ||||
| Returns a bool indicating if the request was serviced. If set, the caller | Returns a bool indicating if the request was serviced. If set, the caller | ||||
| should stop processing the request, as a response has already been issued. | should stop processing the request, as a response has already been issued. | ||||
| """ | """ | ||||
| # Avoid cycle involving hg module. | # Avoid cycle involving hg module. | ||||
| from .hgweb import common as hgwebcommon | from .hgweb import common as hgwebcommon | ||||
| res.status = hgwebcommon.statusmessage(404) | res.status = hgwebcommon.statusmessage(404) | ||||
| res.headers['Content-Type'] = HGTYPE | res.headers['Content-Type'] = HGTYPE | ||||
| # TODO This is not a good response to issue for this request. This | # TODO This is not a good response to issue for this request. This | ||||
| # is mostly for BC for now. | # is mostly for BC for now. | ||||
| res.setbodybytes('0\n%s\n' % b'Not Found') | res.setbodybytes('0\n%s\n' % b'Not Found') | ||||
| return True | return True | ||||
| proto = httpv1protocolhandler(req, repo.ui, | proto = httpv1protocolhandler(req, repo.ui, | ||||
| lambda perm: checkperm(rctx, wsgireq, perm)) | lambda perm: checkperm(rctx, req, perm)) | ||||
| # The permissions checker should be the only thing that can raise an | # The permissions checker should be the only thing that can raise an | ||||
| # ErrorResponse. It is kind of a layer violation to catch an hgweb | # ErrorResponse. It is kind of a layer violation to catch an hgweb | ||||
| # exception here. So consider refactoring into a exception type that | # exception here. So consider refactoring into a exception type that | ||||
| # is associated with the wire protocol. | # is associated with the wire protocol. | ||||
| try: | try: | ||||
| _callhttp(repo, req, res, proto, cmd) | _callhttp(repo, req, res, proto, cmd) | ||||
| except hgwebcommon.ErrorResponse as e: | except hgwebcommon.ErrorResponse as e: | ||||
| test http authentication | test http authentication | ||||
| + use the same server to test server side streaming preference | + use the same server to test server side streaming preference | ||||
| $ cd test | $ cd test | ||||
| $ cat << EOT > userpass.py | $ cat << EOT > userpass.py | ||||
| > import base64 | > import base64 | ||||
| > from mercurial.hgweb import common | > from mercurial.hgweb import common | ||||
| > def perform_authentication(hgweb, req, op): | > def perform_authentication(hgweb, req, op): | ||||
| > auth = req.env.get('HTTP_AUTHORIZATION') | > auth = req.headers.get('Authorization') | ||||
| > if not auth: | > if not auth: | ||||
| > raise common.ErrorResponse(common.HTTP_UNAUTHORIZED, 'who', | > raise common.ErrorResponse(common.HTTP_UNAUTHORIZED, 'who', | ||||
| > [('WWW-Authenticate', 'Basic Realm="mercurial"')]) | > [('WWW-Authenticate', 'Basic Realm="mercurial"')]) | ||||
| > if base64.b64decode(auth.split()[1]).split(b':', 1) != [b'user', | > if base64.b64decode(auth.split()[1]).split(b':', 1) != [b'user', | ||||
| > b'pass']: | > b'pass']: | ||||
| > raise common.ErrorResponse(common.HTTP_FORBIDDEN, 'no') | > raise common.ErrorResponse(common.HTTP_FORBIDDEN, 'no') | ||||
| > def extsetup(): | > def extsetup(): | ||||
| > common.permhooks.insert(0, perform_authentication) | > common.permhooks.insert(0, perform_authentication) | ||||
| test http authentication | test http authentication | ||||
| + use the same server to test server side streaming preference | + use the same server to test server side streaming preference | ||||
| $ cd test | $ cd test | ||||
| $ cat << EOT > userpass.py | $ cat << EOT > userpass.py | ||||
| > import base64 | > import base64 | ||||
| > from mercurial.hgweb import common | > from mercurial.hgweb import common | ||||
| > def perform_authentication(hgweb, req, op): | > def perform_authentication(hgweb, req, op): | ||||
| > auth = req.env.get('HTTP_AUTHORIZATION') | > auth = req.headers.get('Authorization') | ||||
| > if not auth: | > if not auth: | ||||
| > raise common.ErrorResponse(common.HTTP_UNAUTHORIZED, 'who', | > raise common.ErrorResponse(common.HTTP_UNAUTHORIZED, 'who', | ||||
| > [('WWW-Authenticate', 'Basic Realm="mercurial"')]) | > [('WWW-Authenticate', 'Basic Realm="mercurial"')]) | ||||
| > if base64.b64decode(auth.split()[1]).split(':', 1) != ['user', 'pass']: | > if base64.b64decode(auth.split()[1]).split(':', 1) != ['user', 'pass']: | ||||
| > raise common.ErrorResponse(common.HTTP_FORBIDDEN, 'no') | > raise common.ErrorResponse(common.HTTP_FORBIDDEN, 'no') | ||||
| > def extsetup(): | > def extsetup(): | ||||
| > common.permhooks.insert(0, perform_authentication) | > common.permhooks.insert(0, perform_authentication) | ||||
| > EOT | > EOT | ||||
| Create dummy authentication handler that looks for cookies. It doesn't do anything | Create dummy authentication handler that looks for cookies. It doesn't do anything | ||||
| useful. It just raises an HTTP 500 with details about the Cookie request header. | useful. It just raises an HTTP 500 with details about the Cookie request header. | ||||
| We raise HTTP 500 because its message is printed in the abort message. | We raise HTTP 500 because its message is printed in the abort message. | ||||
| $ cat > cookieauth.py << EOF | $ cat > cookieauth.py << EOF | ||||
| > from mercurial import util | > from mercurial import util | ||||
| > from mercurial.hgweb import common | > from mercurial.hgweb import common | ||||
| > def perform_authentication(hgweb, req, op): | > def perform_authentication(hgweb, req, op): | ||||
| > cookie = req.env.get('HTTP_COOKIE') | > cookie = req.headers.get('Cookie') | ||||
| > if not cookie: | > if not cookie: | ||||
| > raise common.ErrorResponse(common.HTTP_SERVER_ERROR, 'no-cookie') | > raise common.ErrorResponse(common.HTTP_SERVER_ERROR, 'no-cookie') | ||||
| > raise common.ErrorResponse(common.HTTP_SERVER_ERROR, 'Cookie: %s' % cookie) | > raise common.ErrorResponse(common.HTTP_SERVER_ERROR, 'Cookie: %s' % cookie) | ||||
| > def extsetup(): | > def extsetup(): | ||||
| > common.permhooks.insert(0, perform_authentication) | > common.permhooks.insert(0, perform_authentication) | ||||
| > EOF | > EOF | ||||
| $ hg serve --config extensions.cookieauth=cookieauth.py -R test -p $HGPORT -d --pid-file=pid | $ hg serve --config extensions.cookieauth=cookieauth.py -R test -p $HGPORT -d --pid-file=pid | ||||
| $ rm "${USERCACHE}"/* | $ rm "${USERCACHE}"/* | ||||
| $ cd .. | $ cd .. | ||||
| $ cat << EOT > userpass.py | $ cat << EOT > userpass.py | ||||
| > import base64 | > import base64 | ||||
| > from mercurial.hgweb import common | > from mercurial.hgweb import common | ||||
| > def perform_authentication(hgweb, req, op): | > def perform_authentication(hgweb, req, op): | ||||
| > auth = req.env.get('HTTP_AUTHORIZATION') | > auth = req.headers.get('Authorization') | ||||
| > if not auth: | > if not auth: | ||||
| > raise common.ErrorResponse(common.HTTP_UNAUTHORIZED, 'who', | > raise common.ErrorResponse(common.HTTP_UNAUTHORIZED, 'who', | ||||
| > [('WWW-Authenticate', 'Basic Realm="mercurial"')]) | > [('WWW-Authenticate', 'Basic Realm="mercurial"')]) | ||||
| > if base64.b64decode(auth.split()[1]).split(':', 1) != ['user', 'pass']: | > if base64.b64decode(auth.split()[1]).split(':', 1) != ['user', 'pass']: | ||||
| > raise common.ErrorResponse(common.HTTP_FORBIDDEN, 'no') | > raise common.ErrorResponse(common.HTTP_FORBIDDEN, 'no') | ||||
| > def extsetup(): | > def extsetup(): | ||||
| > common.permhooks.insert(0, perform_authentication) | > common.permhooks.insert(0, perform_authentication) | ||||
| > EOT | > EOT | ||||