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

Updated a bunch of links from http: to https: based on a patch from lars@netapp.com.

Browse source 
- Legacy-Id: 9556
This commit is contained in:
Henrik Levkowetz 2015-04-24 21:47:12 +00:00
parent 0d08fff0ac
commit acc2c59920
20 changed files with 47 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ietf/community/views.py
View file

@ -164,7 +164,7 @@ def _atom_view(request, clist, significant=False):
notifications = notifications.filter(listnotification__significant=True)
host = request.get_host()
feed_url = 'http://%s%s' % (host, request.get_full_path())
feed_url = 'https://%s%s' % (host, request.get_full_path())
feed_id = uuid.uuid5(uuid.NAMESPACE_URL, feed_url.encode('utf-8'))
title = '%s RSS Feed' % clist.long_name()
if significant:

2
ietf/doc/redirect_drafts_urls.py
View file

@ -17,5 +17,5 @@ urlpatterns = patterns('',
(r'^(?P<name>[^/]+)/(related/)?$', RedirectView.as_view(url='/doc/%(name)s/')),
(r'^wgid/(?P<id>\d+)/$', lambda request, id: HttpResponsePermanentRedirect("/wg/%s/" % get_object_or_404(Group, id=id).acronym)),
(r'^wg/(?P<acronym>[^/]+)/$', RedirectView.as_view(url='/wg/%(acronym)s/')),
(r'^all_id(?:_txt)?.html$', RedirectView.as_view(url='http://www.ietf.org/id/all_id.txt')),
(r'^all_id(?:_txt)?.html$', RedirectView.as_view(url='https://www.ietf.org/id/all_id.txt')),
)

2
ietf/doc/redirect_idtracker_urls.py
View file

