altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Merged in [18857] from housley@vigilsec.com:

Browse source 
Properly handle bibxml3 for drafts with filenames that end in a hypen and digits. Fixes #3188.
 - Legacy-Id: 18870
Note: SVN reference [18857] has been migrated to Git commit cb554fa862
This commit is contained in:
Robert Sparks 2021-03-02 14:51:08 +00:00
parent 87489c8694 cb554fa862
commit c44c8a0caa
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ietf/doc/views_doc.py
View file

@ -832,6 +832,11 @@ def document_history(request, name):
def document_bibtex(request, name, rev=None):
# If URL_REGEXPS put trailing digits in rev, they must be two digits
if rev != None and len(rev) != 2:
name = name+"-"+rev
rev = None
doc = get_object_or_404(Document, docalias__name=name)
latest_revision = doc.latest_event(NewRevisionDocEvent, type="new_revision")
@ -870,6 +875,9 @@ def document_bibxml_ref(request, name, rev=None):
raise Http404()
if not name.startswith('draft-'):
name = 'draft-'+name
if rev != None and len(rev) != 2:
name = name+"-"+rev
rev = None
return document_bibxml(request, name, rev=rev)
def document_bibxml(request, name, rev=None):
@ -877,6 +885,12 @@ def document_bibxml(request, name, rev=None):
# the RFC-Editor.
if re.search(r'^rfc\d+$', name):
raise Http404()
# If URL_REGEXPS put trailing digits in rev, they must be two digits
if rev != None and len(rev) != 2:
name = name+"-"+rev
rev = None
doc = get_object_or_404(Document, name=name, type_id='draft')
latest_revision = doc.latest_event(NewRevisionDocEvent, type="new_revision")