Return a 404 not found error when repository is not found.

NEWS

@@ -10,6 +10,8 @@
  * Fix output format of ``porcelain.diff`` to match that of
    C Git. (Boris Feld)
 
+ * Return a 404 not found error when repository is not found.
+
 0.19.11	2019-02-07
 
  IMPROVEMENTS

dulwich/tests/test_web.py

@@ -277,6 +277,20 @@ class DumbHandlersTestCase(WebTestCase):
         self.assertContentTypeEquals('text/plain')
         self.assertFalse(self._req.cached)
 
+    def test_get_info_refs_not_found(self):
+        self._environ['QUERY_STRING'] = ''
+
+        objects = []
+        refs = {}
+        backend = _test_backend(objects, refs=refs)
+
+        mat = re.search('info/refs', '/foo/info/refs')
+        self.assertEqual(
+            ['No git repository was found at /foo'],
+            list(get_info_refs(self._req, backend, mat)))
+        self.assertEqual(HTTP_NOT_FOUND, self._status)
+        self.assertContentTypeEquals('text/plain')
+
     def test_get_info_packs(self):
         class TestPackData(object):
 
@@ -341,8 +355,12 @@ class SmartHandlersTestCase(WebTestCase):
         if content_length is not None:
             self._environ['CONTENT_LENGTH'] = content_length
         mat = re.search('.*', '/git-upload-pack')
+
+        class Backend(object):
+            def open_repository(self, path):
+                return None
         handler_output = b''.join(
-          handle_service_request(self._req, 'backend', mat))
+          handle_service_request(self._req, Backend(), mat))
         write_output = self._output.getvalue()
         # Ensure all output was written via the write callback.
         self.assertEqual(b'', handler_output)
@@ -363,7 +381,13 @@ class SmartHandlersTestCase(WebTestCase):
 
     def test_get_info_refs_unknown(self):
         self._environ['QUERY_STRING'] = 'service=git-evil-handler'
-        content = list(get_info_refs(self._req, b'backend', None))
+
+        class Backend(object):
+            def open_repository(self, url):
+                return None
+
+        mat = re.search('.*', '/git-evil-pack')
+        content = list(get_info_refs(self._req, Backend(), mat))
         self.assertFalse(b'git-evil-handler' in b"".join(content))
         self.assertEqual(HTTP_FORBIDDEN, self._status)
         self.assertFalse(self._req.cached)
@@ -372,8 +396,13 @@ class SmartHandlersTestCase(WebTestCase):
         self._environ['wsgi.input'] = BytesIO(b'foo')
         self._environ['QUERY_STRING'] = 'service=git-upload-pack'
 
+        class Backend(object):
+
+            def open_repository(self, url):
+                return None
+
         mat = re.search('.*', '/git-upload-pack')
-        handler_output = b''.join(get_info_refs(self._req, b'backend', mat))
+        handler_output = b''.join(get_info_refs(self._req, Backend(), mat))
         write_output = self._output.getvalue()
         self.assertEqual((b'001e# service=git-upload-pack\n'
                           b'0000'

dulwich/web.py

@@ -47,6 +47,7 @@ from dulwich.protocol import (
     ReceivableProtocol,
     )
 from dulwich.repo import (
+    NotGitRepository,
     Repo,
     )
 from dulwich.server import (
@@ -173,6 +174,11 @@ def get_idx_file(req, backend, mat):
 def get_info_refs(req, backend, mat):
     params = parse_qs(req.environ['QUERY_STRING'])
     service = params.get('service', [None])[0]
+    try:
+        repo = get_repo(backend, mat)
+    except NotGitRepository as e:
+        yield req.not_found(str(e))
+        return
     if service and not req.dumb:
         handler_cls = req.handlers.get(service.encode('ascii'), None)
         if handler_cls is None:
@@ -194,7 +200,6 @@ def get_info_refs(req, backend, mat):
         req.nocache()
         req.respond(HTTP_OK, 'text/plain')
         logger.info('Emulating dumb info/refs')
-        repo = get_repo(backend, mat)
         for text in generate_info_refs(repo):
             yield text
 
@@ -236,9 +241,16 @@ def handle_service_request(req, backend, mat):
     if handler_cls is None:
         yield req.forbidden('Unsupported service')
         return
+    try:
+        get_repo(backend, mat)
+    except NotGitRepository as e:
+        yield req.not_found(str(e))
+        return
     req.nocache()
     write = req.respond(HTTP_OK, 'application/x-%s-result' % service)
     proto = ReceivableProtocol(req.environ['wsgi.input'].read, write)
+    # TODO(jelmer): Find a way to pass in repo, rather than having handler_cls
+    # reopen.
     handler = handler_cls(backend, [url_prefix(mat)], proto, http_req=req)
     handler.handle()