| durin42 |
| hg-reviewers |
The lookup/dispatch table was cute. But it isn't needed. Future
refactors will benefit from the handlers for individual response
types living outside the class.
As part of this, I snuck in a change that changes a type compare
from str to bytes. This has no effect on Python 2. But it might
make Python 3 a bit happier.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| req.headers.append((r'Connection', r'Close')) | req.headers.append((r'Connection', r'Close')) | ||||
| # TODO This response body assumes the failed command was | # TODO This response body assumes the failed command was | ||||
| # "unbundle." That assumption is not always valid. | # "unbundle." That assumption is not always valid. | ||||
| req.respond(e, HGTYPE, body='0\n%s\n' % e) | req.respond(e, HGTYPE, body='0\n%s\n' % e) | ||||
| return '' | return '' | ||||
| def _sshv1respondbytes(fout, value): | |||||
| """Send a bytes response for protocol version 1.""" | |||||
| fout.write('%d\n' % len(value)) | |||||
| fout.write(value) | |||||
| fout.flush() | |||||
| def _sshv1respondstream(fout, source): | |||||
| write = fout.write | |||||
| for chunk in source.gen: | |||||
| write(chunk) | |||||
| fout.flush() | |||||
| def _sshv1respondooberror(fout, ferr, rsp): | |||||
| ferr.write(b'%s\n-\n' % rsp) | |||||
| ferr.flush() | |||||
| fout.write(b'\n') | |||||
| fout.flush() | |||||
| class sshserver(baseprotocolhandler): | class sshserver(baseprotocolhandler): | ||||
| def __init__(self, ui, repo): | def __init__(self, ui, repo): | ||||
| self._ui = ui | self._ui = ui | ||||
| self._repo = repo | self._repo = repo | ||||
| self._fin = ui.fin | self._fin = ui.fin | ||||
| self._fout = ui.fout | self._fout = ui.fout | ||||
| hook.redirect(True) | hook.redirect(True) | ||||
| star[arg] = val | star[arg] = val | ||||
| data['*'] = star | data['*'] = star | ||||
| else: | else: | ||||
| val = self._fin.read(int(l)) | val = self._fin.read(int(l)) | ||||
| data[arg] = val | data[arg] = val | ||||
| return [data[k] for k in keys] | return [data[k] for k in keys] | ||||
| def getfile(self, fpout): | def getfile(self, fpout): | ||||
| self._sendresponse('') | _sshv1respondbytes(self._fout, b'') | ||||
| count = int(self._fin.readline()) | count = int(self._fin.readline()) | ||||
| while count: | while count: | ||||
| fpout.write(self._fin.read(count)) | fpout.write(self._fin.read(count)) | ||||
| count = int(self._fin.readline()) | count = int(self._fin.readline()) | ||||
| def redirect(self): | def redirect(self): | ||||
| pass | pass | ||||
| def _sendresponse(self, v): | |||||
| self._fout.write("%d\n" % len(v)) | |||||
| self._fout.write(v) | |||||
| self._fout.flush() | |||||
| def _sendstream(self, source): | |||||
| write = self._fout.write | |||||
| for chunk in source.gen: | |||||
| write(chunk) | |||||
| self._fout.flush() | |||||
| def _sendpushresponse(self, rsp): | |||||
| self._sendresponse('') | |||||
| self._sendresponse(str(rsp.res)) | |||||
| def _sendpusherror(self, rsp): | |||||
| self._sendresponse(rsp.res) | |||||
| def _sendooberror(self, rsp): | |||||
| self._ui.ferr.write('%s\n-\n' % rsp.message) | |||||
| self._ui.ferr.flush() | |||||
| self._fout.write('\n') | |||||
| self._fout.flush() | |||||
| def serve_forever(self): | def serve_forever(self): | ||||
| while self.serve_one(): | while self.serve_one(): | ||||
| pass | pass | ||||
| sys.exit(0) | sys.exit(0) | ||||
| _handlers = { | |||||
| str: _sendresponse, | |||||
| wireproto.streamres: _sendstream, | |||||
| wireproto.streamres_legacy: _sendstream, | |||||
| wireproto.pushres: _sendpushresponse, | |||||
| wireproto.pusherr: _sendpusherror, | |||||
| wireproto.ooberror: _sendooberror, | |||||
| } | |||||
| def serve_one(self): | def serve_one(self): | ||||
| cmd = self._fin.readline()[:-1] | cmd = self._fin.readline()[:-1] | ||||
| if cmd and wireproto.commands.commandavailable(cmd, self): | if cmd and wireproto.commands.commandavailable(cmd, self): | ||||
| rsp = wireproto.dispatch(self._repo, self, cmd) | rsp = wireproto.dispatch(self._repo, self, cmd) | ||||
| self._handlers[rsp.__class__](self, rsp) | |||||
| if isinstance(rsp, bytes): | |||||
| _sshv1respondbytes(self._fout, rsp) | |||||
| elif isinstance(rsp, wireproto.streamres): | |||||
| _sshv1respondstream(self._fout, rsp) | |||||
| elif isinstance(rsp, wireproto.streamres_legacy): | |||||
| _sshv1respondstream(self._fout, rsp) | |||||
| elif isinstance(rsp, wireproto.pushres): | |||||
| _sshv1respondbytes(self._fout, b'') | |||||
| _sshv1respondbytes(self._fout, bytes(rsp.res)) | |||||
yuja: `rsp.res` here looks like an integer. | |||||
indygregAuthorUnsubmitted Not Done This was fixed by b67d4b7e8235. indygreg: This was fixed by b67d4b7e8235. | |||||
| elif isinstance(rsp, wireproto.pusherr): | |||||
| _sshv1respondbytes(self._fout, rsp.res) | |||||
| elif isinstance(rsp, wireproto.ooberror): | |||||
| _sshv1respondooberror(self._fout, self._ui.ferr, rsp.message) | |||||
| else: | |||||
| raise error.ProgrammingError('unhandled response type from ' | |||||
| 'wire protocol command: %s' % rsp) | |||||
| elif cmd: | elif cmd: | ||||
| self._sendresponse("") | _sshv1respondbytes(self._fout, b'') | ||||
| return cmd != '' | return cmd != '' | ||||
| def _client(self): | def _client(self): | ||||
| client = encoding.environ.get('SSH_CLIENT', '').split(' ', 1)[0] | client = encoding.environ.get('SSH_CLIENT', '').split(' ', 1)[0] | ||||
| return 'remote:ssh:' + client | return 'remote:ssh:' + client | ||||
| 0.9.1. Modern clients send the ``hello`` command when connecting | 0.9.1. Modern clients send the ``hello`` command when connecting | ||||
| to SSH servers. This mock server tests behavior of the handshake | to SSH servers. This mock server tests behavior of the handshake | ||||
| when ``hello`` is not supported. | when ``hello`` is not supported. | ||||
| """ | """ | ||||
| def serve_forever(self): | def serve_forever(self): | ||||
| l = self._fin.readline() | l = self._fin.readline() | ||||
| assert l == b'hello\n' | assert l == b'hello\n' | ||||
| # Respond to unknown commands with an empty reply. | # Respond to unknown commands with an empty reply. | ||||
| self._sendresponse(b'') | wireprotoserver._sshv1respondbytes(self._fout, b'') | ||||
| l = self._fin.readline() | l = self._fin.readline() | ||||
| assert l == b'between\n' | assert l == b'between\n' | ||||
| rsp = wireproto.dispatch(self._repo, self, b'between') | rsp = wireproto.dispatch(self._repo, self, b'between') | ||||
| self._handlers[rsp.__class__](self, rsp) | wireprotoserver._sshv1respondbytes(self._fout, rsp) | ||||
| super(prehelloserver, self).serve_forever() | super(prehelloserver, self).serve_forever() | ||||
| class upgradev2server(wireprotoserver.sshserver): | class upgradev2server(wireprotoserver.sshserver): | ||||
| """Tests behavior for clients that issue upgrade to version 2.""" | """Tests behavior for clients that issue upgrade to version 2.""" | ||||
| def serve_forever(self): | def serve_forever(self): | ||||
| name = wireprotoserver.SSHV2 | name = wireprotoserver.SSHV2 | ||||
| l = self._fin.readline() | l = self._fin.readline() | ||||
rsp.res here looks like an integer.