| durin42 |
| hg-reviewers |
Sending this header automatically could interfere with future
testing and client behavior. Let's add a knob to disable the
behavior.
We don't have a control for User-Agent because urllib will send
it if we don't set something. I don't feel like hacking into the
bowels of urllib to figure out how to suppress that. UA shouldn't
be used for anything meaningful. So it shouldn't pose any problems
beyond non-determinism (since the header has the Mercurial version in
it).
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/debugcommands.py (6 lines) | |||
| M | mercurial/url.py (9 lines) | |||
| M | tests/test-http-protocol.t (6 lines) |
| r'logdata': True, | r'logdata': True, | ||||
| r'logdataapis': False, | r'logdataapis': False, | ||||
| }, | }, | ||||
| } | } | ||||
| if ui.debugflag: | if ui.debugflag: | ||||
| openerargs[r'loggingopts'][r'logdataapis'] = True | openerargs[r'loggingopts'][r'logdataapis'] = True | ||||
| # Don't send default headers when in raw mode. This allows us to | |||||
| # bypass most of the behavior of our URL handling code so we can | |||||
| # have near complete control over what's sent on the wire. | |||||
| if opts['peer'] == 'raw': | |||||
| openerargs[r'sendaccept'] = False | |||||
| opener = urlmod.opener(ui, authinfo, **openerargs) | opener = urlmod.opener(ui, authinfo, **openerargs) | ||||
| if opts['peer'] == 'raw': | if opts['peer'] == 'raw': | ||||
| ui.write(_('using raw connection to peer\n')) | ui.write(_('using raw connection to peer\n')) | ||||
| peer = None | peer = None | ||||
| elif opts['peer']: | elif opts['peer']: | ||||
| raise error.Abort(_('--peer %s not supported with HTTP peers') % | raise error.Abort(_('--peer %s not supported with HTTP peers') % | ||||
| opts['peer']) | opts['peer']) | ||||
| if self.cookiejar: | if self.cookiejar: | ||||
| self.cookiejar.add_cookie_header(request) | self.cookiejar.add_cookie_header(request) | ||||
| return request | return request | ||||
| handlerfuncs = [] | handlerfuncs = [] | ||||
| def opener(ui, authinfo=None, useragent=None, loggingfh=None, | def opener(ui, authinfo=None, useragent=None, loggingfh=None, | ||||
| loggingname=b's', loggingopts=None): | loggingname=b's', loggingopts=None, sendaccept=True): | ||||
| ''' | ''' | ||||
| construct an opener suitable for urllib2 | construct an opener suitable for urllib2 | ||||
| authinfo will be added to the password manager | authinfo will be added to the password manager | ||||
| The opener can be configured to log socket events if the various | The opener can be configured to log socket events if the various | ||||
| ``logging*`` arguments are specified. | ``logging*`` arguments are specified. | ||||
| ``loggingfh`` denotes a file object to log events to. | ``loggingfh`` denotes a file object to log events to. | ||||
| ``loggingname`` denotes the name of the to print when logging. | ``loggingname`` denotes the name of the to print when logging. | ||||
| ``loggingopts`` is a dict of keyword arguments to pass to the constructed | ``loggingopts`` is a dict of keyword arguments to pass to the constructed | ||||
| ``util.socketobserver`` instance. | ``util.socketobserver`` instance. | ||||
| ``sendaccept`` allows controlling whether the ``Accept`` request header | |||||
| is sent. The header is sent by default. | |||||
| ''' | ''' | ||||
| handlers = [] | handlers = [] | ||||
| if loggingfh: | if loggingfh: | ||||
| handlers.append(logginghttphandler(loggingfh, loggingname, | handlers.append(logginghttphandler(loggingfh, loggingname, | ||||
| loggingopts or {})) | loggingopts or {})) | ||||
| # We don't yet support HTTPS when logging I/O. If we attempt to open | # We don't yet support HTTPS when logging I/O. If we attempt to open | ||||
| # an HTTPS URL, we'll likely fail due to unknown protocol. | # an HTTPS URL, we'll likely fail due to unknown protocol. | ||||
| opener.addheaders = [(r'User-agent', pycompat.sysstr(agent))] | opener.addheaders = [(r'User-agent', pycompat.sysstr(agent))] | ||||
| else: | else: | ||||
| opener.addheaders = [(r'User-agent', pycompat.sysstr(useragent))] | opener.addheaders = [(r'User-agent', pycompat.sysstr(useragent))] | ||||
| # This header should only be needed by wire protocol requests. But it has | # This header should only be needed by wire protocol requests. But it has | ||||
| # been sent on all requests since forever. We keep sending it for backwards | # been sent on all requests since forever. We keep sending it for backwards | ||||
| # compatibility reasons. Modern versions of the wire protocol use | # compatibility reasons. Modern versions of the wire protocol use | ||||
| # X-HgProto-<N> for advertising client support. | # X-HgProto-<N> for advertising client support. | ||||
| if sendaccept: | |||||
| opener.addheaders.append((r'Accept', r'application/mercurial-0.1')) | opener.addheaders.append((r'Accept', r'application/mercurial-0.1')) | ||||
| return opener | return opener | ||||
| def open(ui, url_, data=None): | def open(ui, url_, data=None): | ||||
| u = util.url(url_) | u = util.url(url_) | ||||
| if u.scheme: | if u.scheme: | ||||
| u.scheme = u.scheme.lower() | u.scheme = u.scheme.lower() | ||||
| url_, authinfo = u.authinfo() | url_, authinfo = u.authinfo() | ||||
| else: | else: | ||||
| path = util.normpath(os.path.abspath(url_)) | path = util.normpath(os.path.abspath(url_)) | ||||
| url_ = 'file://' + urlreq.pathname2url(path) | url_ = 'file://' + urlreq.pathname2url(path) | ||||
| authinfo = None | authinfo = None | ||||
| return opener(ui, authinfo).open(pycompat.strurl(url_), data) | return opener(ui, authinfo).open(pycompat.strurl(url_), data) | ||||
| s> namespaces \n | s> namespaces \n | ||||
| s> phases | s> phases | ||||
| response: bookmarks \nnamespaces \nphases | response: bookmarks \nnamespaces \nphases | ||||
| Same thing, but with "httprequest" command | Same thing, but with "httprequest" command | ||||
| $ hg --verbose debugwireproto --peer raw http://$LOCALIP:$HGPORT << EOF | $ hg --verbose debugwireproto --peer raw http://$LOCALIP:$HGPORT << EOF | ||||
| > httprequest GET ?cmd=listkeys | > httprequest GET ?cmd=listkeys | ||||
| > accept: application/mercurial-0.1 | > user-agent: test | ||||
| > user-agent: mercurial/proto-1.0 (Mercurial 42) | |||||
| > x-hgarg-1: namespace=namespaces | > x-hgarg-1: namespace=namespaces | ||||
| > EOF | > EOF | ||||
| using raw connection to peer | using raw connection to peer | ||||
| s> GET /?cmd=listkeys HTTP/1.1\r\n | s> GET /?cmd=listkeys HTTP/1.1\r\n | ||||
| s> Accept-Encoding: identity\r\n | s> Accept-Encoding: identity\r\n | ||||
| s> accept: application/mercurial-0.1\r\n | s> user-agent: test\r\n | ||||
| s> user-agent: mercurial/proto-1.0 (Mercurial 42)\r\n | |||||
| s> x-hgarg-1: namespace=namespaces\r\n | s> x-hgarg-1: namespace=namespaces\r\n | ||||
| s> host: $LOCALIP:$HGPORT\r\n (glob) | s> host: $LOCALIP:$HGPORT\r\n (glob) | ||||
| s> \r\n | s> \r\n | ||||
| s> makefile('rb', None) | s> makefile('rb', None) | ||||
| s> HTTP/1.1 200 Script output follows\r\n | s> HTTP/1.1 200 Script output follows\r\n | ||||
| s> Server: testing stub value\r\n | s> Server: testing stub value\r\n | ||||
| s> Date: $HTTP_DATE$\r\n | s> Date: $HTTP_DATE$\r\n | ||||
| s> Content-Type: application/mercurial-0.1\r\n | s> Content-Type: application/mercurial-0.1\r\n | ||||
| s> Content-Length: 30\r\n | s> Content-Length: 30\r\n | ||||
| s> \r\n | s> \r\n | ||||
| s> bookmarks \n | s> bookmarks \n | ||||
| s> namespaces \n | s> namespaces \n | ||||
| s> phases | s> phases | ||||
| $ killdaemons.py | $ killdaemons.py | ||||