@ -3,7 +3,7 @@ from django.views.generic import RedirectView
urlpatterns = patterns('',
(r'^help/(?:sub)?state/(?:\d+/)?$', RedirectView.as_view(url='/doc/help/state/draft-iesg/')),
(r'^help/evaluation/$', RedirectView.as_view(url='http://www.ietf.org/iesg/voting-procedures.html')),
(r'^help/evaluation/$', RedirectView.as_view(url='https://www.ietf.org/iesg/voting-procedures.html')),
(r'^status/$', RedirectView.as_view(url='/doc/iesg/')),
(r'^status/last-call/$', RedirectView.as_view(url='/doc/iesg/last-call/')),
(r'^rfc0*(?P<rfc_number>\d+)/$', RedirectView.as_view(url='/doc/rfc%(rfc_number)s/')),

4
ietf/doc/utils.py
View file

@ -239,7 +239,7 @@ def add_links_in_new_revision_events(doc, events, diff_revisions):
full_url = diff_url = diff_urls[(e.doc.name, e.rev)]
if doc.type_id in "draft": # work around special diff url for drafts
full_url = "http://tools.ietf.org/id/" + diff_url + ".txt"
full_url = "https://tools.ietf.org/id/" + diff_url + ".txt"
# build links
links = r'<a href="%s">\1</a>' % full_url
@ -247,7 +247,7 @@ def add_links_in_new_revision_events(doc, events, diff_revisions):
links += ""
if prev != None:
links += ' (<a href="http:%s?url1=%s&url2=%s">diff from previous</a>)' % (settings.RFCDIFF_PREFIX, urllib.quote(prev, safe="~"), urllib.quote(diff_url, safe="~"))
links += ' (<a href="https:%s?url1=%s&url2=%s">diff from previous</a>)' % (settings.RFCDIFF_PREFIX, urllib.quote(prev, safe="~"), urllib.quote(diff_url, safe="~"))
# replace the bold filename part
e.desc = re.sub(r"<b>(.+-[0-9][0-9].txt)</b>", links, e.desc)

8
ietf/doc/views_doc.py
View file

@ -179,7 +179,7 @@ def document_main(request, name, rev=None):
possible_types = ["txt", "pdf", "ps"]
found_types = [t for t in possible_types if os.path.exists(base_path + t)]
base = "http://www.rfc-editor.org/rfc/"
base = "https://www.rfc-editor.org/rfc/"
file_urls = []
for t in found_types:
@ -190,7 +190,7 @@ def document_main(request, name, rev=None):
file_urls.append(("pdf", base + "pdfrfc/" + name + ".txt.pdf"))
if "txt" in found_types:
file_urls.append(("html", "http://tools.ietf.org/html/" + name))
file_urls.append(("html", "https://tools.ietf.org/html/" + name))
if not found_types:
content = "This RFC is not currently available online."
@ -209,10 +209,10 @@ def document_main(request, name, rev=None):
possible_types = ["pdf", "xml", "ps"]
found_types = ["txt"] + [t for t in possible_types if os.path.exists(base_path + t)]
tools_base = "http://tools.ietf.org/"
tools_base = "https://tools.ietf.org/"
if doc.get_state_slug() == "active":
base = "http://www.ietf.org/id/"
base = "https://www.ietf.org/id/"
else:
base = tools_base + "id/"

2
ietf/iesg/urls.py
View file

@ -36,7 +36,7 @@ from django.conf.urls import patterns
from django.views.generic import RedirectView
urlpatterns = patterns('',
(r'^telechat/.*$', RedirectView.as_view(url='http://www.ietf.org/iesg/minutes.html')),
(r'^telechat/.*$', RedirectView.as_view(url='https://www.ietf.org/iesg/minutes.html')),
(r'^ann/(?:ind|new|prev)/$', RedirectView.as_view(url="/iesg/decisions/", permanent=True )),
(r'^telechatdates/$', RedirectView.as_view(url='/admin/iesg/telechatdate/')),

2
ietf/liaisons/mails.py
View file

@ -30,7 +30,7 @@ def notify_pending_by_email(request, liaison):
# Broken: this does not find the list of approvers for the sending body
# For now, we are sending to statements@ietf.org so the Secretariat can nudge
# Bug 880: http://trac.tools.ietf.org/tools/ietfdb/ticket/880
# Bug 880: https://trac.tools.ietf.org/tools/ietfdb/ticket/880
#
# from ietf.liaisons.utils import IETFHM
#

2
ietf/liaisons/urls.py
View file

@ -8,7 +8,7 @@ urlpatterns = patterns('',
url(r'^help/fields/$', TemplateView.as_view(template_name='liaisons/field_help.html'), name="liaisons_field_help"),
(r'^help/from_ietf/$', TemplateView.as_view(template_name='liaisons/guide_from_ietf.html')),
(r'^help/to_ietf/$', TemplateView.as_view(template_name='liaisons/guide_to_ietf.html')),
(r'^managers/$', RedirectView.as_view(url='http://www.ietf.org/liaison/managers.html')),
(r'^managers/$', RedirectView.as_view(url='https://www.ietf.org/liaison/managers.html')),
)
urlpatterns += patterns('ietf.liaisons.views',

6
ietf/mailinglists/urls.py
View file

@ -5,7 +5,7 @@ from django.views.generic import RedirectView
urlpatterns = patterns('',
(r'^wg/$', 'ietf.mailinglists.views.groups'),
(r'^nonwg/$', RedirectView.as_view(url='http://www.ietf.org/list/nonwg.html')),
(r'^nonwg/update/$', RedirectView.as_view(url='http://www.ietf.org/list/nonwg.html')),
(r'^request/$', RedirectView.as_view(url='http://www.ietf.org/list/request.html')),
(r'^nonwg/$', RedirectView.as_view(url='https://www.ietf.org/list/nonwg.html')),
(r'^nonwg/update/$', RedirectView.as_view(url='https://www.ietf.org/list/nonwg.html')),
(r'^request/$', RedirectView.as_view(url='https://www.ietf.org/list/request.html')),
)

2
ietf/meeting/feeds.py
View file

@ -11,7 +11,7 @@ class LatestMeetingMaterialFeed(Feed):
feed_type = Atom1Feed
link = "/meeting/"
language = "en"
base_url = "http://www3.ietf.org/proceedings/"
base_url = "https://www.ietf.org/proceedings/"
def items(self):
objs = []

4
ietf/release/views.py
View file

@ -12,9 +12,9 @@ import changelog
def trac_links(text):
# changeset links
text = re.sub(r'\[(\d+)\]', r'<a href="http://wiki.tools.ietf.org/tools/ietfdb/changeset/\1">[\1]</a>', text)
text = re.sub(r'\[(\d+)\]', r'<a href="https://wiki.tools.ietf.org/tools/ietfdb/changeset/\1">[\1]</a>', text)
# issue links
text = re.sub(r'#(\d+)', r'<a href="http://wiki.tools.ietf.org/tools/ietfdb/ticket/\1">#\1</a>', text)
text = re.sub(r'#(\d+)', r'<a href="https://wiki.tools.ietf.org/tools/ietfdb/ticket/\1">#\1</a>', text)
return text

2
ietf/secr/proceedings/proc_utils.py
View file

@ -50,7 +50,7 @@ def check_audio_files(group,meeting):
filename = 'ietf{}-{}-{}-*'.format(meeting.number,room,time)
path = os.path.join(settings.MEETING_RECORDINGS_DIR,'ietf{}'.format(meeting.number),filename)
for file in glob.glob(path):
url = 'http://www.ietf.org/audio/ietf{}/{}'.format(meeting.number,os.path.basename(file))
url = 'https://www.ietf.org/audio/ietf{}/{}'.format(meeting.number,os.path.basename(file))
doc = Document.objects.filter(external_url=url).first()
if not doc:
create_recording(session,meeting,group,url)

2
ietf/secr/templates/base_site.html
View file

@ -32,7 +32,7 @@
</div>
<div id="footer-logo">
<a href="http://www.amsl.com/"><img src="{{ SECR_STATIC_URL }}img/ams_logo.png" alt="AMS" align="right" border="0" hspace="5" /></a>
<a href="https://www.amsl.com/"><img src="{{ SECR_STATIC_URL }}img/ams_logo.png" alt="AMS" align="right" border="0" hspace="5" /></a>
</div>
</div>
{% endblock %}

6
ietf/secr/templates/includes/proceeding_footer.html
View file

@ -1,8 +1,8 @@
<tr>
<td id="footer1" colspan="2"><div id="footer2">
<p><a href="https://www.isoc.org/"><img src="/images/isoc_logo.gif" alt="Internet Society" align="left" border="0" hspace="5" /></a><a href="http://www.amsl.com/"><img src="/images/ams_logo.png" alt="AMS" align="right" border="0" hspace="5" /></a><a href="/">Home</a> - <a href="https://tools.ietf.org/">Tools
Team</a> - <a href="https://datatracker.ietf.org/">Datatracker</a> - <a href="/usagedata/">Web&nbsp;Site&nbsp;Usage&nbsp;Statistics</a> - <a href="http://iaoc.ietf.org/">IASA</a> - <a href="http://www.iab.org/">IAB</a> - <a href="http://www.rfc-editor.org/">RFC&nbsp;Editor</a> - <a href="https://www.iana.org/">IANA</a> - <a href="http://www.irtf.org/">IRTF</a> - <a href="http://trustee.ietf.org/">IETF&nbsp;Trust</a> - <a href="http://www.isoc.org/">ISOC</a> - <a href="http://www.cafepress.com/ietf">Store</a> - <a href="/secretariat.html">Contact&nbsp;Us</a><br />
Secretariat services provided by <a href="http://www.amsl.com/">Association Management Solutions, LLC (AMS)</a>.<br />
<p><a href="https://www.isoc.org/"><img src="/images/isoc_logo.gif" alt="Internet Society" align="left" border="0" hspace="5" /></a><a href="https://www.amsl.com/"><img src="/images/ams_logo.png" alt="AMS" align="right" border="0" hspace="5" /></a><a href="/">Home</a> - <a href="https://tools.ietf.org/">Tools
Team</a> - <a href="https://datatracker.ietf.org/">Datatracker</a> - <a href="/usagedata/">Web&nbsp;Site&nbsp;Usage&nbsp;Statistics</a> - <a href="https://iaoc.ietf.org/">IASA</a> - <a href="https://www.iab.org/">IAB</a> - <a href="https://www.rfc-editor.org/">RFC&nbsp;Editor</a> - <a href="https://www.iana.org/">IANA</a> - <a href="https://www.irtf.org/">IRTF</a> - <a href="https://trustee.ietf.org/">IETF&nbsp;Trust</a> - <a href="https://www.isoc.org/">ISOC</a> - <a href="https://www.cafepress.com/ietf">Store</a> - <a href="/secretariat.html">Contact&nbsp;Us</a><br />
Secretariat services provided by <a href="https://www.amsl.com/">Association Management Solutions, LLC (AMS)</a>.<br />
Please send problem reports to: <a href="mailto:ietf-action@ietf.org">ietf-action@ietf.org</a>.<br />
&nbsp;</p>
</div></td>

2
ietf/secr/templates/proceedings/interim_directory.html
View file

@ -13,7 +13,7 @@
{% for meeting in meetings %}
<tr class="{% cycle row1,row2 %}">
<td align="left" style="white-space: nowrap">{{ meeting.date }}</td>
<td><a href="http://datatracker.ietf.org/wg/{{ meeting.group.acronym }}">{{ meeting.group.acronym }}</a></td>
<td><a href="https://datatracker.ietf.org/wg/{{ meeting.group.acronym }}">{{ meeting.group.acronym }}</a></td>
{% if meeting.agenda %}
<td width="70" align="center"><a href="{{ meeting.agenda.get_absolute_url }}">Agenda</a></td>
{% else %}

28
ietf/settings.py
View file

@ -276,8 +276,8 @@ INTERNAL_IPS = (
)
# no slash at end
IDTRACKER_BASE_URL = "http://datatracker.ietf.org"
RFCDIFF_PREFIX = "//www.ietf.org/rfcdiff"
IDTRACKER_BASE_URL = "https://datatracker.ietf.org"
RFCDIFF_PREFIX = "https://www.ietf.org/rfcdiff"
# Valid values:
# 'production', 'test', 'development'
@ -352,22 +352,22 @@ INTERNET_DRAFT_ARCHIVE_DIR = '/a/www/www6s/draft-archive'
MEETING_RECORDINGS_DIR = '/a/www/audio'
# Mailing list info URL for lists hosted on the IETF servers
MAILING_LIST_INFO_URL = "//www.ietf.org/mailman/listinfo/%(list_addr)s"
MAILING_LIST_INFO_URL = "https://www.ietf.org/mailman/listinfo/%(list_addr)s"
# Ideally, more of these would be local -- but since we don't support
# versions right now, we'll point to external websites
DOC_HREFS = {
"charter": "//www.ietf.org/charter/{doc.name}-{doc.rev}.txt",
"draft": "//www.ietf.org/archive/id/{doc.name}-{doc.rev}.txt",
"slides": "//www.ietf.org/slides/{doc.name}-{doc.rev}",
"conflrev": "//www.ietf.org/cr/{doc.name}-{doc.rev}.txt",
"statchg": "//www.ietf.org/sc/{doc.name}-{doc.rev}.txt",
"charter": "https://www.ietf.org/charter/{doc.name}-{doc.rev}.txt",
"draft": "https://www.ietf.org/archive/id/{doc.name}-{doc.rev}.txt",
"slides": "https://www.ietf.org/slides/{doc.name}-{doc.rev}",
"conflrev": "https://www.ietf.org/cr/{doc.name}-{doc.rev}.txt",
"statchg": "https://www.ietf.org/sc/{doc.name}-{doc.rev}.txt",
}
MEETING_DOC_HREFS = {
"agenda": "/meeting/{meeting}/agenda/{doc.group.acronym}/",
"minutes": "//www.ietf.org/proceedings/{meeting}/minutes/{doc.external_url}",
"slides": "//www.ietf.org/proceedings/{meeting}/slides/{doc.external_url}",
"minutes": "https://www.ietf.org/proceedings/{meeting}/minutes/{doc.external_url}",
"slides": "https://www.ietf.org/proceedings/{meeting}/slides/{doc.external_url}",
"recording": "{doc.external_url}",
}
@ -393,14 +393,14 @@ IANA_APPROVE_EMAIL = "drafts-approval@icann.org"
# Put real password in settings_local.py
IANA_SYNC_PASSWORD = "secret"
IANA_SYNC_CHANGES_URL = "https://datatracker.iana.org:4443/data-tracker/changes"
IANA_SYNC_PROTOCOLS_URL = "http://www.iana.org/protocols/"
IANA_SYNC_PROTOCOLS_URL = "https://www.iana.org/protocols/"
RFC_TEXT_RSYNC_SOURCE="ftp.rfc-editor.org::rfcs-text-only"
RFC_EDITOR_SYNC_PASSWORD="secret"
RFC_EDITOR_SYNC_NOTIFICATION_URL = "http://www.rfc-editor.org/parser/parser.php"
RFC_EDITOR_QUEUE_URL = "http://www.rfc-editor.org/queue2.xml"
RFC_EDITOR_INDEX_URL = "http://www.rfc-editor.org/rfc/rfc-index.xml"
RFC_EDITOR_SYNC_NOTIFICATION_URL = "https://www.rfc-editor.org/parser/parser.php"
RFC_EDITOR_QUEUE_URL = "https://www.rfc-editor.org/queue2.xml"
RFC_EDITOR_INDEX_URL = "https://www.rfc-editor.org/rfc/rfc-index.xml"
# Liaison Statement Tool settings
LIAISON_UNIVERSAL_FROM = 'Liaison Statement Management Tool <lsmt@' + IETF_DOMAIN + '>'

2
ietf/submit/admin.py
View file

@ -19,7 +19,7 @@ class SubmissionAdmin(admin.ModelAdmin):
def draft_link(self, instance):
if instance.state_id == "posted":
return '<a href="http://www.ietf.org/id/%s-%s.txt">%s</a>' % (instance.name, instance.rev, instance.name)
return '<a href="https://www.ietf.org/id/%s-%s.txt">%s</a>' % (instance.name, instance.rev, instance.name)
else:
return instance.name
draft_link.allow_tags = True

4
ietf/submit/parsers/plain_parser.py
View file

@ -61,10 +61,10 @@ class PlainParser(FileParser):
if extra_chars:
if len(extra_chars) == 1:
self.parsed_info.add_error((u'The name contains a disallowed character: %s ' % (', '.join(set(extra_chars))).decode('ascii','replace')) +
u'(see http://www.ietf.org/id-info/guidelines.html#naming for details).')
u'(see https://www.ietf.org/id-info/guidelines.html#naming for details).')
else:
self.parsed_info.add_error((u'The name contains disallowed characters: %s ' % (', '.join(set(extra_chars))).decode('ascii','replace')) +
u'(see http://www.ietf.org/id-info/guidelines.html#naming for details).')
u'(see https://www.ietf.org/id-info/guidelines.html#naming for details).')
match_revision = revisionre.match(name)
if match_revision:
self.parsed_info.metadata.rev = match_revision.group(1)

8
ietf/sync/iana.py
View file

@ -15,8 +15,8 @@ from ietf.person.models import Person
from ietf.utils.timezone import local_timezone_to_utc, email_time_to_local_timezone, utc_to_local_timezone
#PROTOCOLS_URL = "http://www.iana.org/protocols/"
#CHANGES_URL = "http://datatracker.dev.icann.org:8080/data-tracker/changes"
#PROTOCOLS_URL = "https://www.iana.org/protocols/"
#CHANGES_URL = "https://datatracker.dev.icann.org:8080/data-tracker/changes"
def fetch_protocol_page(url):
f = urllib2.urlopen(settings.IANA_SYNC_PROTOCOLS_URL)
@ -89,8 +89,8 @@ def parse_changes_json(text):
# a little bit of cleaning
i["doc"] = i["doc"].strip()
if i["doc"].startswith("http://www.ietf.org/internet-drafts/"):
i["doc"] = i["doc"][len("http://www.ietf.org/internet-drafts/"):]
if i["doc"].startswith("https://www.ietf.org/internet-drafts/"):
i["doc"] = i["doc"][len("https://www.ietf.org/internet-drafts/"):]
# make sure we process oldest entries first
changes.sort(key=lambda c: c["time"])

4
ietf/sync/rfceditor.py
View file

@ -18,8 +18,8 @@ from ietf.person.models import Person
from ietf.utils.log import log
from ietf.utils.mail import send_mail_text
#QUEUE_URL = "http://www.rfc-editor.org/queue2.xml"
#INDEX_URL = "http://www.rfc-editor.org/rfc/rfc-index.xml"
#QUEUE_URL = "https://www.rfc-editor.org/queue2.xml"
#INDEX_URL = "https://www.rfc-editor.org/rfc/rfc-index.xml"
#POST_APPROVED_DRAFT_URL = "https://www.rfc-editor.org/sdev/jsonexp/jsonparser.php"
MIN_QUEUE_RESULTS = 10