From 8436078af661ff9946f8228fd85f2326cb384e75 Mon Sep 17 00:00:00 2001
From: Robert Sparks <rjsparks@nostrum.com>
Date: Thu, 3 May 2018 15:39:00 +0000
Subject: [PATCH] Made settings.URL_REGEXPS.name non-greedy. Added a test to
exercise the bug at #2429. Fixes #2429. Commit ready for merge. - Legacy-Id:
15110
---
ietf/doc/tests.py | 3 +++
ietf/settings.py | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/ietf/doc/tests.py b/ietf/doc/tests.py
index 723efd03e..1f274e0c2 100644
--- a/ietf/doc/tests.py
+++ b/ietf/doc/tests.py
@@ -531,6 +531,9 @@ Man Expires September 22, 2015 [Page 3]
self.assertEqual(len(q('.rfcmarkup span.h1')), 2)
self.assertEqual(len(q('.rfcmarkup a[href]')), 30)
+ r = self.client.get(urlreverse("ietf.doc.views_doc.document_html", kwargs=dict(name=draft.name, rev=draft.rev)))
+ self.assertEqual(r.status_code, 200)
+
# expired draft
draft.set_state(State.objects.get(type="draft", slug="expired"))
diff --git a/ietf/settings.py b/ietf/settings.py
index 62b3f7bd0..9819c802f 100644
--- a/ietf/settings.py
+++ b/ietf/settings.py
@@ -550,7 +550,7 @@ URL_REGEXPS = {
"acronym": r"(?P<acronym>[-a-z0-9]+)",
"charter": r"(?P<name>charter-[-a-z0-9]+)",
"date": r"(?P<date>\d{4}-\d{2}-\d{2})",
- "name": r"(?P<name>[A-Za-z0-9._+-]+)",
+ "name": r"(?P<name>[A-Za-z0-9._+-]+?)",
"document": r"(?P<document>[a-z][-a-z0-9]+)", # regular document names
"rev": r"(?P<rev>[0-9]{1,2}(-[0-9]{2})?)",
"owner": r"(?P<owner>[-A-Za-z0-9\'+._]+@[A-Za-z0-9-._]+)",