Skip to content

Commit

Permalink
Remove reference to old get_host method.
Browse files Browse the repository at this point in the history
  • Loading branch information
dstegelman committed Mar 1, 2013
1 parent 69ab0de commit b92610a
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions cas/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,20 @@
import urlparse
from operator import itemgetter

from django.http import get_host, HttpResponseRedirect, HttpResponseForbidden, HttpResponse
from django.http import HttpResponseRedirect, HttpResponseForbidden, HttpResponse
from django.conf import settings
from django.contrib.auth import REDIRECT_FIELD_NAME
from cas.models import PgtIOU
from django.contrib import messages

__all__ = ['login', 'logout']


def _service_url(request, redirect_to=None, gateway=False):
"""Generates application service URL for CAS"""

protocol = ('http://', 'https://')[request.is_secure()]
host = get_host(request)
host = request.get_host()
prefix = (('http://', 'https://')[request.is_secure()] + host)
service = protocol + host + request.path
if redirect_to:
Expand Down Expand Up @@ -61,7 +62,7 @@ def _redirect_url(request):
else:
next = request.META.get('HTTP_REFERER', settings.CAS_REDIRECT_URL)

host = get_host(request)
host = request.get_host()
prefix = (('http://', 'https://')[request.is_secure()] + host)
if next.startswith(prefix):
next = next[len(prefix):]
Expand Down Expand Up @@ -90,7 +91,7 @@ def _logout_url(request, next_page=None):
url = urlparse.urljoin(settings.CAS_SERVER_URL, 'logout')
if next_page:
protocol = ('http://', 'https://')[request.is_secure()]
host = get_host(request)
host = request.get_host()
url += '?' + urlencode({'url': protocol + host + next_page})
return url

Expand Down Expand Up @@ -130,7 +131,7 @@ def login(request, next_page=None, required=False, gateway=False):
#Has ticket, not session
if getattr(settings, 'CAS_CUSTOM_FORBIDDEN'):
from django.core.urlresolvers import reverse
return HttpResponseRedirect(reverse(settings.CAS_CUSTOM_FORBIDDEN)+ "?" + request.META['QUERY_STRING'] )
return HttpResponseRedirect(reverse(settings.CAS_CUSTOM_FORBIDDEN) + "?" + request.META['QUERY_STRING'])
else:
error = "<h1>Forbidden</h1><p>Login failed.</p>"
return HttpResponseForbidden(error)
Expand Down Expand Up @@ -167,7 +168,7 @@ def proxy_callback(request):
if not (pgtIou and tgt):
return HttpResponse('No pgtIOO', mimetype="text/plain")
try:
PgtIOU.objects.create(tgt = tgt, pgtIou = pgtIou, created = datetime.now())
PgtIOU.objects.create(tgt=tgt, pgtIou=pgtIou, created=datetime.now())
request.session['pgt-TICKET'] = ticket
return HttpResponse('PGT ticket is: %s' % str(ticket, mimetype="text/plain"))
except:
Expand Down

0 comments on commit b92610a

Please sign in to comment.