Fixed #8995 -- Added support for HTTPS in sitemaps. (a4b472dd) · Commits · Dom Sekotill / django

django/contrib/sitemaps/init.py

+18 −3

Original line number	Diff line number	Diff line
		@@ -40,6 +40,10 @@ class Sitemap(object):
		# http://sitemaps.org/protocol.php#index.
		limit = 50000

		# If protocol is None, the URLs in the sitemap will use the protocol
		# with which the sitemap was requested.
		protocol = None

		def __get(self, name, obj, default=None):
		try:
		attr = getattr(self, name)
		@@ -61,7 +65,14 @@ class Sitemap(object):
		return self._paginator
		paginator = property(_get_paginator)

		def get_urls(self, page=1, site=None):
		def get_urls(self, page=1, site=None, protocol=None):
		# Determine protocol
		if self.protocol is not None:
		protocol = self.protocol
		if protocol is None:
		protocol = 'http'

		# Determine domain
		if site is None:
		if Site._meta.installed:
		try:
		@@ -69,11 +80,15 @@ class Sitemap(object):
		except Site.DoesNotExist:
		pass
		if site is None:
		raise ImproperlyConfigured("In order to use Sitemaps you must either use the sites framework or pass in a Site or RequestSite object in your view code.")
		raise ImproperlyConfigured("In order to use Sitemaps "
		"you must either use the sites framework "
		"or pass in a Site or RequestSite object "
		"in your view code.")
		domain = site.domain

		urls = []
		for item in self.paginator.page(page).object_list:
		loc = "http://%s%s" % (site.domain, self.__get('location', item))
		loc = "%s://%s%s" % (protocol, domain, self.__get('location', item))
		priority = self.__get('priority', item, None)
		url_info = {
		'item': item,

+4 −1

Original line number	Diff line number	Diff line
		from django.contrib.sitemaps.tests.basic import *
		from .flatpages import FlatpagesSitemapTests
		from .generic import GenericViewsSitemapTests
		from .http import HTTPSitemapTests
		from .https import HTTPSSitemapTests, HTTPSDetectionSitemapTests

0 → 100644

+28 −0

Original line number	Diff line number	Diff line
		import os

		from django.conf import settings
		from django.contrib.auth.models import User
		from django.contrib.sites.models import Site
		from django.test import TestCase


		class SitemapTestsBase(TestCase):
		protocol = 'http'
		domain = 'example.com' if Site._meta.installed else 'testserver'
		urls = 'django.contrib.sitemaps.tests.urls.http'

		def setUp(self):
		self.base_url = '%s://%s' % (self.protocol, self.domain)
		self.old_USE_L10N = settings.USE_L10N
		self.old_TEMPLATE_DIRS = settings.TEMPLATE_DIRS
		settings.TEMPLATE_DIRS = (
		os.path.join(os.path.dirname(__file__), 'templates'),
		)
		self.old_Site_meta_installed = Site._meta.installed
		# Create a user that will double as sitemap content
		User.objects.create_user('testuser', 'test@example.com', 's3krit')

		def tearDown(self):
		settings.USE_L10N = self.old_USE_L10N
		settings.TEMPLATE_DIRS = self.old_TEMPLATE_DIRS
		Site._meta.installed = self.old_Site_meta_installed

0 → 100644

+37 −0

Original line number	Diff line number	Diff line
		from django.conf import settings
		from django.utils.unittest import skipUnless

		from .base import SitemapTestsBase

		class FlatpagesSitemapTests(SitemapTestsBase):

		@skipUnless("django.contrib.flatpages" in settings.INSTALLED_APPS,
		"django.contrib.flatpages app not installed.")
		def test_flatpage_sitemap(self):
		"Basic FlatPage sitemap test"

		# Import FlatPage inside the test so that when django.contrib.flatpages
		# is not installed we don't get problems trying to delete Site
		# objects (FlatPage has an M2M to Site, Site.delete() tries to
		# delete related objects, but the M2M table doesn't exist.
		from django.contrib.flatpages.models import FlatPage

		public = FlatPage.objects.create(
		url=u'/public/',
		title=u'Public Page',
		enable_comments=True,
		registration_required=False,
		)
		public.sites.add(settings.SITE_ID)
		private = FlatPage.objects.create(
		url=u'/private/',
		title=u'Private Page',
		enable_comments=True,
		registration_required=True
		)
		private.sites.add(settings.SITE_ID)
		response = self.client.get('/flatpages/sitemap.xml')
		# Public flatpage should be in the sitemap
		self.assertContains(response, '<loc>%s%s</loc>' % (self.base_url, public.url))
		# Private flatpage should not be in the sitemap
		self.assertNotContains(response, '<loc>%s%s</loc>' % (self.base_url, private.url))

0 → 100644

+17 −0

Original line number	Diff line number	Diff line
		from django.contrib.auth.models import User

		from .base import SitemapTestsBase

		class GenericViewsSitemapTests(SitemapTestsBase):

		def test_generic_sitemap(self):
		"A minimal generic sitemap can be rendered"
		response = self.client.get('/generic/sitemap.xml')
		expected = ''
		for username in User.objects.values_list("username", flat=True):
		expected += "<url><loc>%s/users/%s/</loc></url>" % (self.base_url, username)
		self.assertEqual(response.content, """<?xml version="1.0" encoding="UTF-8"?>
		<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
		%s
		</urlset>
		""" % expected)