Changeset 4251

Show
Ignore:
Timestamp:
11/12/07 02:49:56 (1 year ago)
Author:
ionrock
Message:

Fixed redirect issue. I was getting an failure on the login attempt
b/c the openid.mode was set to checkid_immediate which doesn't offer
the user a chance to sign in, so you get a failure.

I also cleaned up the login.xslt by deleting a line and merged changes
from the openid-redirect.xsl in /transform/ for testing.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/nuxleus/Scripts/openid/gateway/openidgateway/__init__.py

    r4234 r4251  
    6363        headers = [('Content-Type', 'application/xml')] 
    6464        if not (req.params.get('uname') or req.params.get('return_location')): 
    65             raise HTTPBadRequest() 
     65            message ='There must be a uname and return_location in the query string' 
     66            raise HTTPBadRequest(detail=message) 
    6667         
    6768        openid_url = req.params['uname'] 
    …… 
    9596            return [] 
    9697 
    97         # sess[self.ekey]['potential_user_id'] = req.params['openid_url'] 
    98  
    9998        sreg_request = sreg.SRegRequest(required=['nickname']) 
    10099        request.addExtension(sreg_request) 
    …… 
    105104        sess[self.ekey]['trusted_root'] = trusted_root 
    106105 
    107         redirect_url = request.redirectURL(trusted_root, return_to, immediate=True) 
    108         print redirect_url 
     106        redirect_url = request.redirectURL(trusted_root, return_to) 
     107 
    109108        set_params(environ, {'redirect_url': redirect_url}) 
    110109        params['status'] = 'redirect' 
    111110        params['message'] = 'OpendID Login Redirection' 
    112         # sess[self.ekey]['token'] = request.token 
    113111 
    114112        sess.save() 
    …… 
    121119        sess = environ['beaker.session'] 
    122120        set_template(environ, 'login.xslt') 
    123         params = {'base_uri': "http://dev.amp.fm/"} 
     121        params = {'base_uri': self.base_url} 
    124122 
    125123        headers = [('Content-Type', 'application/xml')] 
    …… 
    159157    def forms(self, environ, start_response): 
    160158        form = '''<form id="openid-login" method="get"  
    161         action="http://dev.amp.fm/gatekeeper/login" target="_top"> 
     159        action="%slogin" target="_top"> 
    162160        <input id="openid-text" type="text" 
    163161               name="uname" class="single-input" 
    …… 
    166164               onclick="if (this.value == 'Authenticate w/ OpenID') this.value = ''; return true;" 
    167165               onblur="if (this.value == '') this.value = 'Authenticate w/ OpenID'; return true;" /> 
    168         <input type="hidden" name="return_location" value="http://dev.amp.fm/" /> 
     166        <input type="hidden" name="return_location" value="http://ionrock.org" /> 
    169167        <input id="openid-submit" class="single-input-submit" type="submit" value="Login" /> 
    170         </form>''' 
     168        </form>''' % self.base_url 
    171169        start_response('200 OK', [('Content-Type', 'text/html')]) 
    172170        return ['<html><head><title>test forms</title></head>', 

  • trunk/nuxleus/Scripts/openid/gateway/templates/login.xslt

    r4227 r4251  
    1010  <xsl:param name="p:return_location" /> 
    1111  <xsl:param name="p:message" /> 
    12  
    1312 
    1413  <xsl:template match="/"> 

  • trunk/nuxleus/Scripts/openid/gateway/templates/openid-redirect.xsl

    r4235 r4251  
    11<?xml version="1.0" encoding="UTF-8"?> 
    2 <xsl:stylesheet version="1.0"  
    3                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"  
    4                 xmlns="http://www.w3.org/1999/xhtml"  
    5                 xmlns:html="http://www.w3.org/1999/xhtml"  
    6                 exclude-result-prefixes="html"> 
     2<xsl:stylesheet 
     3    xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" xmlns:html="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="html"> 
    74 
    85  <xsl:variable name="return-uri" select="/auth/return-location" /> 
    …… 
    107  <xsl:variable name="openid" select="substring-after($openid-message, 'Logged in as ')"/> 
    118  <xsl:variable name="base-uri" select="/auth/@xml:base"/> 
    12   <xsl:variable name="session-uri" select="concat($base-uri, 'service/session?return_uri=', /auth/return-location, '?', $openid)"/> 
     9  <xsl:variable name="session-uri" select="concat($base-uri, 'service/session?return_uri=', /auth/return-location, $openid)"/> 
    1310 
    1411  <xsl:output doctype-system="-//W3C//DTD HTML 4.01//EN" 
    15       doctype-public="http://www.w3.org/TR/html4/strict.dtd"  
    16       cdata-section-elements="script" 
     12      doctype-public="http://www.w3.org/TR/html4/strict.dtd" cdata-section-elements="script" 
    1713      method="html" omit-xml-declaration="yes" /> 
    1814