kallithea Changeset - 1e373254388c

Changeset - 1e373254388c

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Andrew Shadura - 9 years ago 2016-07-14 14:56:20
andrew@shadura.me

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.

1 file changed with 11 insertions and 8 deletions:

kallithea/lib/middleware/pygrack.py

0 comments (0 inline, 0 general)

kallithea/lib/middleware/pygrack.py

➞

Show inline comments

@@ @@ -99,20 +99,23 @@ class GitRepository(object): @@
         git_command = request.GET.get('service')
         if git_command not in self.commands:
             log.debug('command %s not allowed', git_command)
             return exc.HTTPMethodNotAllowed()
         # note to self:
         # please, resist the urge to add '\n' to git capture and increment
         # line count by 1.
         # The code in Git client not only does NOT need '\n', but actually
         # blows up if you sprinkle "flush" (0000) as "0001\n".
         # It reads binary, per number of bytes specified.
         # if you do add '\n' as part of data, count it.
         server_advert = '# service=%s' % git_command
         # 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:

0 comments (0 inline, 0 general)