Changeset 68

Show
Ignore:
Timestamp:
01/26/07 21:19:25 (2 years ago)
Author:
paulhethmon
Message:

--

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • AcmeIdp/trunk/nbproject/build-impl.xml

    r61 r68  
    398398        <basename property="included.lib.libs.Javolution.classpath" file="${libs.Javolution.classpath}"/> 
    399399        <copy-ear-war file="${libs.Javolution.classpath}" propname="included.lib.libs.Javolution.classpath.X"/> 
    400         <basename property="included.lib.libs.OpenSAML.classpath.8" file="${libs.OpenSAML.classpath.libfile.8}"/> 
    401400        <basename property="included.lib.libs.OpenSAML.classpath.7" file="${libs.OpenSAML.classpath.libfile.7}"/> 
    402401        <basename property="included.lib.libs.OpenSAML.classpath.6" file="${libs.OpenSAML.classpath.libfile.6}"/> 
     
    406405        <basename property="included.lib.libs.OpenSAML.classpath.2" file="${libs.OpenSAML.classpath.libfile.2}"/> 
    407406        <basename property="included.lib.libs.OpenSAML.classpath.1" file="${libs.OpenSAML.classpath.libfile.1}"/> 
    408         <copy-ear-war file="${libs.OpenSAML.classpath.libfile.8}" propname="included.lib.libs.OpenSAML.classpath.8.X"/> 
    409407        <copy-ear-war file="${libs.OpenSAML.classpath.libfile.7}" propname="included.lib.libs.OpenSAML.classpath.7.X"/> 
    410408        <copy-ear-war file="${libs.OpenSAML.classpath.libfile.6}" propname="included.lib.libs.OpenSAML.classpath.6.X"/> 
     
    414412        <copy-ear-war file="${libs.OpenSAML.classpath.libfile.2}" propname="included.lib.libs.OpenSAML.classpath.2.X"/> 
    415413        <copy-ear-war file="${libs.OpenSAML.classpath.libfile.1}" propname="included.lib.libs.OpenSAML.classpath.1.X"/> 
    416         <basename property="included.lib.libs.Xalan.classpath.5" file="${libs.Xalan.classpath.libfile.5}"/> 
    417         <basename property="included.lib.libs.Xalan.classpath.4" file="${libs.Xalan.classpath.libfile.4}"/> 
    418         <basename property="included.lib.libs.Xalan.classpath.3" file="${libs.Xalan.classpath.libfile.3}"/> 
    419         <basename property="included.lib.libs.Xalan.classpath.2" file="${libs.Xalan.classpath.libfile.2}"/> 
    420         <basename property="included.lib.libs.Xalan.classpath.1" file="${libs.Xalan.classpath.libfile.1}"/> 
    421         <copy-ear-war file="${libs.Xalan.classpath.libfile.5}" propname="included.lib.libs.Xalan.classpath.5.X"/> 
    422         <copy-ear-war file="${libs.Xalan.classpath.libfile.4}" propname="included.lib.libs.Xalan.classpath.4.X"/> 
    423         <copy-ear-war file="${libs.Xalan.classpath.libfile.3}" propname="included.lib.libs.Xalan.classpath.3.X"/> 
    424         <copy-ear-war file="${libs.Xalan.classpath.libfile.2}" propname="included.lib.libs.Xalan.classpath.2.X"/> 
    425         <copy-ear-war file="${libs.Xalan.classpath.libfile.1}" propname="included.lib.libs.Xalan.classpath.1.X"/> 
    426414        <mkdir dir="${build.web.dir.real}/META-INF"/> 
    427415        <manifest file="${build.web.dir.real}/META-INF/MANIFEST.MF" mode="update"> 
    428             <attribute name="Class-Path" value="${included.lib.libs.ApacheCommons.classpath.1.X} ${included.lib.libs.ApacheCommons.classpath.2.X} ${included.lib.libs.ApacheCommons.classpath.3.X} ${included.lib.libs.ApacheCommons.classpath.4.X} ${included.lib.libs.ApacheCommons.classpath.5.X} ${included.lib.libs.Javolution.classpath} ${included.lib.libs.OpenSAML.classpath.1.X} ${included.lib.libs.OpenSAML.classpath.2.X} ${included.lib.libs.OpenSAML.classpath.3.X} ${included.lib.libs.OpenSAML.classpath.4.X} ${included.lib.libs.OpenSAML.classpath.5.X} ${included.lib.libs.OpenSAML.classpath.6.X} ${included.lib.libs.OpenSAML.classpath.7.X} ${included.lib.libs.OpenSAML.classpath.8.X} ${included.lib.libs.Xalan.classpath.1.X} ${included.lib.libs.Xalan.classpath.2.X} ${included.lib.libs.Xalan.classpath.3.X} ${included.lib.libs.Xalan.classpath.4.X} ${included.lib.libs.Xalan.classpath.5.X} "/> 
     416            <attribute name="Class-Path" value="${included.lib.libs.ApacheCommons.classpath.1.X} ${included.lib.libs.ApacheCommons.classpath.2.X} ${included.lib.libs.ApacheCommons.classpath.3.X} ${included.lib.libs.ApacheCommons.classpath.4.X} ${included.lib.libs.ApacheCommons.classpath.5.X} ${included.lib.libs.Javolution.classpath} ${included.lib.libs.OpenSAML.classpath.1.X} ${included.lib.libs.OpenSAML.classpath.2.X} ${included.lib.libs.OpenSAML.classpath.3.X} ${included.lib.libs.OpenSAML.classpath.4.X} ${included.lib.libs.OpenSAML.classpath.5.X} ${included.lib.libs.OpenSAML.classpath.6.X} ${included.lib.libs.OpenSAML.classpath.7.X} "/> 
    429417        </manifest> 
    430418        <delete dir="${dist.ear.dir}/temp"/> 
     
    437425        <copy file="${libs.ApacheCommons.classpath.libfile.1}" todir="${build.web.dir.real}/WEB-INF/lib"/> 
    438426        <copy file="${libs.Javolution.classpath}" todir="${build.web.dir.real}/WEB-INF/lib"/> 
    439         <copy file="${libs.OpenSAML.classpath.libfile.8}" todir="${build.web.dir.real}/WEB-INF/lib"/> 
    440427        <copy file="${libs.OpenSAML.classpath.libfile.7}" todir="${build.web.dir.real}/WEB-INF/lib"/> 
    441428        <copy file="${libs.OpenSAML.classpath.libfile.6}" todir="${build.web.dir.real}/WEB-INF/lib"/> 
     
    445432        <copy file="${libs.OpenSAML.classpath.libfile.2}" todir="${build.web.dir.real}/WEB-INF/lib"/> 
    446433        <copy file="${libs.OpenSAML.classpath.libfile.1}" todir="${build.web.dir.real}/WEB-INF/lib"/> 
    447         <copy file="${libs.Xalan.classpath.libfile.5}" todir="${build.web.dir.real}/WEB-INF/lib"/> 
    448         <copy file="${libs.Xalan.classpath.libfile.4}" todir="${build.web.dir.real}/WEB-INF/lib"/> 
    449         <copy file="${libs.Xalan.classpath.libfile.3}" todir="${build.web.dir.real}/WEB-INF/lib"/> 
    450         <copy file="${libs.Xalan.classpath.libfile.2}" todir="${build.web.dir.real}/WEB-INF/lib"/> 
    451         <copy file="${libs.Xalan.classpath.libfile.1}" todir="${build.web.dir.real}/WEB-INF/lib"/> 
    452434    </target> 
    453435    <target name="do-ear-dist" depends="init,compile,compile-jsps,-pre-dist,library-inclusion-in-manifest"> 
  • AcmeIdp/trunk/nbproject/genfiles.properties

    r61 r68  
    1 build.xml.data.CRC32=d756e565 
     1build.xml.data.CRC32=d1e419c4 
    22build.xml.script.CRC32=ff870e9f 
    33build.xml.stylesheet.CRC32=b4cea8bf 
    44# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. 
    55# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. 
    6 nbproject/build-impl.xml.data.CRC32=d756e565 
    7 nbproject/build-impl.xml.script.CRC32=74742c9c 
     6nbproject/build-impl.xml.data.CRC32=d1e419c4 
     7nbproject/build-impl.xml.script.CRC32=a1bd2566 
    88nbproject/build-impl.xml.stylesheet.CRC32=8b52d23f 
  • AcmeIdp/trunk/nbproject/project.properties

    r61 r68  
    2626    ${libs.ApacheCommons.classpath}:\ 
    2727    ${libs.Javolution.classpath}:\ 
    28     ${libs.OpenSAML.classpath}:\ 
    29     ${libs.Xalan.classpath} 
     28    ${libs.OpenSAML.classpath} 
    3029# Space-separated list of extra javac options 
    3130javac.compilerargs= 
  • AcmeIdp/trunk/nbproject/project.xml

    r61 r68  
    1515                    <path-in-war>WEB-INF/lib</path-in-war> 
    1616                </library> 
    17                 <library files="8"> 
     17                <library files="7"> 
    1818                    <file>${libs.OpenSAML.classpath}</file> 
    19                     <path-in-war>WEB-INF/lib</path-in-war> 
    20                 </library> 
    21                 <library files="5"> 
    22                     <file>${libs.Xalan.classpath}</file> 
    2319                    <path-in-war>WEB-INF/lib</path-in-war> 
    2420                </library> 
  • AcmeIdp/trunk/web/recv-authnrequest.jsp

    r67 r68  
    55 
    66<%@ page import="org.joda.time.DateTime" %> 
    7 <%@ page import="org.apache.commons.codec.binary.Base64" %> 
    87 
    98<%@ page import="org.opensaml.*" %> 
    109<%@ page import="org.opensaml.common.binding.BindingException" %> 
    1110<%@ page import="org.opensaml.common.xml.SAMLConstants" %> 
    12 <%@ page import="org.opensaml.xml.*" %> 
    13 <%@ page import="org.opensaml.xml.io.*" %> 
    1411<%@ page import="org.opensaml.saml2.binding.*" %> 
    1512<%@ page import="org.opensaml.saml2.core.*" %> 
    1613<%@ page import="org.opensaml.saml2.core.impl.*" %> 
     14<%@ page import="org.opensaml.xml.*" %> 
     15<%@ page import="org.opensaml.xml.io.*" %> 
     16<%@ page import="org.opensaml.xml.util.Base64" %> 
     17<%@ page import="org.opensaml.xml.util.XMLHelper" %> 
    1718 
    1819<%@ page import="org.w3c.dom.Element" %> 
    19 <%@ page import="org.w3c.dom.bootstrap.DOMImplementationRegistry" %> 
    20 <%@ page import="org.w3c.dom.Document" %> 
    21 <%@ page import="org.w3c.dom.ls.DOMImplementationLS" %> 
    22 <%@ page import="org.w3c.dom.ls.*" %> 
    23  
    2420 
    2521<% 
     22  String relayState; 
     23   
     24  relayState = request.getParameter("RelayState"); // grab the Base64 value 
     25  relayState = new String(Base64.decode(relayState)); 
     26  
     27  
    2628  // first bootstrap the entire opensaml library 
    2729  org.opensaml.DefaultBootstrap.bootstrap(); 
    2830   
    29   String relayState; 
    3031  HTTPPostDecoder decode = new HTTPPostDecoder(); 
    3132   
     
    3536    relayState = decode.getRelayState(); 
    3637  } catch (BindingException be) { 
    37     response.sendError(500, "No valid SAML 2.0 RelayState found in the request."); 
    38     return; 
     38//    response.sendError(500, "No valid SAML 2.0 RelayState found in the request. [" + be.getMessage() + "] [" + be.getCause().getMessage() + "]"); 
     39//    return; 
    3940  } 
    4041    // Use the OpenSAML Configuration singleton to get a builder factory object 
     
    8889    } 
    8990*/ 
     91  relayState = relayState.replace("<", "&lt;"); 
     92  relayState = relayState.replace(">", "&gt;"); 
    9093     
    9194%>     
     
    103106 
    104107 
    105     <h1>ACME Idp AuthnRequest</h1> 
     108    <h1>ACME Idp AuthnRequest Received</h1> 
    106109    <table> 
    107       <tr><td>auth:  <% //out.println( auth.toString() );%></td></tr> 
    108       <tr><td>newIssuer:  <% //out.println( newIssuer.toString() );%></td></tr> 
    109       <tr><td>authElement:  <% //if (authElement != null) out.println( authElement.toString() );%></td></tr> 
    110       <tr><td>msg  <% //out.println( msg );%></td></tr> 
    111       <tr><td>str <% //out.println( str );%> </td></tr> 
     110      <tr><td><% out.println( relayState );%></td></tr> 
    112111 
    113112    </table>