Add support for mirror selection and redirection.

pgweb/downloads/admin.py

@@ -2,12 +2,19 @@ from django.contrib import admin
 from util.admin import register_markdown, MarkdownPreviewAdmin
 from models import *
 
+class MirrorAdmin(admin.ModelAdmin):
+	list_display = ('__unicode__', 'country_name', 'country_code', 'mirror_index', 'mirror_last_rsync', 'host_sponsor', )
+	list_filter = ('country_name', 'mirror_active', )
+	search_fields = ('country_name', 'host_sponsor', 'host_notes', )
+	ordering = ('country_code', )
+
 class ProductAdmin(MarkdownPreviewAdmin):
 	list_display = ('name', 'publisher', 'approved', 'lastconfirmed',)
 	list_filter = ('approved',)
 	search_fields = ('name', 'description', )
 	ordering = ('name', )
 
+admin.site.register(Mirror, MirrorAdmin)
 admin.site.register(Category)
 admin.site.register(LicenceType)
 admin.site.register(Product, ProductAdmin)

pgweb/downloads/models.py

@@ -6,6 +6,50 @@ from pgweb.core.models import Organisation
 
 from datetime import datetime
 
+class Mirror(models.Model):
+	country_name = models.CharField(max_length=50, null=False, blank=False)
+	country_code = models.CharField(max_length=2, null=False, blank=False)
+	mirror_created = models.DateTimeField(null=False, blank=False, default=datetime.now())
+	mirror_last_rsync = models.DateTimeField(null=False, blank=False, default=datetime(1970,1,1))
+	mirror_index = models.IntegerField(null=False)
+	host_addr = models.IPAddressField(null=True, default='0.0.0.0')
+	host_path = models.CharField(max_length=100, null=True)
+	host_sponsor = models.CharField(max_length=100, null=True)
+	host_contact = models.CharField(max_length=100, null=True)
+	host_email = models.CharField(max_length=100, null=True)
+	host_notes = models.TextField(null=True)
+	rsync_host1 = models.CharField(max_length=100, null=True)
+	rsync_host2 = models.CharField(max_length=100, null=True)
+	mirror_active = models.BooleanField(null=False, default=True)
+	mirror_dns = models.BooleanField(null=False, default=False)
+	mirror_private = models.BooleanField(null=False, default=False)
+	host_use_cname = models.BooleanField(null=True, default=False)
+	host_cname_host = models.CharField(max_length=100, null=True)
+	mirror_primary = models.BooleanField(null=False, default=False)
+	error_count = models.IntegerField(null=False, default=0)
+	alternate_protocol = models.BooleanField(null=False, default=False)
+	alternate_at_root = models.BooleanField(null=False, default=False)
+
+	class Meta:
+		db_table='mirrors'
+
+	def __unicode__(self):
+		return "%s.%s" % (self.country_code, self.mirror_index)
+
+	def get_host_name(self):
+		if self.mirror_index == 0:
+			return "ftp.%s.postgresql.org" % self.country_code
+		else:
+			return "ftp%s.%s.postgresql.org" % (self.mirror_index, self.country_code)
+
+	def get_root_path(self, method):
+		if method == 'f' or not self.alternate_at_root:
+			# FTP method, or http with same path, build complete one
+			return ("%s/%s" % (self.get_host_name(), self.host_path)).replace('//','/').rstrip('/')
+		else:
+			# http with alternate_at_root - thus, ignore the path element
+			return self.get_host_name()
+
 class Category(models.Model):
 	catname = models.CharField(max_length=100, null=False, blank=False)
 	blurb = models.TextField(null=False, blank=True)

pgweb/downloads/views.py

@@ -2,10 +2,12 @@ from django.shortcuts import render_to_response, get_object_or_404
 from django.http import HttpResponse, Http404, HttpResponseRedirect
 from django.template import TemplateDoesNotExist, loader, Context
 from django.contrib.auth.decorators import login_required
+from django.db import connection, transaction
 from django.conf import settings
 
 import os
 from datetime import datetime
+import urlparse
 
 from pgweb.util.decorators import ssl_required
 from pgweb.util.contexts import NavContext
@@ -103,7 +105,76 @@ def ftpbrowser(request, subpath):
 		'maintainer': _getfile(fspath, 'CURRENT_MAINTAINER'),
 	}, NavContext(request, 'download'))
 
+def _get_numeric_ip(request):
+	try:
+		ip = request.META['REMOTE_ADDR']
+		p = ip.split('.')
+		return int(p[0])*16777216 + int(p[1])*65536 + int(p[2])*256 + int(p[3])
+	except:
+		return None
 
