From 21070bba4868d745ffcc440b559df569418d803b Mon Sep 17 00:00:00 2001 From: "Bradley M. Kuhn" Date: Sun, 26 Sep 2010 19:37:01 -0400 Subject: [PATCH] SSL site from previous running instance on conservancy.softwarefreedom.org --- www/conservancy_ssl/__init__.py | 0 www/conservancy_ssl/middleware.py | 32 ++++++++++++++++++++++++++++++ www/conservancy_ssl/settings.py | 24 ++++++++++++++++++++++ www/conservancy_ssl/urls.py | 33 +++++++++++++++++++++++++++++++ www/conservancy_ssl_wrapper.py | 27 +++++++++++++++++++++++++ 5 files changed, 116 insertions(+) create mode 100644 www/conservancy_ssl/__init__.py create mode 100644 www/conservancy_ssl/middleware.py create mode 100644 www/conservancy_ssl/settings.py create mode 100644 www/conservancy_ssl/urls.py create mode 100644 www/conservancy_ssl_wrapper.py diff --git a/www/conservancy_ssl/__init__.py b/www/conservancy_ssl/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/www/conservancy_ssl/middleware.py b/www/conservancy_ssl/middleware.py new file mode 100644 index 00000000..03b05360 --- /dev/null +++ b/www/conservancy_ssl/middleware.py @@ -0,0 +1,32 @@ +# Copyright 2005-2008, James Garrison +# Copyright 2010, Bradley M. Kuhn + +# This software's license gives you freedom; you can copy, convey, +# propagate, redistribute, modify and/or redistribute modified versions of +# this program under the terms of the GNU Affero General Public License +# (AGPL) as published by the Free Software Foundation (FSF), either +# version 3 of the License, or (at your option) any later version of the +# AGPL published by the FSF. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero +# General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program in a file in the toplevel directory called +# "AGPLv3". If not, see . + +from django import http + +class RedirectToNonSslSite(object): + + def process_request(self, request): + """Redirect to non-SSL site if not an admin request + """ + + if not request.path.startswith('/admin'): + url = 'http://www.sfconservancy.org%s' % request.path + return http.HttpResponseRedirect(url) + + return None diff --git a/www/conservancy_ssl/settings.py b/www/conservancy_ssl/settings.py new file mode 100644 index 00000000..11dfb6da --- /dev/null +++ b/www/conservancy_ssl/settings.py @@ -0,0 +1,24 @@ +# Copyright 2005-2008, James Garrison +# Copyright 2010, Bradley M. Kuhn + +# This software's license gives you freedom; you can copy, convey, +# propagate, redistribute, modify and/or redistribute modified versions of +# this program under the terms of the GNU Affero General Public License +# (AGPL) as published by the Free Software Foundation (FSF), either +# version 3 of the License, or (at your option) any later version of the +# AGPL published by the FSF. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero +# General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program in a file in the toplevel directory called +# "AGPLv3". If not, see . + +from conservancy.settings import * + +ROOT_URLCONF = 'conservancy_ssl.urls' + +MIDDLEWARE_CLASSES += ('conservancy_ssl.middleware.RedirectToNonSslSite',) diff --git a/www/conservancy_ssl/urls.py b/www/conservancy_ssl/urls.py new file mode 100644 index 00000000..c0784fae --- /dev/null +++ b/www/conservancy_ssl/urls.py @@ -0,0 +1,33 @@ +# Copyright 2005-2008, James Garrison +# Copyright 2010, Bradley M. Kuhn + +# This software's license gives you freedom; you can copy, convey, +# propagate, redistribute, modify and/or redistribute modified versions of +# this program under the terms of the GNU Affero General Public License +# (AGPL) as published by the Free Software Foundation (FSF), either +# version 3 of the License, or (at your option) any later version of the +# AGPL published by the FSF. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero +# General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program in a file in the toplevel directory called +# "AGPLv3". If not, see . + + +# Start with typical conservancy url scheme. The middleware will +# intercept non-admin requests, but having the main conservancy urlconf +# repeated here allows us to browse the automatic documentation in the +# admin interface. + +from conservancy.urls import * +from django.contrib import admin + +admin.autodiscover() + +urlpatterns += patterns('', + (r'^admin/doc/', include('django.contrib.admindocs.urls')), + (r'^admin/(.*)', admin.site.root),) diff --git a/www/conservancy_ssl_wrapper.py b/www/conservancy_ssl_wrapper.py new file mode 100644 index 00000000..fd10266b --- /dev/null +++ b/www/conservancy_ssl_wrapper.py @@ -0,0 +1,27 @@ +# Copyright 2005-2008, James Garrison +# Copyright 2010, Bradley M. Kuhn + +# This software's license gives you freedom; you can copy, convey, +# propagate, redistribute, modify and/or redistribute modified versions of +# this program under the terms of the GNU Affero General Public License +# (AGPL) as published by the Free Software Foundation (FSF), either +# version 3 of the License, or (at your option) any later version of the +# AGPL published by the FSF. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero +# General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program in a file in the toplevel directory called +# "AGPLv3". If not, see . + +# req.subprocess_env is not set when the PostReadRequestHandler runs, +# so we just bypass it altogether and set the relevant variable here. +# See deployment documentation for more info. +from os import environ +environ["DJANGO_SETTINGS_MODULE"] = 'conservancy_ssl.settings' +environ["CANONICAL_HOSTNAME"] = 'sfconservancy.org' + +from modpythoncustom import *