sshserver attempts to conform to a well-defined interface. The instance
attributes changed as part of this commit don't appear to be part of
that interface. So prefix them with _ to mark them as private.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/wireprotoserver.py (48 lines) |
| elif isinstance(rsp, wireproto.ooberror): | elif isinstance(rsp, wireproto.ooberror): | ||||
| rsp = rsp.message | rsp = rsp.message | ||||
| req.respond(HTTP_OK, HGERRTYPE, body=rsp) | req.respond(HTTP_OK, HGERRTYPE, body=rsp) | ||||
| return [] | return [] | ||||
| raise error.ProgrammingError('hgweb.protocol internal failure', rsp) | raise error.ProgrammingError('hgweb.protocol internal failure', rsp) | ||||
| class sshserver(abstractserverproto): | class sshserver(abstractserverproto): | ||||
| 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 | ||||
| self.name = 'ssh' | self.name = 'ssh' | ||||
| hook.redirect(True) | hook.redirect(True) | ||||
| ui.fout = repo.ui.fout = ui.ferr | ui.fout = repo.ui.fout = ui.ferr | ||||
| # Prevent insertion/deletion of CRs | # Prevent insertion/deletion of CRs | ||||
| util.setbinary(self.fin) | util.setbinary(self._fin) | ||||
| util.setbinary(self.fout) | util.setbinary(self._fout) | ||||
| def getargs(self, args): | def getargs(self, args): | ||||
| data = {} | data = {} | ||||
| keys = args.split() | keys = args.split() | ||||
| for n in xrange(len(keys)): | for n in xrange(len(keys)): | ||||
| argline = self.fin.readline()[:-1] | argline = self._fin.readline()[:-1] | ||||
| arg, l = argline.split() | arg, l = argline.split() | ||||
| if arg not in keys: | if arg not in keys: | ||||
| raise error.Abort(_("unexpected parameter %r") % arg) | raise error.Abort(_("unexpected parameter %r") % arg) | ||||
| if arg == '*': | if arg == '*': | ||||
| star = {} | star = {} | ||||
| for k in xrange(int(l)): | for k in xrange(int(l)): | ||||
| argline = self.fin.readline()[:-1] | argline = self._fin.readline()[:-1] | ||||
| arg, l = argline.split() | arg, l = argline.split() | ||||
| val = self.fin.read(int(l)) | val = self._fin.read(int(l)) | ||||
| 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('') | self.sendresponse('') | ||||
| 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): | def sendresponse(self, v): | ||||
| self.fout.write("%d\n" % len(v)) | self._fout.write("%d\n" % len(v)) | ||||
| self.fout.write(v) | self._fout.write(v) | ||||
| self.fout.flush() | self._fout.flush() | ||||
| def sendstream(self, source): | def sendstream(self, source): | ||||
| write = self.fout.write | write = self._fout.write | ||||
| for chunk in source.gen: | for chunk in source.gen: | ||||
| write(chunk) | write(chunk) | ||||
| self.fout.flush() | self._fout.flush() | ||||
| def sendpushresponse(self, rsp): | def sendpushresponse(self, rsp): | ||||
| self.sendresponse('') | self.sendresponse('') | ||||
| self.sendresponse(str(rsp.res)) | self.sendresponse(str(rsp.res)) | ||||
| def sendpusherror(self, rsp): | def sendpusherror(self, rsp): | ||||
| self.sendresponse(rsp.res) | self.sendresponse(rsp.res) | ||||
| def sendooberror(self, rsp): | def sendooberror(self, rsp): | ||||
| self.ui.ferr.write('%s\n-\n' % rsp.message) | self._ui.ferr.write('%s\n-\n' % rsp.message) | ||||
| self.ui.ferr.flush() | self._ui.ferr.flush() | ||||
| self.fout.write('\n') | self._fout.write('\n') | ||||
| self.fout.flush() | 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 = { | handlers = { | ||||
| str: sendresponse, | str: sendresponse, | ||||
| wireproto.streamres: sendstream, | wireproto.streamres: sendstream, | ||||
| wireproto.streamres_legacy: sendstream, | wireproto.streamres_legacy: sendstream, | ||||
| wireproto.pushres: sendpushresponse, | wireproto.pushres: sendpushresponse, | ||||
| wireproto.pusherr: sendpusherror, | wireproto.pusherr: sendpusherror, | ||||
| wireproto.ooberror: sendooberror, | wireproto.ooberror: sendooberror, | ||||
| } | } | ||||
| def serve_one(self): | def serve_one(self): | ||||
| cmd = self.fin.readline()[:-1] | cmd = self._fin.readline()[:-1] | ||||
| if cmd and cmd in wireproto.commands: | if cmd and cmd in wireproto.commands: | ||||
| rsp = wireproto.dispatch(self.repo, self, cmd) | rsp = wireproto.dispatch(self._repo, self, cmd) | ||||
| self.handlers[rsp.__class__](self, rsp) | self.handlers[rsp.__class__](self, rsp) | ||||
| elif cmd: | elif cmd: | ||||
| self.sendresponse("") | self.sendresponse("") | ||||
| 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 | ||||