+def mirrorselect(request, path):
+	try:
+		numericip = _get_numeric_ip(request)
+		near_mirrors = Mirror.objects.filter(mirror_active=True, mirror_private=False, mirror_dns=True).extra(where=["mirror_last_rsync>(now() - '48 hours'::interval)","country_code IN (SELECT lower(countrycode) FROM iptocountry WHERE %s BETWEEN startip AND endip)" % numericip]).order_by('country_name', 'mirror_index')
+	except:
+		near_mirrors = None
+	all_mirrors = Mirror.objects.filter(mirror_active=True, mirror_private=False, mirror_dns=True).extra(where=["mirror_last_rsync>(now() - '48 hours'::interval)"]).order_by('country_name', 'mirror_index')
+	return render_to_response('downloads/mirrorselect.html', {
+		'path': path,
+		'all_mirrors': all_mirrors,
+		'near_mirrors': near_mirrors,
+		'masterserver': settings.MASTERSITE_ROOT,
+	}, NavContext(request, 'download'))
+
+def _mirror_redirect_internal(request, scheme, host, path):
+	# Log the access
+	curs = connection.cursor()
+	curs.execute("""INSERT INTO clickthrus (scheme, host, path, country)
+VALUES (%(scheme)s, %(host)s, %(path)s, (
+SELECT countrycode FROM iptocountry WHERE %(ip)s BETWEEN startip and endip LIMIT 1))""", {
+		'scheme': scheme,
+		'host': host,
+		'path': path,
+		'ip': _get_numeric_ip(request),
+})
+	transaction.commit_unless_managed()
+
+	# Redirect!
+	newurl = "%s://%s/%s" % (scheme, host, path)
+	return HttpResponseRedirect(newurl)
+
+def mirror_redirect(request, mirrorid, protocol, path):
+	try:
+		mirror = Mirror.objects.get(pk=mirrorid)
+	except Mirror.NotFound:
+		raise Http404("Specified mirror not found")
+
+	return _mirror_redirect_internal(
+		request,
+		protocol=='h' and 'http' or 'ftp',
+		mirror.get_root_path(protocol),
+		path,
+	)
+
+def mirror_redirect_old(request):
+	# Version of redirect that takes parameters in the querystring. This is
+	# only used by the stackbuilder.
+	if not request.GET['sb'] == "1":
+		raise Http404("Page not found, you should be using the new URL format!")
+
+	urlpieces = urlparse.urlparse(request.GET['url'])
+	if urlpieces.query:
+		path = "%s?%s" % (urlpieces.path, urlpieces.query)
+	else:
+		path = urlpieces.path
+
+	return _mirror_redirect_internal(
+		request,
+		urlpieces.scheme,
+		urlpieces.netloc,
+		path,
+	)
 
 #######
 # Product catalogue

pgweb/settings.py

@@ -107,6 +107,7 @@ INSTALLED_APPS = [
 
 
 SITE_ROOT="http://www.postgresql.org"
+MASTERSITE_ROOT="http://wwwmaster.postgresql.org"
 
 # Load local settings overrides
 from settings_local import *

pgweb/urls.py

@@ -29,8 +29,11 @@ urlpatterns = patterns('',
     (r'^about/quotesarchive/$', 'quotes.views.allquotes'),
     
     (r'^ftp/(.*/)?$', 'downloads.views.ftpbrowser'),
+    (r'^download/mirrors-ftp/+(.*)$', 'downloads.views.mirrorselect'),
     (r'^download/product-categories/$', 'downloads.views.categorylist'),
     (r'^download/products/(\d+)(-.*)?/$', 'downloads.views.productlist'),
+    (r'^redir/(\d+)/([hf])/([a-zA-Z0-9/\._-]+)$', 'downloads.views.mirror_redirect'),
+    (r'^redir$', 'downloads.views.mirror_redirect_old'),
 
     (r'^docs/(current|\d\.\d)/(static|interactive)/(.*).html$', 'docs.views.docpage'),
 

templates/downloads/inc_mirror.html

@@ -0,0 +1,9 @@
+<div class="mirrorselect">
+ <img src="/media/img/flags/{{mirror.country_name|cut:" "}}.gif" alt="{{mirror.country_name}}" title="{{mirror.country_name}}" width="32" height="21" style="border: 1px" />
+ <br/>
+ {%if mirror.alternate_protocol %}
+ <a href="{{masterserver}}/redir/{{mirror.id}}/h/{{path}}">http</a> |
+ {%endif%}
+ <a href="{{masterserver}}/redir/{{mirror.id}}/f/{{path}}">ftp</a>
+</div>
+

templates/downloads/mirrorselect.html

@@ -0,0 +1,37 @@
+{%extends "base/page.html"%}
+{%block title%}Choose a download mirror{%endblock%}
+{%block extrahead%}
+<style>
+div.mirrorselect {
+//   border: 1px solid black;
+   display: inline-block;
+   width: 110px;
+   text-align: center;
+   height: 50px;
+}
+</style>
+{%endblock%}
+{%block contents%}
+<h1>Choose a download mirror</h1>
+<p><b>Downloading: </b> {{path}}</p>
+
+
+{%if near_mirrors%}
+<p><b>We think these mirrors are near you:</b></p>
+<div id="nearmirrorwrap">
+ {%for mirror in near_mirrors%}
+  {%include "downloads/inc_mirror.html"%}
+ {%endfor%}
+</div>
+{%endif%}
+
+<p><b>Choose any other mirror in the world:</b></p>
+<div id="mainmirrorwrap">
+ {%for mirror in all_mirrors%}
+  {%include "downloads/inc_mirror.html"%}
+ {%endfor%}
+</div>
+
+<p><a href="/mirror/howto">Read this</a> if you would like to host a mirror.</p>
+{%endblock%}
+