Mercurial > kallithea
view kallithea/lib/middleware/pygrack.py @ 6760:d28545413343 stable
git: include an LF at the end of the service advertisement (Fixes #230)
This fixes hg-git/Dulwich and possibly other conservative Git clients,
which do not ignore the absence of the LF.
The original comment was a guess based on reverse engineering the protocol
not specified in the documentation yet at that moment. Now that the
documentation exists and states this explicitly, just do as it says.
author | Andrew Shadura <andrew@shadura.me> |
---|---|
date | Thu, 14 Jul 2016 14:56:20 +0200 |
parents | 0210d0b769d4 |
children | 19af3fef3b34 |
line wrap: on
line source
import os import socket import logging import traceback from webob import Request, Response, exc import kallithea from kallithea.lib.vcs import subprocessio log = logging.getLogger(__name__) class FileWrapper(object): def __init__(self, fd, content_length): self.fd = fd self.content_length = content_length self.remain = content_length def read(self, size): if size <= self.remain: try: data = self.fd.read(size) except socket.error: raise IOError(self) self.remain -= size elif self.remain: data = self.fd.read(self.remain) self.remain = 0 else: data = None return data def __repr__(self): return '<FileWrapper %s len: %s, read: %s>' % ( self.fd, self.content_length, self.content_length - self.remain ) class GitRepository(object): git_folder_signature = set(['config', 'head', 'info', 'objects', 'refs']) commands = ['git-upload-pack', 'git-receive-pack'] def __init__(self, repo_name, content_path, extras): files = set([f.lower() for f in os.listdir(content_path)]) if not (self.git_folder_signature.intersection(files) == self.git_folder_signature): raise OSError('%s missing git signature' % content_path) self.content_path = content_path self.valid_accepts = ['application/x-%s-result' % c for c in self.commands] self.repo_name = repo_name self.extras = extras def _get_fixedpath(self, path): """ Small fix for repo_path :param path: """ return path.split(self.repo_name, 1)[-1].strip('/') def inforefs(self, request, environ): """ WSGI Response producer for HTTP GET Git Smart HTTP /info/refs request. """ git_command = request.GET.get('service') if git_command not in self.commands: log.debug('command %s not allowed', git_command) return exc.HTTPMethodNotAllowed() # From Documentation/technical/http-protocol.txt shipped with Git: # # Clients MUST verify the first pkt-line is `# service=$servicename`. # Servers MUST set $servicename to be the request parameter value. # Servers SHOULD include an LF at the end of this line. # Clients MUST ignore an LF at the end of the line. # # smart_reply = PKT-LINE("# service=$servicename" LF) # ref_list # "0000" server_advert = '# service=%s\n' % git_command packet_len = str(hex(len(server_advert) + 4)[2:].rjust(4, '0')).lower() _git_path = kallithea.CONFIG.get('git_path', 'git') cmd = [_git_path, git_command[4:], '--stateless-rpc', '--advertise-refs', self.content_path] log.debug('handling cmd %s', cmd) try: out = subprocessio.SubprocessIOChunker(cmd, starting_values=[packet_len + server_advert + '0000'] ) except EnvironmentError as e: log.error(traceback.format_exc()) raise exc.HTTPExpectationFailed() resp = Response() resp.content_type = 'application/x-%s-advertisement' % str(git_command) resp.charset = None resp.app_iter = out return resp def backend(self, request, environ): """ WSGI Response producer for HTTP POST Git Smart HTTP requests. Reads commands and data from HTTP POST's body. returns an iterator obj with contents of git command's response to stdout """ _git_path = kallithea.CONFIG.get('git_path', 'git') git_command = self._get_fixedpath(request.path_info) if git_command not in self.commands: log.debug('command %s not allowed', git_command) return exc.HTTPMethodNotAllowed() if 'CONTENT_LENGTH' in environ: inputstream = FileWrapper(environ['wsgi.input'], request.content_length) else: inputstream = environ['wsgi.input'] gitenv = dict(os.environ) # forget all configs gitenv['GIT_CONFIG_NOGLOBAL'] = '1' cmd = [_git_path, git_command[4:], '--stateless-rpc', self.content_path] log.debug('handling cmd %s', cmd) try: out = subprocessio.SubprocessIOChunker( cmd, inputstream=inputstream, env=gitenv, cwd=self.content_path, ) except EnvironmentError as e: log.error(traceback.format_exc()) raise exc.HTTPExpectationFailed() if git_command in [u'git-receive-pack']: # updating refs manually after each push. # Needed for pre-1.7.0.4 git clients using regular HTTP mode. from kallithea.lib.vcs import get_repo from dulwich.server import update_server_info repo = get_repo(self.content_path) if repo: update_server_info(repo._repo) resp = Response() resp.content_type = 'application/x-%s-result' % git_command.encode('utf8') resp.charset = None resp.app_iter = out return resp def __call__(self, environ, start_response): request = Request(environ) _path = self._get_fixedpath(request.path_info) if _path.startswith('info/refs'): app = self.inforefs elif [a for a in self.valid_accepts if a in request.accept]: app = self.backend try: resp = app(request, environ) except exc.HTTPException as e: resp = e log.error(traceback.format_exc()) except Exception as e: log.error(traceback.format_exc()) resp = exc.HTTPInternalServerError() return resp(environ, start_response) class GitDirectory(object): def __init__(self, repo_root, repo_name, extras): repo_location = os.path.join(repo_root, repo_name) if not os.path.isdir(repo_location): raise OSError(repo_location) self.content_path = repo_location self.repo_name = repo_name self.repo_location = repo_location self.extras = extras def __call__(self, environ, start_response): content_path = self.content_path try: app = GitRepository(self.repo_name, content_path, self.extras) except (AssertionError, OSError): content_path = os.path.join(content_path, '.git') if os.path.isdir(content_path): app = GitRepository(self.repo_name, content_path, self.extras) else: return exc.HTTPNotFound()(environ, start_response) return app(environ, start_response) def make_wsgi_app(repo_name, repo_root, extras): from dulwich.web import LimitedInputFilter, GunzipFilter app = GitDirectory(repo_root, repo_name, extras) return GunzipFilter(LimitedInputFilter(app))