hgweb: respond HTTP_NOT_FOUND when an archive request does not match any files

mercurial/hgweb/webcommands.py

@@ -819,15 +819,16 def archive(web, req, tmpl):
 
     ctx = webutil.changectx(web.repo, req)
     pats = []
+    matchfn = None
     file = req.form.get('file', None)
     if file:
-        file = file[0]
-        patandfile = file.split(':')
-        if len(patandfile) > 1 and patandfile[0].lower() in ('glob', 'relglob',
-                'path', 'relpath', 're', 'relre', 'set'):
-            msg = 'Archive pattern not allowed: %s' % file
-            raise ErrorResponse(HTTP_FORBIDDEN, msg)
-        pats = ['path:' + file]
+        pats = ['path:' + file[0]]
+        matchfn = scmutil.match(ctx, pats, default='path')
+        if pats:
+            files = [f for f in ctx.manifest().keys() if matchfn(f)]
+            if not files:
+                raise ErrorResponse(HTTP_NOT_FOUND,
+                    'file(s) not found: %s' % file[0])
 
     mimetype, artype, extension, encoding = web.archive_specs[type_]
     headers = [
@@ -838,7 +839,6 def archive(web, req, tmpl):
     req.headers.extend(headers)
     req.respond(HTTP_OK, mimetype)
 
-    matchfn = scmutil.match(ctx, pats, default='path')
     archival.archive(web.repo, req, cnode, artype, prefix=name,
                      matchfn=matchfn,
                      subrepos=web.configbool("web", "archivesubrepos"))

tests/test-archive.t

@@ -108,10 +108,15 test that we can download single directo
   $ python getarchive.py "$TIP" gz foo | gunzip | tar tf - 2>/dev/null
   test-archive-2c0277f05ed4/foo
 
+test that we detect file patterns that match no files
+
+  $ python getarchive.py "$TIP" gz foobar
+  HTTP Error 404: file(s) not found: foobar
+
 test that we reject unsafe patterns
 
   $ python getarchive.py "$TIP" gz relre:baz
-  HTTP Error 403: Archive pattern not allowed: relre:baz
+  HTTP Error 404: file(s) not found: relre:baz
 
   $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS