chore: Use URL resolver in more places (ietf-tools#4104)

* chore: Use URL resolver more

* Use settings.IDTRACKER_BASE_URL

* More fixes

* Use URL resolver for things under /accounts

* Use URL resolver for things under /stream

* Use URL resolver for things under /iesg

* Use URL resolver for things under /meeting

* Fix bugs

* Use URL resolver for things under /help

* Use URL resolver for things under /ipr

* More changes

* Revert vnu.jar

* Fix typos

* Address review comments by @rjsparks

Co-authored-by: Robert Sparks <rjsparks@nostrum.com>

Author: larseggert

ietf/doc/templatetags/ietf_filters.py

@@ -169,16 +169,14 @@ def find_unique(n):
     return ""
 
 
-def link_charter_doc_match1(match):
+def link_charter_doc_match(match):
     if not doc_canonical_name(match[0]):
         return match[0]
-    return f'<a href="/doc/{match[1][:-1]}/{match[2]}/">{match[0]}</a>'
-
-
-def link_charter_doc_match2(match):
-    if not doc_canonical_name(match[0]):
-        return match[0]
-    return f'<a href="/doc/{match[1][:-1]}/{match[2]}/">{match[0]}</a>'
+    url = urlreverse(
+        "ietf.doc.views_doc.document_main",
+        kwargs=dict(name=match[1][:-1], rev=match[2]),
+    )
+    return f'<a href="{url}">{match[0]}</a>'
 
 
 def link_non_charter_doc_match(match):
@@ -187,20 +185,26 @@ def link_non_charter_doc_match(match):
     if not cname:
         return match[0]
     if name == cname:
-        return f'<a href="/doc/{cname}/">{match[0]}</a>'
+        url = urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=cname))
+        return f'<a href="{url}">{match[0]}</a>'
 
     # if we get here, the name probably has a version number and/or extension at the end
     rev_split = re.search(r"^(" + re.escape(cname) + r")-(\d{2,})", name)
     if rev_split:
         name = rev_split.group(1)
     else:
-        return f'<a href="/doc/{cname}/">{match[0]}</a>'
+        url = urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=cname))
+        return f'<a href="{url}">{match[0]}</a>'
 
     cname = doc_canonical_name(name)
     if not cname:
         return match[0]
     if name == cname:
-        return f'<a href="/doc/{cname}/{rev_split.group(2)}/">{match[0]}</a>'
+        url = urlreverse(
+            "ietf.doc.views_doc.document_main",
+            kwargs=dict(name=cname, rev=rev_split.group(2)),
+        )
+        return f'<a href="{url}">{match[0]}</a>'
 
     # if we get here, we can't linkify
     return match[0]
@@ -211,44 +215,33 @@ def link_other_doc_match(match):
     rev = match[3]
     if not doc_canonical_name(doc + rev):
         return match[0]
-    return f'<a href="/doc/{doc}{rev}/">{match[1]}</a>'
+    url = urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc + rev))
+    return f'<a href="{url}">{match[1]}</a>'
 
 
 @register.filter(name="urlize_ietf_docs", is_safe=True, needs_autoescape=True)
 def urlize_ietf_docs(string, autoescape=None):
     """
-    Make occurrences of RFC NNNN and draft-foo-bar links to /doc/.
+    Make occurrences of RFC NNNN and draft-foo-bar links to the doc pages.
     """
     if autoescape and not isinstance(string, SafeData):
         if "<" in string:
             string = escape(string)
         else:
             string = mark_safe(string)
-    exp1 = r"\b(?<![/\-:=#])(charter-(?:[\d\w\.+]+-)*)(\d{2}-\d{2})(\.(?:txt|ps|pdf|html))?\b"
-    exp2 = r"\b(?<![/\-:=#])(charter-(?:[\d\w\.+]+-)*)(\d{2})(\.(?:txt|ps|pdf|html))?\b"
-    if re.search(exp1, string):
-        string = re.sub(
-            exp1,
-            link_charter_doc_match1,
-            string,
-            flags=re.IGNORECASE | re.ASCII,
-        )
-    elif re.search(exp2, string):
-        string = re.sub(
-            exp2,
-            link_charter_doc_match2,
-            string,
-            flags=re.IGNORECASE | re.ASCII,
-        )
+    string = re.sub(
+        r"\b(?<![/\-:=#])(charter-(?:[\d\w\.+]+-)*)(\d{2}(?:-\d{2}))(\.(?:txt|ps|pdf|html))?\b",
+        link_charter_doc_match,
+        string,
+        flags=re.IGNORECASE | re.ASCII,
+    )
     string = re.sub(
         r"\b(?<![/\-:=#])((?:draft-|bofreq-|conflict-review-|status-change-)[\d\w\.+-]+(?![-@]))",
-        # r"\b(?<![/\-:=#])(((?:draft-|bofreq-|conflict-review-|status-change-)(?:[\d\w\.+]+-)*)([\d\w\.+]+?)(\.(?:txt|ps|pdf|html))?)\b(?![-@])",
         link_non_charter_doc_match,
         string,
         flags=re.IGNORECASE | re.ASCII,
     )
     string = re.sub(
-        # r"\b((RFC|BCP|STD|FYI|(?:draft-|bofreq-|conflict-review-|status-change-|charter-)[-\d\w.+]+)\s*0*(\d+))\b",
         r"\b(?<![/\-:=#])((RFC|BCP|STD|FYI)\s*0*(\d+))\b",
         link_other_doc_match,
         string,

ietf/doc/tests.py

@@ -1887,7 +1887,7 @@ def test_document_bibtex(self):
         self.assertEqual(entry['year'],     str(draft.pub_date().year))
         self.assertEqual(entry['month'],    draft.pub_date().strftime('%b').lower())
         self.assertEqual(entry['day'],      str(draft.pub_date().day))
-        self.assertEqual(entry['url'],      f'https://datatracker.ietf.org/doc/html/{docname}')
+        self.assertEqual(entry['url'],      settings.IDTRACKER_BASE_URL + urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name, rev=draft.rev)))
         #
         self.assertNotIn('doi', entry)
 

ietf/doc/tests_bofreq.py

@@ -322,7 +322,7 @@ def test_start_new_bofreq(self):
         self.assertContains(r,'Fill in the details below. Keep items in the order they appear here.',status_code=200)
         r = self.client.post(url, dict(title='default', 
                                        bofreq_submission='enter',
-                                       bofreq_content=render_to_string('doc/bofreq/bofreq_template.md',{})))
+                                       bofreq_content=render_to_string('doc/bofreq/bofreq_template.md',{'settings': settings})))
         self.assertContains(r, 'The example content may not be saved.', status_code=200)
         file = NamedTemporaryFile(delete=False,mode="w+",encoding='utf-8')
         file.write('some stuff')

ietf/doc/views_bofreq.py

@@ -5,6 +5,7 @@
 import io 
 
 from django import forms
+from django.conf import settings
 from django.contrib.auth.decorators import login_required
 from django.shortcuts import get_object_or_404, redirect, render
 from django.template.loader import render_to_string
@@ -57,7 +58,7 @@ def require_field(f):
         if submission_method == "enter":
             if require_field("bofreq_content"):
                 content = self.cleaned_data["bofreq_content"].replace("\r", "")
-                default_content = render_to_string('doc/bofreq/bofreq_template.md',{})
+                default_content = render_to_string('doc/bofreq/bofreq_template.md', {'settings': settings})
                 if content==default_content:
                     raise forms.ValidationError('The example content may not be saved. Edit it as instructed to document this BOF request.')
         elif submission_method == "upload":
@@ -178,7 +179,7 @@ def new_bof_request(request):
             return redirect('ietf.doc.views_doc.document_main', name=bofreq.name)
 
     else:
-        init = {'bofreq_content':escape(render_to_string('doc/bofreq/bofreq_template.md',{})),
+        init = {'bofreq_content':escape(render_to_string('doc/bofreq/bofreq_template.md',{'settings': settings})),
                 'bofreq_submission':'enter',
                }
         form = NewBofreqForm(request.user.person, initial=init)
@@ -346,4 +347,4 @@ def change_state(request, name, option=None):
                                    doc=bofreq,
                                    login=login,
                                    help_url=urlreverse('ietf.doc.views_help.state_help', kwargs=dict(type="bofreq")),
-                                   ))
+                                   ))

ietf/doc/views_search.py

@@ -547,7 +547,7 @@ def index_all_drafts(request):
 
         names.sort(key=lambda t: t[1])
 
-        names = ['<a href="/doc/' + n + '/">' + n +'</a>'
+        names = [f'<a href=\"{urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=n))}\">{n}</a>'
                  for n, __ in names if n not in names_to_skip]
 
         categories.append((state,

ietf/ietfauth/views.py

@@ -744,11 +744,11 @@ def login(request, extra_context=None):
             logout(request)
             response = render(request, 'registration/missing_person.html')
         if require_consent:
-            messages.warning(request, mark_safe('''
+            messages.warning(request, mark_safe(f'''
 
                 You have personal information associated with your account which is not
                 derived from draft submissions or other ietf work, namely: %s.  Please go
-                to your <a href="/accounts/profile">account profile</a> and review your
+                to your <a href="{urlreverse("ietf.ietfauth.views.profile")}">account profile</a> and review your
                 personal information, then scoll to the bottom and check the 'confirm'
                 checkbox and submit the form, in order to to indicate that that the
                 provided personal information may be used and displayed within the IETF

ietf/secr/templates/base_site.html

@@ -14,7 +14,7 @@ <h1 id="site-name">{% if user|has_role:"Secretariat" %} Secretariat Dashboard {%
             </td>
             <td class="text-end">
                 <br>
-                <span class="login">{% if user|has_role:"Secretariat" %}Secretariat {% endif %}Logged in: <a href="/accounts/profile/">{{ user }}</a>  | <a rel="nofollow" href="/accounts/logout/">Log out</a></span>
+                <span class="login">{% if user|has_role:"Secretariat" %}Secretariat {% endif %}Logged in: <a href="{% url 'ietf.ietfauth.views.profile' %}">{{ user }}</a>  | <a rel="nofollow" href="{% url 'django.contrib.auth.views.logout' %}">Log out</a></span>
             </td>
         </tr>
         </tbody>
@@ -36,4 +36,4 @@ <h1 id="site-name">{% if user|has_role:"Secretariat" %} Secretariat Dashboard {%
             <a href="https://www.amsl.com/"><img src="{% static 'secr/images/ams_logo.png' %}" alt="AMS" class="text-end p-3" ></a>
         </div>
     </div>
-{% endblock %}
+{% endblock %}

ietf/secr/templates/base_site_bootstrap.html

@@ -14,7 +14,7 @@ <h1 id="site-name">{% if user|has_role:"Secretariat" %} Secretariat Dashboard {%
             </td>
             <td class="text-end">
                 <br>
-                <span class="login">{% if user|has_role:"Secretariat" %}Secretariat {% endif %}Logged in: <a href="/accounts/profile/">{{ user }}</a>  | <a rel="nofollow" href="/accounts/logout/">Log out</a></span>
+                <span class="login">{% if user|has_role:"Secretariat" %}Secretariat {% endif %}Logged in: <a href="{% url 'ietf.ietfauth.views.profile' %}">{{ user }}</a>  | <a rel="nofollow" href="{% url 'django.contrib.auth.views.logout' %}">Log out</a></span>
             </td>
         </tr>
         </tbody>
@@ -36,4 +36,4 @@ <h1 id="site-name">{% if user|has_role:"Secretariat" %} Secretariat Dashboard {%
             <a href="https://www.amsl.com/"><img src="{% static 'secr/images/ams_logo.png' %}" alt="AMS" class="text-end p-3" ></a>
         </div>
     </div>
-{% endblock %}
+{% endblock %}

ietf/secr/templates/includes/meetings_footer.html

@@ -1,3 +1,3 @@
 <ul>
-<li><a href="https://datatracker.ietf.org/meeting/{{ meeting.number }}/agenda.txt" target="_blank">View Agenda</a>.</li>
+<li><a href="{% url 'ietf.meeting.views.agenda' num=meeting.number ext='.txt' %}" target="_blank">View Agenda</a>.</li>
 </ul>

ietf/secr/templates/proceedings/interim_directory.html

@@ -13,7 +13,7 @@ <h2>Interim Meeting Proceedings</h2>
         {% for meeting in meetings %}
             <tr class="{% cycle 'row1' 'row2' %}">
                 <td class="text-start text-nowrap">{{ meeting.date }}</td>
-                <td><a href="https://datatracker.ietf.org/wg/{{ meeting.group.acronym }}">{{ meeting.group.acronym }}</a></td>
+                <td><a href="{% url 'ietf.group.views.group_home' acronym=meeting.group.acronym %}">{{ meeting.group.acronym }}</a></td>
                 {% if meeting.schedule %}
                     <td class="text-center"><a href="{{ meeting.schedule.get_absolute_url }}">Agenda</a></td>
                 {% else %}
@@ -33,4 +33,4 @@ <h2>Interim Meeting Proceedings</h2>
         {% endfor %}
     </table>
 
-{% endblock %}
+{% endblock %}