diff options
| author | root <root@ds1.sunet.se> | 2010-06-29 23:47:21 +0200 |
|---|---|---|
| committer | root <root@ds1.sunet.se> | 2010-06-29 23:47:21 +0200 |
| commit | ca19e1aeccc299295d581aab6e9f409f85c248c2 (patch) | |
| tree | 5d398811083d3a0bea2a530f94f2eea9ad2345d9 | |
| parent | 0a90384a9c7d840e88d9636271e8393a514647a0 (diff) | |
import 1.1.
97 files changed, 2014 insertions, 2069 deletions
diff --git a/doc/INSTALL.txt b/doc/INSTALL.txt index 8ca3ae0..a9fd0a1 100644 --- a/doc/INSTALL.txt +++ b/doc/INSTALL.txt @@ -1,18 +1,6 @@ -3-Mar-08 -Version 1.0 Release Candidate 3 - Shibboleth Discovery Service Installation Prior to installation you may need to configure the system as described in deployment guide. This is currently available at: -https://spaces.internet2.edu/display/SHIB/DiscoveryService - -Specifically you may need to edit webpages\wayf.jsp and -src/conf/wayfconfig.xml. With no configuration the DiscoveryService -deploys an internet2 branded GUI and looks for metadata in the file -"/usr/local/sites.xml" (unix) and "%systemdrive%:\usr\local\sites.xml" -(Windows) - -Then run ant in the top level directory to build the war file suitable -for deploying into your container.
\ No newline at end of file +https://spaces.internet2.edu/display/SHIB/DiscoveryService
\ No newline at end of file diff --git a/doc/RELEASE-NOTES.txt b/doc/RELEASE-NOTES.txt index 07aa43f..da2cc9a 100644 --- a/doc/RELEASE-NOTES.txt +++ b/doc/RELEASE-NOTES.txt @@ -1,20 +1,19 @@ -Changes in Release 1.1.0 +Changes in Release 1.1.1 ============================================= -[SDSJ-22] - wayf.jsp: Invalid loaction of tag <input/> and <select/> -[SDSJ-27] - Discovery Service produce megabytes of logging -[SDSJ-34] - Add tabindex to the inputfields . -[SDSJ-36] - Strip out cookie handling parameters from HandlerConfig -[SDSJ-37] - Logging is still stuffed for V2 discovery service. -[SDSJ-39] - Calling wayf.jsp directly should induce wayf error page with appropiate message -[SDSJ-41] - Could the DS be made more informative when the SP point it to the wrong address -[SDSJ-42] - DS should also listen on DS and *.ds endpoints -[SDSJ-44] - Add version information in library JAR manifest and provide command line tool to view it -[SDSJ-46] - 1.1 Installation is broken in several exciting and new ways. -[SDSJ-48] - DS accepts SP endpoints without checking Binding attribute. -[SDSJ-50] - Need to collect more recent versions of libraries for this release -[SDSj-51] - Should be able to have <MetadataProvider> whose contents are never shown. -[SDSJ-52] - Display of UTF8 is currently broken. -[SDSJ-53] - NPE in edu.internet2.middleware.shibboleth.wayf.plugins.provider.SamlCookiePlug -[SDSJ-54] - requestURL is fetched from the application context -[SDSJ-55] - NPE on empty <OrganizationDisplayName> -[SDSJ-57] - Add White/BloackList Filter +The major change in this release is the UI in particular the searching for IdPs can be done +from within the browser (by way of a javascript class). The old style searching is still +supported and is used when the browser does not support javascript. This means that the precise +effect of the provideList and provideListOfList configuration values for wayfconfig +have changed. With the default JSP, the former controls whether the quick search is enabled, the +latter toggles whether the single or double pane selector is chosen. + +There is some support for prototyping of "embedded WAYF" code. + +The precise Cases changed are. + +[SDSJ-58] - Subtle bug to do with the default attribute handling and default end points. (2120) +[SDSJ-60] - Missed case normalization before search meant we missed some items. +[SDSJ-62] - Add Java script driver quick searching +[SDSJ-63] - UI GUI -changes - dynamic search and nascent embedded WAYF work +[SDSJ-64] - Needs to clean non printing whitespace from Organization DisplayName before outputing javascript arrays +[SDSJ-65] - Update libraries for release
\ No newline at end of file diff --git a/doc/api/allclasses-frame.html b/doc/api/allclasses-frame.html index 2bede0e..962f318 100644 --- a/doc/api/allclasses-frame.html +++ b/doc/api/allclasses-frame.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -All Classes (Shibboleth Discovery Service 1.1.0 Java API.) +All Classes (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> @@ -23,12 +23,6 @@ All Classes (Shibboleth Discovery Service 1.1.0 Java API.) <TR> <TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="edu/internet2/middleware/shibboleth/wayf/plugins/provider/BindingFilter.html" title="class in edu.internet2.middleware.shibboleth.wayf.plugins.provider" target="classFrame">BindingFilter</A> <BR> -<A HREF="edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseBuilder.html" title="class in edu.internet2.middleware.shibboleth.wayf" target="classFrame">DiscoveryResponseBuilder</A> -<BR> -<A HREF="edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseImpl.html" title="class in edu.internet2.middleware.shibboleth.wayf" target="classFrame">DiscoveryResponseImpl</A> -<BR> -<A HREF="edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseUnmarshaller.html" title="class in edu.internet2.middleware.shibboleth.wayf" target="classFrame">DiscoveryResponseUnmarshaller</A> -<BR> <A HREF="edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html" title="class in edu.internet2.middleware.shibboleth.wayf" target="classFrame">DiscoveryServiceHandler</A> <BR> <A HREF="edu/internet2/middleware/shibboleth/wayf/HandlerConfig.html" title="class in edu.internet2.middleware.shibboleth.wayf" target="classFrame">HandlerConfig</A> diff --git a/doc/api/allclasses-noframe.html b/doc/api/allclasses-noframe.html index da6e3ae..577254a 100644 --- a/doc/api/allclasses-noframe.html +++ b/doc/api/allclasses-noframe.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -All Classes (Shibboleth Discovery Service 1.1.0 Java API.) +All Classes (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> @@ -23,12 +23,6 @@ All Classes (Shibboleth Discovery Service 1.1.0 Java API.) <TR> <TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="edu/internet2/middleware/shibboleth/wayf/plugins/provider/BindingFilter.html" title="class in edu.internet2.middleware.shibboleth.wayf.plugins.provider">BindingFilter</A> <BR> -<A HREF="edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseBuilder.html" title="class in edu.internet2.middleware.shibboleth.wayf">DiscoveryResponseBuilder</A> -<BR> -<A HREF="edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseImpl.html" title="class in edu.internet2.middleware.shibboleth.wayf">DiscoveryResponseImpl</A> -<BR> -<A HREF="edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseUnmarshaller.html" title="class in edu.internet2.middleware.shibboleth.wayf">DiscoveryResponseUnmarshaller</A> -<BR> <A HREF="edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html" title="class in edu.internet2.middleware.shibboleth.wayf">DiscoveryServiceHandler</A> <BR> <A HREF="edu/internet2/middleware/shibboleth/wayf/HandlerConfig.html" title="class in edu.internet2.middleware.shibboleth.wayf">HandlerConfig</A> diff --git a/doc/api/constant-values.html b/doc/api/constant-values.html index 809ee54..2e4577a 100644 --- a/doc/api/constant-values.html +++ b/doc/api/constant-values.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -Constant Field Values (Shibboleth Discovery Service 1.1.0 Java API.) +Constant Field Values (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> @@ -14,7 +14,7 @@ Constant Field Values (Shibboleth Discovery Service 1.1.0 Java API.) <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="Constant Field Values (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="Constant Field Values (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> @@ -97,30 +97,6 @@ edu.internet2.*</FONT></TH> <TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor"> -<TH ALIGN="left" COLSPAN="3">edu.internet2.middleware.shibboleth.wayf.<A HREF="edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseImpl.html" title="class in edu.internet2.middleware.shibboleth.wayf">DiscoveryResponseImpl</A></TH> -</TR> -<TR BGCOLOR="white" CLASS="TableRowColor"> -<A NAME="edu.internet2.middleware.shibboleth.wayf.DiscoveryResponseImpl.DEFAULT_ELEMENT_LOCAL_NAME"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1"> -<CODE>protected static final <A HREF="http://java.sun.com/j2se/1.5.0/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD> -<TD ALIGN="left"><CODE><A HREF="edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseImpl.html#DEFAULT_ELEMENT_LOCAL_NAME">DEFAULT_ELEMENT_LOCAL_NAME</A></CODE></TD> -<TD ALIGN="right"><CODE>"DiscoveryResponse"</CODE></TD> -</TR> -<TR BGCOLOR="white" CLASS="TableRowColor"> -<A NAME="edu.internet2.middleware.shibboleth.wayf.DiscoveryResponseImpl.METADATA_NS"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1"> -<CODE>public static final <A HREF="http://java.sun.com/j2se/1.5.0/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD> -<TD ALIGN="left"><CODE><A HREF="edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseImpl.html#METADATA_NS">METADATA_NS</A></CODE></TD> -<TD ALIGN="right"><CODE>"urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"</CODE></TD> -</TR> -</FONT></TD> -</TR> -</TABLE> - -<P> - -<P> - -<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> -<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor"> <TH ALIGN="left" COLSPAN="3">edu.internet2.middleware.shibboleth.wayf.<A HREF="edu/internet2/middleware/shibboleth/wayf/XMLConstants.html" title="class in edu.internet2.middleware.shibboleth.wayf">XMLConstants</A></TH> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> diff --git a/doc/api/deprecated-list.html b/doc/api/deprecated-list.html index ac37240..93b7cf5 100644 --- a/doc/api/deprecated-list.html +++ b/doc/api/deprecated-list.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -Deprecated List (Shibboleth Discovery Service 1.1.0 Java API.) +Deprecated List (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> @@ -14,7 +14,7 @@ Deprecated List (Shibboleth Discovery Service 1.1.0 Java API.) <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="Deprecated List (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="Deprecated List (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/common/ShibbolethConfigurationException.html b/doc/api/edu/internet2/middleware/shibboleth/common/ShibbolethConfigurationException.html index ece2906..79b456a 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/common/ShibbolethConfigurationException.html +++ b/doc/api/edu/internet2/middleware/shibboleth/common/ShibbolethConfigurationException.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:23 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -ShibbolethConfigurationException (Shibboleth Discovery Service 1.1.0 Java API.) +ShibbolethConfigurationException (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> <META NAME="keywords" CONTENT="edu.internet2.middleware.shibboleth.common.ShibbolethConfigurationException class"> @@ -15,7 +15,7 @@ ShibbolethConfigurationException (Shibboleth Discovery Service 1.1.0 Java API.) <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="ShibbolethConfigurationException (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="ShibbolethConfigurationException (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/common/class-use/ShibbolethConfigurationException.html b/doc/api/edu/internet2/middleware/shibboleth/common/class-use/ShibbolethConfigurationException.html index 21ada9d..b496d30 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/common/class-use/ShibbolethConfigurationException.html +++ b/doc/api/edu/internet2/middleware/shibboleth/common/class-use/ShibbolethConfigurationException.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -Uses of Class edu.internet2.middleware.shibboleth.common.ShibbolethConfigurationException (Shibboleth Discovery Service 1.1.0 Java API.) +Uses of Class edu.internet2.middleware.shibboleth.common.ShibbolethConfigurationException (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> @@ -14,7 +14,7 @@ Uses of Class edu.internet2.middleware.shibboleth.common.ShibbolethConfiguration <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="Uses of Class edu.internet2.middleware.shibboleth.common.ShibbolethConfigurationException (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="Uses of Class edu.internet2.middleware.shibboleth.common.ShibbolethConfigurationException (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/common/package-frame.html b/doc/api/edu/internet2/middleware/shibboleth/common/package-frame.html index 90af46b..34bcd86 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/common/package-frame.html +++ b/doc/api/edu/internet2/middleware/shibboleth/common/package-frame.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -edu.internet2.middleware.shibboleth.common (Shibboleth Discovery Service 1.1.0 Java API.) +edu.internet2.middleware.shibboleth.common (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> <META NAME="keywords" CONTENT="edu.internet2.middleware.shibboleth.common package"> diff --git a/doc/api/edu/internet2/middleware/shibboleth/common/package-summary.html b/doc/api/edu/internet2/middleware/shibboleth/common/package-summary.html index 731ed08..fc9f5fe 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/common/package-summary.html +++ b/doc/api/edu/internet2/middleware/shibboleth/common/package-summary.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -edu.internet2.middleware.shibboleth.common (Shibboleth Discovery Service 1.1.0 Java API.) +edu.internet2.middleware.shibboleth.common (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> <META NAME="keywords" CONTENT="edu.internet2.middleware.shibboleth.common package"> @@ -15,7 +15,7 @@ edu.internet2.middleware.shibboleth.common (Shibboleth Discovery Service 1.1.0 J <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="edu.internet2.middleware.shibboleth.common (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="edu.internet2.middleware.shibboleth.common (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/common/package-tree.html b/doc/api/edu/internet2/middleware/shibboleth/common/package-tree.html index feeac93..b029af2 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/common/package-tree.html +++ b/doc/api/edu/internet2/middleware/shibboleth/common/package-tree.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -edu.internet2.middleware.shibboleth.common Class Hierarchy (Shibboleth Discovery Service 1.1.0 Java API.) +edu.internet2.middleware.shibboleth.common Class Hierarchy (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> @@ -14,7 +14,7 @@ edu.internet2.middleware.shibboleth.common Class Hierarchy (Shibboleth Discovery <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="edu.internet2.middleware.shibboleth.common Class Hierarchy (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="edu.internet2.middleware.shibboleth.common Class Hierarchy (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/common/package-use.html b/doc/api/edu/internet2/middleware/shibboleth/common/package-use.html index c8a0bd8..32152f7 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/common/package-use.html +++ b/doc/api/edu/internet2/middleware/shibboleth/common/package-use.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -Uses of Package edu.internet2.middleware.shibboleth.common (Shibboleth Discovery Service 1.1.0 Java API.) +Uses of Package edu.internet2.middleware.shibboleth.common (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> @@ -14,7 +14,7 @@ Uses of Package edu.internet2.middleware.shibboleth.common (Shibboleth Discovery <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="Uses of Package edu.internet2.middleware.shibboleth.common (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="Uses of Package edu.internet2.middleware.shibboleth.common (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html index c5f8026..b5f99b2 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -DiscoveryServiceHandler (Shibboleth Discovery Service 1.1.0 Java API.) +DiscoveryServiceHandler (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> <META NAME="keywords" CONTENT="edu.internet2.middleware.shibboleth.wayf.DiscoveryServiceHandler class"> @@ -15,7 +15,7 @@ DiscoveryServiceHandler (Shibboleth Discovery Service 1.1.0 Java API.) <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="DiscoveryServiceHandler (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="DiscoveryServiceHandler (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> @@ -53,7 +53,7 @@ function windowTitle() <TR> <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2"> - <A HREF="../../../../../edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseUnmarshaller.html" title="class in edu.internet2.middleware.shibboleth.wayf"><B>PREV CLASS</B></A> + PREV CLASS <A HREF="../../../../../edu/internet2/middleware/shibboleth/wayf/HandlerConfig.html" title="class in edu.internet2.middleware.shibboleth.wayf"><B>NEXT CLASS</B></A></FONT></TD> <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2"> <A HREF="../../../../../index.html?edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html" target="_top"><B>FRAMES</B></A> @@ -308,7 +308,7 @@ public static void <B>forwardRequest</B>(javax.servlet.http.HttpServletRequest&n <TR> <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2"> - <A HREF="../../../../../edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseUnmarshaller.html" title="class in edu.internet2.middleware.shibboleth.wayf"><B>PREV CLASS</B></A> + PREV CLASS <A HREF="../../../../../edu/internet2/middleware/shibboleth/wayf/HandlerConfig.html" title="class in edu.internet2.middleware.shibboleth.wayf"><B>NEXT CLASS</B></A></FONT></TD> <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2"> <A HREF="../../../../../index.html?edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html" target="_top"><B>FRAMES</B></A> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/HandlerConfig.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/HandlerConfig.html index 7fcf436..fea917e 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/HandlerConfig.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/HandlerConfig.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -HandlerConfig (Shibboleth Discovery Service 1.1.0 Java API.) +HandlerConfig (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> <META NAME="keywords" CONTENT="edu.internet2.middleware.shibboleth.wayf.HandlerConfig class"> @@ -15,7 +15,7 @@ HandlerConfig (Shibboleth Discovery Service 1.1.0 Java API.) <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="HandlerConfig (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="HandlerConfig (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/IdPSite.Compare.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/IdPSite.Compare.html index 02959bf..4a2a3e5 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/IdPSite.Compare.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/IdPSite.Compare.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -IdPSite.Compare (Shibboleth Discovery Service 1.1.0 Java API.) +IdPSite.Compare (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> <META NAME="keywords" CONTENT="edu.internet2.middleware.shibboleth.wayf.IdPSite.Compare class"> @@ -15,7 +15,7 @@ IdPSite.Compare (Shibboleth Discovery Service 1.1.0 Java API.) <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="IdPSite.Compare (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="IdPSite.Compare (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/IdPSite.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/IdPSite.html index b90486c..3a39b44 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/IdPSite.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/IdPSite.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -IdPSite (Shibboleth Discovery Service 1.1.0 Java API.) +IdPSite (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> <META NAME="keywords" CONTENT="edu.internet2.middleware.shibboleth.wayf.IdPSite class"> @@ -15,7 +15,7 @@ IdPSite (Shibboleth Discovery Service 1.1.0 Java API.) <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="IdPSite (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="IdPSite (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.html index 2269d01..832761b 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -IdPSiteSet (Shibboleth Discovery Service 1.1.0 Java API.) +IdPSiteSet (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> <META NAME="keywords" CONTENT="edu.internet2.middleware.shibboleth.wayf.IdPSiteSet class"> @@ -15,7 +15,7 @@ IdPSiteSet (Shibboleth Discovery Service 1.1.0 Java API.) <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="IdPSiteSet (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="IdPSiteSet (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/IdPSiteSetEntry.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/IdPSiteSetEntry.html index f5bfd11..077e076 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/IdPSiteSetEntry.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/IdPSiteSetEntry.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -IdPSiteSetEntry (Shibboleth Discovery Service 1.1.0 Java API.) +IdPSiteSetEntry (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> <META NAME="keywords" CONTENT="edu.internet2.middleware.shibboleth.wayf.IdPSiteSetEntry class"> @@ -15,7 +15,7 @@ IdPSiteSetEntry (Shibboleth Discovery Service 1.1.0 Java API.) <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="IdPSiteSetEntry (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="IdPSiteSetEntry (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/LogbackConfigurationChangeListener.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/LogbackConfigurationChangeListener.html index 5fcc6f9..bab581f 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/LogbackConfigurationChangeListener.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/LogbackConfigurationChangeListener.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -LogbackConfigurationChangeListener (Shibboleth Discovery Service 1.1.0 Java API.) +LogbackConfigurationChangeListener (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> <META NAME="keywords" CONTENT="edu.internet2.middleware.shibboleth.wayf.LogbackConfigurationChangeListener class"> @@ -15,7 +15,7 @@ LogbackConfigurationChangeListener (Shibboleth Discovery Service 1.1.0 Java API. <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="LogbackConfigurationChangeListener (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="LogbackConfigurationChangeListener (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/LogbackLoggingService.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/LogbackLoggingService.html index 80af937..ec43a03 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/LogbackLoggingService.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/LogbackLoggingService.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -LogbackLoggingService (Shibboleth Discovery Service 1.1.0 Java API.) +LogbackLoggingService (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> <META NAME="keywords" CONTENT="edu.internet2.middleware.shibboleth.wayf.LogbackLoggingService class"> @@ -15,7 +15,7 @@ LogbackLoggingService (Shibboleth Discovery Service 1.1.0 Java API.) <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="LogbackLoggingService (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="LogbackLoggingService (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/Version.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/Version.html index cf00218..9bc9546 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/Version.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/Version.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -Version (Shibboleth Discovery Service 1.1.0 Java API.) +Version (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> <META NAME="keywords" CONTENT="edu.internet2.middleware.shibboleth.wayf.Version class"> @@ -15,7 +15,7 @@ Version (Shibboleth Discovery Service 1.1.0 Java API.) <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="Version (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="Version (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/WayfException.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/WayfException.html index a7de7c4..1be1bcc 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/WayfException.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/WayfException.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -WayfException (Shibboleth Discovery Service 1.1.0 Java API.) +WayfException (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> <META NAME="keywords" CONTENT="edu.internet2.middleware.shibboleth.wayf.WayfException class"> @@ -15,7 +15,7 @@ WayfException (Shibboleth Discovery Service 1.1.0 Java API.) <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="WayfException (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="WayfException (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/WayfService.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/WayfService.html index f083251..5fc54d6 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/WayfService.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/WayfService.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -WayfService (Shibboleth Discovery Service 1.1.0 Java API.) +WayfService (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> <META NAME="keywords" CONTENT="edu.internet2.middleware.shibboleth.wayf.WayfService class"> @@ -15,7 +15,7 @@ WayfService (Shibboleth Discovery Service 1.1.0 Java API.) <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="WayfService (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="WayfService (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/XMLConstants.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/XMLConstants.html index af62eff..766e4bd 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/XMLConstants.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/XMLConstants.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -XMLConstants (Shibboleth Discovery Service 1.1.0 Java API.) +XMLConstants (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> <META NAME="keywords" CONTENT="edu.internet2.middleware.shibboleth.wayf.XMLConstants class"> @@ -15,7 +15,7 @@ XMLConstants (Shibboleth Discovery Service 1.1.0 Java API.) <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="XMLConstants (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="XMLConstants (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/DiscoveryServiceHandler.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/DiscoveryServiceHandler.html index e768d92..7eeb029 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/DiscoveryServiceHandler.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/DiscoveryServiceHandler.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -Uses of Class edu.internet2.middleware.shibboleth.wayf.DiscoveryServiceHandler (Shibboleth Discovery Service 1.1.0 Java API.) +Uses of Class edu.internet2.middleware.shibboleth.wayf.DiscoveryServiceHandler (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> @@ -14,7 +14,7 @@ Uses of Class edu.internet2.middleware.shibboleth.wayf.DiscoveryServiceHandler ( <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="Uses of Class edu.internet2.middleware.shibboleth.wayf.DiscoveryServiceHandler (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="Uses of Class edu.internet2.middleware.shibboleth.wayf.DiscoveryServiceHandler (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/HandlerConfig.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/HandlerConfig.html index efda75e..b8387dc 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/HandlerConfig.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/HandlerConfig.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -Uses of Class edu.internet2.middleware.shibboleth.wayf.HandlerConfig (Shibboleth Discovery Service 1.1.0 Java API.) +Uses of Class edu.internet2.middleware.shibboleth.wayf.HandlerConfig (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> @@ -14,7 +14,7 @@ Uses of Class edu.internet2.middleware.shibboleth.wayf.HandlerConfig (Shibboleth <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="Uses of Class edu.internet2.middleware.shibboleth.wayf.HandlerConfig (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="Uses of Class edu.internet2.middleware.shibboleth.wayf.HandlerConfig (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/IdPSite.Compare.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/IdPSite.Compare.html index ae6550b..c425c25 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/IdPSite.Compare.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/IdPSite.Compare.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -Uses of Class edu.internet2.middleware.shibboleth.wayf.IdPSite.Compare (Shibboleth Discovery Service 1.1.0 Java API.) +Uses of Class edu.internet2.middleware.shibboleth.wayf.IdPSite.Compare (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> @@ -14,7 +14,7 @@ Uses of Class edu.internet2.middleware.shibboleth.wayf.IdPSite.Compare (Shibbole <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="Uses of Class edu.internet2.middleware.shibboleth.wayf.IdPSite.Compare (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="Uses of Class edu.internet2.middleware.shibboleth.wayf.IdPSite.Compare (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/IdPSite.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/IdPSite.html index b228fec..f6fde21 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/IdPSite.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/IdPSite.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -Uses of Class edu.internet2.middleware.shibboleth.wayf.IdPSite (Shibboleth Discovery Service 1.1.0 Java API.) +Uses of Class edu.internet2.middleware.shibboleth.wayf.IdPSite (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> @@ -14,7 +14,7 @@ Uses of Class edu.internet2.middleware.shibboleth.wayf.IdPSite (Shibboleth Disco <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="Uses of Class edu.internet2.middleware.shibboleth.wayf.IdPSite (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="Uses of Class edu.internet2.middleware.shibboleth.wayf.IdPSite (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/IdPSiteSet.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/IdPSiteSet.html index 62b8110..3f29834 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/IdPSiteSet.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/IdPSiteSet.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -Uses of Class edu.internet2.middleware.shibboleth.wayf.IdPSiteSet (Shibboleth Discovery Service 1.1.0 Java API.) +Uses of Class edu.internet2.middleware.shibboleth.wayf.IdPSiteSet (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> @@ -14,7 +14,7 @@ Uses of Class edu.internet2.middleware.shibboleth.wayf.IdPSiteSet (Shibboleth Di <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="Uses of Class edu.internet2.middleware.shibboleth.wayf.IdPSiteSet (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="Uses of Class edu.internet2.middleware.shibboleth.wayf.IdPSiteSet (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/IdPSiteSetEntry.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/IdPSiteSetEntry.html index 606ecb4..719f7f0 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/IdPSiteSetEntry.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/IdPSiteSetEntry.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -Uses of Class edu.internet2.middleware.shibboleth.wayf.IdPSiteSetEntry (Shibboleth Discovery Service 1.1.0 Java API.) +Uses of Class edu.internet2.middleware.shibboleth.wayf.IdPSiteSetEntry (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> @@ -14,7 +14,7 @@ Uses of Class edu.internet2.middleware.shibboleth.wayf.IdPSiteSetEntry (Shibbole <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="Uses of Class edu.internet2.middleware.shibboleth.wayf.IdPSiteSetEntry (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="Uses of Class edu.internet2.middleware.shibboleth.wayf.IdPSiteSetEntry (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/LogbackConfigurationChangeListener.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/LogbackConfigurationChangeListener.html index d5bac62..ce82d35 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/LogbackConfigurationChangeListener.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/LogbackConfigurationChangeListener.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -Uses of Class edu.internet2.middleware.shibboleth.wayf.LogbackConfigurationChangeListener (Shibboleth Discovery Service 1.1.0 Java API.) +Uses of Class edu.internet2.middleware.shibboleth.wayf.LogbackConfigurationChangeListener (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> @@ -14,7 +14,7 @@ Uses of Class edu.internet2.middleware.shibboleth.wayf.LogbackConfigurationChang <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="Uses of Class edu.internet2.middleware.shibboleth.wayf.LogbackConfigurationChangeListener (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="Uses of Class edu.internet2.middleware.shibboleth.wayf.LogbackConfigurationChangeListener (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/LogbackLoggingService.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/LogbackLoggingService.html index 39f16bc..ca943a0 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/LogbackLoggingService.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/LogbackLoggingService.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -Uses of Class edu.internet2.middleware.shibboleth.wayf.LogbackLoggingService (Shibboleth Discovery Service 1.1.0 Java API.) +Uses of Class edu.internet2.middleware.shibboleth.wayf.LogbackLoggingService (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> @@ -14,7 +14,7 @@ Uses of Class edu.internet2.middleware.shibboleth.wayf.LogbackLoggingService (Sh <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="Uses of Class edu.internet2.middleware.shibboleth.wayf.LogbackLoggingService (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="Uses of Class edu.internet2.middleware.shibboleth.wayf.LogbackLoggingService (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/Version.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/Version.html index 4b8901d..6a64f32 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/Version.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/Version.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -Uses of Class edu.internet2.middleware.shibboleth.wayf.Version (Shibboleth Discovery Service 1.1.0 Java API.) +Uses of Class edu.internet2.middleware.shibboleth.wayf.Version (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> @@ -14,7 +14,7 @@ Uses of Class edu.internet2.middleware.shibboleth.wayf.Version (Shibboleth Disco <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="Uses of Class edu.internet2.middleware.shibboleth.wayf.Version (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="Uses of Class edu.internet2.middleware.shibboleth.wayf.Version (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/WayfException.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/WayfException.html index 5794f6e..ee4c975 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/WayfException.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/WayfException.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -Uses of Class edu.internet2.middleware.shibboleth.wayf.WayfException (Shibboleth Discovery Service 1.1.0 Java API.) +Uses of Class edu.internet2.middleware.shibboleth.wayf.WayfException (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> @@ -14,7 +14,7 @@ Uses of Class edu.internet2.middleware.shibboleth.wayf.WayfException (Shibboleth <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="Uses of Class edu.internet2.middleware.shibboleth.wayf.WayfException (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="Uses of Class edu.internet2.middleware.shibboleth.wayf.WayfException (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/WayfService.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/WayfService.html index 05a6f86..526f701 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/WayfService.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/WayfService.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -Uses of Class edu.internet2.middleware.shibboleth.wayf.WayfService (Shibboleth Discovery Service 1.1.0 Java API.) +Uses of Class edu.internet2.middleware.shibboleth.wayf.WayfService (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> @@ -14,7 +14,7 @@ Uses of Class edu.internet2.middleware.shibboleth.wayf.WayfService (Shibboleth D <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="Uses of Class edu.internet2.middleware.shibboleth.wayf.WayfService (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="Uses of Class edu.internet2.middleware.shibboleth.wayf.WayfService (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/XMLConstants.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/XMLConstants.html index d3bf757..f0e2c14 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/XMLConstants.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/XMLConstants.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -Uses of Class edu.internet2.middleware.shibboleth.wayf.XMLConstants (Shibboleth Discovery Service 1.1.0 Java API.) +Uses of Class edu.internet2.middleware.shibboleth.wayf.XMLConstants (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> @@ -14,7 +14,7 @@ Uses of Class edu.internet2.middleware.shibboleth.wayf.XMLConstants (Shibboleth <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="Uses of Class edu.internet2.middleware.shibboleth.wayf.XMLConstants (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="Uses of Class edu.internet2.middleware.shibboleth.wayf.XMLConstants (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/package-frame.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/package-frame.html index ff7b32d..7abe673 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/package-frame.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/package-frame.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -edu.internet2.middleware.shibboleth.wayf (Shibboleth Discovery Service 1.1.0 Java API.) +edu.internet2.middleware.shibboleth.wayf (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> <META NAME="keywords" CONTENT="edu.internet2.middleware.shibboleth.wayf package"> @@ -24,12 +24,6 @@ edu.internet2.middleware.shibboleth.wayf (Shibboleth Discovery Service 1.1.0 Jav Classes</FONT> <FONT CLASS="FrameItemFont"> <BR> -<A HREF="DiscoveryResponseBuilder.html" title="class in edu.internet2.middleware.shibboleth.wayf" target="classFrame">DiscoveryResponseBuilder</A> -<BR> -<A HREF="DiscoveryResponseImpl.html" title="class in edu.internet2.middleware.shibboleth.wayf" target="classFrame">DiscoveryResponseImpl</A> -<BR> -<A HREF="DiscoveryResponseUnmarshaller.html" title="class in edu.internet2.middleware.shibboleth.wayf" target="classFrame">DiscoveryResponseUnmarshaller</A> -<BR> <A HREF="DiscoveryServiceHandler.html" title="class in edu.internet2.middleware.shibboleth.wayf" target="classFrame">DiscoveryServiceHandler</A> <BR> <A HREF="HandlerConfig.html" title="class in edu.internet2.middleware.shibboleth.wayf" target="classFrame">HandlerConfig</A> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/package-summary.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/package-summary.html index e506936..7fddb85 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/package-summary.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/package-summary.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -edu.internet2.middleware.shibboleth.wayf (Shibboleth Discovery Service 1.1.0 Java API.) +edu.internet2.middleware.shibboleth.wayf (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> <META NAME="keywords" CONTENT="edu.internet2.middleware.shibboleth.wayf package"> @@ -15,7 +15,7 @@ edu.internet2.middleware.shibboleth.wayf (Shibboleth Discovery Service 1.1.0 Jav <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="edu.internet2.middleware.shibboleth.wayf (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="edu.internet2.middleware.shibboleth.wayf (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> @@ -87,19 +87,6 @@ Package edu.internet2.middleware.shibboleth.wayf <B>Class Summary</B></FONT></TH> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> -<TD WIDTH="15%"><B><A HREF="../../../../../edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseBuilder.html" title="class in edu.internet2.middleware.shibboleth.wayf">DiscoveryResponseBuilder</A></B></TD> -<TD>Builder of <CODE>SingleLogoutServiceImpl</CODE>.</TD> -</TR> -<TR BGCOLOR="white" CLASS="TableRowColor"> -<TD WIDTH="15%"><B><A HREF="../../../../../edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseImpl.html" title="class in edu.internet2.middleware.shibboleth.wayf">DiscoveryResponseImpl</A></B></TD> -<TD>This plugs into the standard opensaml2 parser framework to allow us to get use <code> DiscoverResponse </code> - elements in our extensions.</TD> -</TR> -<TR BGCOLOR="white" CLASS="TableRowColor"> -<TD WIDTH="15%"><B><A HREF="../../../../../edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseUnmarshaller.html" title="class in edu.internet2.middleware.shibboleth.wayf">DiscoveryResponseUnmarshaller</A></B></TD> -<TD>A thread safe Unmarshaller for <CODE>SingleLogoutService</CODE> objects.</TD> -</TR> -<TR BGCOLOR="white" CLASS="TableRowColor"> <TD WIDTH="15%"><B><A HREF="../../../../../edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html" title="class in edu.internet2.middleware.shibboleth.wayf">DiscoveryServiceHandler</A></B></TD> <TD>Specific handler for each version of the Discovery Service.</TD> </TR> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/package-tree.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/package-tree.html index 71d08c4..f267e87 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/package-tree.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/package-tree.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -edu.internet2.middleware.shibboleth.wayf Class Hierarchy (Shibboleth Discovery Service 1.1.0 Java API.) +edu.internet2.middleware.shibboleth.wayf Class Hierarchy (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> @@ -14,7 +14,7 @@ edu.internet2.middleware.shibboleth.wayf Class Hierarchy (Shibboleth Discovery S <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="edu.internet2.middleware.shibboleth.wayf Class Hierarchy (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="edu.internet2.middleware.shibboleth.wayf Class Hierarchy (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> @@ -89,36 +89,6 @@ Class Hierarchy </H2> <UL> <LI TYPE="circle">java.lang.<A HREF="http://java.sun.com/j2se/1.5.0/docs/api/java/lang/Object.html" title="class or interface in java.lang"><B>Object</B></A><UL> -<LI TYPE="circle">org.opensaml.xml.AbstractXMLObject (implements org.opensaml.xml.XMLObject) -<UL> -<LI TYPE="circle">org.opensaml.xml.validation.AbstractValidatingXMLObject (implements org.opensaml.xml.validation.ValidatingXMLObject) -<UL> -<LI TYPE="circle">org.opensaml.common.impl.AbstractSAMLObject<UL> -<LI TYPE="circle">org.opensaml.saml2.metadata.impl.EndpointImpl (implements org.opensaml.saml2.metadata.Endpoint) -<UL> -<LI TYPE="circle">org.opensaml.saml2.metadata.impl.IndexedEndpointImpl (implements org.opensaml.saml2.metadata.IndexedEndpoint) -<UL> -<LI TYPE="circle">edu.internet2.middleware.shibboleth.wayf.<A HREF="../../../../../edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseImpl.html" title="class in edu.internet2.middleware.shibboleth.wayf"><B>DiscoveryResponseImpl</B></A> (implements org.opensaml.saml2.metadata.IndexedEndpoint) -</UL> -</UL> -</UL> -</UL> -</UL> -<LI TYPE="circle">org.opensaml.xml.AbstractXMLObjectBuilder<XMLObjectType> (implements org.opensaml.xml.XMLObjectBuilder<XMLObjectType>) -<UL> -<LI TYPE="circle">org.opensaml.common.impl.AbstractSAMLObjectBuilder<SAMLObjectType> (implements org.opensaml.common.SAMLObjectBuilder<SAMLObjectType>) -<UL> -<LI TYPE="circle">edu.internet2.middleware.shibboleth.wayf.<A HREF="../../../../../edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseBuilder.html" title="class in edu.internet2.middleware.shibboleth.wayf"><B>DiscoveryResponseBuilder</B></A></UL> -</UL> -<LI TYPE="circle">org.opensaml.xml.io.AbstractXMLObjectUnmarshaller (implements org.opensaml.xml.io.Unmarshaller) -<UL> -<LI TYPE="circle">org.opensaml.common.impl.AbstractSAMLObjectUnmarshaller<UL> -<LI TYPE="circle">org.opensaml.saml2.metadata.impl.EndpointUnmarshaller<UL> -<LI TYPE="circle">org.opensaml.saml2.metadata.impl.IndexedEndpointUnmarshaller<UL> -<LI TYPE="circle">edu.internet2.middleware.shibboleth.wayf.<A HREF="../../../../../edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseUnmarshaller.html" title="class in edu.internet2.middleware.shibboleth.wayf"><B>DiscoveryResponseUnmarshaller</B></A></UL> -</UL> -</UL> -</UL> <LI TYPE="circle">edu.internet2.middleware.shibboleth.wayf.<A HREF="../../../../../edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html" title="class in edu.internet2.middleware.shibboleth.wayf"><B>DiscoveryServiceHandler</B></A><LI TYPE="circle">javax.servlet.GenericServlet (implements java.io.<A HREF="http://java.sun.com/j2se/1.5.0/docs/api/java/io/Serializable.html" title="class or interface in java.io">Serializable</A>, javax.servlet.Servlet, javax.servlet.ServletConfig) <UL> <LI TYPE="circle">javax.servlet.http.HttpServlet (implements java.io.<A HREF="http://java.sun.com/j2se/1.5.0/docs/api/java/io/Serializable.html" title="class or interface in java.io">Serializable</A>) diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/package-use.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/package-use.html index 217930a..e5c1e60 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/package-use.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/package-use.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -Uses of Package edu.internet2.middleware.shibboleth.wayf (Shibboleth Discovery Service 1.1.0 Java API.) +Uses of Package edu.internet2.middleware.shibboleth.wayf (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> @@ -14,7 +14,7 @@ Uses of Package edu.internet2.middleware.shibboleth.wayf (Shibboleth Discovery S <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="Uses of Package edu.internet2.middleware.shibboleth.wayf (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="Uses of Package edu.internet2.middleware.shibboleth.wayf (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> @@ -108,13 +108,6 @@ Packages that use <A HREF="../../../../../edu/internet2/middleware/shibboleth/wa Classes in <A HREF="../../../../../edu/internet2/middleware/shibboleth/wayf/package-summary.html">edu.internet2.middleware.shibboleth.wayf</A> used by <A HREF="../../../../../edu/internet2/middleware/shibboleth/wayf/package-summary.html">edu.internet2.middleware.shibboleth.wayf</A></FONT></TH> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> -<TD><B><A HREF="../../../../../edu/internet2/middleware/shibboleth/wayf/class-use/DiscoveryResponseImpl.html#edu.internet2.middleware.shibboleth.wayf"><B>DiscoveryResponseImpl</B></A></B> - -<BR> - This plugs into the standard opensaml2 parser framework to allow us to get use <code> DiscoverResponse </code> - elements in our extensions.</TD> -</TR> -<TR BGCOLOR="white" CLASS="TableRowColor"> <TD><B><A HREF="../../../../../edu/internet2/middleware/shibboleth/wayf/class-use/HandlerConfig.html#edu.internet2.middleware.shibboleth.wayf"><B>HandlerConfig</B></A></B> <BR> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/Plugin.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/Plugin.html index fd2e55d..608fb00 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/Plugin.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/Plugin.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -Plugin (Shibboleth Discovery Service 1.1.0 Java API.) +Plugin (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> <META NAME="keywords" CONTENT="edu.internet2.middleware.shibboleth.wayf.plugins.Plugin interface"> @@ -15,7 +15,7 @@ Plugin (Shibboleth Discovery Service 1.1.0 Java API.) <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="Plugin (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="Plugin (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/PluginContext.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/PluginContext.html index a52ce92..ba844f1 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/PluginContext.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/PluginContext.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -PluginContext (Shibboleth Discovery Service 1.1.0 Java API.) +PluginContext (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> <META NAME="keywords" CONTENT="edu.internet2.middleware.shibboleth.wayf.plugins.PluginContext interface"> @@ -15,7 +15,7 @@ PluginContext (Shibboleth Discovery Service 1.1.0 Java API.) <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="PluginContext (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="PluginContext (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/PluginMetadataParameter.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/PluginMetadataParameter.html index 0922980..93bd9f5 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/PluginMetadataParameter.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/PluginMetadataParameter.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -PluginMetadataParameter (Shibboleth Discovery Service 1.1.0 Java API.) +PluginMetadataParameter (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> <META NAME="keywords" CONTENT="edu.internet2.middleware.shibboleth.wayf.plugins.PluginMetadataParameter interface"> @@ -15,7 +15,7 @@ PluginMetadataParameter (Shibboleth Discovery Service 1.1.0 Java API.) <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="PluginMetadataParameter (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="PluginMetadataParameter (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/WayfRequestHandled.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/WayfRequestHandled.html index 3ef38e1..97b95a8 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/WayfRequestHandled.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/WayfRequestHandled.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -WayfRequestHandled (Shibboleth Discovery Service 1.1.0 Java API.) +WayfRequestHandled (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> <META NAME="keywords" CONTENT="edu.internet2.middleware.shibboleth.wayf.plugins.WayfRequestHandled class"> @@ -15,7 +15,7 @@ WayfRequestHandled (Shibboleth Discovery Service 1.1.0 Java API.) <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="WayfRequestHandled (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="WayfRequestHandled (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/class-use/Plugin.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/class-use/Plugin.html index 0521d9a..bb3d7c5 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/class-use/Plugin.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/class-use/Plugin.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -Uses of Interface edu.internet2.middleware.shibboleth.wayf.plugins.Plugin (Shibboleth Discovery Service 1.1.0 Java API.) +Uses of Interface edu.internet2.middleware.shibboleth.wayf.plugins.Plugin (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> @@ -14,7 +14,7 @@ Uses of Interface edu.internet2.middleware.shibboleth.wayf.plugins.Plugin (Shibb <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="Uses of Interface edu.internet2.middleware.shibboleth.wayf.plugins.Plugin (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="Uses of Interface edu.internet2.middleware.shibboleth.wayf.plugins.Plugin (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/class-use/PluginContext.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/class-use/PluginContext.html index a1c190a..99a51f3 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/class-use/PluginContext.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/class-use/PluginContext.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -Uses of Interface edu.internet2.middleware.shibboleth.wayf.plugins.PluginContext (Shibboleth Discovery Service 1.1.0 Java API.) +Uses of Interface edu.internet2.middleware.shibboleth.wayf.plugins.PluginContext (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> @@ -14,7 +14,7 @@ Uses of Interface edu.internet2.middleware.shibboleth.wayf.plugins.PluginContext <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="Uses of Interface edu.internet2.middleware.shibboleth.wayf.plugins.PluginContext (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="Uses of Interface edu.internet2.middleware.shibboleth.wayf.plugins.PluginContext (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/class-use/PluginMetadataParameter.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/class-use/PluginMetadataParameter.html index b442fa8..d41a104 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/class-use/PluginMetadataParameter.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/class-use/PluginMetadataParameter.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -Uses of Interface edu.internet2.middleware.shibboleth.wayf.plugins.PluginMetadataParameter (Shibboleth Discovery Service 1.1.0 Java API.) +Uses of Interface edu.internet2.middleware.shibboleth.wayf.plugins.PluginMetadataParameter (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> @@ -14,7 +14,7 @@ Uses of Interface edu.internet2.middleware.shibboleth.wayf.plugins.PluginMetadat <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="Uses of Interface edu.internet2.middleware.shibboleth.wayf.plugins.PluginMetadataParameter (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="Uses of Interface edu.internet2.middleware.shibboleth.wayf.plugins.PluginMetadataParameter (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/class-use/WayfRequestHandled.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/class-use/WayfRequestHandled.html index 6a1ead5..0b141ef 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/class-use/WayfRequestHandled.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/class-use/WayfRequestHandled.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -Uses of Class edu.internet2.middleware.shibboleth.wayf.plugins.WayfRequestHandled (Shibboleth Discovery Service 1.1.0 Java API.) +Uses of Class edu.internet2.middleware.shibboleth.wayf.plugins.WayfRequestHandled (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> @@ -14,7 +14,7 @@ Uses of Class edu.internet2.middleware.shibboleth.wayf.plugins.WayfRequestHandle <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="Uses of Class edu.internet2.middleware.shibboleth.wayf.plugins.WayfRequestHandled (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="Uses of Class edu.internet2.middleware.shibboleth.wayf.plugins.WayfRequestHandled (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/package-frame.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/package-frame.html index 55f1ae3..915b9c1 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/package-frame.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/package-frame.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -edu.internet2.middleware.shibboleth.wayf.plugins (Shibboleth Discovery Service 1.1.0 Java API.) +edu.internet2.middleware.shibboleth.wayf.plugins (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> <META NAME="keywords" CONTENT="edu.internet2.middleware.shibboleth.wayf.plugins package"> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/package-summary.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/package-summary.html index cf48e7e..6f1e90c 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/package-summary.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/package-summary.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -edu.internet2.middleware.shibboleth.wayf.plugins (Shibboleth Discovery Service 1.1.0 Java API.) +edu.internet2.middleware.shibboleth.wayf.plugins (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> <META NAME="keywords" CONTENT="edu.internet2.middleware.shibboleth.wayf.plugins package"> @@ -15,7 +15,7 @@ edu.internet2.middleware.shibboleth.wayf.plugins (Shibboleth Discovery Service 1 <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="edu.internet2.middleware.shibboleth.wayf.plugins (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="edu.internet2.middleware.shibboleth.wayf.plugins (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/package-tree.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/package-tree.html index e0e8975..ebb67c4 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/package-tree.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/package-tree.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -edu.internet2.middleware.shibboleth.wayf.plugins Class Hierarchy (Shibboleth Discovery Service 1.1.0 Java API.) +edu.internet2.middleware.shibboleth.wayf.plugins Class Hierarchy (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> @@ -14,7 +14,7 @@ edu.internet2.middleware.shibboleth.wayf.plugins Class Hierarchy (Shibboleth Dis <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="edu.internet2.middleware.shibboleth.wayf.plugins Class Hierarchy (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="edu.internet2.middleware.shibboleth.wayf.plugins Class Hierarchy (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/package-use.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/package-use.html index 1c5f99d..ebb308c 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/package-use.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/package-use.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -Uses of Package edu.internet2.middleware.shibboleth.wayf.plugins (Shibboleth Discovery Service 1.1.0 Java API.) +Uses of Package edu.internet2.middleware.shibboleth.wayf.plugins (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> @@ -14,7 +14,7 @@ Uses of Package edu.internet2.middleware.shibboleth.wayf.plugins (Shibboleth Dis <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="Uses of Package edu.internet2.middleware.shibboleth.wayf.plugins (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="Uses of Package edu.internet2.middleware.shibboleth.wayf.plugins (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/BindingFilter.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/BindingFilter.html index eb3219d..dbf4905 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/BindingFilter.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/BindingFilter.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -BindingFilter (Shibboleth Discovery Service 1.1.0 Java API.) +BindingFilter (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> <META NAME="keywords" CONTENT="edu.internet2.middleware.shibboleth.wayf.plugins.provider.BindingFilter class"> @@ -15,7 +15,7 @@ BindingFilter (Shibboleth Discovery Service 1.1.0 Java API.) <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="BindingFilter (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="BindingFilter (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/ListFilter.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/ListFilter.html index 4fbc41a..3cf0648 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/ListFilter.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/ListFilter.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -ListFilter (Shibboleth Discovery Service 1.1.0 Java API.) +ListFilter (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> <META NAME="keywords" CONTENT="edu.internet2.middleware.shibboleth.wayf.plugins.provider.ListFilter class"> @@ -15,7 +15,7 @@ ListFilter (Shibboleth Discovery Service 1.1.0 Java API.) <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="ListFilter (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="ListFilter (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/SamlCookiePlugin.SamlIdPCookie.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/SamlCookiePlugin.SamlIdPCookie.html index 7122956..71aede6 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/SamlCookiePlugin.SamlIdPCookie.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/SamlCookiePlugin.SamlIdPCookie.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -SamlCookiePlugin.SamlIdPCookie (Shibboleth Discovery Service 1.1.0 Java API.) +SamlCookiePlugin.SamlIdPCookie (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> <META NAME="keywords" CONTENT="edu.internet2.middleware.shibboleth.wayf.plugins.provider.SamlCookiePlugin.SamlIdPCookie class"> @@ -15,7 +15,7 @@ SamlCookiePlugin.SamlIdPCookie (Shibboleth Discovery Service 1.1.0 Java API.) <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="SamlCookiePlugin.SamlIdPCookie (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="SamlCookiePlugin.SamlIdPCookie (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/SamlCookiePlugin.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/SamlCookiePlugin.html index 2cdafbd..d6e0d9c 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/SamlCookiePlugin.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/SamlCookiePlugin.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -SamlCookiePlugin (Shibboleth Discovery Service 1.1.0 Java API.) +SamlCookiePlugin (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> <META NAME="keywords" CONTENT="edu.internet2.middleware.shibboleth.wayf.plugins.provider.SamlCookiePlugin class"> @@ -15,7 +15,7 @@ SamlCookiePlugin (Shibboleth Discovery Service 1.1.0 Java API.) <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="SamlCookiePlugin (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="SamlCookiePlugin (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/class-use/BindingFilter.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/class-use/BindingFilter.html index 399a773..89a56fc 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/class-use/BindingFilter.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/class-use/BindingFilter.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -Uses of Class edu.internet2.middleware.shibboleth.wayf.plugins.provider.BindingFilter (Shibboleth Discovery Service 1.1.0 Java API.) +Uses of Class edu.internet2.middleware.shibboleth.wayf.plugins.provider.BindingFilter (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> @@ -14,7 +14,7 @@ Uses of Class edu.internet2.middleware.shibboleth.wayf.plugins.provider.BindingF <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="Uses of Class edu.internet2.middleware.shibboleth.wayf.plugins.provider.BindingFilter (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="Uses of Class edu.internet2.middleware.shibboleth.wayf.plugins.provider.BindingFilter (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/class-use/ListFilter.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/class-use/ListFilter.html index 4ed8d51..1e0743f 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/class-use/ListFilter.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/class-use/ListFilter.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -Uses of Class edu.internet2.middleware.shibboleth.wayf.plugins.provider.ListFilter (Shibboleth Discovery Service 1.1.0 Java API.) +Uses of Class edu.internet2.middleware.shibboleth.wayf.plugins.provider.ListFilter (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> @@ -14,7 +14,7 @@ Uses of Class edu.internet2.middleware.shibboleth.wayf.plugins.provider.ListFilt <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="Uses of Class edu.internet2.middleware.shibboleth.wayf.plugins.provider.ListFilter (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="Uses of Class edu.internet2.middleware.shibboleth.wayf.plugins.provider.ListFilter (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/class-use/SamlCookiePlugin.SamlIdPCookie.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/class-use/SamlCookiePlugin.SamlIdPCookie.html index 7b8076d..1899c1b 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/class-use/SamlCookiePlugin.SamlIdPCookie.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/class-use/SamlCookiePlugin.SamlIdPCookie.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -Uses of Class edu.internet2.middleware.shibboleth.wayf.plugins.provider.SamlCookiePlugin.SamlIdPCookie (Shibboleth Discovery Service 1.1.0 Java API.) +Uses of Class edu.internet2.middleware.shibboleth.wayf.plugins.provider.SamlCookiePlugin.SamlIdPCookie (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> @@ -14,7 +14,7 @@ Uses of Class edu.internet2.middleware.shibboleth.wayf.plugins.provider.SamlCook <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="Uses of Class edu.internet2.middleware.shibboleth.wayf.plugins.provider.SamlCookiePlugin.SamlIdPCookie (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="Uses of Class edu.internet2.middleware.shibboleth.wayf.plugins.provider.SamlCookiePlugin.SamlIdPCookie (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/class-use/SamlCookiePlugin.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/class-use/SamlCookiePlugin.html index 33bfcfc..b9dabf9 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/class-use/SamlCookiePlugin.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/class-use/SamlCookiePlugin.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -Uses of Class edu.internet2.middleware.shibboleth.wayf.plugins.provider.SamlCookiePlugin (Shibboleth Discovery Service 1.1.0 Java API.) +Uses of Class edu.internet2.middleware.shibboleth.wayf.plugins.provider.SamlCookiePlugin (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> @@ -14,7 +14,7 @@ Uses of Class edu.internet2.middleware.shibboleth.wayf.plugins.provider.SamlCook <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="Uses of Class edu.internet2.middleware.shibboleth.wayf.plugins.provider.SamlCookiePlugin (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="Uses of Class edu.internet2.middleware.shibboleth.wayf.plugins.provider.SamlCookiePlugin (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/package-frame.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/package-frame.html index 64d2e79..cf1da95 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/package-frame.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/package-frame.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -edu.internet2.middleware.shibboleth.wayf.plugins.provider (Shibboleth Discovery Service 1.1.0 Java API.) +edu.internet2.middleware.shibboleth.wayf.plugins.provider (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> <META NAME="keywords" CONTENT="edu.internet2.middleware.shibboleth.wayf.plugins.provider package"> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/package-summary.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/package-summary.html index 088f8a1..6165462 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/package-summary.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/package-summary.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -edu.internet2.middleware.shibboleth.wayf.plugins.provider (Shibboleth Discovery Service 1.1.0 Java API.) +edu.internet2.middleware.shibboleth.wayf.plugins.provider (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> <META NAME="keywords" CONTENT="edu.internet2.middleware.shibboleth.wayf.plugins.provider package"> @@ -15,7 +15,7 @@ edu.internet2.middleware.shibboleth.wayf.plugins.provider (Shibboleth Discovery <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="edu.internet2.middleware.shibboleth.wayf.plugins.provider (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="edu.internet2.middleware.shibboleth.wayf.plugins.provider (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/package-tree.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/package-tree.html index c0b38e7..2088ef6 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/package-tree.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/package-tree.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -edu.internet2.middleware.shibboleth.wayf.plugins.provider Class Hierarchy (Shibboleth Discovery Service 1.1.0 Java API.) +edu.internet2.middleware.shibboleth.wayf.plugins.provider Class Hierarchy (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> @@ -14,7 +14,7 @@ edu.internet2.middleware.shibboleth.wayf.plugins.provider Class Hierarchy (Shibb <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="edu.internet2.middleware.shibboleth.wayf.plugins.provider Class Hierarchy (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="edu.internet2.middleware.shibboleth.wayf.plugins.provider Class Hierarchy (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/package-use.html b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/package-use.html index 2e426c4..9153ff4 100644 --- a/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/package-use.html +++ b/doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/package-use.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -Uses of Package edu.internet2.middleware.shibboleth.wayf.plugins.provider (Shibboleth Discovery Service 1.1.0 Java API.) +Uses of Package edu.internet2.middleware.shibboleth.wayf.plugins.provider (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> @@ -14,7 +14,7 @@ Uses of Package edu.internet2.middleware.shibboleth.wayf.plugins.provider (Shibb <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="Uses of Package edu.internet2.middleware.shibboleth.wayf.plugins.provider (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="Uses of Package edu.internet2.middleware.shibboleth.wayf.plugins.provider (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/help-doc.html b/doc/api/help-doc.html index 57860da..12fd668 100644 --- a/doc/api/help-doc.html +++ b/doc/api/help-doc.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -API Help (Shibboleth Discovery Service 1.1.0 Java API.) +API Help (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> @@ -14,7 +14,7 @@ API Help (Shibboleth Discovery Service 1.1.0 Java API.) <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="API Help (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="API Help (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/api/index-all.html b/doc/api/index-all.html index e53d492..8ecfe1d 100644 --- a/doc/api/index-all.html +++ b/doc/api/index-all.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -Index (Shibboleth Discovery Service 1.1.0 Java API.) +Index (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> @@ -14,7 +14,7 @@ Index (Shibboleth Discovery Service 1.1.0 Java API.) <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="Index (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="Index (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> @@ -90,12 +90,6 @@ Method in class edu.internet2.middleware.shibboleth.wayf.<A HREF="./edu/internet <DT><A HREF="./edu/internet2/middleware/shibboleth/wayf/plugins/provider/BindingFilter.html" title="class in edu.internet2.middleware.shibboleth.wayf.plugins.provider"><B>BindingFilter</B></A> - Class in <A HREF="./edu/internet2/middleware/shibboleth/wayf/plugins/provider/package-summary.html">edu.internet2.middleware.shibboleth.wayf.plugins.provider</A><DD>See SDSJ-48.<DT><A HREF="./edu/internet2/middleware/shibboleth/wayf/plugins/provider/BindingFilter.html#BindingFilter(boolean)"><B>BindingFilter(boolean)</B></A> - Constructor for class edu.internet2.middleware.shibboleth.wayf.plugins.provider.<A HREF="./edu/internet2/middleware/shibboleth/wayf/plugins/provider/BindingFilter.html" title="class in edu.internet2.middleware.shibboleth.wayf.plugins.provider">BindingFilter</A> <DD>Initialize the filter. -<DT><A HREF="./edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseBuilder.html#buildObject()"><B>buildObject()</B></A> - -Method in class edu.internet2.middleware.shibboleth.wayf.<A HREF="./edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseBuilder.html" title="class in edu.internet2.middleware.shibboleth.wayf">DiscoveryResponseBuilder</A> -<DD> -<DT><A HREF="./edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseBuilder.html#buildObject(java.lang.String, java.lang.String, java.lang.String)"><B>buildObject(String, String, String)</B></A> - -Method in class edu.internet2.middleware.shibboleth.wayf.<A HREF="./edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseBuilder.html" title="class in edu.internet2.middleware.shibboleth.wayf">DiscoveryResponseBuilder</A> -<DD> </DL> <HR> <A NAME="_C_"><!-- --></A><H2> @@ -124,22 +118,9 @@ Method in class edu.internet2.middleware.shibboleth.wayf.<A HREF="./edu/internet <A NAME="_D_"><!-- --></A><H2> <B>D</B></H2> <DL> -<DT><A HREF="./edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseImpl.html#DEFAULT_ELEMENT_LOCAL_NAME"><B>DEFAULT_ELEMENT_LOCAL_NAME</B></A> - -Static variable in class edu.internet2.middleware.shibboleth.wayf.<A HREF="./edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseImpl.html" title="class in edu.internet2.middleware.shibboleth.wayf">DiscoveryResponseImpl</A> -<DD>Name of the element inside the Extensions. <DT><A HREF="./edu/internet2/middleware/shibboleth/wayf/plugins/provider/SamlCookiePlugin.SamlIdPCookie.html#deleteIdPName(java.lang.String, int)"><B>deleteIdPName(String, int)</B></A> - Method in class edu.internet2.middleware.shibboleth.wayf.plugins.provider.<A HREF="./edu/internet2/middleware/shibboleth/wayf/plugins/provider/SamlCookiePlugin.SamlIdPCookie.html" title="class in edu.internet2.middleware.shibboleth.wayf.plugins.provider">SamlCookiePlugin.SamlIdPCookie</A> <DD>Remove origin from the cachedata and write it back. -<DT><A HREF="./edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseBuilder.html" title="class in edu.internet2.middleware.shibboleth.wayf"><B>DiscoveryResponseBuilder</B></A> - Class in <A HREF="./edu/internet2/middleware/shibboleth/wayf/package-summary.html">edu.internet2.middleware.shibboleth.wayf</A><DD>Builder of <CODE>SingleLogoutServiceImpl</CODE>.<DT><A HREF="./edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseBuilder.html#DiscoveryResponseBuilder()"><B>DiscoveryResponseBuilder()</B></A> - -Constructor for class edu.internet2.middleware.shibboleth.wayf.<A HREF="./edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseBuilder.html" title="class in edu.internet2.middleware.shibboleth.wayf">DiscoveryResponseBuilder</A> -<DD>Constructor -<DT><A HREF="./edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseImpl.html" title="class in edu.internet2.middleware.shibboleth.wayf"><B>DiscoveryResponseImpl</B></A> - Class in <A HREF="./edu/internet2/middleware/shibboleth/wayf/package-summary.html">edu.internet2.middleware.shibboleth.wayf</A><DD>This plugs into the standard opensaml2 parser framework to allow us to get use <code> DiscoverResponse </code> - elements in our extensions.<DT><A HREF="./edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseImpl.html#DiscoveryResponseImpl(java.lang.String, java.lang.String, java.lang.String)"><B>DiscoveryResponseImpl(String, String, String)</B></A> - -Constructor for class edu.internet2.middleware.shibboleth.wayf.<A HREF="./edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseImpl.html" title="class in edu.internet2.middleware.shibboleth.wayf">DiscoveryResponseImpl</A> -<DD>Constructor. -<DT><A HREF="./edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseUnmarshaller.html" title="class in edu.internet2.middleware.shibboleth.wayf"><B>DiscoveryResponseUnmarshaller</B></A> - Class in <A HREF="./edu/internet2/middleware/shibboleth/wayf/package-summary.html">edu.internet2.middleware.shibboleth.wayf</A><DD>A thread safe Unmarshaller for <CODE>SingleLogoutService</CODE> objects.<DT><A HREF="./edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseUnmarshaller.html#DiscoveryResponseUnmarshaller()"><B>DiscoveryResponseUnmarshaller()</B></A> - -Constructor for class edu.internet2.middleware.shibboleth.wayf.<A HREF="./edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseUnmarshaller.html" title="class in edu.internet2.middleware.shibboleth.wayf">DiscoveryResponseUnmarshaller</A> -<DD> <DT><A HREF="./edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html" title="class in edu.internet2.middleware.shibboleth.wayf"><B>DiscoveryServiceHandler</B></A> - Class in <A HREF="./edu/internet2/middleware/shibboleth/wayf/package-summary.html">edu.internet2.middleware.shibboleth.wayf</A><DD>Specific handler for each version of the Discovery Service.<DT><A HREF="./edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html#DiscoveryServiceHandler(org.w3c.dom.Element, java.util.Hashtable, java.util.Hashtable, edu.internet2.middleware.shibboleth.wayf.HandlerConfig)"><B>DiscoveryServiceHandler(Element, Hashtable<String, IdPSiteSet>, Hashtable<String, Plugin>, HandlerConfig)</B></A> - Constructor for class edu.internet2.middleware.shibboleth.wayf.<A HREF="./edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html" title="class in edu.internet2.middleware.shibboleth.wayf">DiscoveryServiceHandler</A> <DD>Constructor to create and configure the handler. @@ -300,9 +281,6 @@ Method in class edu.internet2.middleware.shibboleth.wayf.plugins.provider.<A HRE <DT><A HREF="./edu/internet2/middleware/shibboleth/wayf/Version.html#main(java.lang.String[])"><B>main(String[])</B></A> - Static method in class edu.internet2.middleware.shibboleth.wayf.<A HREF="./edu/internet2/middleware/shibboleth/wayf/Version.html" title="class in edu.internet2.middleware.shibboleth.wayf">Version</A> <DD>Main entry point to program. -<DT><A HREF="./edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseImpl.html#METADATA_NS"><B>METADATA_NS</B></A> - -Static variable in class edu.internet2.middleware.shibboleth.wayf.<A HREF="./edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseImpl.html" title="class in edu.internet2.middleware.shibboleth.wayf">DiscoveryResponseImpl</A> -<DD>Namespace for Discovery Service metadata extensions. </DL> <HR> <A NAME="_O_"><!-- --></A><H2> @@ -329,10 +307,7 @@ Method in class edu.internet2.middleware.shibboleth.wayf.<A HREF="./edu/internet Method in class edu.internet2.middleware.shibboleth.wayf.<A HREF="./edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.html" title="class in edu.internet2.middleware.shibboleth.wayf">IdPSiteSet</A> <DD>Return the parameter that this plugin uses. <DT><A HREF="./edu/internet2/middleware/shibboleth/wayf/plugins/Plugin.html" title="interface in edu.internet2.middleware.shibboleth.wayf.plugins"><B>Plugin</B></A> - Interface in <A HREF="./edu/internet2/middleware/shibboleth/wayf/plugins/package-summary.html">edu.internet2.middleware.shibboleth.wayf.plugins</A><DD>The Plugin interface is used to affect the 'hints' that the WAYF offers to the users.<DT><A HREF="./edu/internet2/middleware/shibboleth/wayf/plugins/PluginContext.html" title="interface in edu.internet2.middleware.shibboleth.wayf.plugins"><B>PluginContext</B></A> - Interface in <A HREF="./edu/internet2/middleware/shibboleth/wayf/plugins/package-summary.html">edu.internet2.middleware.shibboleth.wayf.plugins</A><DD>This is a marker interface.<DT><A HREF="./edu/internet2/middleware/shibboleth/wayf/plugins/PluginMetadataParameter.html" title="interface in edu.internet2.middleware.shibboleth.wayf.plugins"><B>PluginMetadataParameter</B></A> - Interface in <A HREF="./edu/internet2/middleware/shibboleth/wayf/plugins/package-summary.html">edu.internet2.middleware.shibboleth.wayf.plugins</A><DD>The PluginParameter is a marker interface which a WAYF <A HREF="./edu/internet2/middleware/shibboleth/wayf/plugins/Plugin.html" title="interface in edu.internet2.middleware.shibboleth.wayf.plugins"><CODE>Plugin</CODE></A> can use to associate extra information - with the metadata.<DT><A HREF="./edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseUnmarshaller.html#processAttribute(org.opensaml.xml.XMLObject, org.w3c.dom.Attr)"><B>processAttribute(XMLObject, Attr)</B></A> - -Method in class edu.internet2.middleware.shibboleth.wayf.<A HREF="./edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseUnmarshaller.html" title="class in edu.internet2.middleware.shibboleth.wayf">DiscoveryResponseUnmarshaller</A> -<DD> -</DL> + with the metadata.</DL> <HR> <A NAME="_R_"><!-- --></A><H2> <B>R</B></H2> diff --git a/doc/api/index.html b/doc/api/index.html index a173fa1..bf9aacf 100644 --- a/doc/api/index.html +++ b/doc/api/index.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc on Wed Jan 14 13:49:24 CET 2009--> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc on Fri Aug 21 09:03:29 CEST 2009--> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -Shibboleth Discovery Service 1.1.0 Java API. +Shibboleth Discovery Service 1.1.1 Java API. </TITLE> <SCRIPT type="text/javascript"> targetPage = "" + window.location.search; diff --git a/doc/api/options b/doc/api/options index 832d349..76f7bc4 100644 --- a/doc/api/options +++ b/doc/api/options @@ -1,23 +1,26 @@ --classpath '/Users/lajoie/workspaces/distro-build/java-wayf/target/classes:/Users/lajoie/.m2/repository/ch/qos/logback/logback-core/0.9.13/logback-core-0.9.13.jar:/Users/lajoie/.m2/repository/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar:/Users/lajoie/.m2/repository/commons-collections/commons-collections/3.1/commons-collections-3.1.jar:/Users/lajoie/.m2/repository/org/apache/struts/struts-taglib/1.3.9/struts-taglib-1.3.9.jar:/Users/lajoie/.m2/repository/org/bouncycastle/bcprov-ext-jdk15/1.40/bcprov-ext-jdk15-1.40.jar:/Users/lajoie/.m2/repository/org/slf4j/slf4j-api/1.5.6/slf4j-api-1.5.6.jar:/Users/lajoie/.m2/repository/org/slf4j/jcl-over-slf4j/1.5.5/jcl-over-slf4j-1.5.5.jar:/Users/lajoie/.m2/repository/commons-digester/commons-digester/1.8/commons-digester-1.8.jar:/Users/lajoie/.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3.jar:/Users/lajoie/.m2/repository/commons-chain/commons-chain/1.1/commons-chain-1.1.jar:/Users/lajoie/.m2/repository/commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.jar:/Users/lajoie/.m2/repository/org/opensaml/xmltooling/1.2.0/xmltooling-1.2.0.jar:/Users/lajoie/.m2/repository/antlr/antlr/2.7.2/antlr-2.7.2.jar:/Users/lajoie/.m2/repository/org/slf4j/log4j-over-slf4j/1.5.5/log4j-over-slf4j-1.5.5.jar:/Users/lajoie/.m2/repository/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar:/Users/lajoie/.m2/repository/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0.jar:/Users/lajoie/.m2/repository/org/opensaml/opensaml/2.2.3/opensaml-2.2.3.jar:/Users/lajoie/.m2/repository/org/apache/santuario/xmlsec/1.4.2/xmlsec-1.4.2.jar:/Users/lajoie/.m2/repository/org/opensaml/openws/1.2.2/openws-1.2.2.jar:/Users/lajoie/.m2/repository/jargs/jargs/1.0/jargs-1.0.jar:/Users/lajoie/.m2/repository/commons-lang/commons-lang/2.1/commons-lang-2.1.jar:/Users/lajoie/.m2/repository/joda-time/joda-time/1.5.2/joda-time-1.5.2.jar:/Users/lajoie/.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar:/Users/lajoie/.m2/repository/oro/oro/2.0.8/oro-2.0.8.jar:/Users/lajoie/.m2/repository/ch/qos/logback/logback-classic/0.9.13/logback-classic-0.9.13.jar:/Users/lajoie/.m2/repository/velocity/velocity/1.5/velocity-1.5.jar:/Users/lajoie/.m2/repository/org/apache/struts/struts-core/1.3.9/struts-core-1.3.9.jar:/Users/lajoie/.m2/repository/org/apache/commons/ssl/not-yet-commons-ssl/0.3.9/not-yet-commons-ssl-0.3.9.jar' - -encoding -'ISO-8859-1' +-classpath +'/Users/lajoie/workspaces/distro-build/wayf/target/classes:/Users/lajoie/.m2/repository/ch/qos/logback/logback-core/0.9.17/logback-core-0.9.17.jar:/Users/lajoie/.m2/repository/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar:/Users/lajoie/.m2/repository/commons-collections/commons-collections/3.1/commons-collections-3.1.jar:/Users/lajoie/.m2/repository/org/apache/struts/struts-taglib/1.3.9/struts-taglib-1.3.9.jar:/Users/lajoie/.m2/repository/org/slf4j/slf4j-api/1.5.8/slf4j-api-1.5.8.jar:/Users/lajoie/.m2/repository/org/slf4j/jcl-over-slf4j/1.5.8/jcl-over-slf4j-1.5.8.jar:/Users/lajoie/.m2/repository/commons-digester/commons-digester/1.8/commons-digester-1.8.jar:/Users/lajoie/.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3.jar:/Users/lajoie/.m2/repository/commons-chain/commons-chain/1.1/commons-chain-1.1.jar:/Users/lajoie/.m2/repository/commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.jar:/Users/lajoie/.m2/repository/commons-logging/commons-logging/1.1/commons-logging-1.1.jar:/Users/lajoie/.m2/repository/org/opensaml/xmltooling/1.2.1/xmltooling-1.2.1.jar:/Users/lajoie/.m2/repository/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar:/Users/lajoie/.m2/repository/antlr/antlr/2.7.2/antlr-2.7.2.jar:/Users/lajoie/.m2/repository/org/slf4j/log4j-over-slf4j/1.5.8/log4j-over-slf4j-1.5.8.jar:/Users/lajoie/.m2/repository/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0.jar:/Users/lajoie/.m2/repository/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar:/Users/lajoie/.m2/repository/org/opensaml/opensaml/2.3.0/opensaml-2.3.0.jar:/Users/lajoie/.m2/repository/org/apache/santuario/xmlsec/1.4.3/xmlsec-1.4.3.jar:/Users/lajoie/.m2/repository/org/opensaml/openws/1.3.0/openws-1.3.0.jar:/Users/lajoie/.m2/repository/org/bouncycastle/bcprov-jdk15/1.43/bcprov-jdk15-1.43.jar:/Users/lajoie/.m2/repository/org/slf4j/jul-to-slf4j/1.5.8/jul-to-slf4j-1.5.8.jar:/Users/lajoie/.m2/repository/commons-lang/commons-lang/2.1/commons-lang-2.1.jar:/Users/lajoie/.m2/repository/joda-time/joda-time/1.6/joda-time-1.6.jar:/Users/lajoie/.m2/repository/log4j/log4j/1.2.12/log4j-1.2.12.jar:/Users/lajoie/.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar:/Users/lajoie/.m2/repository/oro/oro/2.0.8/oro-2.0.8.jar:/Users/lajoie/.m2/repository/logkit/logkit/1.0.1/logkit-1.0.1.jar:/Users/lajoie/.m2/repository/ch/qos/logback/logback-classic/0.9.17/logback-classic-0.9.17.jar:/Users/lajoie/.m2/repository/velocity/velocity/1.5/velocity-1.5.jar:/Users/lajoie/.m2/repository/org/apache/struts/struts-core/1.3.9/struts-core-1.3.9.jar:/Users/lajoie/.m2/repository/org/apache/commons/ssl/not-yet-commons-ssl/0.3.9/not-yet-commons-ssl-0.3.9.jar' +-encoding +'MacRoman' -overview -'/Users/lajoie/workspaces/distro-build/java-wayf/src/main/java/overview.html' +'/Users/lajoie/workspaces/distro-build/wayf/src/main/java/overview.html' -protected -quiet -sourcepath -'/Users/lajoie/workspaces/distro-build/java-wayf/src/main/java' +'/Users/lajoie/workspaces/distro-build/wayf/src/main/java' -bottom 'Copyright © 2006-2009 <a href="http://www.internet2.edu/">Internet2</a>. All Rights Reserved.' -charset -'ISO-8859-1' +'UTF-8' -d -'/Users/lajoie/workspaces/distro-build/java-wayf/target/site/apidocs' +'/Users/lajoie/workspaces/distro-build/wayf/target/site/apidocs' +-docencoding +'UTF-8' -doctitle -'Shibboleth Discovery Service 1.1.0 Java API.' +'Shibboleth Discovery Service 1.1.1 Java API.' -link 'http://java.sun.com/j2se/1.5.0/docs/api' -use -version -windowtitle -'Shibboleth Discovery Service 1.1.0 Java API.'
\ No newline at end of file +'Shibboleth Discovery Service 1.1.1 Java API.'
\ No newline at end of file diff --git a/doc/api/overview-frame.html b/doc/api/overview-frame.html index 7432b44..c4aaef3 100644 --- a/doc/api/overview-frame.html +++ b/doc/api/overview-frame.html @@ -2,13 +2,13 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -Overview (Shibboleth Discovery Service 1.1.0 Java API.) +Overview (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> -<META NAME="keywords" CONTENT="Overview, Shibboleth Discovery Service 1.1.0 Java API."> +<META NAME="keywords" CONTENT="Overview, Shibboleth Discovery Service 1.1.1 Java API."> <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style"> diff --git a/doc/api/overview-summary.html b/doc/api/overview-summary.html index 1406fe6..393ca5b 100644 --- a/doc/api/overview-summary.html +++ b/doc/api/overview-summary.html @@ -2,20 +2,20 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -Overview (Shibboleth Discovery Service 1.1.0 Java API.) +Overview (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> -<META NAME="keywords" CONTENT="Overview, Shibboleth Discovery Service 1.1.0 Java API."> +<META NAME="keywords" CONTENT="Overview, Shibboleth Discovery Service 1.1.1 Java API."> <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style"> <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="Overview (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="Overview (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> @@ -79,7 +79,7 @@ function windowTitle() <HR> <CENTER> <H1> -Shibboleth Discovery Service 1.1.0 Java API. +Shibboleth Discovery Service 1.1.1 Java API. </H1> </CENTER> diff --git a/doc/api/overview-tree.html b/doc/api/overview-tree.html index 48c6305..4b0a9a0 100644 --- a/doc/api/overview-tree.html +++ b/doc/api/overview-tree.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -Class Hierarchy (Shibboleth Discovery Service 1.1.0 Java API.) +Class Hierarchy (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> @@ -14,7 +14,7 @@ Class Hierarchy (Shibboleth Discovery Service 1.1.0 Java API.) <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="Class Hierarchy (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="Class Hierarchy (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> @@ -88,36 +88,6 @@ Class Hierarchy </H2> <UL> <LI TYPE="circle">java.lang.<A HREF="http://java.sun.com/j2se/1.5.0/docs/api/java/lang/Object.html" title="class or interface in java.lang"><B>Object</B></A><UL> -<LI TYPE="circle">org.opensaml.xml.AbstractXMLObject (implements org.opensaml.xml.XMLObject) -<UL> -<LI TYPE="circle">org.opensaml.xml.validation.AbstractValidatingXMLObject (implements org.opensaml.xml.validation.ValidatingXMLObject) -<UL> -<LI TYPE="circle">org.opensaml.common.impl.AbstractSAMLObject<UL> -<LI TYPE="circle">org.opensaml.saml2.metadata.impl.EndpointImpl (implements org.opensaml.saml2.metadata.Endpoint) -<UL> -<LI TYPE="circle">org.opensaml.saml2.metadata.impl.IndexedEndpointImpl (implements org.opensaml.saml2.metadata.IndexedEndpoint) -<UL> -<LI TYPE="circle">edu.internet2.middleware.shibboleth.wayf.<A HREF="edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseImpl.html" title="class in edu.internet2.middleware.shibboleth.wayf"><B>DiscoveryResponseImpl</B></A> (implements org.opensaml.saml2.metadata.IndexedEndpoint) -</UL> -</UL> -</UL> -</UL> -</UL> -<LI TYPE="circle">org.opensaml.xml.AbstractXMLObjectBuilder<XMLObjectType> (implements org.opensaml.xml.XMLObjectBuilder<XMLObjectType>) -<UL> -<LI TYPE="circle">org.opensaml.common.impl.AbstractSAMLObjectBuilder<SAMLObjectType> (implements org.opensaml.common.SAMLObjectBuilder<SAMLObjectType>) -<UL> -<LI TYPE="circle">edu.internet2.middleware.shibboleth.wayf.<A HREF="edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseBuilder.html" title="class in edu.internet2.middleware.shibboleth.wayf"><B>DiscoveryResponseBuilder</B></A></UL> -</UL> -<LI TYPE="circle">org.opensaml.xml.io.AbstractXMLObjectUnmarshaller (implements org.opensaml.xml.io.Unmarshaller) -<UL> -<LI TYPE="circle">org.opensaml.common.impl.AbstractSAMLObjectUnmarshaller<UL> -<LI TYPE="circle">org.opensaml.saml2.metadata.impl.EndpointUnmarshaller<UL> -<LI TYPE="circle">org.opensaml.saml2.metadata.impl.IndexedEndpointUnmarshaller<UL> -<LI TYPE="circle">edu.internet2.middleware.shibboleth.wayf.<A HREF="edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseUnmarshaller.html" title="class in edu.internet2.middleware.shibboleth.wayf"><B>DiscoveryResponseUnmarshaller</B></A></UL> -</UL> -</UL> -</UL> <LI TYPE="circle">edu.internet2.middleware.shibboleth.wayf.plugins.provider.<A HREF="edu/internet2/middleware/shibboleth/wayf/plugins/provider/BindingFilter.html" title="class in edu.internet2.middleware.shibboleth.wayf.plugins.provider"><B>BindingFilter</B></A> (implements org.opensaml.saml2.metadata.provider.MetadataFilter) <LI TYPE="circle">edu.internet2.middleware.shibboleth.wayf.<A HREF="edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html" title="class in edu.internet2.middleware.shibboleth.wayf"><B>DiscoveryServiceHandler</B></A><LI TYPE="circle">javax.servlet.GenericServlet (implements java.io.<A HREF="http://java.sun.com/j2se/1.5.0/docs/api/java/io/Serializable.html" title="class or interface in java.io">Serializable</A>, javax.servlet.Servlet, javax.servlet.ServletConfig) <UL> diff --git a/doc/api/serialized-form.html b/doc/api/serialized-form.html index af511e7..6c35298 100644 --- a/doc/api/serialized-form.html +++ b/doc/api/serialized-form.html @@ -2,10 +2,10 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.5.0_16) on Wed Jan 14 13:49:24 CET 2009 --> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<!-- Generated by javadoc (build 1.5.0_19) on Fri Aug 21 09:03:29 CEST 2009 --> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE> -Serialized Form (Shibboleth Discovery Service 1.1.0 Java API.) +Serialized Form (Shibboleth Discovery Service 1.1.1 Java API.) </TITLE> @@ -14,7 +14,7 @@ Serialized Form (Shibboleth Discovery Service 1.1.0 Java API.) <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="Serialized Form (Shibboleth Discovery Service 1.1.0 Java API.)"; + parent.document.title="Serialized Form (Shibboleth Discovery Service 1.1.1 Java API.)"; } </SCRIPT> <NOSCRIPT> diff --git a/doc/src-xref/allclasses-frame.html b/doc/src-xref/allclasses-frame.html index 4f84d03..8f96b33 100644 --- a/doc/src-xref/allclasses-frame.html +++ b/doc/src-xref/allclasses-frame.html @@ -21,15 +21,6 @@ <a href="edu/internet2/middleware/shibboleth/wayf/plugins/provider/SamlCookiePlugin.html" target="classFrame">Context</a>
</li>
<li>
- <a href="edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseBuilder.html" target="classFrame">DiscoveryResponseBuilder</a>
- </li>
- <li>
- <a href="edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseImpl.html" target="classFrame">DiscoveryResponseImpl</a>
- </li>
- <li>
- <a href="edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseUnmarshaller.html" target="classFrame">DiscoveryResponseUnmarshaller</a>
- </li>
- <li>
<a href="edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html" target="classFrame">DiscoveryServiceHandler</a>
</li>
<li>
diff --git a/doc/src-xref/edu/internet2/middleware/shibboleth/common/package-frame.html b/doc/src-xref/edu/internet2/middleware/shibboleth/common/package-frame.html index 49ad758..6a60a72 100644 --- a/doc/src-xref/edu/internet2/middleware/shibboleth/common/package-frame.html +++ b/doc/src-xref/edu/internet2/middleware/shibboleth/common/package-frame.html @@ -3,7 +3,7 @@ <html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
- <title>Shibboleth Discovery Service 1.1.0 Reference Package edu.internet2.middleware.shibboleth.common</title>
+ <title>Shibboleth Discovery Service 1.1.1 Reference Package edu.internet2.middleware.shibboleth.common</title>
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
</head>
<body>
diff --git a/doc/src-xref/edu/internet2/middleware/shibboleth/common/package-summary.html b/doc/src-xref/edu/internet2/middleware/shibboleth/common/package-summary.html index 95e0aa0..75321a1 100644 --- a/doc/src-xref/edu/internet2/middleware/shibboleth/common/package-summary.html +++ b/doc/src-xref/edu/internet2/middleware/shibboleth/common/package-summary.html @@ -3,7 +3,7 @@ <html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
- <title>Shibboleth Discovery Service 1.1.0 Reference Package edu.internet2.middleware.shibboleth.common</title>
+ <title>Shibboleth Discovery Service 1.1.1 Reference Package edu.internet2.middleware.shibboleth.common</title>
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
</head>
<body>
diff --git a/doc/src-xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html b/doc/src-xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html index 9f4e4ed..a9e9e2f 100644 --- a/doc/src-xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html +++ b/doc/src-xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html @@ -52,964 +52,965 @@ <a name="42" href="#42">42</a> <strong class="jxr_keyword">import</strong> org.opensaml.saml2.metadata.EntityDescriptor; <a name="43" href="#43">43</a> <strong class="jxr_keyword">import</strong> org.opensaml.saml2.metadata.RoleDescriptor; <a name="44" href="#44">44</a> <strong class="jxr_keyword">import</strong> org.opensaml.saml2.metadata.SPSSODescriptor; -<a name="45" href="#45">45</a> <strong class="jxr_keyword">import</strong> org.opensaml.xml.XMLObject; -<a name="46" href="#46">46</a> <strong class="jxr_keyword">import</strong> org.slf4j.Logger; -<a name="47" href="#47">47</a> <strong class="jxr_keyword">import</strong> org.slf4j.LoggerFactory; -<a name="48" href="#48">48</a> <strong class="jxr_keyword">import</strong> org.w3c.dom.Element; -<a name="49" href="#49">49</a> <strong class="jxr_keyword">import</strong> org.w3c.dom.NodeList; -<a name="50" href="#50">50</a> -<a name="51" href="#51">51</a> <strong class="jxr_keyword">import</strong> edu.internet2.middleware.shibboleth.common.ShibbolethConfigurationException; -<a name="52" href="#52">52</a> <strong class="jxr_keyword">import</strong> edu.internet2.middleware.shibboleth.wayf.plugins.Plugin; -<a name="53" href="#53">53</a> <strong class="jxr_keyword">import</strong> edu.internet2.middleware.shibboleth.wayf.plugins.PluginContext; -<a name="54" href="#54">54</a> <strong class="jxr_keyword">import</strong> edu.internet2.middleware.shibboleth.wayf.plugins.PluginMetadataParameter; -<a name="55" href="#55">55</a> <strong class="jxr_keyword">import</strong> edu.internet2.middleware.shibboleth.wayf.plugins.WayfRequestHandled; -<a name="56" href="#56">56</a> -<a name="57" href="#57">57</a> <em class="jxr_javadoccomment">/**</em> -<a name="58" href="#58">58</a> <em class="jxr_javadoccomment"> * Specific handler for each version of the Discovery Service. </em> -<a name="59" href="#59">59</a> <em class="jxr_javadoccomment"> */</em> -<a name="60" href="#60">60</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html">DiscoveryServiceHandler</a> { -<a name="61" href="#61">61</a> -<a name="62" href="#62">62</a> <em class="jxr_comment">/*</em> -<a name="63" href="#63">63</a> <em class="jxr_comment"> * Protcol parameters - Old.</em> -<a name="64" href="#64">64</a> <em class="jxr_comment"> */</em> -<a name="65" href="#65">65</a> <em class="jxr_javadoccomment">/**</em> -<a name="66" href="#66">66</a> <em class="jxr_javadoccomment"> * Shire is the SP Assertion Consumer endpoint.</em> -<a name="67" href="#67">67</a> <em class="jxr_javadoccomment"> */</em> -<a name="68" href="#68">68</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String SHIRE_PARAM_NAME = <span class="jxr_string">"shire"</span>; -<a name="69" href="#69">69</a> <em class="jxr_javadoccomment">/**</em> -<a name="70" href="#70">70</a> <em class="jxr_javadoccomment"> * TargetName is where we are trying to get to.</em> -<a name="71" href="#71">71</a> <em class="jxr_javadoccomment"> */</em> -<a name="72" href="#72">72</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String TARGET_PARAM_NAME = <span class="jxr_string">"target"</span>; -<a name="73" href="#73">73</a> <em class="jxr_javadoccomment">/**</em> -<a name="74" href="#74">74</a> <em class="jxr_javadoccomment"> * time is to do with replay attack.</em> -<a name="75" href="#75">75</a> <em class="jxr_javadoccomment"> */</em> -<a name="76" href="#76">76</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String TIME_PARAM_NAME = <span class="jxr_string">"time"</span>; -<a name="77" href="#77">77</a> <em class="jxr_javadoccomment">/**</em> -<a name="78" href="#78">78</a> <em class="jxr_javadoccomment"> * This is the ID (in the metadata) of the SP.</em> -<a name="79" href="#79">79</a> <em class="jxr_javadoccomment"> */</em> -<a name="80" href="#80">80</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String PROVIDERID_PARAM_NAME = <span class="jxr_string">"providerId"</span>; -<a name="81" href="#81">81</a> -<a name="82" href="#82">82</a> <em class="jxr_comment">/*</em> -<a name="83" href="#83">83</a> <em class="jxr_comment"> * Protocol parameters - New</em> -<a name="84" href="#84">84</a> <em class="jxr_comment"> */</em> -<a name="85" href="#85">85</a> <em class="jxr_javadoccomment">/**</em> -<a name="86" href="#86">86</a> <em class="jxr_javadoccomment"> * The SP id.</em> -<a name="87" href="#87">87</a> <em class="jxr_javadoccomment"> */</em> -<a name="88" href="#88">88</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String ENTITYID_PARAM_NAME = <span class="jxr_string">"entityID"</span>; -<a name="89" href="#89">89</a> <em class="jxr_javadoccomment">/**</em> -<a name="90" href="#90">90</a> <em class="jxr_javadoccomment"> * Where to send the request back to.</em> -<a name="91" href="#91">91</a> <em class="jxr_javadoccomment"> */</em> -<a name="92" href="#92">92</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String RETURN_PARAM_NAME = <span class="jxr_string">"return"</span>; -<a name="93" href="#93">93</a> <em class="jxr_javadoccomment">/**</em> -<a name="94" href="#94">94</a> <em class="jxr_javadoccomment"> * "return" is an invalid attribute, so we use returnX.</em> -<a name="95" href="#95">95</a> <em class="jxr_javadoccomment"> */</em> -<a name="96" href="#96">96</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String RETURN_ATTRIBUTE_NAME = <span class="jxr_string">"returnX"</span>; -<a name="97" href="#97">97</a> <em class="jxr_javadoccomment">/**</em> -<a name="98" href="#98">98</a> <em class="jxr_javadoccomment"> * Alternatively the index of where to send the address back to.</em> -<a name="99" href="#99">99</a> <em class="jxr_javadoccomment"> */</em> -<a name="100" href="#100">100</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String RETURN_INDEX_NAME = <span class="jxr_string">"returnIndex"</span>; -<a name="101" href="#101">101</a> -<a name="102" href="#102">102</a> <em class="jxr_javadoccomment">/**</em> -<a name="103" href="#103">103</a> <em class="jxr_javadoccomment"> * What value to put the ID of the selected metadata into.</em> -<a name="104" href="#104">104</a> <em class="jxr_javadoccomment"> */</em> -<a name="105" href="#105">105</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String RETURNID_PARAM_NAME = <span class="jxr_string">"returnIDParam"</span>; -<a name="106" href="#106">106</a> -<a name="107" href="#107">107</a> <em class="jxr_javadoccomment">/**</em> -<a name="108" href="#108">108</a> <em class="jxr_javadoccomment"> * What returnIDParam defaults to.</em> -<a name="109" href="#109">109</a> <em class="jxr_javadoccomment"> */</em> -<a name="110" href="#110">110</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String RETURNID_DEFAULT_VALUE = <span class="jxr_string">"entityID"</span>; -<a name="111" href="#111">111</a> <em class="jxr_javadoccomment">/**</em> -<a name="112" href="#112">112</a> <em class="jxr_javadoccomment"> * Whether we are allowed to interact.</em> -<a name="113" href="#113">113</a> <em class="jxr_javadoccomment"> */</em> -<a name="114" href="#114">114</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String ISPASSIVE_PARAM_NAME = <span class="jxr_string">"isPassive"</span>; -<a name="115" href="#115">115</a> -<a name="116" href="#116">116</a> <em class="jxr_javadoccomment">/**</em> -<a name="117" href="#117">117</a> <em class="jxr_javadoccomment"> * Whether we understand this or not.</em> -<a name="118" href="#118">118</a> <em class="jxr_javadoccomment"> */</em> -<a name="119" href="#119">119</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String POLICY_PARAM_NAME = <span class="jxr_string">"policy"</span>; -<a name="120" href="#120">120</a> -<a name="121" href="#121">121</a> <em class="jxr_javadoccomment">/**</em> -<a name="122" href="#122">122</a> <em class="jxr_javadoccomment"> * The only policy we know about.</em> -<a name="123" href="#123">123</a> <em class="jxr_javadoccomment"> */</em> -<a name="124" href="#124">124</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String KNOWN_POLICY_NAME -<a name="125" href="#125">125</a> = <span class="jxr_string">"urn:oasis:names:tc:SAML:profiles:SSO:idp-discoveryprotocol:single"</span>; -<a name="126" href="#126">126</a> -<a name="127" href="#127">127</a> <em class="jxr_javadoccomment">/**</em> -<a name="128" href="#128">128</a> <em class="jxr_javadoccomment"> * Mandatory Serialization constant.</em> -<a name="129" href="#129">129</a> <em class="jxr_javadoccomment"> */</em> -<a name="130" href="#130">130</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Logger LOG = LoggerFactory.getLogger(DiscoveryServiceHandler.<strong class="jxr_keyword">class</strong>.getName()); -<a name="131" href="#131">131</a> -<a name="132" href="#132">132</a> <em class="jxr_javadoccomment">/**</em> -<a name="133" href="#133">133</a> <em class="jxr_javadoccomment"> * The location defines the last part of the URL which distinguished this handler. </em> -<a name="134" href="#134">134</a> <em class="jxr_javadoccomment"> */</em> -<a name="135" href="#135">135</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String location; -<a name="136" href="#136">136</a> -<a name="137" href="#137">137</a> <em class="jxr_javadoccomment">/**</em> -<a name="138" href="#138">138</a> <em class="jxr_javadoccomment"> * If isDefault is true then if there is a mismatch then this handler is used. </em> -<a name="139" href="#139">139</a> <em class="jxr_javadoccomment"> */</em> -<a name="140" href="#140">140</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong> isDefault; -<a name="141" href="#141">141</a> -<a name="142" href="#142">142</a> <em class="jxr_javadoccomment">/**</em> -<a name="143" href="#143">143</a> <em class="jxr_javadoccomment"> * Config handles detailed behavior.</em> -<a name="144" href="#144">144</a> <em class="jxr_javadoccomment"> */</em> -<a name="145" href="#145">145</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/HandlerConfig.html">HandlerConfig</a> config; -<a name="146" href="#146">146</a> -<a name="147" href="#147">147</a> <em class="jxr_javadoccomment">/**</em> -<a name="148" href="#148">148</a> <em class="jxr_javadoccomment"> * The list of all the metadata providers that this discovery handler believes in.</em> -<a name="149" href="#149">149</a> <em class="jxr_javadoccomment"> */</em> -<a name="150" href="#150">150</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> List <IdPSiteSet> siteSets; -<a name="151" href="#151">151</a> -<a name="152" href="#152">152</a> <em class="jxr_javadoccomment">/**</em> -<a name="153" href="#153">153</a> <em class="jxr_javadoccomment"> * The list of all the plugins that this hanlder has had configured.</em> -<a name="154" href="#154">154</a> <em class="jxr_javadoccomment"> */</em> -<a name="155" href="#155">155</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> List <Plugin> plugins; -<a name="156" href="#156">156</a> -<a name="157" href="#157">157</a> <em class="jxr_javadoccomment">/**</em> -<a name="158" href="#158">158</a> <em class="jxr_javadoccomment"> * Constructor to create and configure the handler.</em> -<a name="159" href="#159">159</a> <em class="jxr_javadoccomment"> * @param config - DOM Element with configuration information.</em> -<a name="160" href="#160">160</a> <em class="jxr_javadoccomment"> * @param federations - Supplies all known providers which will be included if so configured.</em> -<a name="161" href="#161">161</a> <em class="jxr_javadoccomment"> * @param plugins - Supplies all known plugins which will be included if configured in. </em> -<a name="162" href="#162">162</a> <em class="jxr_javadoccomment"> * @param defaultConfig - The default configurations.</em> -<a name="163" href="#163">163</a> <em class="jxr_javadoccomment"> * @throws ShibbolethConfigurationException - if we find something odd in the config file. </em> -<a name="164" href="#164">164</a> <em class="jxr_javadoccomment"> */</em> -<a name="165" href="#165">165</a> <strong class="jxr_keyword">protected</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html">DiscoveryServiceHandler</a>(Element config, -<a name="166" href="#166">166</a> Hashtable <String, IdPSiteSet> federations, -<a name="167" href="#167">167</a> Hashtable <String, Plugin> plugins, -<a name="168" href="#168">168</a> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/HandlerConfig.html">HandlerConfig</a> defaultConfig) <strong class="jxr_keyword">throws</strong> ShibbolethConfigurationException -<a name="169" href="#169">169</a> { -<a name="170" href="#170">170</a> siteSets = <strong class="jxr_keyword">new</strong> ArrayList <IdPSiteSet>(federations.size()); -<a name="171" href="#171">171</a> <strong class="jxr_keyword">this</strong>.plugins = <strong class="jxr_keyword">new</strong> ArrayList <Plugin>(plugins.size()); -<a name="172" href="#172">172</a> -<a name="173" href="#173">173</a> <em class="jxr_comment">//</em> -<a name="174" href="#174">174</a> <em class="jxr_comment">// Collect the Configuration from the XML</em> -<a name="175" href="#175">175</a> <em class="jxr_comment">//</em> -<a name="176" href="#176">176</a> -<a name="177" href="#177">177</a> <strong class="jxr_keyword">this</strong>.config = <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/HandlerConfig.html">HandlerConfig</a>(config, defaultConfig); -<a name="178" href="#178">178</a> -<a name="179" href="#179">179</a> location = config.getAttribute(<span class="jxr_string">"location"</span>); -<a name="180" href="#180">180</a> -<a name="181" href="#181">181</a> <strong class="jxr_keyword">if</strong> (location == <strong class="jxr_keyword">null</strong> || location.equals(<span class="jxr_string">""</span>)) { -<a name="182" href="#182">182</a> -<a name="183" href="#183">183</a> LOG.error(<span class="jxr_string">"DiscoveryService must have a location specified"</span>); -<a name="184" href="#184">184</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/common/ShibbolethConfigurationException.html">ShibbolethConfigurationException</a>(<span class="jxr_string">"DiscoveryService must have a location specified"</span>); -<a name="185" href="#185">185</a> } -<a name="186" href="#186">186</a> -<a name="187" href="#187">187</a> <em class="jxr_comment">//</em> -<a name="188" href="#188">188</a> <em class="jxr_comment">// Is this the default WAYF?</em> -<a name="189" href="#189">189</a> <em class="jxr_comment">//</em> -<a name="190" href="#190">190</a> -<a name="191" href="#191">191</a> String attribute = config.getAttribute(<span class="jxr_string">"default"</span>); -<a name="192" href="#192">192</a> <strong class="jxr_keyword">if</strong> (attribute != <strong class="jxr_keyword">null</strong> && !attribute.equals(<span class="jxr_string">""</span>)) { -<a name="193" href="#193">193</a> isDefault = Boolean.valueOf(attribute).booleanValue(); -<a name="194" href="#194">194</a> } <strong class="jxr_keyword">else</strong> { -<a name="195" href="#195">195</a> isDefault = <strong class="jxr_keyword">true</strong>; -<a name="196" href="#196">196</a> } -<a name="197" href="#197">197</a> -<a name="198" href="#198">198</a> <em class="jxr_comment">//</em> -<a name="199" href="#199">199</a> <em class="jxr_comment">// Which federations (sitesets) do we care about?</em> -<a name="200" href="#200">200</a> <em class="jxr_comment">//</em> -<a name="201" href="#201">201</a> -<a name="202" href="#202">202</a> NodeList list = config.getElementsByTagName(<span class="jxr_string">"Federation"</span>); -<a name="203" href="#203">203</a> -<a name="204" href="#204">204</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < list.getLength(); i++ ) { -<a name="205" href="#205">205</a> -<a name="206" href="#206">206</a> attribute = ((Element) list.item(i)).getAttribute(<span class="jxr_string">"identifier"</span>); -<a name="207" href="#207">207</a> -<a name="208" href="#208">208</a> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.html">IdPSiteSet</a> siteset = federations.get(attribute); -<a name="209" href="#209">209</a> -<a name="210" href="#210">210</a> <strong class="jxr_keyword">if</strong> (siteset == <strong class="jxr_keyword">null</strong>) { -<a name="211" href="#211">211</a> LOG.error(<span class="jxr_string">"Handler "</span> + location + <span class="jxr_string">": could not find metadata for <Federation> with identifier "</span> + attribute + <span class="jxr_string">"."</span>); -<a name="212" href="#212">212</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/common/ShibbolethConfigurationException.html">ShibbolethConfigurationException</a>( -<a name="213" href="#213">213</a> <span class="jxr_string">"Handler "</span> + location + <span class="jxr_string">": could not find metadata for <Federation> identifier "</span> + attribute + <span class="jxr_string">"."</span>); -<a name="214" href="#214">214</a> } -<a name="215" href="#215">215</a> -<a name="216" href="#216">216</a> siteSets.add(siteset); -<a name="217" href="#217">217</a> } -<a name="218" href="#218">218</a> -<a name="219" href="#219">219</a> <strong class="jxr_keyword">if</strong> (siteSets.size() == 0) { -<a name="220" href="#220">220</a> <em class="jxr_comment">//</em> -<a name="221" href="#221">221</a> <em class="jxr_comment">// No Federations explicitly named pick em all</em> -<a name="222" href="#222">222</a> <em class="jxr_comment">//</em> -<a name="223" href="#223">223</a> siteSets.addAll(federations.values()); -<a name="224" href="#224">224</a> } -<a name="225" href="#225">225</a> -<a name="226" href="#226">226</a> <em class="jxr_comment">//</em> -<a name="227" href="#227">227</a> <em class="jxr_comment">// Now, which plugins?</em> -<a name="228" href="#228">228</a> <em class="jxr_comment">//</em> -<a name="229" href="#229">229</a> -<a name="230" href="#230">230</a> list = config.getElementsByTagName(<span class="jxr_string">"PluginInstance"</span>); -<a name="231" href="#231">231</a> -<a name="232" href="#232">232</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < list.getLength(); i++ ) { -<a name="233" href="#233">233</a> -<a name="234" href="#234">234</a> attribute = ((Element) list.item(i)).getAttribute(<span class="jxr_string">"identifier"</span>); -<a name="235" href="#235">235</a> -<a name="236" href="#236">236</a> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/plugins/Plugin.html">Plugin</a> plugin = plugins.get(attribute); -<a name="237" href="#237">237</a> -<a name="238" href="#238">238</a> <strong class="jxr_keyword">if</strong> (plugin == <strong class="jxr_keyword">null</strong>) { -<a name="239" href="#239">239</a> LOG.error(<span class="jxr_string">"Handler "</span> + location + <span class="jxr_string">": could not find plugin for identifier "</span> + attribute); -<a name="240" href="#240">240</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/common/ShibbolethConfigurationException.html">ShibbolethConfigurationException</a>( -<a name="241" href="#241">241</a> <span class="jxr_string">"Handler "</span> + location + <span class="jxr_string">": could not find plugin for identifier "</span> + attribute); -<a name="242" href="#242">242</a> } -<a name="243" href="#243">243</a> -<a name="244" href="#244">244</a> <strong class="jxr_keyword">this</strong>.plugins.add(plugin); -<a name="245" href="#245">245</a> } -<a name="246" href="#246">246</a> -<a name="247" href="#247">247</a> <em class="jxr_comment">//</em> -<a name="248" href="#248">248</a> <em class="jxr_comment">// So now tell every IdPSite about every plugin.</em> -<a name="249" href="#249">249</a> <em class="jxr_comment">//</em> -<a name="250" href="#250">250</a> <em class="jxr_comment">// Note that there is only one idpsite per metadatafile per WAYF and that the discovery </em> -<a name="251" href="#251">251</a> <em class="jxr_comment">// services share them, so the data explosion is only number(IdpSites) * number(Plugins) not</em> -<a name="252" href="#252">252</a> <em class="jxr_comment">// number(IdpSites) * number(Plugins) * number(DiscoverHandlers)</em> -<a name="253" href="#253">253</a> -<a name="254" href="#254">254</a> <strong class="jxr_keyword">for</strong> (IdPSiteSet site: siteSets) { -<a name="255" href="#255">255</a> <strong class="jxr_keyword">for</strong> (Plugin plugin: <strong class="jxr_keyword">this</strong>.plugins) { -<a name="256" href="#256">256</a> site.addPlugin(plugin); -<a name="257" href="#257">257</a> } -<a name="258" href="#258">258</a> } -<a name="259" href="#259">259</a> } -<a name="260" href="#260">260</a> +<a name="45" href="#45">45</a> <strong class="jxr_keyword">import</strong> org.opensaml.samlext.idpdisco.DiscoveryResponse; +<a name="46" href="#46">46</a> <strong class="jxr_keyword">import</strong> org.opensaml.xml.XMLObject; +<a name="47" href="#47">47</a> <strong class="jxr_keyword">import</strong> org.slf4j.Logger; +<a name="48" href="#48">48</a> <strong class="jxr_keyword">import</strong> org.slf4j.LoggerFactory; +<a name="49" href="#49">49</a> <strong class="jxr_keyword">import</strong> org.w3c.dom.Element; +<a name="50" href="#50">50</a> <strong class="jxr_keyword">import</strong> org.w3c.dom.NodeList; +<a name="51" href="#51">51</a> +<a name="52" href="#52">52</a> <strong class="jxr_keyword">import</strong> edu.internet2.middleware.shibboleth.common.ShibbolethConfigurationException; +<a name="53" href="#53">53</a> <strong class="jxr_keyword">import</strong> edu.internet2.middleware.shibboleth.wayf.plugins.Plugin; +<a name="54" href="#54">54</a> <strong class="jxr_keyword">import</strong> edu.internet2.middleware.shibboleth.wayf.plugins.PluginContext; +<a name="55" href="#55">55</a> <strong class="jxr_keyword">import</strong> edu.internet2.middleware.shibboleth.wayf.plugins.PluginMetadataParameter; +<a name="56" href="#56">56</a> <strong class="jxr_keyword">import</strong> edu.internet2.middleware.shibboleth.wayf.plugins.WayfRequestHandled; +<a name="57" href="#57">57</a> +<a name="58" href="#58">58</a> <em class="jxr_javadoccomment">/**</em> +<a name="59" href="#59">59</a> <em class="jxr_javadoccomment"> * Specific handler for each version of the Discovery Service. </em> +<a name="60" href="#60">60</a> <em class="jxr_javadoccomment"> */</em> +<a name="61" href="#61">61</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html">DiscoveryServiceHandler</a> { +<a name="62" href="#62">62</a> +<a name="63" href="#63">63</a> <em class="jxr_comment">/*</em> +<a name="64" href="#64">64</a> <em class="jxr_comment"> * Protcol parameters - Old.</em> +<a name="65" href="#65">65</a> <em class="jxr_comment"> */</em> +<a name="66" href="#66">66</a> <em class="jxr_javadoccomment">/**</em> +<a name="67" href="#67">67</a> <em class="jxr_javadoccomment"> * Shire is the SP Assertion Consumer endpoint.</em> +<a name="68" href="#68">68</a> <em class="jxr_javadoccomment"> */</em> +<a name="69" href="#69">69</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String SHIRE_PARAM_NAME = <span class="jxr_string">"shire"</span>; +<a name="70" href="#70">70</a> <em class="jxr_javadoccomment">/**</em> +<a name="71" href="#71">71</a> <em class="jxr_javadoccomment"> * TargetName is where we are trying to get to.</em> +<a name="72" href="#72">72</a> <em class="jxr_javadoccomment"> */</em> +<a name="73" href="#73">73</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String TARGET_PARAM_NAME = <span class="jxr_string">"target"</span>; +<a name="74" href="#74">74</a> <em class="jxr_javadoccomment">/**</em> +<a name="75" href="#75">75</a> <em class="jxr_javadoccomment"> * time is to do with replay attack.</em> +<a name="76" href="#76">76</a> <em class="jxr_javadoccomment"> */</em> +<a name="77" href="#77">77</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String TIME_PARAM_NAME = <span class="jxr_string">"time"</span>; +<a name="78" href="#78">78</a> <em class="jxr_javadoccomment">/**</em> +<a name="79" href="#79">79</a> <em class="jxr_javadoccomment"> * This is the ID (in the metadata) of the SP.</em> +<a name="80" href="#80">80</a> <em class="jxr_javadoccomment"> */</em> +<a name="81" href="#81">81</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String PROVIDERID_PARAM_NAME = <span class="jxr_string">"providerId"</span>; +<a name="82" href="#82">82</a> +<a name="83" href="#83">83</a> <em class="jxr_comment">/*</em> +<a name="84" href="#84">84</a> <em class="jxr_comment"> * Protocol parameters - New</em> +<a name="85" href="#85">85</a> <em class="jxr_comment"> */</em> +<a name="86" href="#86">86</a> <em class="jxr_javadoccomment">/**</em> +<a name="87" href="#87">87</a> <em class="jxr_javadoccomment"> * The SP id.</em> +<a name="88" href="#88">88</a> <em class="jxr_javadoccomment"> */</em> +<a name="89" href="#89">89</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String ENTITYID_PARAM_NAME = <span class="jxr_string">"entityID"</span>; +<a name="90" href="#90">90</a> <em class="jxr_javadoccomment">/**</em> +<a name="91" href="#91">91</a> <em class="jxr_javadoccomment"> * Where to send the request back to.</em> +<a name="92" href="#92">92</a> <em class="jxr_javadoccomment"> */</em> +<a name="93" href="#93">93</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String RETURN_PARAM_NAME = <span class="jxr_string">"return"</span>; +<a name="94" href="#94">94</a> <em class="jxr_javadoccomment">/**</em> +<a name="95" href="#95">95</a> <em class="jxr_javadoccomment"> * "return" is an invalid attribute, so we use returnX.</em> +<a name="96" href="#96">96</a> <em class="jxr_javadoccomment"> */</em> +<a name="97" href="#97">97</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String RETURN_ATTRIBUTE_NAME = <span class="jxr_string">"returnX"</span>; +<a name="98" href="#98">98</a> <em class="jxr_javadoccomment">/**</em> +<a name="99" href="#99">99</a> <em class="jxr_javadoccomment"> * Alternatively the index of where to send the address back to.</em> +<a name="100" href="#100">100</a> <em class="jxr_javadoccomment"> */</em> +<a name="101" href="#101">101</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String RETURN_INDEX_NAME = <span class="jxr_string">"returnIndex"</span>; +<a name="102" href="#102">102</a> +<a name="103" href="#103">103</a> <em class="jxr_javadoccomment">/**</em> +<a name="104" href="#104">104</a> <em class="jxr_javadoccomment"> * What value to put the ID of the selected metadata into.</em> +<a name="105" href="#105">105</a> <em class="jxr_javadoccomment"> */</em> +<a name="106" href="#106">106</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String RETURNID_PARAM_NAME = <span class="jxr_string">"returnIDParam"</span>; +<a name="107" href="#107">107</a> +<a name="108" href="#108">108</a> <em class="jxr_javadoccomment">/**</em> +<a name="109" href="#109">109</a> <em class="jxr_javadoccomment"> * What returnIDParam defaults to.</em> +<a name="110" href="#110">110</a> <em class="jxr_javadoccomment"> */</em> +<a name="111" href="#111">111</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String RETURNID_DEFAULT_VALUE = <span class="jxr_string">"entityID"</span>; +<a name="112" href="#112">112</a> <em class="jxr_javadoccomment">/**</em> +<a name="113" href="#113">113</a> <em class="jxr_javadoccomment"> * Whether we are allowed to interact.</em> +<a name="114" href="#114">114</a> <em class="jxr_javadoccomment"> */</em> +<a name="115" href="#115">115</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String ISPASSIVE_PARAM_NAME = <span class="jxr_string">"isPassive"</span>; +<a name="116" href="#116">116</a> +<a name="117" href="#117">117</a> <em class="jxr_javadoccomment">/**</em> +<a name="118" href="#118">118</a> <em class="jxr_javadoccomment"> * Whether we understand this or not.</em> +<a name="119" href="#119">119</a> <em class="jxr_javadoccomment"> */</em> +<a name="120" href="#120">120</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String POLICY_PARAM_NAME = <span class="jxr_string">"policy"</span>; +<a name="121" href="#121">121</a> +<a name="122" href="#122">122</a> <em class="jxr_javadoccomment">/**</em> +<a name="123" href="#123">123</a> <em class="jxr_javadoccomment"> * The only policy we know about.</em> +<a name="124" href="#124">124</a> <em class="jxr_javadoccomment"> */</em> +<a name="125" href="#125">125</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String KNOWN_POLICY_NAME +<a name="126" href="#126">126</a> = <span class="jxr_string">"urn:oasis:names:tc:SAML:profiles:SSO:idp-discoveryprotocol:single"</span>; +<a name="127" href="#127">127</a> +<a name="128" href="#128">128</a> <em class="jxr_javadoccomment">/**</em> +<a name="129" href="#129">129</a> <em class="jxr_javadoccomment"> * Mandatory Serialization constant.</em> +<a name="130" href="#130">130</a> <em class="jxr_javadoccomment"> */</em> +<a name="131" href="#131">131</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Logger LOG = LoggerFactory.getLogger(DiscoveryServiceHandler.<strong class="jxr_keyword">class</strong>.getName()); +<a name="132" href="#132">132</a> +<a name="133" href="#133">133</a> <em class="jxr_javadoccomment">/**</em> +<a name="134" href="#134">134</a> <em class="jxr_javadoccomment"> * The location defines the last part of the URL which distinguished this handler. </em> +<a name="135" href="#135">135</a> <em class="jxr_javadoccomment"> */</em> +<a name="136" href="#136">136</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String location; +<a name="137" href="#137">137</a> +<a name="138" href="#138">138</a> <em class="jxr_javadoccomment">/**</em> +<a name="139" href="#139">139</a> <em class="jxr_javadoccomment"> * If isDefault is true then if there is a mismatch then this handler is used. </em> +<a name="140" href="#140">140</a> <em class="jxr_javadoccomment"> */</em> +<a name="141" href="#141">141</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong> isDefault; +<a name="142" href="#142">142</a> +<a name="143" href="#143">143</a> <em class="jxr_javadoccomment">/**</em> +<a name="144" href="#144">144</a> <em class="jxr_javadoccomment"> * Config handles detailed behavior.</em> +<a name="145" href="#145">145</a> <em class="jxr_javadoccomment"> */</em> +<a name="146" href="#146">146</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/HandlerConfig.html">HandlerConfig</a> config; +<a name="147" href="#147">147</a> +<a name="148" href="#148">148</a> <em class="jxr_javadoccomment">/**</em> +<a name="149" href="#149">149</a> <em class="jxr_javadoccomment"> * The list of all the metadata providers that this discovery handler believes in.</em> +<a name="150" href="#150">150</a> <em class="jxr_javadoccomment"> */</em> +<a name="151" href="#151">151</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> List <IdPSiteSet> siteSets; +<a name="152" href="#152">152</a> +<a name="153" href="#153">153</a> <em class="jxr_javadoccomment">/**</em> +<a name="154" href="#154">154</a> <em class="jxr_javadoccomment"> * The list of all the plugins that this hanlder has had configured.</em> +<a name="155" href="#155">155</a> <em class="jxr_javadoccomment"> */</em> +<a name="156" href="#156">156</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> List <Plugin> plugins; +<a name="157" href="#157">157</a> +<a name="158" href="#158">158</a> <em class="jxr_javadoccomment">/**</em> +<a name="159" href="#159">159</a> <em class="jxr_javadoccomment"> * Constructor to create and configure the handler.</em> +<a name="160" href="#160">160</a> <em class="jxr_javadoccomment"> * @param config - DOM Element with configuration information.</em> +<a name="161" href="#161">161</a> <em class="jxr_javadoccomment"> * @param federations - Supplies all known providers which will be included if so configured.</em> +<a name="162" href="#162">162</a> <em class="jxr_javadoccomment"> * @param plugins - Supplies all known plugins which will be included if configured in. </em> +<a name="163" href="#163">163</a> <em class="jxr_javadoccomment"> * @param defaultConfig - The default configurations.</em> +<a name="164" href="#164">164</a> <em class="jxr_javadoccomment"> * @throws ShibbolethConfigurationException - if we find something odd in the config file. </em> +<a name="165" href="#165">165</a> <em class="jxr_javadoccomment"> */</em> +<a name="166" href="#166">166</a> <strong class="jxr_keyword">protected</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html">DiscoveryServiceHandler</a>(Element config, +<a name="167" href="#167">167</a> Hashtable <String, IdPSiteSet> federations, +<a name="168" href="#168">168</a> Hashtable <String, Plugin> plugins, +<a name="169" href="#169">169</a> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/HandlerConfig.html">HandlerConfig</a> defaultConfig) <strong class="jxr_keyword">throws</strong> ShibbolethConfigurationException +<a name="170" href="#170">170</a> { +<a name="171" href="#171">171</a> siteSets = <strong class="jxr_keyword">new</strong> ArrayList <IdPSiteSet>(federations.size()); +<a name="172" href="#172">172</a> <strong class="jxr_keyword">this</strong>.plugins = <strong class="jxr_keyword">new</strong> ArrayList <Plugin>(plugins.size()); +<a name="173" href="#173">173</a> +<a name="174" href="#174">174</a> <em class="jxr_comment">//</em> +<a name="175" href="#175">175</a> <em class="jxr_comment">// Collect the Configuration from the XML</em> +<a name="176" href="#176">176</a> <em class="jxr_comment">//</em> +<a name="177" href="#177">177</a> +<a name="178" href="#178">178</a> <strong class="jxr_keyword">this</strong>.config = <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/HandlerConfig.html">HandlerConfig</a>(config, defaultConfig); +<a name="179" href="#179">179</a> +<a name="180" href="#180">180</a> location = config.getAttribute(<span class="jxr_string">"location"</span>); +<a name="181" href="#181">181</a> +<a name="182" href="#182">182</a> <strong class="jxr_keyword">if</strong> (location == <strong class="jxr_keyword">null</strong> || location.equals(<span class="jxr_string">""</span>)) { +<a name="183" href="#183">183</a> +<a name="184" href="#184">184</a> LOG.error(<span class="jxr_string">"DiscoveryService must have a location specified"</span>); +<a name="185" href="#185">185</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/common/ShibbolethConfigurationException.html">ShibbolethConfigurationException</a>(<span class="jxr_string">"DiscoveryService must have a location specified"</span>); +<a name="186" href="#186">186</a> } +<a name="187" href="#187">187</a> +<a name="188" href="#188">188</a> <em class="jxr_comment">//</em> +<a name="189" href="#189">189</a> <em class="jxr_comment">// Is this the default WAYF?</em> +<a name="190" href="#190">190</a> <em class="jxr_comment">//</em> +<a name="191" href="#191">191</a> +<a name="192" href="#192">192</a> String attribute = config.getAttribute(<span class="jxr_string">"default"</span>); +<a name="193" href="#193">193</a> <strong class="jxr_keyword">if</strong> (attribute != <strong class="jxr_keyword">null</strong> && !attribute.equals(<span class="jxr_string">""</span>)) { +<a name="194" href="#194">194</a> isDefault = Boolean.valueOf(attribute).booleanValue(); +<a name="195" href="#195">195</a> } <strong class="jxr_keyword">else</strong> { +<a name="196" href="#196">196</a> isDefault = false; +<a name="197" href="#197">197</a> } +<a name="198" href="#198">198</a> +<a name="199" href="#199">199</a> <em class="jxr_comment">//</em> +<a name="200" href="#200">200</a> <em class="jxr_comment">// Which federations (sitesets) do we care about?</em> +<a name="201" href="#201">201</a> <em class="jxr_comment">//</em> +<a name="202" href="#202">202</a> +<a name="203" href="#203">203</a> NodeList list = config.getElementsByTagName(<span class="jxr_string">"Federation"</span>); +<a name="204" href="#204">204</a> +<a name="205" href="#205">205</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < list.getLength(); i++ ) { +<a name="206" href="#206">206</a> +<a name="207" href="#207">207</a> attribute = ((Element) list.item(i)).getAttribute(<span class="jxr_string">"identifier"</span>); +<a name="208" href="#208">208</a> +<a name="209" href="#209">209</a> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.html">IdPSiteSet</a> siteset = federations.get(attribute); +<a name="210" href="#210">210</a> +<a name="211" href="#211">211</a> <strong class="jxr_keyword">if</strong> (siteset == <strong class="jxr_keyword">null</strong>) { +<a name="212" href="#212">212</a> LOG.error(<span class="jxr_string">"Handler "</span> + location + <span class="jxr_string">": could not find metadata for <Federation> with identifier "</span> + attribute + <span class="jxr_string">"."</span>); +<a name="213" href="#213">213</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/common/ShibbolethConfigurationException.html">ShibbolethConfigurationException</a>( +<a name="214" href="#214">214</a> <span class="jxr_string">"Handler "</span> + location + <span class="jxr_string">": could not find metadata for <Federation> identifier "</span> + attribute + <span class="jxr_string">"."</span>); +<a name="215" href="#215">215</a> } +<a name="216" href="#216">216</a> +<a name="217" href="#217">217</a> siteSets.add(siteset); +<a name="218" href="#218">218</a> } +<a name="219" href="#219">219</a> +<a name="220" href="#220">220</a> <strong class="jxr_keyword">if</strong> (siteSets.size() == 0) { +<a name="221" href="#221">221</a> <em class="jxr_comment">//</em> +<a name="222" href="#222">222</a> <em class="jxr_comment">// No Federations explicitly named pick em all</em> +<a name="223" href="#223">223</a> <em class="jxr_comment">//</em> +<a name="224" href="#224">224</a> siteSets.addAll(federations.values()); +<a name="225" href="#225">225</a> } +<a name="226" href="#226">226</a> +<a name="227" href="#227">227</a> <em class="jxr_comment">//</em> +<a name="228" href="#228">228</a> <em class="jxr_comment">// Now, which plugins?</em> +<a name="229" href="#229">229</a> <em class="jxr_comment">//</em> +<a name="230" href="#230">230</a> +<a name="231" href="#231">231</a> list = config.getElementsByTagName(<span class="jxr_string">"PluginInstance"</span>); +<a name="232" href="#232">232</a> +<a name="233" href="#233">233</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < list.getLength(); i++ ) { +<a name="234" href="#234">234</a> +<a name="235" href="#235">235</a> attribute = ((Element) list.item(i)).getAttribute(<span class="jxr_string">"identifier"</span>); +<a name="236" href="#236">236</a> +<a name="237" href="#237">237</a> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/plugins/Plugin.html">Plugin</a> plugin = plugins.get(attribute); +<a name="238" href="#238">238</a> +<a name="239" href="#239">239</a> <strong class="jxr_keyword">if</strong> (plugin == <strong class="jxr_keyword">null</strong>) { +<a name="240" href="#240">240</a> LOG.error(<span class="jxr_string">"Handler "</span> + location + <span class="jxr_string">": could not find plugin for identifier "</span> + attribute); +<a name="241" href="#241">241</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/common/ShibbolethConfigurationException.html">ShibbolethConfigurationException</a>( +<a name="242" href="#242">242</a> <span class="jxr_string">"Handler "</span> + location + <span class="jxr_string">": could not find plugin for identifier "</span> + attribute); +<a name="243" href="#243">243</a> } +<a name="244" href="#244">244</a> +<a name="245" href="#245">245</a> <strong class="jxr_keyword">this</strong>.plugins.add(plugin); +<a name="246" href="#246">246</a> } +<a name="247" href="#247">247</a> +<a name="248" href="#248">248</a> <em class="jxr_comment">//</em> +<a name="249" href="#249">249</a> <em class="jxr_comment">// So now tell every IdPSite about every plugin.</em> +<a name="250" href="#250">250</a> <em class="jxr_comment">//</em> +<a name="251" href="#251">251</a> <em class="jxr_comment">// Note that there is only one idpsite per metadatafile per WAYF and that the discovery </em> +<a name="252" href="#252">252</a> <em class="jxr_comment">// services share them, so the data explosion is only number(IdpSites) * number(Plugins) not</em> +<a name="253" href="#253">253</a> <em class="jxr_comment">// number(IdpSites) * number(Plugins) * number(DiscoverHandlers)</em> +<a name="254" href="#254">254</a> +<a name="255" href="#255">255</a> <strong class="jxr_keyword">for</strong> (IdPSiteSet site: siteSets) { +<a name="256" href="#256">256</a> <strong class="jxr_keyword">for</strong> (Plugin plugin: <strong class="jxr_keyword">this</strong>.plugins) { +<a name="257" href="#257">257</a> site.addPlugin(plugin); +<a name="258" href="#258">258</a> } +<a name="259" href="#259">259</a> } +<a name="260" href="#260">260</a> } <a name="261" href="#261">261</a> -<a name="262" href="#262">262</a> <em class="jxr_comment">//</em> -<a name="263" href="#263">263</a> <em class="jxr_comment">// Standard Beany Methods</em> -<a name="264" href="#264">264</a> <em class="jxr_comment">//</em> -<a name="265" href="#265">265</a> <em class="jxr_javadoccomment">/**</em> -<a name="266" href="#266">266</a> <em class="jxr_javadoccomment"> * The 'Name' of the service. the path used to identify the ServiceHandler.</em> -<a name="267" href="#267">267</a> <em class="jxr_javadoccomment"> * @return the path used to identify the ServiceHandler.</em> -<a name="268" href="#268">268</a> <em class="jxr_javadoccomment"> */</em> -<a name="269" href="#269">269</a> -<a name="270" href="#270">270</a> <strong class="jxr_keyword">protected</strong> String getLocation() { -<a name="271" href="#271">271</a> <strong class="jxr_keyword">return</strong> location; -<a name="272" href="#272">272</a> } -<a name="273" href="#273">273</a> -<a name="274" href="#274">274</a> <em class="jxr_javadoccomment">/**</em> -<a name="275" href="#275">275</a> <em class="jxr_javadoccomment"> * Whether this is the default service.</em> -<a name="276" href="#276">276</a> <em class="jxr_javadoccomment"> * @return is it?</em> -<a name="277" href="#277">277</a> <em class="jxr_javadoccomment"> */</em> -<a name="278" href="#278">278</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">boolean</strong> isDefault() { -<a name="279" href="#279">279</a> <strong class="jxr_keyword">return</strong> isDefault; -<a name="280" href="#280">280</a> } -<a name="281" href="#281">281</a> -<a name="282" href="#282">282</a> <em class="jxr_comment">//</em> -<a name="283" href="#283">283</a> <em class="jxr_comment">// Now the bits that deal with the user request</em> -<a name="284" href="#284">284</a> <em class="jxr_comment">//</em> -<a name="285" href="#285">285</a> -<a name="286" href="#286">286</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> doGet(HttpServletRequest req, HttpServletResponse res) { -<a name="287" href="#287">287</a> -<a name="288" href="#288">288</a> String policy = req.getParameter(POLICY_PARAM_NAME); -<a name="289" href="#289">289</a> -<a name="290" href="#290">290</a> <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> != policy && !KNOWN_POLICY_NAME.equals(policy)) { -<a name="291" href="#291">291</a> <em class="jxr_comment">//</em> -<a name="292" href="#292">292</a> <em class="jxr_comment">// unknown policy</em> -<a name="293" href="#293">293</a> <em class="jxr_comment">//</em> -<a name="294" href="#294">294</a> LOG.error(<span class="jxr_string">"Unknown policy "</span> + policy); -<a name="295" href="#295">295</a> handleError(req, res, <span class="jxr_string">"Unknown policy "</span> + policy); -<a name="296" href="#296">296</a> <strong class="jxr_keyword">return</strong>; -<a name="297" href="#297">297</a> } -<a name="298" href="#298">298</a> -<a name="299" href="#299">299</a> <em class="jxr_comment">//</em> -<a name="300" href="#300">300</a> <em class="jxr_comment">// Decide how to route the request based on query string</em> -<a name="301" href="#301">301</a> <em class="jxr_comment">//</em> -<a name="302" href="#302">302</a> String requestType = req.getParameter(<span class="jxr_string">"action"</span>); -<a name="303" href="#303">303</a> -<a name="304" href="#304">304</a> <strong class="jxr_keyword">if</strong> (requestType == <strong class="jxr_keyword">null</strong> || requestType.equals(<span class="jxr_string">""</span>)) { -<a name="305" href="#305">305</a> requestType = <span class="jxr_string">"lookup"</span>; -<a name="306" href="#306">306</a> } -<a name="307" href="#307">307</a> -<a name="308" href="#308">308</a> <strong class="jxr_keyword">try</strong> { -<a name="309" href="#309">309</a> -<a name="310" href="#310">310</a> <strong class="jxr_keyword">if</strong> (requestType.equals(<span class="jxr_string">"search"</span>)) { -<a name="311" href="#311">311</a> -<a name="312" href="#312">312</a> String parameter = req.getParameter(<span class="jxr_string">"string"</span>); -<a name="313" href="#313">313</a> <strong class="jxr_keyword">if</strong> (parameter != <strong class="jxr_keyword">null</strong> && parameter.equals(<span class="jxr_string">""</span>)) { -<a name="314" href="#314">314</a> parameter = <strong class="jxr_keyword">null</strong>; -<a name="315" href="#315">315</a> } -<a name="316" href="#316">316</a> handleLookup(req, res, parameter); -<a name="317" href="#317">317</a> -<a name="318" href="#318">318</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (requestType.equals(<span class="jxr_string">"selection"</span>)) { -<a name="319" href="#319">319</a> -<a name="320" href="#320">320</a> handleSelection(req, res); -<a name="321" href="#321">321</a> } <strong class="jxr_keyword">else</strong> { -<a name="322" href="#322">322</a> handleLookup(req, res, <strong class="jxr_keyword">null</strong>); -<a name="323" href="#323">323</a> } -<a name="324" href="#324">324</a> } <strong class="jxr_keyword">catch</strong> (WayfException we) { -<a name="325" href="#325">325</a> LOG.error(<span class="jxr_string">"Error processing DS request:"</span>, we); -<a name="326" href="#326">326</a> handleError(req, res, we.getLocalizedMessage()); -<a name="327" href="#327">327</a> } <strong class="jxr_keyword">catch</strong> (WayfRequestHandled we) { -<a name="328" href="#328">328</a> <em class="jxr_comment">//</em> -<a name="329" href="#329">329</a> <em class="jxr_comment">// Yuck - a sucess path involving an exception</em> -<a name="330" href="#330">330</a> <em class="jxr_comment">//</em> -<a name="331" href="#331">331</a> } -<a name="332" href="#332">332</a> -<a name="333" href="#333">333</a> } -<a name="334" href="#334">334</a> -<a name="335" href="#335">335</a> <em class="jxr_javadoccomment">/**</em> -<a name="336" href="#336">336</a> <em class="jxr_javadoccomment"> * When the WAYF user has selected something we look it up, tell the plugins and then dispatch to the Idp.</em> -<a name="337" href="#337">337</a> <em class="jxr_javadoccomment"> * </em> -<a name="338" href="#338">338</a> <em class="jxr_javadoccomment"> * @param req - standard J2EE stuff</em> -<a name="339" href="#339">339</a> <em class="jxr_javadoccomment"> * @param res - standard J2EE stuff</em> -<a name="340" href="#340">340</a> <em class="jxr_javadoccomment"> * @throws WayfRequestHandled - if one of the plugins has done the dispatch</em> -<a name="341" href="#341">341</a> <em class="jxr_javadoccomment"> * @throws WayfException - if we had an errors</em> -<a name="342" href="#342">342</a> <em class="jxr_javadoccomment"> */</em> -<a name="343" href="#343">343</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> handleSelection(HttpServletRequest req, -<a name="344" href="#344">344</a> HttpServletResponse res) <strong class="jxr_keyword">throws</strong> WayfRequestHandled, WayfException -<a name="345" href="#345">345</a> { -<a name="346" href="#346">346</a> -<a name="347" href="#347">347</a> String idpName = req.getParameter(<span class="jxr_string">"origin"</span>); -<a name="348" href="#348">348</a> LOG.debug(<span class="jxr_string">"Processing handle selection: "</span> + idpName); -<a name="349" href="#349">349</a> -<a name="350" href="#350">350</a> String sPName = getSPId(req); -<a name="351" href="#351">351</a> -<a name="352" href="#352">352</a> <strong class="jxr_keyword">if</strong> (idpName == <strong class="jxr_keyword">null</strong> || idpName.equals(<span class="jxr_string">""</span>)) { -<a name="353" href="#353">353</a> handleLookup(req, res, <strong class="jxr_keyword">null</strong>); -<a name="354" href="#354">354</a> <strong class="jxr_keyword">return</strong>; -<a name="355" href="#355">355</a> } -<a name="356" href="#356">356</a> -<a name="357" href="#357">357</a> <strong class="jxr_keyword">if</strong> (getValue(req, SHIRE_PARAM_NAME) == <strong class="jxr_keyword">null</strong>) { -<a name="358" href="#358">358</a> <em class="jxr_comment">//</em> -<a name="359" href="#359">359</a> <em class="jxr_comment">// 2.0 protocol</em> -<a name="360" href="#360">360</a> <em class="jxr_comment">//</em> -<a name="361" href="#361">361</a> setupReturnAddress(sPName, req); -<a name="362" href="#362">362</a> } -<a name="363" href="#363">363</a> <em class="jxr_comment">//</em> -<a name="364" href="#364">364</a> <em class="jxr_comment">// Notify plugins</em> -<a name="365" href="#365">365</a> <em class="jxr_comment">//</em> -<a name="366" href="#366">366</a> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/IdPSite.html">IdPSite</a> site = <strong class="jxr_keyword">null</strong>; -<a name="367" href="#367">367</a> -<a name="368" href="#368">368</a> <strong class="jxr_keyword">for</strong> (Plugin plugin:plugins) { -<a name="369" href="#369">369</a> <strong class="jxr_keyword">for</strong> (IdPSiteSet idPSiteSet: siteSets) { -<a name="370" href="#370">370</a> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/plugins/PluginMetadataParameter.html">PluginMetadataParameter</a> param = idPSiteSet.paramFor(plugin); -<a name="371" href="#371">371</a> plugin.selected(req, res, param, idpName); -<a name="372" href="#372">372</a> <strong class="jxr_keyword">if</strong> (site == <strong class="jxr_keyword">null</strong> && idPSiteSet.containsIdP(idpName)) { -<a name="373" href="#373">373</a> site = idPSiteSet.getSite(idpName); -<a name="374" href="#374">374</a> } -<a name="375" href="#375">375</a> } -<a name="376" href="#376">376</a> } -<a name="377" href="#377">377</a> -<a name="378" href="#378">378</a> <strong class="jxr_keyword">if</strong> (site == <strong class="jxr_keyword">null</strong>) { -<a name="379" href="#379">379</a> handleLookup(req, res, <strong class="jxr_keyword">null</strong>); -<a name="380" href="#380">380</a> } <strong class="jxr_keyword">else</strong> { -<a name="381" href="#381">381</a> forwardRequest(req, res, site); -<a name="382" href="#382">382</a> } -<a name="383" href="#383">383</a> } -<a name="384" href="#384">384</a> +<a name="262" href="#262">262</a> +<a name="263" href="#263">263</a> <em class="jxr_comment">//</em> +<a name="264" href="#264">264</a> <em class="jxr_comment">// Standard Beany Methods</em> +<a name="265" href="#265">265</a> <em class="jxr_comment">//</em> +<a name="266" href="#266">266</a> <em class="jxr_javadoccomment">/**</em> +<a name="267" href="#267">267</a> <em class="jxr_javadoccomment"> * The 'Name' of the service. the path used to identify the ServiceHandler.</em> +<a name="268" href="#268">268</a> <em class="jxr_javadoccomment"> * @return the path used to identify the ServiceHandler.</em> +<a name="269" href="#269">269</a> <em class="jxr_javadoccomment"> */</em> +<a name="270" href="#270">270</a> +<a name="271" href="#271">271</a> <strong class="jxr_keyword">protected</strong> String getLocation() { +<a name="272" href="#272">272</a> <strong class="jxr_keyword">return</strong> location; +<a name="273" href="#273">273</a> } +<a name="274" href="#274">274</a> +<a name="275" href="#275">275</a> <em class="jxr_javadoccomment">/**</em> +<a name="276" href="#276">276</a> <em class="jxr_javadoccomment"> * Whether this is the default service.</em> +<a name="277" href="#277">277</a> <em class="jxr_javadoccomment"> * @return is it?</em> +<a name="278" href="#278">278</a> <em class="jxr_javadoccomment"> */</em> +<a name="279" href="#279">279</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">boolean</strong> isDefault() { +<a name="280" href="#280">280</a> <strong class="jxr_keyword">return</strong> isDefault; +<a name="281" href="#281">281</a> } +<a name="282" href="#282">282</a> +<a name="283" href="#283">283</a> <em class="jxr_comment">//</em> +<a name="284" href="#284">284</a> <em class="jxr_comment">// Now the bits that deal with the user request</em> +<a name="285" href="#285">285</a> <em class="jxr_comment">//</em> +<a name="286" href="#286">286</a> +<a name="287" href="#287">287</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> doGet(HttpServletRequest req, HttpServletResponse res) { +<a name="288" href="#288">288</a> +<a name="289" href="#289">289</a> String policy = req.getParameter(POLICY_PARAM_NAME); +<a name="290" href="#290">290</a> +<a name="291" href="#291">291</a> <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> != policy && !KNOWN_POLICY_NAME.equals(policy)) { +<a name="292" href="#292">292</a> <em class="jxr_comment">//</em> +<a name="293" href="#293">293</a> <em class="jxr_comment">// unknown policy</em> +<a name="294" href="#294">294</a> <em class="jxr_comment">//</em> +<a name="295" href="#295">295</a> LOG.error(<span class="jxr_string">"Unknown policy "</span> + policy); +<a name="296" href="#296">296</a> handleError(req, res, <span class="jxr_string">"Unknown policy "</span> + policy); +<a name="297" href="#297">297</a> <strong class="jxr_keyword">return</strong>; +<a name="298" href="#298">298</a> } +<a name="299" href="#299">299</a> +<a name="300" href="#300">300</a> <em class="jxr_comment">//</em> +<a name="301" href="#301">301</a> <em class="jxr_comment">// Decide how to route the request based on query string</em> +<a name="302" href="#302">302</a> <em class="jxr_comment">//</em> +<a name="303" href="#303">303</a> String requestType = req.getParameter(<span class="jxr_string">"action"</span>); +<a name="304" href="#304">304</a> +<a name="305" href="#305">305</a> <strong class="jxr_keyword">if</strong> (requestType == <strong class="jxr_keyword">null</strong> || requestType.equals(<span class="jxr_string">""</span>)) { +<a name="306" href="#306">306</a> requestType = <span class="jxr_string">"lookup"</span>; +<a name="307" href="#307">307</a> } +<a name="308" href="#308">308</a> +<a name="309" href="#309">309</a> <strong class="jxr_keyword">try</strong> { +<a name="310" href="#310">310</a> +<a name="311" href="#311">311</a> <strong class="jxr_keyword">if</strong> (requestType.equals(<span class="jxr_string">"search"</span>)) { +<a name="312" href="#312">312</a> +<a name="313" href="#313">313</a> String parameter = req.getParameter(<span class="jxr_string">"string"</span>); +<a name="314" href="#314">314</a> <strong class="jxr_keyword">if</strong> (parameter != <strong class="jxr_keyword">null</strong> && parameter.equals(<span class="jxr_string">""</span>)) { +<a name="315" href="#315">315</a> parameter = <strong class="jxr_keyword">null</strong>; +<a name="316" href="#316">316</a> } +<a name="317" href="#317">317</a> handleLookup(req, res, parameter); +<a name="318" href="#318">318</a> +<a name="319" href="#319">319</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (requestType.equals(<span class="jxr_string">"selection"</span>)) { +<a name="320" href="#320">320</a> +<a name="321" href="#321">321</a> handleSelection(req, res); +<a name="322" href="#322">322</a> } <strong class="jxr_keyword">else</strong> { +<a name="323" href="#323">323</a> handleLookup(req, res, <strong class="jxr_keyword">null</strong>); +<a name="324" href="#324">324</a> } +<a name="325" href="#325">325</a> } <strong class="jxr_keyword">catch</strong> (WayfException we) { +<a name="326" href="#326">326</a> LOG.error(<span class="jxr_string">"Error processing DS request:"</span>, we); +<a name="327" href="#327">327</a> handleError(req, res, we.getLocalizedMessage()); +<a name="328" href="#328">328</a> } <strong class="jxr_keyword">catch</strong> (WayfRequestHandled we) { +<a name="329" href="#329">329</a> <em class="jxr_comment">//</em> +<a name="330" href="#330">330</a> <em class="jxr_comment">// Yuck - a sucess path involving an exception</em> +<a name="331" href="#331">331</a> <em class="jxr_comment">//</em> +<a name="332" href="#332">332</a> } +<a name="333" href="#333">333</a> +<a name="334" href="#334">334</a> } +<a name="335" href="#335">335</a> +<a name="336" href="#336">336</a> <em class="jxr_javadoccomment">/**</em> +<a name="337" href="#337">337</a> <em class="jxr_javadoccomment"> * When the WAYF user has selected something we look it up, tell the plugins and then dispatch to the Idp.</em> +<a name="338" href="#338">338</a> <em class="jxr_javadoccomment"> * </em> +<a name="339" href="#339">339</a> <em class="jxr_javadoccomment"> * @param req - standard J2EE stuff</em> +<a name="340" href="#340">340</a> <em class="jxr_javadoccomment"> * @param res - standard J2EE stuff</em> +<a name="341" href="#341">341</a> <em class="jxr_javadoccomment"> * @throws WayfRequestHandled - if one of the plugins has done the dispatch</em> +<a name="342" href="#342">342</a> <em class="jxr_javadoccomment"> * @throws WayfException - if we had an errors</em> +<a name="343" href="#343">343</a> <em class="jxr_javadoccomment"> */</em> +<a name="344" href="#344">344</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> handleSelection(HttpServletRequest req, +<a name="345" href="#345">345</a> HttpServletResponse res) <strong class="jxr_keyword">throws</strong> WayfRequestHandled, WayfException +<a name="346" href="#346">346</a> { +<a name="347" href="#347">347</a> +<a name="348" href="#348">348</a> String idpName = req.getParameter(<span class="jxr_string">"origin"</span>); +<a name="349" href="#349">349</a> LOG.debug(<span class="jxr_string">"Processing handle selection: "</span> + idpName); +<a name="350" href="#350">350</a> +<a name="351" href="#351">351</a> String sPName = getSPId(req); +<a name="352" href="#352">352</a> +<a name="353" href="#353">353</a> <strong class="jxr_keyword">if</strong> (idpName == <strong class="jxr_keyword">null</strong> || idpName.equals(<span class="jxr_string">""</span>)) { +<a name="354" href="#354">354</a> handleLookup(req, res, <strong class="jxr_keyword">null</strong>); +<a name="355" href="#355">355</a> <strong class="jxr_keyword">return</strong>; +<a name="356" href="#356">356</a> } +<a name="357" href="#357">357</a> +<a name="358" href="#358">358</a> <strong class="jxr_keyword">if</strong> (getValue(req, SHIRE_PARAM_NAME) == <strong class="jxr_keyword">null</strong>) { +<a name="359" href="#359">359</a> <em class="jxr_comment">//</em> +<a name="360" href="#360">360</a> <em class="jxr_comment">// 2.0 protocol</em> +<a name="361" href="#361">361</a> <em class="jxr_comment">//</em> +<a name="362" href="#362">362</a> setupReturnAddress(sPName, req); +<a name="363" href="#363">363</a> } +<a name="364" href="#364">364</a> <em class="jxr_comment">//</em> +<a name="365" href="#365">365</a> <em class="jxr_comment">// Notify plugins</em> +<a name="366" href="#366">366</a> <em class="jxr_comment">//</em> +<a name="367" href="#367">367</a> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/IdPSite.html">IdPSite</a> site = <strong class="jxr_keyword">null</strong>; +<a name="368" href="#368">368</a> +<a name="369" href="#369">369</a> <strong class="jxr_keyword">for</strong> (Plugin plugin:plugins) { +<a name="370" href="#370">370</a> <strong class="jxr_keyword">for</strong> (IdPSiteSet idPSiteSet: siteSets) { +<a name="371" href="#371">371</a> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/plugins/PluginMetadataParameter.html">PluginMetadataParameter</a> param = idPSiteSet.paramFor(plugin); +<a name="372" href="#372">372</a> plugin.selected(req, res, param, idpName); +<a name="373" href="#373">373</a> <strong class="jxr_keyword">if</strong> (site == <strong class="jxr_keyword">null</strong> && idPSiteSet.containsIdP(idpName)) { +<a name="374" href="#374">374</a> site = idPSiteSet.getSite(idpName); +<a name="375" href="#375">375</a> } +<a name="376" href="#376">376</a> } +<a name="377" href="#377">377</a> } +<a name="378" href="#378">378</a> +<a name="379" href="#379">379</a> <strong class="jxr_keyword">if</strong> (site == <strong class="jxr_keyword">null</strong>) { +<a name="380" href="#380">380</a> handleLookup(req, res, <strong class="jxr_keyword">null</strong>); +<a name="381" href="#381">381</a> } <strong class="jxr_keyword">else</strong> { +<a name="382" href="#382">382</a> forwardRequest(req, res, site); +<a name="383" href="#383">383</a> } +<a name="384" href="#384">384</a> } <a name="385" href="#385">385</a> -<a name="386" href="#386">386</a> <em class="jxr_javadoccomment">/**</em> -<a name="387" href="#387">387</a> <em class="jxr_javadoccomment"> * This sets up the parameter RETURN_ATTRIBUTE_NAME with the return address </em> -<a name="388" href="#388">388</a> <em class="jxr_javadoccomment"> * harvested from the reqest.</em> -<a name="389" href="#389">389</a> <em class="jxr_javadoccomment"> * <ul><le>If a "return" parameter is present we check in the metadata for spoofing </em> -<a name="390" href="#390">390</a> <em class="jxr_javadoccomment"> * and then set up from there </le></em> -<a name="391" href="#391">391</a> <em class="jxr_javadoccomment"> * <le>If "returnID" is specified we get this from the metadata</le></em> -<a name="392" href="#392">392</a> <em class="jxr_javadoccomment"> * <le>If nothing is provided we get the default from the metadata (if provided)</le></em> -<a name="393" href="#393">393</a> <em class="jxr_javadoccomment"> * <le>Otherwise we whine</le></em> -<a name="394" href="#394">394</a> <em class="jxr_javadoccomment"> * </ul> </em> -<a name="395" href="#395">395</a> <em class="jxr_javadoccomment"> * @param spName - the name of the Service provider.</em> -<a name="396" href="#396">396</a> <em class="jxr_javadoccomment"> * @param req - The request.</em> -<a name="397" href="#397">397</a> <em class="jxr_javadoccomment"> * @throws WayfException - if we spot spoofing or there is no defaumlt </em> -<a name="398" href="#398">398</a> <em class="jxr_javadoccomment"> */</em> -<a name="399" href="#399">399</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> setupReturnAddress(String spName, HttpServletRequest req) <strong class="jxr_keyword">throws</strong> WayfException{ -<a name="400" href="#400">400</a> -<a name="401" href="#401">401</a> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseImpl.html">DiscoveryResponseImpl</a>[] discoveryServices; -<a name="402" href="#402">402</a> Set<XMLObject> objects = <strong class="jxr_keyword">new</strong> HashSet<XMLObject>(); -<a name="403" href="#403">403</a> String defaultName = <strong class="jxr_keyword">null</strong>; -<a name="404" href="#404">404</a> -<a name="405" href="#405">405</a> <strong class="jxr_keyword">for</strong> (IdPSiteSet metadataProvider:siteSets) { -<a name="406" href="#406">406</a> -<a name="407" href="#407">407</a> <em class="jxr_comment">//</em> -<a name="408" href="#408">408</a> <em class="jxr_comment">// Only do work if the SP makes sense</em> -<a name="409" href="#409">409</a> <em class="jxr_comment">//</em> -<a name="410" href="#410">410</a> -<a name="411" href="#411">411</a> <strong class="jxr_keyword">if</strong> (metadataProvider.containsSP(spName)) { -<a name="412" href="#412">412</a> -<a name="413" href="#413">413</a> <em class="jxr_comment">//</em> -<a name="414" href="#414">414</a> <em class="jxr_comment">// The name makes sense so let's get the entity and from that</em> -<a name="415" href="#415">415</a> <em class="jxr_comment">// all of its roles</em> -<a name="416" href="#416">416</a> <em class="jxr_comment">//</em> -<a name="417" href="#417">417</a> -<a name="418" href="#418">418</a> EntityDescriptor entity = metadataProvider.getEntity(spName); -<a name="419" href="#419">419</a> List<RoleDescriptor> roles = entity.getRoleDescriptors(); -<a name="420" href="#420">420</a> -<a name="421" href="#421">421</a> <strong class="jxr_keyword">for</strong> (RoleDescriptor role:roles) { -<a name="422" href="#422">422</a> -<a name="423" href="#423">423</a> <em class="jxr_comment">//</em> -<a name="424" href="#424">424</a> <em class="jxr_comment">// Check every role</em> -<a name="425" href="#425">425</a> <em class="jxr_comment">//</em> -<a name="426" href="#426">426</a> -<a name="427" href="#427">427</a> <strong class="jxr_keyword">if</strong> (role instanceof SPSSODescriptor) { -<a name="428" href="#428">428</a> -<a name="429" href="#429">429</a> <em class="jxr_comment">//</em> -<a name="430" href="#430">430</a> <em class="jxr_comment">// And grab hold of all the extensions for SPSSO descriptors</em> -<a name="431" href="#431">431</a> <em class="jxr_comment">//</em> -<a name="432" href="#432">432</a> -<a name="433" href="#433">433</a> Extensions exts = role.getExtensions(); -<a name="434" href="#434">434</a> <strong class="jxr_keyword">if</strong> (exts != <strong class="jxr_keyword">null</strong>) { -<a name="435" href="#435">435</a> objects.addAll(exts.getOrderedChildren()); -<a name="436" href="#436">436</a> } -<a name="437" href="#437">437</a> } -<a name="438" href="#438">438</a> } -<a name="439" href="#439">439</a> } -<a name="440" href="#440">440</a> } -<a name="441" href="#441">441</a> -<a name="442" href="#442">442</a> <em class="jxr_comment">//</em> -<a name="443" href="#443">443</a> <em class="jxr_comment">// Now, let's strip out everything which isn't a DiscoveryService</em> -<a name="444" href="#444">444</a> <em class="jxr_comment">//</em> -<a name="445" href="#445">445</a> -<a name="446" href="#446">446</a> discoveryServices = <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseImpl.html">DiscoveryResponseImpl</a>[objects.size()]; -<a name="447" href="#447">447</a> <strong class="jxr_keyword">int</strong> dsCount = 0; -<a name="448" href="#448">448</a> -<a name="449" href="#449">449</a> <strong class="jxr_keyword">for</strong> (XMLObject obj:objects) { -<a name="450" href="#450">450</a> <strong class="jxr_keyword">if</strong> (obj instanceof DiscoveryResponseImpl) { -<a name="451" href="#451">451</a> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseImpl.html">DiscoveryResponseImpl</a> ds = (DiscoveryResponseImpl) obj; -<a name="452" href="#452">452</a> discoveryServices[dsCount++] = ds; -<a name="453" href="#453">453</a> <strong class="jxr_keyword">if</strong> (ds.isDefault() || <strong class="jxr_keyword">null</strong> == defaultName) { -<a name="454" href="#454">454</a> defaultName = ds.getLocation(); -<a name="455" href="#455">455</a> } -<a name="456" href="#456">456</a> } -<a name="457" href="#457">457</a> } -<a name="458" href="#458">458</a> -<a name="459" href="#459">459</a> <em class="jxr_comment">//</em> -<a name="460" href="#460">460</a> <em class="jxr_comment">// Now process the return parameters. The name is either a parameter</em> -<a name="461" href="#461">461</a> <em class="jxr_comment">// called RETURN_PARAM_NAME or an attributes called RETURN_ATTRIBUTE_NAME</em> -<a name="462" href="#462">462</a> <em class="jxr_comment">//</em> -<a name="463" href="#463">463</a> String returnName = req.getParameter(RETURN_PARAM_NAME); -<a name="464" href="#464">464</a> -<a name="465" href="#465">465</a> <strong class="jxr_keyword">if</strong> (returnName == <strong class="jxr_keyword">null</strong> || returnName.length() == 0) { -<a name="466" href="#466">466</a> returnName = getValue(req, RETURN_ATTRIBUTE_NAME); -<a name="467" href="#467">467</a> } -<a name="468" href="#468">468</a> -<a name="469" href="#469">469</a> <em class="jxr_comment">//</em> -<a name="470" href="#470">470</a> <em class="jxr_comment">// Return index is only ever a parameter</em> -<a name="471" href="#471">471</a> <em class="jxr_comment">//</em> -<a name="472" href="#472">472</a> -<a name="473" href="#473">473</a> String returnIndex = req.getParameter(RETURN_INDEX_NAME); -<a name="474" href="#474">474</a> -<a name="475" href="#475">475</a> <strong class="jxr_keyword">if</strong> (returnName != <strong class="jxr_keyword">null</strong> && returnName.length() != 0) { -<a name="476" href="#476">476</a> <em class="jxr_comment">//</em> -<a name="477" href="#477">477</a> <em class="jxr_comment">// Given something so we have to police it.</em> -<a name="478" href="#478">478</a> <em class="jxr_comment">//</em> -<a name="479" href="#479">479</a> String nameNoParam = returnName; -<a name="480" href="#480">480</a> URL providedReturnURL; -<a name="481" href="#481">481</a> <strong class="jxr_keyword">int</strong> index = nameNoParam.indexOf('?'); -<a name="482" href="#482">482</a> <strong class="jxr_keyword">boolean</strong> found = false; -<a name="483" href="#483">483</a> -<a name="484" href="#484">484</a> <strong class="jxr_keyword">if</strong> (index >= 0) { -<a name="485" href="#485">485</a> nameNoParam = nameNoParam.substring(0,index); -<a name="486" href="#486">486</a> } -<a name="487" href="#487">487</a> -<a name="488" href="#488">488</a> <strong class="jxr_keyword">try</strong> { -<a name="489" href="#489">489</a> providedReturnURL = <strong class="jxr_keyword">new</strong> URL(nameNoParam); -<a name="490" href="#490">490</a> } <strong class="jxr_keyword">catch</strong> (MalformedURLException e) { -<a name="491" href="#491">491</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/WayfException.html">WayfException</a>(<span class="jxr_string">"Couldn't parse provided return name "</span> + nameNoParam, e); -<a name="492" href="#492">492</a> } -<a name="493" href="#493">493</a> +<a name="386" href="#386">386</a> +<a name="387" href="#387">387</a> <em class="jxr_javadoccomment">/**</em> +<a name="388" href="#388">388</a> <em class="jxr_javadoccomment"> * This sets up the parameter RETURN_ATTRIBUTE_NAME with the return address </em> +<a name="389" href="#389">389</a> <em class="jxr_javadoccomment"> * harvested from the reqest.</em> +<a name="390" href="#390">390</a> <em class="jxr_javadoccomment"> * <ul><le>If a "return" parameter is present we check in the metadata for spoofing </em> +<a name="391" href="#391">391</a> <em class="jxr_javadoccomment"> * and then set up from there </le></em> +<a name="392" href="#392">392</a> <em class="jxr_javadoccomment"> * <le>If "returnID" is specified we get this from the metadata</le></em> +<a name="393" href="#393">393</a> <em class="jxr_javadoccomment"> * <le>If nothing is provided we get the default from the metadata (if provided)</le></em> +<a name="394" href="#394">394</a> <em class="jxr_javadoccomment"> * <le>Otherwise we whine</le></em> +<a name="395" href="#395">395</a> <em class="jxr_javadoccomment"> * </ul> </em> +<a name="396" href="#396">396</a> <em class="jxr_javadoccomment"> * @param spName - the name of the Service provider.</em> +<a name="397" href="#397">397</a> <em class="jxr_javadoccomment"> * @param req - The request.</em> +<a name="398" href="#398">398</a> <em class="jxr_javadoccomment"> * @throws WayfException - if we spot spoofing or there is no defaumlt </em> +<a name="399" href="#399">399</a> <em class="jxr_javadoccomment"> */</em> +<a name="400" href="#400">400</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> setupReturnAddress(String spName, HttpServletRequest req) <strong class="jxr_keyword">throws</strong> WayfException{ +<a name="401" href="#401">401</a> +<a name="402" href="#402">402</a> DiscoveryResponse[] discoveryServices; +<a name="403" href="#403">403</a> Set<XMLObject> objects = <strong class="jxr_keyword">new</strong> HashSet<XMLObject>(); +<a name="404" href="#404">404</a> String defaultName = <strong class="jxr_keyword">null</strong>; +<a name="405" href="#405">405</a> +<a name="406" href="#406">406</a> <strong class="jxr_keyword">for</strong> (IdPSiteSet metadataProvider:siteSets) { +<a name="407" href="#407">407</a> +<a name="408" href="#408">408</a> <em class="jxr_comment">//</em> +<a name="409" href="#409">409</a> <em class="jxr_comment">// Only do work if the SP makes sense</em> +<a name="410" href="#410">410</a> <em class="jxr_comment">//</em> +<a name="411" href="#411">411</a> +<a name="412" href="#412">412</a> <strong class="jxr_keyword">if</strong> (metadataProvider.containsSP(spName)) { +<a name="413" href="#413">413</a> +<a name="414" href="#414">414</a> <em class="jxr_comment">//</em> +<a name="415" href="#415">415</a> <em class="jxr_comment">// The name makes sense so let's get the entity and from that</em> +<a name="416" href="#416">416</a> <em class="jxr_comment">// all of its roles</em> +<a name="417" href="#417">417</a> <em class="jxr_comment">//</em> +<a name="418" href="#418">418</a> +<a name="419" href="#419">419</a> EntityDescriptor entity = metadataProvider.getEntity(spName); +<a name="420" href="#420">420</a> List<RoleDescriptor> roles = entity.getRoleDescriptors(); +<a name="421" href="#421">421</a> +<a name="422" href="#422">422</a> <strong class="jxr_keyword">for</strong> (RoleDescriptor role:roles) { +<a name="423" href="#423">423</a> +<a name="424" href="#424">424</a> <em class="jxr_comment">//</em> +<a name="425" href="#425">425</a> <em class="jxr_comment">// Check every role</em> +<a name="426" href="#426">426</a> <em class="jxr_comment">//</em> +<a name="427" href="#427">427</a> +<a name="428" href="#428">428</a> <strong class="jxr_keyword">if</strong> (role instanceof SPSSODescriptor) { +<a name="429" href="#429">429</a> +<a name="430" href="#430">430</a> <em class="jxr_comment">//</em> +<a name="431" href="#431">431</a> <em class="jxr_comment">// And grab hold of all the extensions for SPSSO descriptors</em> +<a name="432" href="#432">432</a> <em class="jxr_comment">//</em> +<a name="433" href="#433">433</a> +<a name="434" href="#434">434</a> Extensions exts = role.getExtensions(); +<a name="435" href="#435">435</a> <strong class="jxr_keyword">if</strong> (exts != <strong class="jxr_keyword">null</strong>) { +<a name="436" href="#436">436</a> objects.addAll(exts.getOrderedChildren()); +<a name="437" href="#437">437</a> } +<a name="438" href="#438">438</a> } +<a name="439" href="#439">439</a> } +<a name="440" href="#440">440</a> } +<a name="441" href="#441">441</a> } +<a name="442" href="#442">442</a> +<a name="443" href="#443">443</a> <em class="jxr_comment">//</em> +<a name="444" href="#444">444</a> <em class="jxr_comment">// Now, let's strip out everything which isn't a DiscoveryService</em> +<a name="445" href="#445">445</a> <em class="jxr_comment">//</em> +<a name="446" href="#446">446</a> +<a name="447" href="#447">447</a> discoveryServices = <strong class="jxr_keyword">new</strong> DiscoveryResponse[objects.size()]; +<a name="448" href="#448">448</a> <strong class="jxr_keyword">int</strong> dsCount = 0; +<a name="449" href="#449">449</a> +<a name="450" href="#450">450</a> <strong class="jxr_keyword">for</strong> (XMLObject obj:objects) { +<a name="451" href="#451">451</a> <strong class="jxr_keyword">if</strong> (obj instanceof DiscoveryResponse) { +<a name="452" href="#452">452</a> DiscoveryResponse ds = (DiscoveryResponse) obj; +<a name="453" href="#453">453</a> discoveryServices[dsCount++] = ds; +<a name="454" href="#454">454</a> <strong class="jxr_keyword">if</strong> (ds.isDefault() || <strong class="jxr_keyword">null</strong> == defaultName) { +<a name="455" href="#455">455</a> defaultName = ds.getLocation(); +<a name="456" href="#456">456</a> } +<a name="457" href="#457">457</a> } +<a name="458" href="#458">458</a> } +<a name="459" href="#459">459</a> +<a name="460" href="#460">460</a> <em class="jxr_comment">//</em> +<a name="461" href="#461">461</a> <em class="jxr_comment">// Now process the return parameters. The name is either a parameter</em> +<a name="462" href="#462">462</a> <em class="jxr_comment">// called RETURN_PARAM_NAME or an attributes called RETURN_ATTRIBUTE_NAME</em> +<a name="463" href="#463">463</a> <em class="jxr_comment">//</em> +<a name="464" href="#464">464</a> String returnName = req.getParameter(RETURN_PARAM_NAME); +<a name="465" href="#465">465</a> +<a name="466" href="#466">466</a> <strong class="jxr_keyword">if</strong> (returnName == <strong class="jxr_keyword">null</strong> || returnName.length() == 0) { +<a name="467" href="#467">467</a> returnName = getValue(req, RETURN_ATTRIBUTE_NAME); +<a name="468" href="#468">468</a> } +<a name="469" href="#469">469</a> +<a name="470" href="#470">470</a> <em class="jxr_comment">//</em> +<a name="471" href="#471">471</a> <em class="jxr_comment">// Return index is only ever a parameter</em> +<a name="472" href="#472">472</a> <em class="jxr_comment">//</em> +<a name="473" href="#473">473</a> +<a name="474" href="#474">474</a> String returnIndex = req.getParameter(RETURN_INDEX_NAME); +<a name="475" href="#475">475</a> +<a name="476" href="#476">476</a> <strong class="jxr_keyword">if</strong> (returnName != <strong class="jxr_keyword">null</strong> && returnName.length() != 0) { +<a name="477" href="#477">477</a> <em class="jxr_comment">//</em> +<a name="478" href="#478">478</a> <em class="jxr_comment">// Given something so we have to police it.</em> +<a name="479" href="#479">479</a> <em class="jxr_comment">//</em> +<a name="480" href="#480">480</a> String nameNoParam = returnName; +<a name="481" href="#481">481</a> URL providedReturnURL; +<a name="482" href="#482">482</a> <strong class="jxr_keyword">int</strong> index = nameNoParam.indexOf('?'); +<a name="483" href="#483">483</a> <strong class="jxr_keyword">boolean</strong> found = false; +<a name="484" href="#484">484</a> +<a name="485" href="#485">485</a> <strong class="jxr_keyword">if</strong> (index >= 0) { +<a name="486" href="#486">486</a> nameNoParam = nameNoParam.substring(0,index); +<a name="487" href="#487">487</a> } +<a name="488" href="#488">488</a> +<a name="489" href="#489">489</a> <strong class="jxr_keyword">try</strong> { +<a name="490" href="#490">490</a> providedReturnURL = <strong class="jxr_keyword">new</strong> URL(nameNoParam); +<a name="491" href="#491">491</a> } <strong class="jxr_keyword">catch</strong> (MalformedURLException e) { +<a name="492" href="#492">492</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/WayfException.html">WayfException</a>(<span class="jxr_string">"Couldn't parse provided return name "</span> + nameNoParam, e); +<a name="493" href="#493">493</a> } <a name="494" href="#494">494</a> -<a name="495" href="#495">495</a> <strong class="jxr_keyword">for</strong> (DiscoveryResponseImpl disc: discoveryServices) { -<a name="496" href="#496">496</a> <strong class="jxr_keyword">if</strong> (equalsURL(disc, providedReturnURL)) { -<a name="497" href="#497">497</a> found = <strong class="jxr_keyword">true</strong>; -<a name="498" href="#498">498</a> <strong class="jxr_keyword">break</strong>; -<a name="499" href="#499">499</a> } -<a name="500" href="#500">500</a> } -<a name="501" href="#501">501</a> <strong class="jxr_keyword">if</strong> (!found) { -<a name="502" href="#502">502</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/WayfException.html">WayfException</a>(<span class="jxr_string">"Couldn't find endpoint "</span> + nameNoParam + <span class="jxr_string">" in metadata"</span>); -<a name="503" href="#503">503</a> } -<a name="504" href="#504">504</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (returnIndex != <strong class="jxr_keyword">null</strong> && returnIndex.length() != 0) { -<a name="505" href="#505">505</a> -<a name="506" href="#506">506</a> <strong class="jxr_keyword">int</strong> index; -<a name="507" href="#507">507</a> <strong class="jxr_keyword">try</strong> { -<a name="508" href="#508">508</a> index = Integer.parseInt(returnIndex); -<a name="509" href="#509">509</a> } <strong class="jxr_keyword">catch</strong> (NumberFormatException e) { -<a name="510" href="#510">510</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/WayfException.html">WayfException</a>(<span class="jxr_string">"Couldn't convert "</span> + returnIndex + <span class="jxr_string">" into an index"</span>); -<a name="511" href="#511">511</a> } -<a name="512" href="#512">512</a> <em class="jxr_comment">//</em> -<a name="513" href="#513">513</a> <em class="jxr_comment">// So look throught to find the endpoint with the correct index</em> -<a name="514" href="#514">514</a> <em class="jxr_comment">//</em> -<a name="515" href="#515">515</a> -<a name="516" href="#516">516</a> <strong class="jxr_keyword">boolean</strong> found = false; -<a name="517" href="#517">517</a> -<a name="518" href="#518">518</a> <strong class="jxr_keyword">for</strong> (DiscoveryResponseImpl disc: discoveryServices) { -<a name="519" href="#519">519</a> <strong class="jxr_keyword">if</strong> (index == disc.getIndex()) { -<a name="520" href="#520">520</a> found = <strong class="jxr_keyword">true</strong>; -<a name="521" href="#521">521</a> returnName = disc.getLocation(); -<a name="522" href="#522">522</a> <strong class="jxr_keyword">break</strong>; -<a name="523" href="#523">523</a> } -<a name="524" href="#524">524</a> } -<a name="525" href="#525">525</a> <strong class="jxr_keyword">if</strong> (!found) { -<a name="526" href="#526">526</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/WayfException.html">WayfException</a>(<span class="jxr_string">"Couldn't not find endpoint "</span> + returnIndex + <span class="jxr_string">"in metadata"</span>); -<a name="527" href="#527">527</a> } -<a name="528" href="#528">528</a> } <strong class="jxr_keyword">else</strong> { -<a name="529" href="#529">529</a> <em class="jxr_comment">//</em> -<a name="530" href="#530">530</a> <em class="jxr_comment">// No name, not index, so we want the default</em> -<a name="531" href="#531">531</a> <em class="jxr_comment">//</em> -<a name="532" href="#532">532</a> returnName = defaultName; -<a name="533" href="#533">533</a> } -<a name="534" href="#534">534</a> <em class="jxr_comment">//</em> -<a name="535" href="#535">535</a> <em class="jxr_comment">// So by now returnName has the correct value, either harvested from or</em> -<a name="536" href="#536">536</a> <em class="jxr_comment">// policed against the metadata</em> -<a name="537" href="#537">537</a> <em class="jxr_comment">//</em> -<a name="538" href="#538">538</a> req.setAttribute(RETURN_ATTRIBUTE_NAME, returnName); -<a name="539" href="#539">539</a> } -<a name="540" href="#540">540</a> -<a name="541" href="#541">541</a> <em class="jxr_javadoccomment">/**</em> -<a name="542" href="#542">542</a> <em class="jxr_javadoccomment"> * Helper function to see whather the provided endpoint in the metadata matches the </em> -<a name="543" href="#543">543</a> <em class="jxr_javadoccomment"> * provided return URL in the request.</em> -<a name="544" href="#544">544</a> <em class="jxr_javadoccomment"> * </em> -<a name="545" href="#545">545</a> <em class="jxr_javadoccomment"> * @param discovery</em> -<a name="546" href="#546">546</a> <em class="jxr_javadoccomment"> * @param providedName</em> -<a name="547" href="#547">547</a> <em class="jxr_javadoccomment"> * @return</em> -<a name="548" href="#548">548</a> <em class="jxr_javadoccomment"> */</em> -<a name="549" href="#549">549</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">boolean</strong> equalsURL(<a href="../../../../../edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseImpl.html">DiscoveryResponseImpl</a> discovery, URL providedName) { -<a name="550" href="#550">550</a> -<a name="551" href="#551">551</a> <em class="jxr_comment">//</em> -<a name="552" href="#552">552</a> <em class="jxr_comment">// Nothing provided - no match</em> -<a name="553" href="#553">553</a> <em class="jxr_comment">//</em> -<a name="554" href="#554">554</a> <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> == discovery) { -<a name="555" href="#555">555</a> <strong class="jxr_keyword">return</strong> false; -<a name="556" href="#556">556</a> } -<a name="557" href="#557">557</a> -<a name="558" href="#558">558</a> URL discoveryName; -<a name="559" href="#559">559</a> <strong class="jxr_keyword">try</strong> { -<a name="560" href="#560">560</a> discoveryName = <strong class="jxr_keyword">new</strong> URL(discovery.getLocation()); -<a name="561" href="#561">561</a> } <strong class="jxr_keyword">catch</strong> (MalformedURLException e) { -<a name="562" href="#562">562</a> <em class="jxr_comment">//</em> -<a name="563" href="#563">563</a> <em class="jxr_comment">// Something bad happened. Log it (it is only of interest to the sysadmin, not to the user)</em> -<a name="564" href="#564">564</a> <em class="jxr_comment">//</em> -<a name="565" href="#565">565</a> LOG.warn(<span class="jxr_string">"Found invalid discovery end point : "</span> + discovery.getLocation(), e); -<a name="566" href="#566">566</a> <strong class="jxr_keyword">return</strong> false; -<a name="567" href="#567">567</a> } -<a name="568" href="#568">568</a> -<a name="569" href="#569">569</a> <strong class="jxr_keyword">return</strong> providedName.equals(discoveryName); -<a name="570" href="#570">570</a> -<a name="571" href="#571">571</a> } -<a name="572" href="#572">572</a> -<a name="573" href="#573">573</a> <em class="jxr_javadoccomment">/**</em> -<a name="574" href="#574">574</a> <em class="jxr_javadoccomment"> * Displays a Discovery Service selection page, having first consulted the plugins as needed.</em> -<a name="575" href="#575">575</a> <em class="jxr_javadoccomment"> * @param req Describes the request</em> -<a name="576" href="#576">576</a> <em class="jxr_javadoccomment"> * @param res Describes the response</em> -<a name="577" href="#577">577</a> <em class="jxr_javadoccomment"> * @param searchName What are we looking for?</em> -<a name="578" href="#578">578</a> <em class="jxr_javadoccomment"> * </em> -<a name="579" href="#579">579</a> <em class="jxr_javadoccomment"> * @throws WayfRequestHandled if a plugin has dealt with the request</em> -<a name="580" href="#580">580</a> <em class="jxr_javadoccomment"> * @throws WayfException in case of an error.</em> -<a name="581" href="#581">581</a> <em class="jxr_javadoccomment"> */</em> -<a name="582" href="#582">582</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> handleLookup(HttpServletRequest req, -<a name="583" href="#583">583</a> HttpServletResponse res, -<a name="584" href="#584">584</a> String searchName) <strong class="jxr_keyword">throws</strong> WayfException, WayfRequestHandled { -<a name="585" href="#585">585</a> -<a name="586" href="#586">586</a> String shire = getValue(req, SHIRE_PARAM_NAME); -<a name="587" href="#587">587</a> String providerId = getSPId(req); -<a name="588" href="#588">588</a> <strong class="jxr_keyword">boolean</strong> twoZeroProtocol = (shire == <strong class="jxr_keyword">null</strong>); -<a name="589" href="#589">589</a> <strong class="jxr_keyword">boolean</strong> isPassive = (twoZeroProtocol && -<a name="590" href="#590">590</a> <span class="jxr_string">"true"</span>.equalsIgnoreCase(getValue(req, ISPASSIVE_PARAM_NAME))); -<a name="591" href="#591">591</a> -<a name="592" href="#592">592</a> Collection <IdPSiteSetEntry> siteLists = <strong class="jxr_keyword">null</strong>; -<a name="593" href="#593">593</a> Collection<IdPSite> searchResults = <strong class="jxr_keyword">null</strong>; -<a name="594" href="#594">594</a> -<a name="595" href="#595">595</a> <strong class="jxr_keyword">if</strong> (config.getProvideListOfLists()) { -<a name="596" href="#596">596</a> siteLists = <strong class="jxr_keyword">new</strong> ArrayList <IdPSiteSetEntry>(siteSets.size()); -<a name="597" href="#597">597</a> } -<a name="598" href="#598">598</a> -<a name="599" href="#599">599</a> Collection <IdPSite> sites = <strong class="jxr_keyword">null</strong>; -<a name="600" href="#600">600</a> Comparator<IdPSite> comparator = <strong class="jxr_keyword">new</strong> IdPSite.Compare(req); -<a name="601" href="#601">601</a> -<a name="602" href="#602">602</a> <strong class="jxr_keyword">if</strong> (config.getProvideList()) { -<a name="603" href="#603">603</a> sites = <strong class="jxr_keyword">new</strong> TreeSet<IdPSite>(comparator); -<a name="604" href="#604">604</a> } -<a name="605" href="#605">605</a> -<a name="606" href="#606">606</a> <strong class="jxr_keyword">if</strong> (searchName != <strong class="jxr_keyword">null</strong> && !searchName.equals(<span class="jxr_string">""</span>)) { -<a name="607" href="#607">607</a> searchResults = <strong class="jxr_keyword">new</strong> TreeSet<IdPSite>(comparator); -<a name="608" href="#608">608</a> } -<a name="609" href="#609">609</a> -<a name="610" href="#610">610</a> LOG.debug(<span class="jxr_string">"Processing Idp Lookup for : "</span> + providerId); -<a name="611" href="#611">611</a> -<a name="612" href="#612">612</a> <em class="jxr_comment">//</em> -<a name="613" href="#613">613</a> <em class="jxr_comment">// Iterate over all the sitesets and if they know about the SP pass them to the plugins</em> -<a name="614" href="#614">614</a> <em class="jxr_comment">// and then add them too the list</em> -<a name="615" href="#615">615</a> <em class="jxr_comment">//</em> -<a name="616" href="#616">616</a> -<a name="617" href="#617">617</a> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/plugins/PluginContext.html">PluginContext</a>[] ctx = <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/plugins/PluginContext.html">PluginContext</a>[plugins.size()]; -<a name="618" href="#618">618</a> List<IdPSite> hintList = <strong class="jxr_keyword">new</strong> ArrayList<IdPSite>(); -<a name="619" href="#619">619</a> -<a name="620" href="#620">620</a> <strong class="jxr_keyword">if</strong> (twoZeroProtocol) { -<a name="621" href="#621">621</a> setupReturnAddress(providerId, req); -<a name="622" href="#622">622</a> } -<a name="623" href="#623">623</a> <em class="jxr_comment">//</em> -<a name="624" href="#624">624</a> <em class="jxr_comment">// By having siteLists and sites as parameters we only iterate over </em> -<a name="625" href="#625">625</a> <em class="jxr_comment">// the metadata arrays once.</em> -<a name="626" href="#626">626</a> <em class="jxr_comment">//</em> -<a name="627" href="#627">627</a> <strong class="jxr_keyword">try</strong> { -<a name="628" href="#628">628</a> <strong class="jxr_keyword">for</strong> (IdPSiteSet metadataProvider:siteSets) { -<a name="629" href="#629">629</a> -<a name="630" href="#630">630</a> <em class="jxr_comment">//</em> -<a name="631" href="#631">631</a> <em class="jxr_comment">// Only do work if the SP makes sense</em> -<a name="632" href="#632">632</a> <em class="jxr_comment">//</em> -<a name="633" href="#633">633</a> -<a name="634" href="#634">634</a> <strong class="jxr_keyword">if</strong> (metadataProvider.containsSP(providerId) || !config.getLookupSp()) { -<a name="635" href="#635">635</a> -<a name="636" href="#636">636</a> Collection <IdPSite> search = <strong class="jxr_keyword">null</strong>; -<a name="637" href="#637">637</a> -<a name="638" href="#638">638</a> <strong class="jxr_keyword">if</strong> (searchResults != <strong class="jxr_keyword">null</strong>) { -<a name="639" href="#639">639</a> search = <strong class="jxr_keyword">new</strong> TreeSet<IdPSite>(comparator); -<a name="640" href="#640">640</a> } -<a name="641" href="#641">641</a> -<a name="642" href="#642">642</a> Map <String, IdPSite> theseSites = metadataProvider.getIdPSites(searchName, config, search); -<a name="643" href="#643">643</a> -<a name="644" href="#644">644</a> <em class="jxr_comment">//</em> -<a name="645" href="#645">645</a> <em class="jxr_comment">// Consult the plugins</em> -<a name="646" href="#646">646</a> <em class="jxr_comment">//</em> -<a name="647" href="#647">647</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < plugins.size(); i++) { -<a name="648" href="#648">648</a> -<a name="649" href="#649">649</a> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/plugins/Plugin.html">Plugin</a> plugin = plugins.get(i); -<a name="650" href="#650">650</a> -<a name="651" href="#651">651</a> <strong class="jxr_keyword">if</strong> (searchResults == <strong class="jxr_keyword">null</strong>) { -<a name="652" href="#652">652</a> <em class="jxr_comment">//</em> -<a name="653" href="#653">653</a> <em class="jxr_comment">// This was a search</em> -<a name="654" href="#654">654</a> <em class="jxr_comment">//</em> -<a name="655" href="#655">655</a> ctx[i] = plugin.lookup(req, -<a name="656" href="#656">656</a> res, -<a name="657" href="#657">657</a> metadataProvider.paramFor(plugin), -<a name="658" href="#658">658</a> theseSites, -<a name="659" href="#659">659</a> ctx[i], -<a name="660" href="#660">660</a> hintList); -<a name="661" href="#661">661</a> } <strong class="jxr_keyword">else</strong> { -<a name="662" href="#662">662</a> ctx[i] = plugin.search(req, -<a name="663" href="#663">663</a> res, -<a name="664" href="#664">664</a> metadataProvider.paramFor(plugin), -<a name="665" href="#665">665</a> searchName, -<a name="666" href="#666">666</a> theseSites, -<a name="667" href="#667">667</a> ctx[i], -<a name="668" href="#668">668</a> searchResults, -<a name="669" href="#669">669</a> hintList); -<a name="670" href="#670">670</a> } -<a name="671" href="#671">671</a> } -<a name="672" href="#672">672</a> -<a name="673" href="#673">673</a> <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> == theseSites || theseSites.isEmpty()) { -<a name="674" href="#674">674</a> <strong class="jxr_keyword">continue</strong>; -<a name="675" href="#675">675</a> } -<a name="676" href="#676">676</a> -<a name="677" href="#677">677</a> <em class="jxr_comment">//</em> -<a name="678" href="#678">678</a> -<a name="679" href="#679">679</a> <em class="jxr_comment">// Accumulate any per-metadata provider information</em> -<a name="680" href="#680">680</a> <em class="jxr_comment">// </em> -<a name="681" href="#681">681</a> -<a name="682" href="#682">682</a> Collection<IdPSite> values = <strong class="jxr_keyword">new</strong> TreeSet<IdPSite>(comparator); -<a name="683" href="#683">683</a> <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> != theseSites) { -<a name="684" href="#684">684</a> values.addAll(theseSites.values()); -<a name="685" href="#685">685</a> } -<a name="686" href="#686">686</a> -<a name="687" href="#687">687</a> <strong class="jxr_keyword">if</strong> (siteLists != <strong class="jxr_keyword">null</strong>) { -<a name="688" href="#688">688</a> siteLists.add(<strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/IdPSiteSetEntry.html">IdPSiteSetEntry</a>(metadataProvider,values)); -<a name="689" href="#689">689</a> } -<a name="690" href="#690">690</a> -<a name="691" href="#691">691</a> <strong class="jxr_keyword">if</strong> (sites != <strong class="jxr_keyword">null</strong>) { -<a name="692" href="#692">692</a> sites.addAll(values); -<a name="693" href="#693">693</a> } -<a name="694" href="#694">694</a> -<a name="695" href="#695">695</a> <strong class="jxr_keyword">if</strong> (searchResults != <strong class="jxr_keyword">null</strong>) { -<a name="696" href="#696">696</a> searchResults.addAll(search); -<a name="697" href="#697">697</a> } -<a name="698" href="#698">698</a> } -<a name="699" href="#699">699</a> } -<a name="700" href="#700">700</a> -<a name="701" href="#701">701</a> <strong class="jxr_keyword">if</strong> (isPassive) { -<a name="702" href="#702">702</a> <em class="jxr_comment">//</em> -<a name="703" href="#703">703</a> <em class="jxr_comment">// No GUI intervention.</em> -<a name="704" href="#704">704</a> <em class="jxr_comment">//</em> -<a name="705" href="#705">705</a> <strong class="jxr_keyword">if</strong> (0 != hintList.size()) { -<a name="706" href="#706">706</a> <em class="jxr_comment">//</em> -<a name="707" href="#707">707</a> <em class="jxr_comment">// We found a candidate, hand it back</em> -<a name="708" href="#708">708</a> <em class="jxr_comment">//</em> -<a name="709" href="#709">709</a> forwardRequest(req, res, hintList.get(0)); -<a name="710" href="#710">710</a> } <strong class="jxr_keyword">else</strong> { -<a name="711" href="#711">711</a> forwardRequest(req, res, <strong class="jxr_keyword">null</strong>); -<a name="712" href="#712">712</a> } -<a name="713" href="#713">713</a> <strong class="jxr_keyword">return</strong>; -<a name="714" href="#714">714</a> } -<a name="715" href="#715">715</a> -<a name="716" href="#716">716</a> <em class="jxr_comment">//</em> -<a name="717" href="#717">717</a> <em class="jxr_comment">// Now set up all the funky stuff that the JSP needs. Firstly the protocol</em> -<a name="718" href="#718">718</a> <em class="jxr_comment">// specific parameters which will come back to us</em> -<a name="719" href="#719">719</a> <em class="jxr_comment">//</em> -<a name="720" href="#720">720</a> -<a name="721" href="#721">721</a> <strong class="jxr_keyword">if</strong> (twoZeroProtocol) { -<a name="722" href="#722">722</a> <em class="jxr_comment">//</em> -<a name="723" href="#723">723</a> <em class="jxr_comment">// The return address was set up in setupReturnAddress</em> -<a name="724" href="#724">724</a> <em class="jxr_comment">//</em> -<a name="725" href="#725">725</a> String returnString = (String) req.getAttribute(RETURN_ATTRIBUTE_NAME); -<a name="726" href="#726">726</a> <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> == returnString || 0 == returnString.length()) { -<a name="727" href="#727">727</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/WayfException.html">WayfException</a>(<span class="jxr_string">"Parameter "</span> + RETURN_PARAM_NAME + <span class="jxr_string">" not supplied"</span>); -<a name="728" href="#728">728</a> } -<a name="729" href="#729">729</a> -<a name="730" href="#730">730</a> String returnId = getValue(req, RETURNID_PARAM_NAME); -<a name="731" href="#731">731</a> <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> == returnId || 0 == returnId.length()) { -<a name="732" href="#732">732</a> returnId = RETURNID_DEFAULT_VALUE; -<a name="733" href="#733">733</a> } -<a name="734" href="#734">734</a> <em class="jxr_comment">//</em> -<a name="735" href="#735">735</a> <em class="jxr_comment">// Return *means* something so we cannot use it as an attribute</em> -<a name="736" href="#736">736</a> <em class="jxr_comment">//</em> -<a name="737" href="#737">737</a> req.setAttribute(RETURN_ATTRIBUTE_NAME, returnString); -<a name="738" href="#738">738</a> req.setAttribute(RETURNID_PARAM_NAME, returnId); -<a name="739" href="#739">739</a> req.setAttribute(ENTITYID_PARAM_NAME, providerId); -<a name="740" href="#740">740</a> -<a name="741" href="#741">741</a> } <strong class="jxr_keyword">else</strong> { -<a name="742" href="#742">742</a> String target = getValue(req, TARGET_PARAM_NAME); -<a name="743" href="#743">743</a> <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> == target || 0 == target.length()) { -<a name="744" href="#744">744</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/WayfException.html">WayfException</a>(<span class="jxr_string">"Could not extract target from provided parameters"</span>); -<a name="745" href="#745">745</a> } -<a name="746" href="#746">746</a> req.setAttribute(SHIRE_PARAM_NAME, shire); -<a name="747" href="#747">747</a> req.setAttribute(TARGET_PARAM_NAME, target); -<a name="748" href="#748">748</a> req.setAttribute(PROVIDERID_PARAM_NAME, providerId); -<a name="749" href="#749">749</a> <em class="jxr_comment">//</em> -<a name="750" href="#750">750</a> <em class="jxr_comment">// Time is in unix format</em> -<a name="751" href="#751">751</a> <em class="jxr_comment">//</em> -<a name="752" href="#752">752</a> req.setAttribute(<span class="jxr_string">"time"</span>, <strong class="jxr_keyword">new</strong> Long(<strong class="jxr_keyword">new</strong> Date().getTime() / 1000).toString()); -<a name="753" href="#753">753</a> -<a name="754" href="#754">754</a> } -<a name="755" href="#755">755</a> -<a name="756" href="#756">756</a> <em class="jxr_comment">//</em> -<a name="757" href="#757">757</a> <em class="jxr_comment">// Setup the stuff that the GUI wants. </em> -<a name="758" href="#758">758</a> <em class="jxr_comment">//</em> -<a name="759" href="#759">759</a> -<a name="760" href="#760">760</a> setDisplayLanguage(sites, req); -<a name="761" href="#761">761</a> req.setAttribute(<span class="jxr_string">"sites"</span>, sites); -<a name="762" href="#762">762</a> <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> != siteLists) { -<a name="763" href="#763">763</a> <strong class="jxr_keyword">for</strong> (IdPSiteSetEntry siteSetEntry:siteLists) { -<a name="764" href="#764">764</a> setDisplayLanguage(siteSetEntry.getSites(), req); -<a name="765" href="#765">765</a> } -<a name="766" href="#766">766</a> } -<a name="767" href="#767">767</a> -<a name="768" href="#768">768</a> req.setAttribute(<span class="jxr_string">"siteLists"</span>, siteLists); -<a name="769" href="#769">769</a> req.setAttribute(<span class="jxr_string">"requestURL"</span>, req.getRequestURI().toString()); -<a name="770" href="#770">770</a> -<a name="771" href="#771">771</a> <strong class="jxr_keyword">if</strong> (searchResults != <strong class="jxr_keyword">null</strong>) { -<a name="772" href="#772">772</a> <strong class="jxr_keyword">if</strong> (searchResults.size() != 0) { -<a name="773" href="#773">773</a> setDisplayLanguage(searchResults, req); -<a name="774" href="#774">774</a> req.setAttribute(<span class="jxr_string">"searchresults"</span>, searchResults); -<a name="775" href="#775">775</a> } <strong class="jxr_keyword">else</strong> { -<a name="776" href="#776">776</a> req.setAttribute(<span class="jxr_string">"searchResultsEmpty"</span>, <span class="jxr_string">"true"</span>); -<a name="777" href="#777">777</a> } -<a name="778" href="#778">778</a> } -<a name="779" href="#779">779</a> -<a name="780" href="#780">780</a> <strong class="jxr_keyword">if</strong> (hintList.size() > 0) { -<a name="781" href="#781">781</a> setDisplayLanguage(hintList, req); -<a name="782" href="#782">782</a> req.setAttribute(<span class="jxr_string">"cookieList"</span>, hintList); -<a name="783" href="#783">783</a> } -<a name="784" href="#784">784</a> -<a name="785" href="#785">785</a> LOG.debug(<span class="jxr_string">"Displaying WAYF selection page."</span>); -<a name="786" href="#786">786</a> RequestDispatcher rd = req.getRequestDispatcher(config.getJspFile()); -<a name="787" href="#787">787</a> -<a name="788" href="#788">788</a> <em class="jxr_comment">//</em> -<a name="789" href="#789">789</a> <em class="jxr_comment">// And off to the jsp</em> -<a name="790" href="#790">790</a> <em class="jxr_comment">//</em> -<a name="791" href="#791">791</a> rd.forward(req, res); -<a name="792" href="#792">792</a> } <strong class="jxr_keyword">catch</strong> (IOException ioe) { -<a name="793" href="#793">793</a> LOG.error(<span class="jxr_string">"Problem displaying WAYF UI.\n"</span> + ioe.getMessage()); -<a name="794" href="#794">794</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/WayfException.html">WayfException</a>(<span class="jxr_string">"Problem displaying WAYF UI"</span>, ioe); -<a name="795" href="#795">795</a> } <strong class="jxr_keyword">catch</strong> (ServletException se) { -<a name="796" href="#796">796</a> LOG.error(<span class="jxr_string">"Problem displaying WAYF UI.\n"</span> + se.getMessage()); -<a name="797" href="#797">797</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/WayfException.html">WayfException</a>(<span class="jxr_string">"Problem displaying WAYF UI"</span>, se); -<a name="798" href="#798">798</a> } -<a name="799" href="#799">799</a> } -<a name="800" href="#800">800</a> -<a name="801" href="#801">801</a> <em class="jxr_javadoccomment">/**</em> -<a name="802" href="#802">802</a> <em class="jxr_javadoccomment"> * Prior to display we set the display language from the</em> -<a name="803" href="#803">803</a> <em class="jxr_javadoccomment"> * browser. There is probably a proper way to do this using</em> -<a name="804" href="#804">804</a> <em class="jxr_javadoccomment"> * jsp, but I want to keep the API between JSP and java the same 1.3->2.0</em> -<a name="805" href="#805">805</a> <em class="jxr_javadoccomment"> * @param sites - the sites we need to impact</em> -<a name="806" href="#806">806</a> <em class="jxr_javadoccomment"> * @param req - from whiuch we get the locale</em> -<a name="807" href="#807">807</a> <em class="jxr_javadoccomment"> */</em> -<a name="808" href="#808">808</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> setDisplayLanguage(Collection<IdPSite> sites, HttpServletRequest req) { -<a name="809" href="#809">809</a> -<a name="810" href="#810">810</a> <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> == sites) { -<a name="811" href="#811">811</a> <strong class="jxr_keyword">return</strong>; -<a name="812" href="#812">812</a> } -<a name="813" href="#813">813</a> Locale locale = req.getLocale(); -<a name="814" href="#814">814</a> <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> == locale) { -<a name="815" href="#815">815</a> Locale.getDefault(); -<a name="816" href="#816">816</a> } -<a name="817" href="#817">817</a> String lang = locale.getLanguage(); -<a name="818" href="#818">818</a> -<a name="819" href="#819">819</a> <strong class="jxr_keyword">for</strong> (IdPSite site : sites) { -<a name="820" href="#820">820</a> site.setDisplayLanguage(lang); -<a name="821" href="#821">821</a> } -<a name="822" href="#822">822</a> } -<a name="823" href="#823">823</a> +<a name="495" href="#495">495</a> +<a name="496" href="#496">496</a> <strong class="jxr_keyword">for</strong> (DiscoveryResponse disc: discoveryServices) { +<a name="497" href="#497">497</a> <strong class="jxr_keyword">if</strong> (equalsURL(disc, providedReturnURL)) { +<a name="498" href="#498">498</a> found = <strong class="jxr_keyword">true</strong>; +<a name="499" href="#499">499</a> <strong class="jxr_keyword">break</strong>; +<a name="500" href="#500">500</a> } +<a name="501" href="#501">501</a> } +<a name="502" href="#502">502</a> <strong class="jxr_keyword">if</strong> (!found) { +<a name="503" href="#503">503</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/WayfException.html">WayfException</a>(<span class="jxr_string">"Couldn't find endpoint "</span> + nameNoParam + <span class="jxr_string">" in metadata"</span>); +<a name="504" href="#504">504</a> } +<a name="505" href="#505">505</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (returnIndex != <strong class="jxr_keyword">null</strong> && returnIndex.length() != 0) { +<a name="506" href="#506">506</a> +<a name="507" href="#507">507</a> <strong class="jxr_keyword">int</strong> index; +<a name="508" href="#508">508</a> <strong class="jxr_keyword">try</strong> { +<a name="509" href="#509">509</a> index = Integer.parseInt(returnIndex); +<a name="510" href="#510">510</a> } <strong class="jxr_keyword">catch</strong> (NumberFormatException e) { +<a name="511" href="#511">511</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/WayfException.html">WayfException</a>(<span class="jxr_string">"Couldn't convert "</span> + returnIndex + <span class="jxr_string">" into an index"</span>); +<a name="512" href="#512">512</a> } +<a name="513" href="#513">513</a> <em class="jxr_comment">//</em> +<a name="514" href="#514">514</a> <em class="jxr_comment">// So look throught to find the endpoint with the correct index</em> +<a name="515" href="#515">515</a> <em class="jxr_comment">//</em> +<a name="516" href="#516">516</a> +<a name="517" href="#517">517</a> <strong class="jxr_keyword">boolean</strong> found = false; +<a name="518" href="#518">518</a> +<a name="519" href="#519">519</a> <strong class="jxr_keyword">for</strong> (DiscoveryResponse disc: discoveryServices) { +<a name="520" href="#520">520</a> <strong class="jxr_keyword">if</strong> (index == disc.getIndex()) { +<a name="521" href="#521">521</a> found = <strong class="jxr_keyword">true</strong>; +<a name="522" href="#522">522</a> returnName = disc.getLocation(); +<a name="523" href="#523">523</a> <strong class="jxr_keyword">break</strong>; +<a name="524" href="#524">524</a> } +<a name="525" href="#525">525</a> } +<a name="526" href="#526">526</a> <strong class="jxr_keyword">if</strong> (!found) { +<a name="527" href="#527">527</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/WayfException.html">WayfException</a>(<span class="jxr_string">"Couldn't not find endpoint "</span> + returnIndex + <span class="jxr_string">"in metadata"</span>); +<a name="528" href="#528">528</a> } +<a name="529" href="#529">529</a> } <strong class="jxr_keyword">else</strong> { +<a name="530" href="#530">530</a> <em class="jxr_comment">//</em> +<a name="531" href="#531">531</a> <em class="jxr_comment">// No name, not index, so we want the default</em> +<a name="532" href="#532">532</a> <em class="jxr_comment">//</em> +<a name="533" href="#533">533</a> returnName = defaultName; +<a name="534" href="#534">534</a> } +<a name="535" href="#535">535</a> <em class="jxr_comment">//</em> +<a name="536" href="#536">536</a> <em class="jxr_comment">// So by now returnName has the correct value, either harvested from or</em> +<a name="537" href="#537">537</a> <em class="jxr_comment">// policed against the metadata</em> +<a name="538" href="#538">538</a> <em class="jxr_comment">//</em> +<a name="539" href="#539">539</a> req.setAttribute(RETURN_ATTRIBUTE_NAME, returnName); +<a name="540" href="#540">540</a> } +<a name="541" href="#541">541</a> +<a name="542" href="#542">542</a> <em class="jxr_javadoccomment">/**</em> +<a name="543" href="#543">543</a> <em class="jxr_javadoccomment"> * Helper function to see whather the provided endpoint in the metadata matches the </em> +<a name="544" href="#544">544</a> <em class="jxr_javadoccomment"> * provided return URL in the request.</em> +<a name="545" href="#545">545</a> <em class="jxr_javadoccomment"> * </em> +<a name="546" href="#546">546</a> <em class="jxr_javadoccomment"> * @param discovery</em> +<a name="547" href="#547">547</a> <em class="jxr_javadoccomment"> * @param providedName</em> +<a name="548" href="#548">548</a> <em class="jxr_javadoccomment"> * @return</em> +<a name="549" href="#549">549</a> <em class="jxr_javadoccomment"> */</em> +<a name="550" href="#550">550</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">boolean</strong> equalsURL(DiscoveryResponse discovery, URL providedName) { +<a name="551" href="#551">551</a> +<a name="552" href="#552">552</a> <em class="jxr_comment">//</em> +<a name="553" href="#553">553</a> <em class="jxr_comment">// Nothing provided - no match</em> +<a name="554" href="#554">554</a> <em class="jxr_comment">//</em> +<a name="555" href="#555">555</a> <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> == discovery) { +<a name="556" href="#556">556</a> <strong class="jxr_keyword">return</strong> false; +<a name="557" href="#557">557</a> } +<a name="558" href="#558">558</a> +<a name="559" href="#559">559</a> URL discoveryName; +<a name="560" href="#560">560</a> <strong class="jxr_keyword">try</strong> { +<a name="561" href="#561">561</a> discoveryName = <strong class="jxr_keyword">new</strong> URL(discovery.getLocation()); +<a name="562" href="#562">562</a> } <strong class="jxr_keyword">catch</strong> (MalformedURLException e) { +<a name="563" href="#563">563</a> <em class="jxr_comment">//</em> +<a name="564" href="#564">564</a> <em class="jxr_comment">// Something bad happened. Log it (it is only of interest to the sysadmin, not to the user)</em> +<a name="565" href="#565">565</a> <em class="jxr_comment">//</em> +<a name="566" href="#566">566</a> LOG.warn(<span class="jxr_string">"Found invalid discovery end point : "</span> + discovery.getLocation(), e); +<a name="567" href="#567">567</a> <strong class="jxr_keyword">return</strong> false; +<a name="568" href="#568">568</a> } +<a name="569" href="#569">569</a> +<a name="570" href="#570">570</a> <strong class="jxr_keyword">return</strong> providedName.equals(discoveryName); +<a name="571" href="#571">571</a> +<a name="572" href="#572">572</a> } +<a name="573" href="#573">573</a> +<a name="574" href="#574">574</a> <em class="jxr_javadoccomment">/**</em> +<a name="575" href="#575">575</a> <em class="jxr_javadoccomment"> * Displays a Discovery Service selection page, having first consulted the plugins as needed.</em> +<a name="576" href="#576">576</a> <em class="jxr_javadoccomment"> * @param req Describes the request</em> +<a name="577" href="#577">577</a> <em class="jxr_javadoccomment"> * @param res Describes the response</em> +<a name="578" href="#578">578</a> <em class="jxr_javadoccomment"> * @param searchName What are we looking for?</em> +<a name="579" href="#579">579</a> <em class="jxr_javadoccomment"> * </em> +<a name="580" href="#580">580</a> <em class="jxr_javadoccomment"> * @throws WayfRequestHandled if a plugin has dealt with the request</em> +<a name="581" href="#581">581</a> <em class="jxr_javadoccomment"> * @throws WayfException in case of an error.</em> +<a name="582" href="#582">582</a> <em class="jxr_javadoccomment"> */</em> +<a name="583" href="#583">583</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> handleLookup(HttpServletRequest req, +<a name="584" href="#584">584</a> HttpServletResponse res, +<a name="585" href="#585">585</a> String searchName) <strong class="jxr_keyword">throws</strong> WayfException, WayfRequestHandled { +<a name="586" href="#586">586</a> +<a name="587" href="#587">587</a> String shire = getValue(req, SHIRE_PARAM_NAME); +<a name="588" href="#588">588</a> String providerId = getSPId(req); +<a name="589" href="#589">589</a> <strong class="jxr_keyword">boolean</strong> twoZeroProtocol = (shire == <strong class="jxr_keyword">null</strong>); +<a name="590" href="#590">590</a> <strong class="jxr_keyword">boolean</strong> isPassive = (twoZeroProtocol && +<a name="591" href="#591">591</a> <span class="jxr_string">"true"</span>.equalsIgnoreCase(getValue(req, ISPASSIVE_PARAM_NAME))); +<a name="592" href="#592">592</a> +<a name="593" href="#593">593</a> Collection <IdPSiteSetEntry> siteLists = <strong class="jxr_keyword">null</strong>; +<a name="594" href="#594">594</a> Collection<IdPSite> searchResults = <strong class="jxr_keyword">null</strong>; +<a name="595" href="#595">595</a> +<a name="596" href="#596">596</a> <strong class="jxr_keyword">if</strong> (config.getProvideListOfLists()) { +<a name="597" href="#597">597</a> siteLists = <strong class="jxr_keyword">new</strong> ArrayList <IdPSiteSetEntry>(siteSets.size()); +<a name="598" href="#598">598</a> } +<a name="599" href="#599">599</a> +<a name="600" href="#600">600</a> Collection <IdPSite> sites = <strong class="jxr_keyword">null</strong>; +<a name="601" href="#601">601</a> Comparator<IdPSite> comparator = <strong class="jxr_keyword">new</strong> IdPSite.Compare(req); +<a name="602" href="#602">602</a> +<a name="603" href="#603">603</a> <strong class="jxr_keyword">if</strong> (config.getProvideList()) { +<a name="604" href="#604">604</a> sites = <strong class="jxr_keyword">new</strong> TreeSet<IdPSite>(comparator); +<a name="605" href="#605">605</a> } +<a name="606" href="#606">606</a> +<a name="607" href="#607">607</a> <strong class="jxr_keyword">if</strong> (searchName != <strong class="jxr_keyword">null</strong> && !searchName.equals(<span class="jxr_string">""</span>)) { +<a name="608" href="#608">608</a> searchResults = <strong class="jxr_keyword">new</strong> TreeSet<IdPSite>(comparator); +<a name="609" href="#609">609</a> } +<a name="610" href="#610">610</a> +<a name="611" href="#611">611</a> LOG.debug(<span class="jxr_string">"Processing Idp Lookup for : "</span> + providerId); +<a name="612" href="#612">612</a> +<a name="613" href="#613">613</a> <em class="jxr_comment">//</em> +<a name="614" href="#614">614</a> <em class="jxr_comment">// Iterate over all the sitesets and if they know about the SP pass them to the plugins</em> +<a name="615" href="#615">615</a> <em class="jxr_comment">// and then add them too the list</em> +<a name="616" href="#616">616</a> <em class="jxr_comment">//</em> +<a name="617" href="#617">617</a> +<a name="618" href="#618">618</a> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/plugins/PluginContext.html">PluginContext</a>[] ctx = <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/plugins/PluginContext.html">PluginContext</a>[plugins.size()]; +<a name="619" href="#619">619</a> List<IdPSite> hintList = <strong class="jxr_keyword">new</strong> ArrayList<IdPSite>(); +<a name="620" href="#620">620</a> +<a name="621" href="#621">621</a> <strong class="jxr_keyword">if</strong> (twoZeroProtocol) { +<a name="622" href="#622">622</a> setupReturnAddress(providerId, req); +<a name="623" href="#623">623</a> } +<a name="624" href="#624">624</a> <em class="jxr_comment">//</em> +<a name="625" href="#625">625</a> <em class="jxr_comment">// By having siteLists and sites as parameters we only iterate over </em> +<a name="626" href="#626">626</a> <em class="jxr_comment">// the metadata arrays once.</em> +<a name="627" href="#627">627</a> <em class="jxr_comment">//</em> +<a name="628" href="#628">628</a> <strong class="jxr_keyword">try</strong> { +<a name="629" href="#629">629</a> <strong class="jxr_keyword">for</strong> (IdPSiteSet metadataProvider:siteSets) { +<a name="630" href="#630">630</a> +<a name="631" href="#631">631</a> <em class="jxr_comment">//</em> +<a name="632" href="#632">632</a> <em class="jxr_comment">// Only do work if the SP makes sense</em> +<a name="633" href="#633">633</a> <em class="jxr_comment">//</em> +<a name="634" href="#634">634</a> +<a name="635" href="#635">635</a> <strong class="jxr_keyword">if</strong> (metadataProvider.containsSP(providerId) || !config.getLookupSp()) { +<a name="636" href="#636">636</a> +<a name="637" href="#637">637</a> Collection <IdPSite> search = <strong class="jxr_keyword">null</strong>; +<a name="638" href="#638">638</a> +<a name="639" href="#639">639</a> <strong class="jxr_keyword">if</strong> (searchResults != <strong class="jxr_keyword">null</strong>) { +<a name="640" href="#640">640</a> search = <strong class="jxr_keyword">new</strong> TreeSet<IdPSite>(comparator); +<a name="641" href="#641">641</a> } +<a name="642" href="#642">642</a> +<a name="643" href="#643">643</a> Map <String, IdPSite> theseSites = metadataProvider.getIdPSites(searchName, config, search); +<a name="644" href="#644">644</a> +<a name="645" href="#645">645</a> <em class="jxr_comment">//</em> +<a name="646" href="#646">646</a> <em class="jxr_comment">// Consult the plugins</em> +<a name="647" href="#647">647</a> <em class="jxr_comment">//</em> +<a name="648" href="#648">648</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < plugins.size(); i++) { +<a name="649" href="#649">649</a> +<a name="650" href="#650">650</a> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/plugins/Plugin.html">Plugin</a> plugin = plugins.get(i); +<a name="651" href="#651">651</a> +<a name="652" href="#652">652</a> <strong class="jxr_keyword">if</strong> (searchResults == <strong class="jxr_keyword">null</strong>) { +<a name="653" href="#653">653</a> <em class="jxr_comment">//</em> +<a name="654" href="#654">654</a> <em class="jxr_comment">// This was a search</em> +<a name="655" href="#655">655</a> <em class="jxr_comment">//</em> +<a name="656" href="#656">656</a> ctx[i] = plugin.lookup(req, +<a name="657" href="#657">657</a> res, +<a name="658" href="#658">658</a> metadataProvider.paramFor(plugin), +<a name="659" href="#659">659</a> theseSites, +<a name="660" href="#660">660</a> ctx[i], +<a name="661" href="#661">661</a> hintList); +<a name="662" href="#662">662</a> } <strong class="jxr_keyword">else</strong> { +<a name="663" href="#663">663</a> ctx[i] = plugin.search(req, +<a name="664" href="#664">664</a> res, +<a name="665" href="#665">665</a> metadataProvider.paramFor(plugin), +<a name="666" href="#666">666</a> searchName, +<a name="667" href="#667">667</a> theseSites, +<a name="668" href="#668">668</a> ctx[i], +<a name="669" href="#669">669</a> searchResults, +<a name="670" href="#670">670</a> hintList); +<a name="671" href="#671">671</a> } +<a name="672" href="#672">672</a> } +<a name="673" href="#673">673</a> +<a name="674" href="#674">674</a> <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> == theseSites || theseSites.isEmpty()) { +<a name="675" href="#675">675</a> <strong class="jxr_keyword">continue</strong>; +<a name="676" href="#676">676</a> } +<a name="677" href="#677">677</a> +<a name="678" href="#678">678</a> <em class="jxr_comment">//</em> +<a name="679" href="#679">679</a> +<a name="680" href="#680">680</a> <em class="jxr_comment">// Accumulate any per-metadata provider information</em> +<a name="681" href="#681">681</a> <em class="jxr_comment">// </em> +<a name="682" href="#682">682</a> +<a name="683" href="#683">683</a> Collection<IdPSite> values = <strong class="jxr_keyword">new</strong> TreeSet<IdPSite>(comparator); +<a name="684" href="#684">684</a> <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> != theseSites) { +<a name="685" href="#685">685</a> values.addAll(theseSites.values()); +<a name="686" href="#686">686</a> } +<a name="687" href="#687">687</a> +<a name="688" href="#688">688</a> <strong class="jxr_keyword">if</strong> (siteLists != <strong class="jxr_keyword">null</strong>) { +<a name="689" href="#689">689</a> siteLists.add(<strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/IdPSiteSetEntry.html">IdPSiteSetEntry</a>(metadataProvider,values)); +<a name="690" href="#690">690</a> } +<a name="691" href="#691">691</a> +<a name="692" href="#692">692</a> <strong class="jxr_keyword">if</strong> (sites != <strong class="jxr_keyword">null</strong>) { +<a name="693" href="#693">693</a> sites.addAll(values); +<a name="694" href="#694">694</a> } +<a name="695" href="#695">695</a> +<a name="696" href="#696">696</a> <strong class="jxr_keyword">if</strong> (searchResults != <strong class="jxr_keyword">null</strong>) { +<a name="697" href="#697">697</a> searchResults.addAll(search); +<a name="698" href="#698">698</a> } +<a name="699" href="#699">699</a> } +<a name="700" href="#700">700</a> } +<a name="701" href="#701">701</a> +<a name="702" href="#702">702</a> <strong class="jxr_keyword">if</strong> (isPassive) { +<a name="703" href="#703">703</a> <em class="jxr_comment">//</em> +<a name="704" href="#704">704</a> <em class="jxr_comment">// No GUI intervention.</em> +<a name="705" href="#705">705</a> <em class="jxr_comment">//</em> +<a name="706" href="#706">706</a> <strong class="jxr_keyword">if</strong> (0 != hintList.size()) { +<a name="707" href="#707">707</a> <em class="jxr_comment">//</em> +<a name="708" href="#708">708</a> <em class="jxr_comment">// We found a candidate, hand it back</em> +<a name="709" href="#709">709</a> <em class="jxr_comment">//</em> +<a name="710" href="#710">710</a> forwardRequest(req, res, hintList.get(0)); +<a name="711" href="#711">711</a> } <strong class="jxr_keyword">else</strong> { +<a name="712" href="#712">712</a> forwardRequest(req, res, <strong class="jxr_keyword">null</strong>); +<a name="713" href="#713">713</a> } +<a name="714" href="#714">714</a> <strong class="jxr_keyword">return</strong>; +<a name="715" href="#715">715</a> } +<a name="716" href="#716">716</a> +<a name="717" href="#717">717</a> <em class="jxr_comment">//</em> +<a name="718" href="#718">718</a> <em class="jxr_comment">// Now set up all the funky stuff that the JSP needs. Firstly the protocol</em> +<a name="719" href="#719">719</a> <em class="jxr_comment">// specific parameters which will come back to us</em> +<a name="720" href="#720">720</a> <em class="jxr_comment">//</em> +<a name="721" href="#721">721</a> +<a name="722" href="#722">722</a> <strong class="jxr_keyword">if</strong> (twoZeroProtocol) { +<a name="723" href="#723">723</a> <em class="jxr_comment">//</em> +<a name="724" href="#724">724</a> <em class="jxr_comment">// The return address was set up in setupReturnAddress</em> +<a name="725" href="#725">725</a> <em class="jxr_comment">//</em> +<a name="726" href="#726">726</a> String returnString = (String) req.getAttribute(RETURN_ATTRIBUTE_NAME); +<a name="727" href="#727">727</a> <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> == returnString || 0 == returnString.length()) { +<a name="728" href="#728">728</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/WayfException.html">WayfException</a>(<span class="jxr_string">"Parameter "</span> + RETURN_PARAM_NAME + <span class="jxr_string">" not supplied"</span>); +<a name="729" href="#729">729</a> } +<a name="730" href="#730">730</a> +<a name="731" href="#731">731</a> String returnId = getValue(req, RETURNID_PARAM_NAME); +<a name="732" href="#732">732</a> <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> == returnId || 0 == returnId.length()) { +<a name="733" href="#733">733</a> returnId = RETURNID_DEFAULT_VALUE; +<a name="734" href="#734">734</a> } +<a name="735" href="#735">735</a> <em class="jxr_comment">//</em> +<a name="736" href="#736">736</a> <em class="jxr_comment">// Return *means* something so we cannot use it as an attribute</em> +<a name="737" href="#737">737</a> <em class="jxr_comment">//</em> +<a name="738" href="#738">738</a> req.setAttribute(RETURN_ATTRIBUTE_NAME, returnString); +<a name="739" href="#739">739</a> req.setAttribute(RETURNID_PARAM_NAME, returnId); +<a name="740" href="#740">740</a> req.setAttribute(ENTITYID_PARAM_NAME, providerId); +<a name="741" href="#741">741</a> +<a name="742" href="#742">742</a> } <strong class="jxr_keyword">else</strong> { +<a name="743" href="#743">743</a> String target = getValue(req, TARGET_PARAM_NAME); +<a name="744" href="#744">744</a> <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> == target || 0 == target.length()) { +<a name="745" href="#745">745</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/WayfException.html">WayfException</a>(<span class="jxr_string">"Could not extract target from provided parameters"</span>); +<a name="746" href="#746">746</a> } +<a name="747" href="#747">747</a> req.setAttribute(SHIRE_PARAM_NAME, shire); +<a name="748" href="#748">748</a> req.setAttribute(TARGET_PARAM_NAME, target); +<a name="749" href="#749">749</a> req.setAttribute(PROVIDERID_PARAM_NAME, providerId); +<a name="750" href="#750">750</a> <em class="jxr_comment">//</em> +<a name="751" href="#751">751</a> <em class="jxr_comment">// Time is in unix format</em> +<a name="752" href="#752">752</a> <em class="jxr_comment">//</em> +<a name="753" href="#753">753</a> req.setAttribute(<span class="jxr_string">"time"</span>, <strong class="jxr_keyword">new</strong> Long(<strong class="jxr_keyword">new</strong> Date().getTime() / 1000).toString()); +<a name="754" href="#754">754</a> +<a name="755" href="#755">755</a> } +<a name="756" href="#756">756</a> +<a name="757" href="#757">757</a> <em class="jxr_comment">//</em> +<a name="758" href="#758">758</a> <em class="jxr_comment">// Setup the stuff that the GUI wants. </em> +<a name="759" href="#759">759</a> <em class="jxr_comment">//</em> +<a name="760" href="#760">760</a> +<a name="761" href="#761">761</a> setDisplayLanguage(sites, req); +<a name="762" href="#762">762</a> req.setAttribute(<span class="jxr_string">"sites"</span>, sites); +<a name="763" href="#763">763</a> <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> != siteLists) { +<a name="764" href="#764">764</a> <strong class="jxr_keyword">for</strong> (IdPSiteSetEntry siteSetEntry:siteLists) { +<a name="765" href="#765">765</a> setDisplayLanguage(siteSetEntry.getSites(), req); +<a name="766" href="#766">766</a> } +<a name="767" href="#767">767</a> } +<a name="768" href="#768">768</a> +<a name="769" href="#769">769</a> req.setAttribute(<span class="jxr_string">"siteLists"</span>, siteLists); +<a name="770" href="#770">770</a> req.setAttribute(<span class="jxr_string">"requestURL"</span>, req.getRequestURI().toString()); +<a name="771" href="#771">771</a> +<a name="772" href="#772">772</a> <strong class="jxr_keyword">if</strong> (searchResults != <strong class="jxr_keyword">null</strong>) { +<a name="773" href="#773">773</a> <strong class="jxr_keyword">if</strong> (searchResults.size() != 0) { +<a name="774" href="#774">774</a> setDisplayLanguage(searchResults, req); +<a name="775" href="#775">775</a> req.setAttribute(<span class="jxr_string">"searchresults"</span>, searchResults); +<a name="776" href="#776">776</a> } <strong class="jxr_keyword">else</strong> { +<a name="777" href="#777">777</a> req.setAttribute(<span class="jxr_string">"searchResultsEmpty"</span>, <span class="jxr_string">"true"</span>); +<a name="778" href="#778">778</a> } +<a name="779" href="#779">779</a> } +<a name="780" href="#780">780</a> +<a name="781" href="#781">781</a> <strong class="jxr_keyword">if</strong> (hintList.size() > 0) { +<a name="782" href="#782">782</a> setDisplayLanguage(hintList, req); +<a name="783" href="#783">783</a> req.setAttribute(<span class="jxr_string">"cookieList"</span>, hintList); +<a name="784" href="#784">784</a> } +<a name="785" href="#785">785</a> +<a name="786" href="#786">786</a> LOG.debug(<span class="jxr_string">"Displaying WAYF selection page."</span>); +<a name="787" href="#787">787</a> RequestDispatcher rd = req.getRequestDispatcher(config.getJspFile()); +<a name="788" href="#788">788</a> +<a name="789" href="#789">789</a> <em class="jxr_comment">//</em> +<a name="790" href="#790">790</a> <em class="jxr_comment">// And off to the jsp</em> +<a name="791" href="#791">791</a> <em class="jxr_comment">//</em> +<a name="792" href="#792">792</a> rd.forward(req, res); +<a name="793" href="#793">793</a> } <strong class="jxr_keyword">catch</strong> (IOException ioe) { +<a name="794" href="#794">794</a> LOG.error(<span class="jxr_string">"Problem displaying WAYF UI.\n"</span> + ioe.getMessage()); +<a name="795" href="#795">795</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/WayfException.html">WayfException</a>(<span class="jxr_string">"Problem displaying WAYF UI"</span>, ioe); +<a name="796" href="#796">796</a> } <strong class="jxr_keyword">catch</strong> (ServletException se) { +<a name="797" href="#797">797</a> LOG.error(<span class="jxr_string">"Problem displaying WAYF UI.\n"</span> + se.getMessage()); +<a name="798" href="#798">798</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/WayfException.html">WayfException</a>(<span class="jxr_string">"Problem displaying WAYF UI"</span>, se); +<a name="799" href="#799">799</a> } +<a name="800" href="#800">800</a> } +<a name="801" href="#801">801</a> +<a name="802" href="#802">802</a> <em class="jxr_javadoccomment">/**</em> +<a name="803" href="#803">803</a> <em class="jxr_javadoccomment"> * Prior to display we set the display language from the</em> +<a name="804" href="#804">804</a> <em class="jxr_javadoccomment"> * browser. There is probably a proper way to do this using</em> +<a name="805" href="#805">805</a> <em class="jxr_javadoccomment"> * jsp, but I want to keep the API between JSP and java the same 1.3->2.0</em> +<a name="806" href="#806">806</a> <em class="jxr_javadoccomment"> * @param sites - the sites we need to impact</em> +<a name="807" href="#807">807</a> <em class="jxr_javadoccomment"> * @param req - from whiuch we get the locale</em> +<a name="808" href="#808">808</a> <em class="jxr_javadoccomment"> */</em> +<a name="809" href="#809">809</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> setDisplayLanguage(Collection<IdPSite> sites, HttpServletRequest req) { +<a name="810" href="#810">810</a> +<a name="811" href="#811">811</a> <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> == sites) { +<a name="812" href="#812">812</a> <strong class="jxr_keyword">return</strong>; +<a name="813" href="#813">813</a> } +<a name="814" href="#814">814</a> Locale locale = req.getLocale(); +<a name="815" href="#815">815</a> <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> == locale) { +<a name="816" href="#816">816</a> Locale.getDefault(); +<a name="817" href="#817">817</a> } +<a name="818" href="#818">818</a> String lang = locale.getLanguage(); +<a name="819" href="#819">819</a> +<a name="820" href="#820">820</a> <strong class="jxr_keyword">for</strong> (IdPSite site : sites) { +<a name="821" href="#821">821</a> site.setDisplayLanguage(lang); +<a name="822" href="#822">822</a> } +<a name="823" href="#823">823</a> } <a name="824" href="#824">824</a> -<a name="825" href="#825">825</a> <em class="jxr_javadoccomment">/**</em> -<a name="826" href="#826">826</a> <em class="jxr_javadoccomment"> * Uses an HTTP Status 307 redirect to forward the user to the IdP or the SP.</em> -<a name="827" href="#827">827</a> <em class="jxr_javadoccomment"> * </em> -<a name="828" href="#828">828</a> <em class="jxr_javadoccomment"> * @param req request under consideration</em> -<a name="829" href="#829">829</a> <em class="jxr_javadoccomment"> * @param res response under construction</em> -<a name="830" href="#830">830</a> <em class="jxr_javadoccomment"> * @param site The Idp</em> -<a name="831" href="#831">831</a> <em class="jxr_javadoccomment"> * @throws WayfException if bad things happen.</em> -<a name="832" href="#832">832</a> <em class="jxr_javadoccomment"> */</em> -<a name="833" href="#833">833</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> forwardRequest(HttpServletRequest req, HttpServletResponse res, <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/IdPSite.html">IdPSite</a> site) -<a name="834" href="#834">834</a> <strong class="jxr_keyword">throws</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/WayfException.html">WayfException</a> { -<a name="835" href="#835">835</a> -<a name="836" href="#836">836</a> String shire = getValue(req, SHIRE_PARAM_NAME); -<a name="837" href="#837">837</a> String providerId = getSPId(req); -<a name="838" href="#838">838</a> <strong class="jxr_keyword">boolean</strong> twoZeroProtocol = (shire == <strong class="jxr_keyword">null</strong>); -<a name="839" href="#839">839</a> -<a name="840" href="#840">840</a> <strong class="jxr_keyword">if</strong> (!twoZeroProtocol) { -<a name="841" href="#841">841</a> String handleService = site.getAddressForWAYF(); -<a name="842" href="#842">842</a> <strong class="jxr_keyword">if</strong> (handleService != <strong class="jxr_keyword">null</strong> ) { -<a name="843" href="#843">843</a> -<a name="844" href="#844">844</a> String target = getValue(req, TARGET_PARAM_NAME); -<a name="845" href="#845">845</a> <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> == target || 0 == target.length()) { -<a name="846" href="#846">846</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/WayfException.html">WayfException</a>(<span class="jxr_string">"Could not extract target from provided parameters"</span>); -<a name="847" href="#847">847</a> } -<a name="848" href="#848">848</a> -<a name="849" href="#849">849</a> LOG.info(<span class="jxr_string">"Redirecting to selected Handle Service: "</span> + handleService); -<a name="850" href="#850">850</a> <strong class="jxr_keyword">try</strong> { -<a name="851" href="#851">851</a> StringBuffer buffer = <strong class="jxr_keyword">new</strong> StringBuffer(handleService + -<a name="852" href="#852">852</a> <span class="jxr_string">"?"</span> + TARGET_PARAM_NAME + <span class="jxr_string">"="</span>); -<a name="853" href="#853">853</a> buffer.append(URLEncoder.encode(target, <span class="jxr_string">"UTF-8"</span>)); -<a name="854" href="#854">854</a> buffer.append(<span class="jxr_string">"&"</span> + SHIRE_PARAM_NAME + <span class="jxr_string">"="</span>); -<a name="855" href="#855">855</a> buffer.append(URLEncoder.encode(shire, <span class="jxr_string">"UTF-8"</span>)); -<a name="856" href="#856">856</a> buffer.append(<span class="jxr_string">"&"</span> + PROVIDERID_PARAM_NAME + <span class="jxr_string">"="</span>); -<a name="857" href="#857">857</a> buffer.append(URLEncoder.encode(providerId, <span class="jxr_string">"UTF-8"</span>)); -<a name="858" href="#858">858</a> -<a name="859" href="#859">859</a> <em class="jxr_comment">//</em> -<a name="860" href="#860">860</a> <em class="jxr_comment">// Time is as per U**X</em> -<a name="861" href="#861">861</a> <em class="jxr_comment">//</em> -<a name="862" href="#862">862</a> buffer.append(<span class="jxr_string">"&"</span> + TIME_PARAM_NAME + <span class="jxr_string">"="</span>); -<a name="863" href="#863">863</a> buffer.append(<strong class="jxr_keyword">new</strong> Long(<strong class="jxr_keyword">new</strong> Date().getTime() / 1000).toString()); -<a name="864" href="#864">864</a> res.sendRedirect(buffer.toString()); -<a name="865" href="#865">865</a> } <strong class="jxr_keyword">catch</strong> (IOException ioe) { -<a name="866" href="#866">866</a> <em class="jxr_comment">//</em> -<a name="867" href="#867">867</a> <em class="jxr_comment">// That failed. </em> -<a name="868" href="#868">868</a> <em class="jxr_comment">//</em> -<a name="869" href="#869">869</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/WayfException.html">WayfException</a>(<span class="jxr_string">"Error forwarding to IdP: \n"</span> + ioe.getMessage()); -<a name="870" href="#870">870</a> } -<a name="871" href="#871">871</a> } <strong class="jxr_keyword">else</strong> { -<a name="872" href="#872">872</a> String s = <span class="jxr_string">"Error finding to IdP: "</span> + site.getDisplayName(req); -<a name="873" href="#873">873</a> LOG.error(s); -<a name="874" href="#874">874</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/WayfException.html">WayfException</a>(s); -<a name="875" href="#875">875</a> } -<a name="876" href="#876">876</a> } <strong class="jxr_keyword">else</strong> { -<a name="877" href="#877">877</a> String returnUrl = (String) req.getAttribute(RETURN_ATTRIBUTE_NAME); -<a name="878" href="#878">878</a> -<a name="879" href="#879">879</a> <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> == returnUrl || 0 == returnUrl.length()) { -<a name="880" href="#880">880</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/WayfException.html">WayfException</a>(<span class="jxr_string">"Could not find return parameter"</span>); -<a name="881" href="#881">881</a> } -<a name="882" href="#882">882</a> <strong class="jxr_keyword">try</strong> { -<a name="883" href="#883">883</a> returnUrl = URLDecoder.decode(returnUrl, <span class="jxr_string">"UTF-8"</span>); -<a name="884" href="#884">884</a> } <strong class="jxr_keyword">catch</strong> (UnsupportedEncodingException e) { -<a name="885" href="#885">885</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/WayfException.html">WayfException</a>(<span class="jxr_string">"Did not understand parameter "</span>, e); -<a name="886" href="#886">886</a> } -<a name="887" href="#887">887</a> String redirect; -<a name="888" href="#888">888</a> <strong class="jxr_keyword">if</strong> (site != <strong class="jxr_keyword">null</strong>) { -<a name="889" href="#889">889</a> StringBuffer buffer = <strong class="jxr_keyword">new</strong> StringBuffer(returnUrl); -<a name="890" href="#890">890</a> <em class="jxr_comment">//</em> -<a name="891" href="#891">891</a> <em class="jxr_comment">// If we were given anybody to lookup, construct the URL</em> -<a name="892" href="#892">892</a> <em class="jxr_comment">//</em> -<a name="893" href="#893">893</a> String returnParam = getValue(req, RETURNID_PARAM_NAME); -<a name="894" href="#894">894</a> <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> == returnParam || 0 == returnParam.length()) { -<a name="895" href="#895">895</a> returnParam = RETURNID_DEFAULT_VALUE; -<a name="896" href="#896">896</a> } -<a name="897" href="#897">897</a> <em class="jxr_comment">//</em> -<a name="898" href="#898">898</a> <em class="jxr_comment">// Do we add a '?' or a '&' for the parameters</em> -<a name="899" href="#899">899</a> <em class="jxr_comment">//</em> -<a name="900" href="#900">900</a> -<a name="901" href="#901">901</a> <strong class="jxr_keyword">if</strong> (returnUrl.indexOf('?') >= 0) { -<a name="902" href="#902">902</a> <em class="jxr_comment">//</em> -<a name="903" href="#903">903</a> <em class="jxr_comment">// there is a parameter already. Add a '&'</em> -<a name="904" href="#904">904</a> <em class="jxr_comment">//</em> -<a name="905" href="#905">905</a> buffer.append(<span class="jxr_string">"&"</span> + returnParam + <span class="jxr_string">"="</span>); -<a name="906" href="#906">906</a> } <strong class="jxr_keyword">else</strong> { -<a name="907" href="#907">907</a> <em class="jxr_comment">//</em> -<a name="908" href="#908">908</a> <em class="jxr_comment">// No parameter. Use ?</em> -<a name="909" href="#909">909</a> <em class="jxr_comment">//</em> -<a name="910" href="#910">910</a> buffer.append(<span class="jxr_string">"?"</span> + returnParam + <span class="jxr_string">"="</span>); -<a name="911" href="#911">911</a> } -<a name="912" href="#912">912</a> buffer.append(site.getName()); -<a name="913" href="#913">913</a> redirect = buffer.toString(); -<a name="914" href="#914">914</a> } <strong class="jxr_keyword">else</strong> { -<a name="915" href="#915">915</a> <em class="jxr_comment">//</em> -<a name="916" href="#916">916</a> <em class="jxr_comment">// Just send it back</em> -<a name="917" href="#917">917</a> <em class="jxr_comment">//</em> -<a name="918" href="#918">918</a> redirect = returnUrl; -<a name="919" href="#919">919</a> } -<a name="920" href="#920">920</a> -<a name="921" href="#921">921</a> LOG.debug(<span class="jxr_string">"Dispatching to "</span> + redirect); -<a name="922" href="#922">922</a> -<a name="923" href="#923">923</a> <strong class="jxr_keyword">try</strong> { -<a name="924" href="#924">924</a> res.sendRedirect(redirect); -<a name="925" href="#925">925</a> } <strong class="jxr_keyword">catch</strong> (IOException ioe) { -<a name="926" href="#926">926</a> <em class="jxr_comment">//</em> -<a name="927" href="#927">927</a> <em class="jxr_comment">// That failed. </em> -<a name="928" href="#928">928</a> <em class="jxr_comment">//</em> -<a name="929" href="#929">929</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/WayfException.html">WayfException</a>(<span class="jxr_string">"Error forwarding back to Sp: \n"</span> + ioe.getMessage()); -<a name="930" href="#930">930</a> } -<a name="931" href="#931">931</a> } -<a name="932" href="#932">932</a> } -<a name="933" href="#933">933</a> -<a name="934" href="#934">934</a> <em class="jxr_javadoccomment">/**</em> -<a name="935" href="#935">935</a> <em class="jxr_javadoccomment"> * Handles all "recoverable" errors in WAYF processing by logging the error and forwarding the user to an</em> -<a name="936" href="#936">936</a> <em class="jxr_javadoccomment"> * appropriate error page.</em> -<a name="937" href="#937">937</a> <em class="jxr_javadoccomment"> * </em> -<a name="938" href="#938">938</a> <em class="jxr_javadoccomment"> * @param req request under consideration</em> -<a name="939" href="#939">939</a> <em class="jxr_javadoccomment"> * @param res response under construction</em> -<a name="940" href="#940">940</a> <em class="jxr_javadoccomment"> * @param message - what so say</em> -<a name="941" href="#941">941</a> <em class="jxr_javadoccomment"> */</em> -<a name="942" href="#942">942</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> handleError(HttpServletRequest req, HttpServletResponse res, String message) { -<a name="943" href="#943">943</a> -<a name="944" href="#944">944</a> LOG.debug(<span class="jxr_string">"Displaying WAYF error page."</span>); -<a name="945" href="#945">945</a> req.setAttribute(<span class="jxr_string">"errorText"</span>, message); -<a name="946" href="#946">946</a> req.setAttribute(<span class="jxr_string">"requestURL"</span>, req.getRequestURI().toString()); -<a name="947" href="#947">947</a> RequestDispatcher rd = req.getRequestDispatcher(config.getErrorJspFile()); -<a name="948" href="#948">948</a> -<a name="949" href="#949">949</a> <strong class="jxr_keyword">try</strong> { -<a name="950" href="#950">950</a> rd.forward(req, res); -<a name="951" href="#951">951</a> } <strong class="jxr_keyword">catch</strong> (IOException ioe) { -<a name="952" href="#952">952</a> LOG.error(<span class="jxr_string">"Problem trying to display WAYF error page: "</span> + ioe.toString()); -<a name="953" href="#953">953</a> } <strong class="jxr_keyword">catch</strong> (ServletException se) { -<a name="954" href="#954">954</a> LOG.error(<span class="jxr_string">"Problem trying to display WAYF error page: "</span> + se.toString()); -<a name="955" href="#955">955</a> } -<a name="956" href="#956">956</a> } -<a name="957" href="#957">957</a> -<a name="958" href="#958">958</a> <em class="jxr_javadoccomment">/**</em> -<a name="959" href="#959">959</a> <em class="jxr_javadoccomment"> * Gets the value for the parameter either from the parameter or from jsp.</em> -<a name="960" href="#960">960</a> <em class="jxr_javadoccomment"> * @param req - the request.</em> -<a name="961" href="#961">961</a> <em class="jxr_javadoccomment"> * @param name - the name of the parameter.</em> -<a name="962" href="#962">962</a> <em class="jxr_javadoccomment"> * @return - result</em> -<a name="963" href="#963">963</a> <em class="jxr_javadoccomment"> */</em> -<a name="964" href="#964">964</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> String getValue(HttpServletRequest req, String name) { -<a name="965" href="#965">965</a> -<a name="966" href="#966">966</a> -<a name="967" href="#967">967</a> String value = req.getParameter(name); -<a name="968" href="#968">968</a> <strong class="jxr_keyword">if</strong> (value != <strong class="jxr_keyword">null</strong>) { -<a name="969" href="#969">969</a> <strong class="jxr_keyword">return</strong> value; -<a name="970" href="#970">970</a> } -<a name="971" href="#971">971</a> <strong class="jxr_keyword">return</strong> (String) req.getAttribute(name); -<a name="972" href="#972">972</a> } -<a name="973" href="#973">973</a> -<a name="974" href="#974">974</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> String getSPId(HttpServletRequest req) <strong class="jxr_keyword">throws</strong> WayfException { -<a name="975" href="#975">975</a> -<a name="976" href="#976">976</a> <em class="jxr_comment">//</em> -<a name="977" href="#977">977</a> <em class="jxr_comment">// Try first with 2.0 version</em> -<a name="978" href="#978">978</a> <em class="jxr_comment">//</em> -<a name="979" href="#979">979</a> String param = req.getParameter(ENTITYID_PARAM_NAME); -<a name="980" href="#980">980</a> <strong class="jxr_keyword">if</strong> (param != <strong class="jxr_keyword">null</strong> && !(param.length() == 0)) { -<a name="981" href="#981">981</a> <strong class="jxr_keyword">return</strong> param; -<a name="982" href="#982">982</a> } -<a name="983" href="#983">983</a> -<a name="984" href="#984">984</a> param = (String) req.getAttribute(ENTITYID_PARAM_NAME); -<a name="985" href="#985">985</a> <strong class="jxr_keyword">if</strong> (param != <strong class="jxr_keyword">null</strong> && !(param.length() == 0)) { -<a name="986" href="#986">986</a> <strong class="jxr_keyword">return</strong> param; -<a name="987" href="#987">987</a> } -<a name="988" href="#988">988</a> <em class="jxr_comment">//</em> -<a name="989" href="#989">989</a> <em class="jxr_comment">// So Try with 1.3 version</em> -<a name="990" href="#990">990</a> <em class="jxr_comment">//</em> -<a name="991" href="#991">991</a> param = req.getParameter(PROVIDERID_PARAM_NAME); -<a name="992" href="#992">992</a> <strong class="jxr_keyword">if</strong> (param != <strong class="jxr_keyword">null</strong> && !(param.length() == 0)) { -<a name="993" href="#993">993</a> <strong class="jxr_keyword">return</strong> param; -<a name="994" href="#994">994</a> } -<a name="995" href="#995">995</a> -<a name="996" href="#996">996</a> param = (String) req.getAttribute(PROVIDERID_PARAM_NAME); -<a name="997" href="#997">997</a> <strong class="jxr_keyword">if</strong> (param != <strong class="jxr_keyword">null</strong> && !(param.length() == 0)) { -<a name="998" href="#998">998</a> <strong class="jxr_keyword">return</strong> param; -<a name="999" href="#999">999</a> } -<a name="1000" href="#1000">1000</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/WayfException.html">WayfException</a>(<span class="jxr_string">"Could not locate SP identifier in parameters"</span>); -<a name="1001" href="#1001">1001</a> } -<a name="1002" href="#1002">1002</a> } +<a name="825" href="#825">825</a> +<a name="826" href="#826">826</a> <em class="jxr_javadoccomment">/**</em> +<a name="827" href="#827">827</a> <em class="jxr_javadoccomment"> * Uses an HTTP Status 307 redirect to forward the user to the IdP or the SP.</em> +<a name="828" href="#828">828</a> <em class="jxr_javadoccomment"> * </em> +<a name="829" href="#829">829</a> <em class="jxr_javadoccomment"> * @param req request under consideration</em> +<a name="830" href="#830">830</a> <em class="jxr_javadoccomment"> * @param res response under construction</em> +<a name="831" href="#831">831</a> <em class="jxr_javadoccomment"> * @param site The Idp</em> +<a name="832" href="#832">832</a> <em class="jxr_javadoccomment"> * @throws WayfException if bad things happen.</em> +<a name="833" href="#833">833</a> <em class="jxr_javadoccomment"> */</em> +<a name="834" href="#834">834</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> forwardRequest(HttpServletRequest req, HttpServletResponse res, <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/IdPSite.html">IdPSite</a> site) +<a name="835" href="#835">835</a> <strong class="jxr_keyword">throws</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/WayfException.html">WayfException</a> { +<a name="836" href="#836">836</a> +<a name="837" href="#837">837</a> String shire = getValue(req, SHIRE_PARAM_NAME); +<a name="838" href="#838">838</a> String providerId = getSPId(req); +<a name="839" href="#839">839</a> <strong class="jxr_keyword">boolean</strong> twoZeroProtocol = (shire == <strong class="jxr_keyword">null</strong>); +<a name="840" href="#840">840</a> +<a name="841" href="#841">841</a> <strong class="jxr_keyword">if</strong> (!twoZeroProtocol) { +<a name="842" href="#842">842</a> String handleService = site.getAddressForWAYF(); +<a name="843" href="#843">843</a> <strong class="jxr_keyword">if</strong> (handleService != <strong class="jxr_keyword">null</strong> ) { +<a name="844" href="#844">844</a> +<a name="845" href="#845">845</a> String target = getValue(req, TARGET_PARAM_NAME); +<a name="846" href="#846">846</a> <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> == target || 0 == target.length()) { +<a name="847" href="#847">847</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/WayfException.html">WayfException</a>(<span class="jxr_string">"Could not extract target from provided parameters"</span>); +<a name="848" href="#848">848</a> } +<a name="849" href="#849">849</a> +<a name="850" href="#850">850</a> LOG.info(<span class="jxr_string">"Redirecting to selected Handle Service: "</span> + handleService); +<a name="851" href="#851">851</a> <strong class="jxr_keyword">try</strong> { +<a name="852" href="#852">852</a> StringBuffer buffer = <strong class="jxr_keyword">new</strong> StringBuffer(handleService + +<a name="853" href="#853">853</a> <span class="jxr_string">"?"</span> + TARGET_PARAM_NAME + <span class="jxr_string">"="</span>); +<a name="854" href="#854">854</a> buffer.append(URLEncoder.encode(target, <span class="jxr_string">"UTF-8"</span>)); +<a name="855" href="#855">855</a> buffer.append(<span class="jxr_string">"&"</span> + SHIRE_PARAM_NAME + <span class="jxr_string">"="</span>); +<a name="856" href="#856">856</a> buffer.append(URLEncoder.encode(shire, <span class="jxr_string">"UTF-8"</span>)); +<a name="857" href="#857">857</a> buffer.append(<span class="jxr_string">"&"</span> + PROVIDERID_PARAM_NAME + <span class="jxr_string">"="</span>); +<a name="858" href="#858">858</a> buffer.append(URLEncoder.encode(providerId, <span class="jxr_string">"UTF-8"</span>)); +<a name="859" href="#859">859</a> +<a name="860" href="#860">860</a> <em class="jxr_comment">//</em> +<a name="861" href="#861">861</a> <em class="jxr_comment">// Time is as per U**X</em> +<a name="862" href="#862">862</a> <em class="jxr_comment">//</em> +<a name="863" href="#863">863</a> buffer.append(<span class="jxr_string">"&"</span> + TIME_PARAM_NAME + <span class="jxr_string">"="</span>); +<a name="864" href="#864">864</a> buffer.append(<strong class="jxr_keyword">new</strong> Long(<strong class="jxr_keyword">new</strong> Date().getTime() / 1000).toString()); +<a name="865" href="#865">865</a> res.sendRedirect(buffer.toString()); +<a name="866" href="#866">866</a> } <strong class="jxr_keyword">catch</strong> (IOException ioe) { +<a name="867" href="#867">867</a> <em class="jxr_comment">//</em> +<a name="868" href="#868">868</a> <em class="jxr_comment">// That failed. </em> +<a name="869" href="#869">869</a> <em class="jxr_comment">//</em> +<a name="870" href="#870">870</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/WayfException.html">WayfException</a>(<span class="jxr_string">"Error forwarding to IdP: \n"</span> + ioe.getMessage()); +<a name="871" href="#871">871</a> } +<a name="872" href="#872">872</a> } <strong class="jxr_keyword">else</strong> { +<a name="873" href="#873">873</a> String s = <span class="jxr_string">"Error finding to IdP: "</span> + site.getDisplayName(req); +<a name="874" href="#874">874</a> LOG.error(s); +<a name="875" href="#875">875</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/WayfException.html">WayfException</a>(s); +<a name="876" href="#876">876</a> } +<a name="877" href="#877">877</a> } <strong class="jxr_keyword">else</strong> { +<a name="878" href="#878">878</a> String returnUrl = (String) req.getAttribute(RETURN_ATTRIBUTE_NAME); +<a name="879" href="#879">879</a> +<a name="880" href="#880">880</a> <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> == returnUrl || 0 == returnUrl.length()) { +<a name="881" href="#881">881</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/WayfException.html">WayfException</a>(<span class="jxr_string">"Could not find return parameter"</span>); +<a name="882" href="#882">882</a> } +<a name="883" href="#883">883</a> <strong class="jxr_keyword">try</strong> { +<a name="884" href="#884">884</a> returnUrl = URLDecoder.decode(returnUrl, <span class="jxr_string">"UTF-8"</span>); +<a name="885" href="#885">885</a> } <strong class="jxr_keyword">catch</strong> (UnsupportedEncodingException e) { +<a name="886" href="#886">886</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/WayfException.html">WayfException</a>(<span class="jxr_string">"Did not understand parameter "</span>, e); +<a name="887" href="#887">887</a> } +<a name="888" href="#888">888</a> String redirect; +<a name="889" href="#889">889</a> <strong class="jxr_keyword">if</strong> (site != <strong class="jxr_keyword">null</strong>) { +<a name="890" href="#890">890</a> StringBuffer buffer = <strong class="jxr_keyword">new</strong> StringBuffer(returnUrl); +<a name="891" href="#891">891</a> <em class="jxr_comment">//</em> +<a name="892" href="#892">892</a> <em class="jxr_comment">// If we were given anybody to lookup, construct the URL</em> +<a name="893" href="#893">893</a> <em class="jxr_comment">//</em> +<a name="894" href="#894">894</a> String returnParam = getValue(req, RETURNID_PARAM_NAME); +<a name="895" href="#895">895</a> <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> == returnParam || 0 == returnParam.length()) { +<a name="896" href="#896">896</a> returnParam = RETURNID_DEFAULT_VALUE; +<a name="897" href="#897">897</a> } +<a name="898" href="#898">898</a> <em class="jxr_comment">//</em> +<a name="899" href="#899">899</a> <em class="jxr_comment">// Do we add a '?' or a '&' for the parameters</em> +<a name="900" href="#900">900</a> <em class="jxr_comment">//</em> +<a name="901" href="#901">901</a> +<a name="902" href="#902">902</a> <strong class="jxr_keyword">if</strong> (returnUrl.indexOf('?') >= 0) { +<a name="903" href="#903">903</a> <em class="jxr_comment">//</em> +<a name="904" href="#904">904</a> <em class="jxr_comment">// there is a parameter already. Add a '&'</em> +<a name="905" href="#905">905</a> <em class="jxr_comment">//</em> +<a name="906" href="#906">906</a> buffer.append(<span class="jxr_string">"&"</span> + returnParam + <span class="jxr_string">"="</span>); +<a name="907" href="#907">907</a> } <strong class="jxr_keyword">else</strong> { +<a name="908" href="#908">908</a> <em class="jxr_comment">//</em> +<a name="909" href="#909">909</a> <em class="jxr_comment">// No parameter. Use ?</em> +<a name="910" href="#910">910</a> <em class="jxr_comment">//</em> +<a name="911" href="#911">911</a> buffer.append(<span class="jxr_string">"?"</span> + returnParam + <span class="jxr_string">"="</span>); +<a name="912" href="#912">912</a> } +<a name="913" href="#913">913</a> buffer.append(site.getName()); +<a name="914" href="#914">914</a> redirect = buffer.toString(); +<a name="915" href="#915">915</a> } <strong class="jxr_keyword">else</strong> { +<a name="916" href="#916">916</a> <em class="jxr_comment">//</em> +<a name="917" href="#917">917</a> <em class="jxr_comment">// Just send it back</em> +<a name="918" href="#918">918</a> <em class="jxr_comment">//</em> +<a name="919" href="#919">919</a> redirect = returnUrl; +<a name="920" href="#920">920</a> } +<a name="921" href="#921">921</a> +<a name="922" href="#922">922</a> LOG.debug(<span class="jxr_string">"Dispatching to "</span> + redirect); +<a name="923" href="#923">923</a> +<a name="924" href="#924">924</a> <strong class="jxr_keyword">try</strong> { +<a name="925" href="#925">925</a> res.sendRedirect(redirect); +<a name="926" href="#926">926</a> } <strong class="jxr_keyword">catch</strong> (IOException ioe) { +<a name="927" href="#927">927</a> <em class="jxr_comment">//</em> +<a name="928" href="#928">928</a> <em class="jxr_comment">// That failed. </em> +<a name="929" href="#929">929</a> <em class="jxr_comment">//</em> +<a name="930" href="#930">930</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/WayfException.html">WayfException</a>(<span class="jxr_string">"Error forwarding back to Sp: \n"</span> + ioe.getMessage()); +<a name="931" href="#931">931</a> } +<a name="932" href="#932">932</a> } +<a name="933" href="#933">933</a> } +<a name="934" href="#934">934</a> +<a name="935" href="#935">935</a> <em class="jxr_javadoccomment">/**</em> +<a name="936" href="#936">936</a> <em class="jxr_javadoccomment"> * Handles all "recoverable" errors in WAYF processing by logging the error and forwarding the user to an</em> +<a name="937" href="#937">937</a> <em class="jxr_javadoccomment"> * appropriate error page.</em> +<a name="938" href="#938">938</a> <em class="jxr_javadoccomment"> * </em> +<a name="939" href="#939">939</a> <em class="jxr_javadoccomment"> * @param req request under consideration</em> +<a name="940" href="#940">940</a> <em class="jxr_javadoccomment"> * @param res response under construction</em> +<a name="941" href="#941">941</a> <em class="jxr_javadoccomment"> * @param message - what so say</em> +<a name="942" href="#942">942</a> <em class="jxr_javadoccomment"> */</em> +<a name="943" href="#943">943</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> handleError(HttpServletRequest req, HttpServletResponse res, String message) { +<a name="944" href="#944">944</a> +<a name="945" href="#945">945</a> LOG.debug(<span class="jxr_string">"Displaying WAYF error page."</span>); +<a name="946" href="#946">946</a> req.setAttribute(<span class="jxr_string">"errorText"</span>, message); +<a name="947" href="#947">947</a> req.setAttribute(<span class="jxr_string">"requestURL"</span>, req.getRequestURI().toString()); +<a name="948" href="#948">948</a> RequestDispatcher rd = req.getRequestDispatcher(config.getErrorJspFile()); +<a name="949" href="#949">949</a> +<a name="950" href="#950">950</a> <strong class="jxr_keyword">try</strong> { +<a name="951" href="#951">951</a> rd.forward(req, res); +<a name="952" href="#952">952</a> } <strong class="jxr_keyword">catch</strong> (IOException ioe) { +<a name="953" href="#953">953</a> LOG.error(<span class="jxr_string">"Problem trying to display WAYF error page: "</span> + ioe.toString()); +<a name="954" href="#954">954</a> } <strong class="jxr_keyword">catch</strong> (ServletException se) { +<a name="955" href="#955">955</a> LOG.error(<span class="jxr_string">"Problem trying to display WAYF error page: "</span> + se.toString()); +<a name="956" href="#956">956</a> } +<a name="957" href="#957">957</a> } +<a name="958" href="#958">958</a> +<a name="959" href="#959">959</a> <em class="jxr_javadoccomment">/**</em> +<a name="960" href="#960">960</a> <em class="jxr_javadoccomment"> * Gets the value for the parameter either from the parameter or from jsp.</em> +<a name="961" href="#961">961</a> <em class="jxr_javadoccomment"> * @param req - the request.</em> +<a name="962" href="#962">962</a> <em class="jxr_javadoccomment"> * @param name - the name of the parameter.</em> +<a name="963" href="#963">963</a> <em class="jxr_javadoccomment"> * @return - result</em> +<a name="964" href="#964">964</a> <em class="jxr_javadoccomment"> */</em> +<a name="965" href="#965">965</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> String getValue(HttpServletRequest req, String name) { +<a name="966" href="#966">966</a> +<a name="967" href="#967">967</a> +<a name="968" href="#968">968</a> String value = req.getParameter(name); +<a name="969" href="#969">969</a> <strong class="jxr_keyword">if</strong> (value != <strong class="jxr_keyword">null</strong>) { +<a name="970" href="#970">970</a> <strong class="jxr_keyword">return</strong> value; +<a name="971" href="#971">971</a> } +<a name="972" href="#972">972</a> <strong class="jxr_keyword">return</strong> (String) req.getAttribute(name); +<a name="973" href="#973">973</a> } +<a name="974" href="#974">974</a> +<a name="975" href="#975">975</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> String getSPId(HttpServletRequest req) <strong class="jxr_keyword">throws</strong> WayfException { +<a name="976" href="#976">976</a> +<a name="977" href="#977">977</a> <em class="jxr_comment">//</em> +<a name="978" href="#978">978</a> <em class="jxr_comment">// Try first with 2.0 version</em> +<a name="979" href="#979">979</a> <em class="jxr_comment">//</em> +<a name="980" href="#980">980</a> String param = req.getParameter(ENTITYID_PARAM_NAME); +<a name="981" href="#981">981</a> <strong class="jxr_keyword">if</strong> (param != <strong class="jxr_keyword">null</strong> && !(param.length() == 0)) { +<a name="982" href="#982">982</a> <strong class="jxr_keyword">return</strong> param; +<a name="983" href="#983">983</a> } +<a name="984" href="#984">984</a> +<a name="985" href="#985">985</a> param = (String) req.getAttribute(ENTITYID_PARAM_NAME); +<a name="986" href="#986">986</a> <strong class="jxr_keyword">if</strong> (param != <strong class="jxr_keyword">null</strong> && !(param.length() == 0)) { +<a name="987" href="#987">987</a> <strong class="jxr_keyword">return</strong> param; +<a name="988" href="#988">988</a> } +<a name="989" href="#989">989</a> <em class="jxr_comment">//</em> +<a name="990" href="#990">990</a> <em class="jxr_comment">// So Try with 1.3 version</em> +<a name="991" href="#991">991</a> <em class="jxr_comment">//</em> +<a name="992" href="#992">992</a> param = req.getParameter(PROVIDERID_PARAM_NAME); +<a name="993" href="#993">993</a> <strong class="jxr_keyword">if</strong> (param != <strong class="jxr_keyword">null</strong> && !(param.length() == 0)) { +<a name="994" href="#994">994</a> <strong class="jxr_keyword">return</strong> param; +<a name="995" href="#995">995</a> } +<a name="996" href="#996">996</a> +<a name="997" href="#997">997</a> param = (String) req.getAttribute(PROVIDERID_PARAM_NAME); +<a name="998" href="#998">998</a> <strong class="jxr_keyword">if</strong> (param != <strong class="jxr_keyword">null</strong> && !(param.length() == 0)) { +<a name="999" href="#999">999</a> <strong class="jxr_keyword">return</strong> param; +<a name="1000" href="#1000">1000</a> } +<a name="1001" href="#1001">1001</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/WayfException.html">WayfException</a>(<span class="jxr_string">"Could not locate SP identifier in parameters"</span>); +<a name="1002" href="#1002">1002</a> } +<a name="1003" href="#1003">1003</a> } </pre> <hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body> </html> diff --git a/doc/src-xref/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.html b/doc/src-xref/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.html index af6f827..acb4888 100644 --- a/doc/src-xref/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.html +++ b/doc/src-xref/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.html @@ -84,7 +84,7 @@ <a name="74" href="#74">74</a> <em class="jxr_javadoccomment">/**</em><em class="jxr_javadoccomment"> Handle for error output. */</em> <a name="75" href="#75">75</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Logger LOG = LoggerFactory.getLogger(IdPSiteSet.<strong class="jxr_keyword">class</strong>.getName()); <a name="76" href="#76">76</a> -<a name="77" href="#77">77</a> <em class="jxr_javadoccomment">/**</em><em class="jxr_javadoccomment"> The OpenSaml metadat6a source. */</em> +<a name="77" href="#77">77</a> <em class="jxr_javadoccomment">/**</em><em class="jxr_javadoccomment"> The OpenSaml metadata source. */</em> <a name="78" href="#78">78</a> <strong class="jxr_keyword">private</strong> ObservableMetadataProvider metadata; <a name="79" href="#79">79</a> <a name="80" href="#80">80</a> <em class="jxr_javadoccomment">/**</em><em class="jxr_javadoccomment"> Is the named SP in the current metadata set? */</em> @@ -256,14 +256,14 @@ <a name="246" href="#246">246</a> <a name="247" href="#247">247</a> List <OrganizationName> orgNames = org.getOrganizationNames(); <a name="248" href="#248">248</a> <strong class="jxr_keyword">for</strong> (OrganizationName name : orgNames) { -<a name="249" href="#249">249</a> <strong class="jxr_keyword">if</strong> (name.getName().getLocalString().indexOf(currentToken) > -1) { +<a name="249" href="#249">249</a> <strong class="jxr_keyword">if</strong> (name.getName().getLocalString().toLowerCase().indexOf(currentToken) > -1) { <a name="250" href="#250">250</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>; <a name="251" href="#251">251</a> } <a name="252" href="#252">252</a> } <a name="253" href="#253">253</a> <a name="254" href="#254">254</a> List <OrganizationDisplayName> orgDisplayNames = org.getDisplayNames(); <a name="255" href="#255">255</a> <strong class="jxr_keyword">for</strong> (OrganizationDisplayName name : orgDisplayNames) { -<a name="256" href="#256">256</a> <strong class="jxr_keyword">if</strong> (name.getName().getLocalString().indexOf(currentToken) > -1) { +<a name="256" href="#256">256</a> <strong class="jxr_keyword">if</strong> (name.getName().getLocalString().toLowerCase().indexOf(currentToken) > -1) { <a name="257" href="#257">257</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>; <a name="258" href="#258">258</a> } <a name="259" href="#259">259</a> } diff --git a/doc/src-xref/edu/internet2/middleware/shibboleth/wayf/WayfService.html b/doc/src-xref/edu/internet2/middleware/shibboleth/wayf/WayfService.html index 488e3a0..b19792a 100644 --- a/doc/src-xref/edu/internet2/middleware/shibboleth/wayf/WayfService.html +++ b/doc/src-xref/edu/internet2/middleware/shibboleth/wayf/WayfService.html @@ -39,293 +39,284 @@ <a name="29" href="#29">29</a> <strong class="jxr_keyword">import</strong> javax.servlet.http.HttpServlet; <a name="30" href="#30">30</a> <strong class="jxr_keyword">import</strong> javax.servlet.http.HttpServletRequest; <a name="31" href="#31">31</a> <strong class="jxr_keyword">import</strong> javax.servlet.http.HttpServletResponse; -<a name="32" href="#32">32</a> <strong class="jxr_keyword">import</strong> javax.xml.namespace.QName; -<a name="33" href="#33">33</a> -<a name="34" href="#34">34</a> <strong class="jxr_keyword">import</strong> org.opensaml.DefaultBootstrap; -<a name="35" href="#35">35</a> <strong class="jxr_keyword">import</strong> org.opensaml.xml.Configuration; -<a name="36" href="#36">36</a> <strong class="jxr_keyword">import</strong> org.opensaml.xml.parse.BasicParserPool; -<a name="37" href="#37">37</a> <strong class="jxr_keyword">import</strong> org.opensaml.xml.util.DatatypeHelper; -<a name="38" href="#38">38</a> <strong class="jxr_keyword">import</strong> org.slf4j.Logger; -<a name="39" href="#39">39</a> <strong class="jxr_keyword">import</strong> org.slf4j.LoggerFactory; -<a name="40" href="#40">40</a> <strong class="jxr_keyword">import</strong> org.w3c.dom.Document; -<a name="41" href="#41">41</a> <strong class="jxr_keyword">import</strong> org.w3c.dom.Element; -<a name="42" href="#42">42</a> <strong class="jxr_keyword">import</strong> org.w3c.dom.NodeList; -<a name="43" href="#43">43</a> -<a name="44" href="#44">44</a> <strong class="jxr_keyword">import</strong> edu.internet2.middleware.shibboleth.common.ShibbolethConfigurationException; -<a name="45" href="#45">45</a> <strong class="jxr_keyword">import</strong> edu.internet2.middleware.shibboleth.wayf.plugins.Plugin; -<a name="46" href="#46">46</a> -<a name="47" href="#47">47</a> <em class="jxr_javadoccomment">/**</em> -<a name="48" href="#48">48</a> <em class="jxr_javadoccomment"> * A servlet implementation of the Shibboleth WAYF service. Allows a browser</em> -<a name="49" href="#49">49</a> <em class="jxr_javadoccomment"> * user to select from among a group of origin sites. User selection is</em> -<a name="50" href="#50">50</a> <em class="jxr_javadoccomment"> * optionally cached and the user is forwarded to the HandleService appropriate</em> -<a name="51" href="#51">51</a> <em class="jxr_javadoccomment"> * to his selection.</em> -<a name="52" href="#52">52</a> <em class="jxr_javadoccomment"> */</em> -<a name="53" href="#53">53</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/WayfService.html">WayfService</a> <strong class="jxr_keyword">extends</strong> HttpServlet { -<a name="54" href="#54">54</a> -<a name="55" href="#55">55</a> <em class="jxr_javadoccomment">/**</em><em class="jxr_javadoccomment"> Required constant for serializaton. */</em> -<a name="56" href="#56">56</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">long</strong> serialVersionUID = 5244503011625804940L; -<a name="57" href="#57">57</a> -<a name="58" href="#58">58</a> <em class="jxr_javadoccomment">/**</em><em class="jxr_javadoccomment"> Handle for outputting error and other messages. */</em> -<a name="59" href="#59">59</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Logger LOG = LoggerFactory.getLogger(WayfService.<strong class="jxr_keyword">class</strong>.getName()); -<a name="60" href="#60">60</a> -<a name="61" href="#61">61</a> <em class="jxr_javadoccomment">/**</em><em class="jxr_javadoccomment"> Where to get the configuration. */</em> -<a name="62" href="#62">62</a> <strong class="jxr_keyword">private</strong> String wayfConfigFileLocation; -<a name="63" href="#63">63</a> -<a name="64" href="#64">64</a> <em class="jxr_javadoccomment">/**</em><em class="jxr_javadoccomment"> Logging service. */</em> -<a name="65" href="#65">65</a> <strong class="jxr_keyword">private</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/LogbackLoggingService.html">LogbackLoggingService</a> logService; -<a name="66" href="#66">66</a> -<a name="67" href="#67">67</a> <em class="jxr_javadoccomment">/**</em><em class="jxr_javadoccomment"> All the different Discovery Services we deal with. */</em> -<a name="68" href="#68">68</a> <strong class="jxr_keyword">private</strong> List <DiscoveryServiceHandler> discoveryServices = <strong class="jxr_keyword">new</strong> ArrayList <DiscoveryServiceHandler>(); -<a name="69" href="#69">69</a> -<a name="70" href="#70">70</a> <em class="jxr_javadoccomment">/**</em> -<a name="71" href="#71">71</a> <em class="jxr_javadoccomment"> * Initialize the Discovery Service.</em> -<a name="72" href="#72">72</a> <em class="jxr_javadoccomment"> * </em> -<a name="73" href="#73">73</a> <em class="jxr_javadoccomment"> * @throws ServletException in the case of something bad happening</em> -<a name="74" href="#74">74</a> <em class="jxr_javadoccomment"> * </em> -<a name="75" href="#75">75</a> <em class="jxr_javadoccomment"> * @see GenericServlet#init()</em> -<a name="76" href="#76">76</a> <em class="jxr_javadoccomment"> */</em> -<a name="77" href="#77">77</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> init() <strong class="jxr_keyword">throws</strong> ServletException { -<a name="78" href="#78">78</a> -<a name="79" href="#79">79</a> <strong class="jxr_keyword">super</strong>.init(); -<a name="80" href="#80">80</a> -<a name="81" href="#81">81</a> wayfConfigFileLocation = getServletContext().getInitParameter(<span class="jxr_string">"WAYFConfigFileLocation"</span>); -<a name="82" href="#82">82</a> <strong class="jxr_keyword">if</strong> (wayfConfigFileLocation == <strong class="jxr_keyword">null</strong>) { -<a name="83" href="#83">83</a> wayfConfigFileLocation = getServletConfig().getInitParameter(<span class="jxr_string">"WAYFConfigFileLocation"</span>); -<a name="84" href="#84">84</a> } -<a name="85" href="#85">85</a> <strong class="jxr_keyword">if</strong> (wayfConfigFileLocation == <strong class="jxr_keyword">null</strong>) { -<a name="86" href="#86">86</a> wayfConfigFileLocation = <span class="jxr_string">"/wayfconfig.xml"</span>; -<a name="87" href="#87">87</a> } -<a name="88" href="#88">88</a> -<a name="89" href="#89">89</a> -<a name="90" href="#90">90</a> <strong class="jxr_keyword">try</strong> { +<a name="32" href="#32">32</a> +<a name="33" href="#33">33</a> <strong class="jxr_keyword">import</strong> org.opensaml.DefaultBootstrap; +<a name="34" href="#34">34</a> <strong class="jxr_keyword">import</strong> org.opensaml.xml.parse.BasicParserPool; +<a name="35" href="#35">35</a> <strong class="jxr_keyword">import</strong> org.opensaml.xml.util.DatatypeHelper; +<a name="36" href="#36">36</a> <strong class="jxr_keyword">import</strong> org.slf4j.Logger; +<a name="37" href="#37">37</a> <strong class="jxr_keyword">import</strong> org.slf4j.LoggerFactory; +<a name="38" href="#38">38</a> <strong class="jxr_keyword">import</strong> org.w3c.dom.Document; +<a name="39" href="#39">39</a> <strong class="jxr_keyword">import</strong> org.w3c.dom.Element; +<a name="40" href="#40">40</a> <strong class="jxr_keyword">import</strong> org.w3c.dom.NodeList; +<a name="41" href="#41">41</a> +<a name="42" href="#42">42</a> <strong class="jxr_keyword">import</strong> edu.internet2.middleware.shibboleth.common.ShibbolethConfigurationException; +<a name="43" href="#43">43</a> <strong class="jxr_keyword">import</strong> edu.internet2.middleware.shibboleth.wayf.plugins.Plugin; +<a name="44" href="#44">44</a> +<a name="45" href="#45">45</a> <em class="jxr_javadoccomment">/**</em> +<a name="46" href="#46">46</a> <em class="jxr_javadoccomment"> * A servlet implementation of the Shibboleth WAYF service. Allows a browser</em> +<a name="47" href="#47">47</a> <em class="jxr_javadoccomment"> * user to select from among a group of origin sites. User selection is</em> +<a name="48" href="#48">48</a> <em class="jxr_javadoccomment"> * optionally cached and the user is forwarded to the HandleService appropriate</em> +<a name="49" href="#49">49</a> <em class="jxr_javadoccomment"> * to his selection.</em> +<a name="50" href="#50">50</a> <em class="jxr_javadoccomment"> */</em> +<a name="51" href="#51">51</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/WayfService.html">WayfService</a> <strong class="jxr_keyword">extends</strong> HttpServlet { +<a name="52" href="#52">52</a> +<a name="53" href="#53">53</a> <em class="jxr_javadoccomment">/**</em><em class="jxr_javadoccomment"> Required constant for serializaton. */</em> +<a name="54" href="#54">54</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">long</strong> serialVersionUID = 5244503011625804940L; +<a name="55" href="#55">55</a> +<a name="56" href="#56">56</a> <em class="jxr_javadoccomment">/**</em><em class="jxr_javadoccomment"> Handle for outputting error and other messages. */</em> +<a name="57" href="#57">57</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Logger LOG = LoggerFactory.getLogger(WayfService.<strong class="jxr_keyword">class</strong>.getName()); +<a name="58" href="#58">58</a> +<a name="59" href="#59">59</a> <em class="jxr_javadoccomment">/**</em><em class="jxr_javadoccomment"> Where to get the configuration. */</em> +<a name="60" href="#60">60</a> <strong class="jxr_keyword">private</strong> String wayfConfigFileLocation; +<a name="61" href="#61">61</a> +<a name="62" href="#62">62</a> <em class="jxr_javadoccomment">/**</em><em class="jxr_javadoccomment"> Logging service. */</em> +<a name="63" href="#63">63</a> <strong class="jxr_keyword">private</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/LogbackLoggingService.html">LogbackLoggingService</a> logService; +<a name="64" href="#64">64</a> +<a name="65" href="#65">65</a> <em class="jxr_javadoccomment">/**</em><em class="jxr_javadoccomment"> All the different Discovery Services we deal with. */</em> +<a name="66" href="#66">66</a> <strong class="jxr_keyword">private</strong> List <DiscoveryServiceHandler> discoveryServices = <strong class="jxr_keyword">new</strong> ArrayList <DiscoveryServiceHandler>(); +<a name="67" href="#67">67</a> +<a name="68" href="#68">68</a> <em class="jxr_javadoccomment">/**</em> +<a name="69" href="#69">69</a> <em class="jxr_javadoccomment"> * Initialize the Discovery Service.</em> +<a name="70" href="#70">70</a> <em class="jxr_javadoccomment"> * </em> +<a name="71" href="#71">71</a> <em class="jxr_javadoccomment"> * @throws ServletException in the case of something bad happening</em> +<a name="72" href="#72">72</a> <em class="jxr_javadoccomment"> * </em> +<a name="73" href="#73">73</a> <em class="jxr_javadoccomment"> * @see GenericServlet#init()</em> +<a name="74" href="#74">74</a> <em class="jxr_javadoccomment"> */</em> +<a name="75" href="#75">75</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> init() <strong class="jxr_keyword">throws</strong> ServletException { +<a name="76" href="#76">76</a> +<a name="77" href="#77">77</a> <strong class="jxr_keyword">super</strong>.init(); +<a name="78" href="#78">78</a> +<a name="79" href="#79">79</a> wayfConfigFileLocation = getServletContext().getInitParameter(<span class="jxr_string">"WAYFConfigFileLocation"</span>); +<a name="80" href="#80">80</a> <strong class="jxr_keyword">if</strong> (wayfConfigFileLocation == <strong class="jxr_keyword">null</strong>) { +<a name="81" href="#81">81</a> wayfConfigFileLocation = getServletConfig().getInitParameter(<span class="jxr_string">"WAYFConfigFileLocation"</span>); +<a name="82" href="#82">82</a> } +<a name="83" href="#83">83</a> <strong class="jxr_keyword">if</strong> (wayfConfigFileLocation == <strong class="jxr_keyword">null</strong>) { +<a name="84" href="#84">84</a> wayfConfigFileLocation = <span class="jxr_string">"/wayfconfig.xml"</span>; +<a name="85" href="#85">85</a> } +<a name="86" href="#86">86</a> +<a name="87" href="#87">87</a> +<a name="88" href="#88">88</a> <strong class="jxr_keyword">try</strong> { +<a name="89" href="#89">89</a> <em class="jxr_comment">//</em> +<a name="90" href="#90">90</a> <em class="jxr_comment">// Initialize logging</em> <a name="91" href="#91">91</a> <em class="jxr_comment">//</em> -<a name="92" href="#92">92</a> <em class="jxr_comment">// Initialize logging</em> -<a name="93" href="#93">93</a> <em class="jxr_comment">//</em> -<a name="94" href="#94">94</a> String wayfLogfile = getServletContext().getInitParameter(<span class="jxr_string">"WAYFLogConfig"</span>); -<a name="95" href="#95">95</a> <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> == wayfLogfile) { -<a name="96" href="#96">96</a> wayfLogfile = getServletConfig().getInitParameter(<span class="jxr_string">"WAYFLogConfig"</span>); -<a name="97" href="#97">97</a> } -<a name="98" href="#98">98</a> <strong class="jxr_keyword">long</strong> pollingFrequency = 1000*60*5; -<a name="99" href="#99">99</a> -<a name="100" href="#100">100</a> String wayfLogfilePollFrequency = getServletContext().getInitParameter(<span class="jxr_string">"WAYFLogConfigPollFrequency"</span>); -<a name="101" href="#101">101</a> <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> == wayfLogfilePollFrequency) { -<a name="102" href="#102">102</a> wayfLogfilePollFrequency = getServletConfig().getInitParameter(<span class="jxr_string">"WAYFLogConfigPollFrequency"</span>); -<a name="103" href="#103">103</a> } -<a name="104" href="#104">104</a> <strong class="jxr_keyword">if</strong>(!DatatypeHelper.isEmpty(wayfLogfilePollFrequency)){ -<a name="105" href="#105">105</a> pollingFrequency = Long.parseLong(wayfLogfilePollFrequency); -<a name="106" href="#106">106</a> } -<a name="107" href="#107">107</a> <strong class="jxr_keyword">if</strong> (wayfLogfile != <strong class="jxr_keyword">null</strong>) { -<a name="108" href="#108">108</a> logService = <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/LogbackLoggingService.html">LogbackLoggingService</a>(wayfLogfile, pollingFrequency); -<a name="109" href="#109">109</a> } -<a name="110" href="#110">110</a> -<a name="111" href="#111">111</a> LOG.info(<span class="jxr_string">"Logging initiated"</span>); -<a name="112" href="#112">112</a> +<a name="92" href="#92">92</a> String wayfLogfile = getServletContext().getInitParameter(<span class="jxr_string">"WAYFLogConfig"</span>); +<a name="93" href="#93">93</a> <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> == wayfLogfile) { +<a name="94" href="#94">94</a> wayfLogfile = getServletConfig().getInitParameter(<span class="jxr_string">"WAYFLogConfig"</span>); +<a name="95" href="#95">95</a> } +<a name="96" href="#96">96</a> <strong class="jxr_keyword">long</strong> pollingFrequency = 1000*60*5; +<a name="97" href="#97">97</a> +<a name="98" href="#98">98</a> String wayfLogfilePollFrequency = getServletContext().getInitParameter(<span class="jxr_string">"WAYFLogConfigPollFrequency"</span>); +<a name="99" href="#99">99</a> <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> == wayfLogfilePollFrequency) { +<a name="100" href="#100">100</a> wayfLogfilePollFrequency = getServletConfig().getInitParameter(<span class="jxr_string">"WAYFLogConfigPollFrequency"</span>); +<a name="101" href="#101">101</a> } +<a name="102" href="#102">102</a> <strong class="jxr_keyword">if</strong>(!DatatypeHelper.isEmpty(wayfLogfilePollFrequency)){ +<a name="103" href="#103">103</a> pollingFrequency = Long.parseLong(wayfLogfilePollFrequency); +<a name="104" href="#104">104</a> } +<a name="105" href="#105">105</a> <strong class="jxr_keyword">if</strong> (wayfLogfile != <strong class="jxr_keyword">null</strong>) { +<a name="106" href="#106">106</a> logService = <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/LogbackLoggingService.html">LogbackLoggingService</a>(wayfLogfile, pollingFrequency); +<a name="107" href="#107">107</a> } +<a name="108" href="#108">108</a> +<a name="109" href="#109">109</a> LOG.info(<span class="jxr_string">"Logging initiated"</span>); +<a name="110" href="#110">110</a> +<a name="111" href="#111">111</a> <em class="jxr_comment">//</em> +<a name="112" href="#112">112</a> <em class="jxr_comment">// Initialize OpenSAML 2 library</em> <a name="113" href="#113">113</a> <em class="jxr_comment">//</em> -<a name="114" href="#114">114</a> <em class="jxr_comment">// Initialize OpenSAML 2 library</em> -<a name="115" href="#115">115</a> <em class="jxr_comment">//</em> -<a name="116" href="#116">116</a> DefaultBootstrap.bootstrap(); -<a name="117" href="#117">117</a> -<a name="118" href="#118">118</a> BasicParserPool parser = <strong class="jxr_keyword">new</strong> BasicParserPool(); -<a name="119" href="#119">119</a> parser.setNamespaceAware(<strong class="jxr_keyword">true</strong>); -<a name="120" href="#120">120</a> Document doc; -<a name="121" href="#121">121</a> <strong class="jxr_keyword">try</strong> { -<a name="122" href="#122">122</a> doc = parser.parse(<strong class="jxr_keyword">new</strong> FileInputStream(wayfConfigFileLocation)); -<a name="123" href="#123">123</a> } <strong class="jxr_keyword">catch</strong> (FileNotFoundException e) { -<a name="124" href="#124">124</a> LOG.error(<span class="jxr_string">"Could not parse "</span> + wayfConfigFileLocation, e); -<a name="125" href="#125">125</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/common/ShibbolethConfigurationException.html">ShibbolethConfigurationException</a>(<span class="jxr_string">"Could not parse "</span> + wayfConfigFileLocation, e); -<a name="126" href="#126">126</a> } -<a name="127" href="#127">127</a> NodeList itemElements = doc.getDocumentElement().getElementsByTagNameNS(XMLConstants.CONFIG_NS, -<a name="128" href="#128">128</a> <span class="jxr_string">"Default"</span>); +<a name="114" href="#114">114</a> DefaultBootstrap.bootstrap(); +<a name="115" href="#115">115</a> +<a name="116" href="#116">116</a> BasicParserPool parser = <strong class="jxr_keyword">new</strong> BasicParserPool(); +<a name="117" href="#117">117</a> parser.setNamespaceAware(<strong class="jxr_keyword">true</strong>); +<a name="118" href="#118">118</a> Document doc; +<a name="119" href="#119">119</a> <strong class="jxr_keyword">try</strong> { +<a name="120" href="#120">120</a> doc = parser.parse(<strong class="jxr_keyword">new</strong> FileInputStream(wayfConfigFileLocation)); +<a name="121" href="#121">121</a> } <strong class="jxr_keyword">catch</strong> (FileNotFoundException e) { +<a name="122" href="#122">122</a> LOG.error(<span class="jxr_string">"Could not parse "</span> + wayfConfigFileLocation, e); +<a name="123" href="#123">123</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/common/ShibbolethConfigurationException.html">ShibbolethConfigurationException</a>(<span class="jxr_string">"Could not parse "</span> + wayfConfigFileLocation, e); +<a name="124" href="#124">124</a> } +<a name="125" href="#125">125</a> NodeList itemElements = doc.getDocumentElement().getElementsByTagNameNS(XMLConstants.CONFIG_NS, +<a name="126" href="#126">126</a> <span class="jxr_string">"Default"</span>); +<a name="127" href="#127">127</a> +<a name="128" href="#128">128</a> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/HandlerConfig.html">HandlerConfig</a> defaultHandlerConfig; <a name="129" href="#129">129</a> -<a name="130" href="#130">130</a> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/HandlerConfig.html">HandlerConfig</a> defaultHandlerConfig; -<a name="131" href="#131">131</a> -<a name="132" href="#132">132</a> <strong class="jxr_keyword">if</strong> (itemElements.getLength() == 1) { -<a name="133" href="#133">133</a> -<a name="134" href="#134">134</a> Element element = (Element) itemElements.item(0); -<a name="135" href="#135">135</a> String attribute = element.getAttribute(<span class="jxr_string">"location"</span>); -<a name="136" href="#136">136</a> -<a name="137" href="#137">137</a> <strong class="jxr_keyword">if</strong> (attribute != <strong class="jxr_keyword">null</strong> && !attribute.equals(<span class="jxr_string">""</span>)) { -<a name="138" href="#138">138</a> -<a name="139" href="#139">139</a> LOG.error(<span class="jxr_string">"<Default> element cannot contain a location attribute"</span>); -<a name="140" href="#140">140</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/common/ShibbolethConfigurationException.html">ShibbolethConfigurationException</a>(<span class="jxr_string">"<Default> element cannot contain a location attribute"</span>); -<a name="141" href="#141">141</a> -<a name="142" href="#142">142</a> } -<a name="143" href="#143">143</a> -<a name="144" href="#144">144</a> attribute = element.getAttribute(<span class="jxr_string">"default"</span>); -<a name="145" href="#145">145</a> -<a name="146" href="#146">146</a> <strong class="jxr_keyword">if</strong> (attribute != <strong class="jxr_keyword">null</strong> && !attribute.equals(<span class="jxr_string">""</span>)) { -<a name="147" href="#147">147</a> -<a name="148" href="#148">148</a> LOG.error(<span class="jxr_string">"<Default> element cannot contain a default attribute"</span>); -<a name="149" href="#149">149</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/common/ShibbolethConfigurationException.html">ShibbolethConfigurationException</a>(<span class="jxr_string">"<Default> element cannot contain a default attribute"</span>); -<a name="150" href="#150">150</a> -<a name="151" href="#151">151</a> } -<a name="152" href="#152">152</a> -<a name="153" href="#153">153</a> itemElements = element.getElementsByTagName(<span class="jxr_string">"Federation"</span>); -<a name="154" href="#154">154</a> -<a name="155" href="#155">155</a> <strong class="jxr_keyword">if</strong> (itemElements.getLength() != 0) { -<a name="156" href="#156">156</a> -<a name="157" href="#157">157</a> LOG.error(<span class="jxr_string">"<Default> element cannot contain <Federation> elements"</span>); -<a name="158" href="#158">158</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/common/ShibbolethConfigurationException.html">ShibbolethConfigurationException</a>(<span class="jxr_string">"<Default> element cannot contain <Federation> elements"</span>); -<a name="159" href="#159">159</a> -<a name="160" href="#160">160</a> } -<a name="161" href="#161">161</a> -<a name="162" href="#162">162</a> defaultHandlerConfig = <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/HandlerConfig.html">HandlerConfig</a>(element, <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/HandlerConfig.html">HandlerConfig</a>()); -<a name="163" href="#163">163</a> -<a name="164" href="#164">164</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (itemElements.getLength() == 0) { -<a name="165" href="#165">165</a> -<a name="166" href="#166">166</a> defaultHandlerConfig = <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/HandlerConfig.html">HandlerConfig</a>(); -<a name="167" href="#167">167</a> -<a name="168" href="#168">168</a> } <strong class="jxr_keyword">else</strong> { -<a name="169" href="#169">169</a> LOG.error(<span class="jxr_string">"Must specify exactly one <Default> element"</span>); -<a name="170" href="#170">170</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/common/ShibbolethConfigurationException.html">ShibbolethConfigurationException</a>(<span class="jxr_string">"Must specify exactly one <Default> element"</span>); -<a name="171" href="#171">171</a> } -<a name="172" href="#172">172</a> <em class="jxr_comment">//</em> -<a name="173" href="#173">173</a> <em class="jxr_comment">// Extra types</em> -<a name="174" href="#174">174</a> <em class="jxr_comment">//</em> -<a name="175" href="#175">175</a> QName response = <strong class="jxr_keyword">new</strong> QName(DiscoveryResponseImpl.METADATA_NS, DiscoveryResponseImpl.DEFAULT_ELEMENT_LOCAL_NAME); -<a name="176" href="#176">176</a> -<a name="177" href="#177">177</a> Configuration.getUnmarshallerFactory().registerUnmarshaller(response, <strong class="jxr_keyword">new</strong> DiscoveryResponseUnmarshaller()); -<a name="178" href="#178">178</a> Configuration.getBuilderFactory().registerBuilder(response, <strong class="jxr_keyword">new</strong> DiscoveryResponseBuilder()); -<a name="179" href="#179">179</a> -<a name="180" href="#180">180</a> <em class="jxr_comment">//</em> -<a name="181" href="#181">181</a> <em class="jxr_comment">// Load metadata</em> -<a name="182" href="#182">182</a> <em class="jxr_comment">//</em> -<a name="183" href="#183">183</a> Hashtable <String, IdPSiteSet> siteSets = <strong class="jxr_keyword">new</strong> Hashtable <String, IdPSiteSet>(); -<a name="184" href="#184">184</a> -<a name="185" href="#185">185</a> itemElements = doc.getDocumentElement().getElementsByTagNameNS(XMLConstants.CONFIG_NS, -<a name="186" href="#186">186</a> <span class="jxr_string">"MetadataProvider"</span>); -<a name="187" href="#187">187</a> -<a name="188" href="#188">188</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < itemElements.getLength(); i++) { -<a name="189" href="#189">189</a> -<a name="190" href="#190">190</a> Element element = (Element) itemElements.item(i); -<a name="191" href="#191">191</a> -<a name="192" href="#192">192</a> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.html">IdPSiteSet</a> siteset = <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.html">IdPSiteSet</a>(element, parser, defaultHandlerConfig.getWarnOnBadBinding()); -<a name="193" href="#193">193</a> -<a name="194" href="#194">194</a> siteSets.put(siteset.getIdentifier(), siteset); -<a name="195" href="#195">195</a> } -<a name="196" href="#196">196</a> <strong class="jxr_keyword">if</strong> (siteSets.size() < 1) { -<a name="197" href="#197">197</a> LOG.error(<span class="jxr_string">"No Metadata Provider metadata loaded."</span>); -<a name="198" href="#198">198</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/common/ShibbolethConfigurationException.html">ShibbolethConfigurationException</a>(<span class="jxr_string">"Could not load SAML metadata."</span>); -<a name="199" href="#199">199</a> } -<a name="200" href="#200">200</a> <em class="jxr_comment">//</em> -<a name="201" href="#201">201</a> <em class="jxr_comment">// Load plugins</em> -<a name="202" href="#202">202</a> <em class="jxr_comment">//</em> -<a name="203" href="#203">203</a> -<a name="204" href="#204">204</a> Hashtable <String, Plugin> plugins = <strong class="jxr_keyword">new</strong> Hashtable <String, Plugin>(); -<a name="205" href="#205">205</a> -<a name="206" href="#206">206</a> itemElements = doc.getDocumentElement().getElementsByTagNameNS(XMLConstants.CONFIG_NS, -<a name="207" href="#207">207</a> <span class="jxr_string">"Plugin"</span>); -<a name="208" href="#208">208</a> -<a name="209" href="#209">209</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < itemElements.getLength(); i++) { -<a name="210" href="#210">210</a> -<a name="211" href="#211">211</a> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/plugins/Plugin.html">Plugin</a> plugin; +<a name="130" href="#130">130</a> <strong class="jxr_keyword">if</strong> (itemElements.getLength() == 1) { +<a name="131" href="#131">131</a> +<a name="132" href="#132">132</a> Element element = (Element) itemElements.item(0); +<a name="133" href="#133">133</a> String attribute = element.getAttribute(<span class="jxr_string">"location"</span>); +<a name="134" href="#134">134</a> +<a name="135" href="#135">135</a> <strong class="jxr_keyword">if</strong> (attribute != <strong class="jxr_keyword">null</strong> && !attribute.equals(<span class="jxr_string">""</span>)) { +<a name="136" href="#136">136</a> +<a name="137" href="#137">137</a> LOG.error(<span class="jxr_string">"<Default> element cannot contain a location attribute"</span>); +<a name="138" href="#138">138</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/common/ShibbolethConfigurationException.html">ShibbolethConfigurationException</a>(<span class="jxr_string">"<Default> element cannot contain a location attribute"</span>); +<a name="139" href="#139">139</a> +<a name="140" href="#140">140</a> } +<a name="141" href="#141">141</a> +<a name="142" href="#142">142</a> attribute = element.getAttribute(<span class="jxr_string">"default"</span>); +<a name="143" href="#143">143</a> +<a name="144" href="#144">144</a> <strong class="jxr_keyword">if</strong> (attribute != <strong class="jxr_keyword">null</strong> && !attribute.equals(<span class="jxr_string">""</span>)) { +<a name="145" href="#145">145</a> +<a name="146" href="#146">146</a> LOG.error(<span class="jxr_string">"<Default> element cannot contain a default attribute"</span>); +<a name="147" href="#147">147</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/common/ShibbolethConfigurationException.html">ShibbolethConfigurationException</a>(<span class="jxr_string">"<Default> element cannot contain a default attribute"</span>); +<a name="148" href="#148">148</a> +<a name="149" href="#149">149</a> } +<a name="150" href="#150">150</a> +<a name="151" href="#151">151</a> itemElements = element.getElementsByTagName(<span class="jxr_string">"Federation"</span>); +<a name="152" href="#152">152</a> +<a name="153" href="#153">153</a> <strong class="jxr_keyword">if</strong> (itemElements.getLength() != 0) { +<a name="154" href="#154">154</a> +<a name="155" href="#155">155</a> LOG.error(<span class="jxr_string">"<Default> element cannot contain <Federation> elements"</span>); +<a name="156" href="#156">156</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/common/ShibbolethConfigurationException.html">ShibbolethConfigurationException</a>(<span class="jxr_string">"<Default> element cannot contain <Federation> elements"</span>); +<a name="157" href="#157">157</a> +<a name="158" href="#158">158</a> } +<a name="159" href="#159">159</a> +<a name="160" href="#160">160</a> defaultHandlerConfig = <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/HandlerConfig.html">HandlerConfig</a>(element, <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/HandlerConfig.html">HandlerConfig</a>()); +<a name="161" href="#161">161</a> +<a name="162" href="#162">162</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (itemElements.getLength() == 0) { +<a name="163" href="#163">163</a> +<a name="164" href="#164">164</a> defaultHandlerConfig = <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/HandlerConfig.html">HandlerConfig</a>(); +<a name="165" href="#165">165</a> +<a name="166" href="#166">166</a> } <strong class="jxr_keyword">else</strong> { +<a name="167" href="#167">167</a> LOG.error(<span class="jxr_string">"Must specify exactly one <Default> element"</span>); +<a name="168" href="#168">168</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/common/ShibbolethConfigurationException.html">ShibbolethConfigurationException</a>(<span class="jxr_string">"Must specify exactly one <Default> element"</span>); +<a name="169" href="#169">169</a> } +<a name="170" href="#170">170</a> +<a name="171" href="#171">171</a> <em class="jxr_comment">//</em> +<a name="172" href="#172">172</a> <em class="jxr_comment">// Load metadata</em> +<a name="173" href="#173">173</a> <em class="jxr_comment">//</em> +<a name="174" href="#174">174</a> Hashtable <String, IdPSiteSet> siteSets = <strong class="jxr_keyword">new</strong> Hashtable <String, IdPSiteSet>(); +<a name="175" href="#175">175</a> +<a name="176" href="#176">176</a> itemElements = doc.getDocumentElement().getElementsByTagNameNS(XMLConstants.CONFIG_NS, +<a name="177" href="#177">177</a> <span class="jxr_string">"MetadataProvider"</span>); +<a name="178" href="#178">178</a> +<a name="179" href="#179">179</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < itemElements.getLength(); i++) { +<a name="180" href="#180">180</a> +<a name="181" href="#181">181</a> Element element = (Element) itemElements.item(i); +<a name="182" href="#182">182</a> +<a name="183" href="#183">183</a> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.html">IdPSiteSet</a> siteset = <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.html">IdPSiteSet</a>(element, parser, defaultHandlerConfig.getWarnOnBadBinding()); +<a name="184" href="#184">184</a> +<a name="185" href="#185">185</a> siteSets.put(siteset.getIdentifier(), siteset); +<a name="186" href="#186">186</a> } +<a name="187" href="#187">187</a> <strong class="jxr_keyword">if</strong> (siteSets.size() < 1) { +<a name="188" href="#188">188</a> LOG.error(<span class="jxr_string">"No Metadata Provider metadata loaded."</span>); +<a name="189" href="#189">189</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/common/ShibbolethConfigurationException.html">ShibbolethConfigurationException</a>(<span class="jxr_string">"Could not load SAML metadata."</span>); +<a name="190" href="#190">190</a> } +<a name="191" href="#191">191</a> <em class="jxr_comment">//</em> +<a name="192" href="#192">192</a> <em class="jxr_comment">// Load plugins</em> +<a name="193" href="#193">193</a> <em class="jxr_comment">//</em> +<a name="194" href="#194">194</a> +<a name="195" href="#195">195</a> Hashtable <String, Plugin> plugins = <strong class="jxr_keyword">new</strong> Hashtable <String, Plugin>(); +<a name="196" href="#196">196</a> +<a name="197" href="#197">197</a> itemElements = doc.getDocumentElement().getElementsByTagNameNS(XMLConstants.CONFIG_NS, +<a name="198" href="#198">198</a> <span class="jxr_string">"Plugin"</span>); +<a name="199" href="#199">199</a> +<a name="200" href="#200">200</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < itemElements.getLength(); i++) { +<a name="201" href="#201">201</a> +<a name="202" href="#202">202</a> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/plugins/Plugin.html">Plugin</a> plugin; +<a name="203" href="#203">203</a> +<a name="204" href="#204">204</a> Element element = (Element) itemElements.item(i); +<a name="205" href="#205">205</a> +<a name="206" href="#206">206</a> String identifier = element.getAttribute(<span class="jxr_string">"identifier"</span>); +<a name="207" href="#207">207</a> +<a name="208" href="#208">208</a> <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> == identifier || identifier.equals(<span class="jxr_string">""</span>)) { +<a name="209" href="#209">209</a> LOG.error(<span class="jxr_string">"Could not load plugin with no identifier"</span>); +<a name="210" href="#210">210</a> <strong class="jxr_keyword">continue</strong>; +<a name="211" href="#211">211</a> } <a name="212" href="#212">212</a> -<a name="213" href="#213">213</a> Element element = (Element) itemElements.item(i); -<a name="214" href="#214">214</a> -<a name="215" href="#215">215</a> String identifier = element.getAttribute(<span class="jxr_string">"identifier"</span>); -<a name="216" href="#216">216</a> -<a name="217" href="#217">217</a> <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> == identifier || identifier.equals(<span class="jxr_string">""</span>)) { -<a name="218" href="#218">218</a> LOG.error(<span class="jxr_string">"Could not load plugin with no identifier"</span>); -<a name="219" href="#219">219</a> <strong class="jxr_keyword">continue</strong>; -<a name="220" href="#220">220</a> } -<a name="221" href="#221">221</a> -<a name="222" href="#222">222</a> String className = element.getAttribute(<span class="jxr_string">"type"</span>); -<a name="223" href="#223">223</a> <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> == className || className.equals(<span class="jxr_string">""</span>)) { -<a name="224" href="#224">224</a> LOG.error(<span class="jxr_string">"Plugin "</span> + identifier + <span class="jxr_string">" did not have a valid type"</span>); -<a name="225" href="#225">225</a> } -<a name="226" href="#226">226</a> <em class="jxr_comment">//</em> -<a name="227" href="#227">227</a> <em class="jxr_comment">// So try to get hold of the plugin</em> -<a name="228" href="#228">228</a> <em class="jxr_comment">//</em> -<a name="229" href="#229">229</a> <strong class="jxr_keyword">try</strong> { -<a name="230" href="#230">230</a> Class<Plugin> pluginClass = (Class<Plugin>) Class.forName(className); -<a name="231" href="#231">231</a> Class[] classParams = {Element.<strong class="jxr_keyword">class</strong>}; -<a name="232" href="#232">232</a> Constructor<Plugin> pluginConstructor = pluginClass.getConstructor(classParams); -<a name="233" href="#233">233</a> Object[] constructorParams = {element}; -<a name="234" href="#234">234</a> -<a name="235" href="#235">235</a> plugin = pluginConstructor.newInstance(constructorParams); -<a name="236" href="#236">236</a> -<a name="237" href="#237">237</a> } <strong class="jxr_keyword">catch</strong> (Exception e) { -<a name="238" href="#238">238</a> LOG.error(<span class="jxr_string">"Plugin "</span> + identifier + <span class="jxr_string">" could not be loaded "</span>, e); -<a name="239" href="#239">239</a> <strong class="jxr_keyword">continue</strong>; -<a name="240" href="#240">240</a> } -<a name="241" href="#241">241</a> -<a name="242" href="#242">242</a> plugins.put(identifier, plugin); -<a name="243" href="#243">243</a> } -<a name="244" href="#244">244</a> -<a name="245" href="#245">245</a> -<a name="246" href="#246">246</a> <em class="jxr_comment">//</em> -<a name="247" href="#247">247</a> <em class="jxr_comment">// Load service handlers</em> -<a name="248" href="#248">248</a> <em class="jxr_comment">//</em> -<a name="249" href="#249">249</a> itemElements = doc.getDocumentElement().getElementsByTagNameNS(XMLConstants.CONFIG_NS, -<a name="250" href="#250">250</a> <span class="jxr_string">"DiscoveryServiceHandler"</span>); -<a name="251" href="#251">251</a> -<a name="252" href="#252">252</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < itemElements.getLength(); i++) { -<a name="253" href="#253">253</a> -<a name="254" href="#254">254</a> discoveryServices.add(<strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html">DiscoveryServiceHandler</a>((Element)itemElements.item(i), -<a name="255" href="#255">255</a> siteSets, -<a name="256" href="#256">256</a> plugins, -<a name="257" href="#257">257</a> defaultHandlerConfig)); -<a name="258" href="#258">258</a> -<a name="259" href="#259">259</a> } -<a name="260" href="#260">260</a> -<a name="261" href="#261">261</a> } <strong class="jxr_keyword">catch</strong> (Exception e) { -<a name="262" href="#262">262</a> <em class="jxr_comment">//</em> -<a name="263" href="#263">263</a> <em class="jxr_comment">// All other exceptions are from the parsing</em> -<a name="264" href="#264">264</a> <em class="jxr_comment">//</em> -<a name="265" href="#265">265</a> <strong class="jxr_keyword">if</strong> (LOG != <strong class="jxr_keyword">null</strong>) { -<a name="266" href="#266">266</a> LOG.error(<span class="jxr_string">"Error parsing DS configuration file."</span>, e); -<a name="267" href="#267">267</a> } -<a name="268" href="#268">268</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> ServletException(<span class="jxr_string">"Error parsing DS configuration file."</span>, e); -<a name="269" href="#269">269</a> } -<a name="270" href="#270">270</a> -<a name="271" href="#271">271</a> LOG.info(<span class="jxr_string">"DS initialization completed."</span>); -<a name="272" href="#272">272</a> } -<a name="273" href="#273">273</a> -<a name="274" href="#274">274</a> <em class="jxr_javadoccomment">/**</em> -<a name="275" href="#275">275</a> <em class="jxr_javadoccomment"> * Handle an HTTP GET. Just passes out to the appropriate handler.</em> -<a name="276" href="#276">276</a> <em class="jxr_javadoccomment"> * @param req described the request.</em> -<a name="277" href="#277">277</a> <em class="jxr_javadoccomment"> * @param res contains the response.</em> -<a name="278" href="#278">278</a> <em class="jxr_javadoccomment"> * @see HttpServlet#doGet(HttpServletRequest, HttpServletResponse)</em> -<a name="279" href="#279">279</a> <em class="jxr_javadoccomment"> */</em> -<a name="280" href="#280">280</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> doGet(HttpServletRequest req, HttpServletResponse res) { -<a name="281" href="#281">281</a> -<a name="282" href="#282">282</a> LOG.info(<span class="jxr_string">"Handling DS request."</span>); -<a name="283" href="#283">283</a> <em class="jxr_comment">// Tell the browser not to cache the WAYF page</em> -<a name="284" href="#284">284</a> res.setHeader(<span class="jxr_string">"Cache-Control"</span>, <span class="jxr_string">"no-cache"</span>); -<a name="285" href="#285">285</a> res.setHeader(<span class="jxr_string">"Pragma"</span>, <span class="jxr_string">"no-cache"</span>); -<a name="286" href="#286">286</a> res.setDateHeader(<span class="jxr_string">"Expires"</span>, 0); -<a name="287" href="#287">287</a> -<a name="288" href="#288">288</a> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html">DiscoveryServiceHandler</a> serviceHandler = lookupServiceHandler(req); -<a name="289" href="#289">289</a> -<a name="290" href="#290">290</a> serviceHandler.doGet(req, res); -<a name="291" href="#291">291</a> -<a name="292" href="#292">292</a> } -<a name="293" href="#293">293</a> -<a name="294" href="#294">294</a> <em class="jxr_javadoccomment">/**</em> -<a name="295" href="#295">295</a> <em class="jxr_javadoccomment"> * Given a request (an HTTP Get) find the apropriate DiscoveryService (from the name).</em> -<a name="296" href="#296">296</a> <em class="jxr_javadoccomment"> * @param req desribed the request</em> -<a name="297" href="#297">297</a> <em class="jxr_javadoccomment"> * @return the apropriate DiscoveryService.</em> -<a name="298" href="#298">298</a> <em class="jxr_javadoccomment"> */</em> -<a name="299" href="#299">299</a> <strong class="jxr_keyword">private</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html">DiscoveryServiceHandler</a> lookupServiceHandler(HttpServletRequest req) { -<a name="300" href="#300">300</a> -<a name="301" href="#301">301</a> Iterator<DiscoveryServiceHandler> it = discoveryServices.iterator(); -<a name="302" href="#302">302</a> String requestURL = req.getRequestURL().toString(); -<a name="303" href="#303">303</a> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html">DiscoveryServiceHandler</a> defaultHandler = <strong class="jxr_keyword">null</strong>; -<a name="304" href="#304">304</a> -<a name="305" href="#305">305</a> <strong class="jxr_keyword">while</strong> (it.hasNext()) { -<a name="306" href="#306">306</a> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html">DiscoveryServiceHandler</a> handler = it.next(); -<a name="307" href="#307">307</a> -<a name="308" href="#308">308</a> <strong class="jxr_keyword">if</strong> (requestURL.matches(handler.getLocation())) { -<a name="309" href="#309">309</a> <strong class="jxr_keyword">return</strong> handler; -<a name="310" href="#310">310</a> } -<a name="311" href="#311">311</a> <strong class="jxr_keyword">if</strong> (defaultHandler == <strong class="jxr_keyword">null</strong> || handler.isDefault()) { -<a name="312" href="#312">312</a> defaultHandler = handler; -<a name="313" href="#313">313</a> } -<a name="314" href="#314">314</a> } -<a name="315" href="#315">315</a> LOG.warn(<span class="jxr_string">"Could not find Discovery service Handler for "</span> + requestURL); -<a name="316" href="#316">316</a> <strong class="jxr_keyword">return</strong> defaultHandler; -<a name="317" href="#317">317</a> } -<a name="318" href="#318">318</a> } +<a name="213" href="#213">213</a> String className = element.getAttribute(<span class="jxr_string">"type"</span>); +<a name="214" href="#214">214</a> <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> == className || className.equals(<span class="jxr_string">""</span>)) { +<a name="215" href="#215">215</a> LOG.error(<span class="jxr_string">"Plugin "</span> + identifier + <span class="jxr_string">" did not have a valid type"</span>); +<a name="216" href="#216">216</a> } +<a name="217" href="#217">217</a> <em class="jxr_comment">//</em> +<a name="218" href="#218">218</a> <em class="jxr_comment">// So try to get hold of the plugin</em> +<a name="219" href="#219">219</a> <em class="jxr_comment">//</em> +<a name="220" href="#220">220</a> <strong class="jxr_keyword">try</strong> { +<a name="221" href="#221">221</a> Class<Plugin> pluginClass = (Class<Plugin>) Class.forName(className); +<a name="222" href="#222">222</a> Class[] classParams = {Element.<strong class="jxr_keyword">class</strong>}; +<a name="223" href="#223">223</a> Constructor<Plugin> pluginConstructor = pluginClass.getConstructor(classParams); +<a name="224" href="#224">224</a> Object[] constructorParams = {element}; +<a name="225" href="#225">225</a> +<a name="226" href="#226">226</a> plugin = pluginConstructor.newInstance(constructorParams); +<a name="227" href="#227">227</a> +<a name="228" href="#228">228</a> } <strong class="jxr_keyword">catch</strong> (Exception e) { +<a name="229" href="#229">229</a> LOG.error(<span class="jxr_string">"Plugin "</span> + identifier + <span class="jxr_string">" could not be loaded "</span>, e); +<a name="230" href="#230">230</a> <strong class="jxr_keyword">continue</strong>; +<a name="231" href="#231">231</a> } +<a name="232" href="#232">232</a> +<a name="233" href="#233">233</a> plugins.put(identifier, plugin); +<a name="234" href="#234">234</a> } +<a name="235" href="#235">235</a> +<a name="236" href="#236">236</a> +<a name="237" href="#237">237</a> <em class="jxr_comment">//</em> +<a name="238" href="#238">238</a> <em class="jxr_comment">// Load service handlers</em> +<a name="239" href="#239">239</a> <em class="jxr_comment">//</em> +<a name="240" href="#240">240</a> itemElements = doc.getDocumentElement().getElementsByTagNameNS(XMLConstants.CONFIG_NS, +<a name="241" href="#241">241</a> <span class="jxr_string">"DiscoveryServiceHandler"</span>); +<a name="242" href="#242">242</a> +<a name="243" href="#243">243</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < itemElements.getLength(); i++) { +<a name="244" href="#244">244</a> +<a name="245" href="#245">245</a> discoveryServices.add(<strong class="jxr_keyword">new</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html">DiscoveryServiceHandler</a>((Element)itemElements.item(i), +<a name="246" href="#246">246</a> siteSets, +<a name="247" href="#247">247</a> plugins, +<a name="248" href="#248">248</a> defaultHandlerConfig)); +<a name="249" href="#249">249</a> +<a name="250" href="#250">250</a> } +<a name="251" href="#251">251</a> +<a name="252" href="#252">252</a> } <strong class="jxr_keyword">catch</strong> (Exception e) { +<a name="253" href="#253">253</a> <em class="jxr_comment">//</em> +<a name="254" href="#254">254</a> <em class="jxr_comment">// All other exceptions are from the parsing</em> +<a name="255" href="#255">255</a> <em class="jxr_comment">//</em> +<a name="256" href="#256">256</a> <strong class="jxr_keyword">if</strong> (LOG != <strong class="jxr_keyword">null</strong>) { +<a name="257" href="#257">257</a> LOG.error(<span class="jxr_string">"Error parsing DS configuration file."</span>, e); +<a name="258" href="#258">258</a> } +<a name="259" href="#259">259</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> ServletException(<span class="jxr_string">"Error parsing DS configuration file."</span>, e); +<a name="260" href="#260">260</a> } +<a name="261" href="#261">261</a> +<a name="262" href="#262">262</a> LOG.info(<span class="jxr_string">"DS initialization completed."</span>); +<a name="263" href="#263">263</a> } +<a name="264" href="#264">264</a> +<a name="265" href="#265">265</a> <em class="jxr_javadoccomment">/**</em> +<a name="266" href="#266">266</a> <em class="jxr_javadoccomment"> * Handle an HTTP GET. Just passes out to the appropriate handler.</em> +<a name="267" href="#267">267</a> <em class="jxr_javadoccomment"> * @param req described the request.</em> +<a name="268" href="#268">268</a> <em class="jxr_javadoccomment"> * @param res contains the response.</em> +<a name="269" href="#269">269</a> <em class="jxr_javadoccomment"> * @see HttpServlet#doGet(HttpServletRequest, HttpServletResponse)</em> +<a name="270" href="#270">270</a> <em class="jxr_javadoccomment"> */</em> +<a name="271" href="#271">271</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> doGet(HttpServletRequest req, HttpServletResponse res) { +<a name="272" href="#272">272</a> +<a name="273" href="#273">273</a> LOG.info(<span class="jxr_string">"Handling DS request."</span>); +<a name="274" href="#274">274</a> <em class="jxr_comment">// Tell the browser not to cache the WAYF page</em> +<a name="275" href="#275">275</a> res.setHeader(<span class="jxr_string">"Cache-Control"</span>, <span class="jxr_string">"no-cache"</span>); +<a name="276" href="#276">276</a> res.setHeader(<span class="jxr_string">"Pragma"</span>, <span class="jxr_string">"no-cache"</span>); +<a name="277" href="#277">277</a> res.setDateHeader(<span class="jxr_string">"Expires"</span>, 0); +<a name="278" href="#278">278</a> +<a name="279" href="#279">279</a> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html">DiscoveryServiceHandler</a> serviceHandler = lookupServiceHandler(req); +<a name="280" href="#280">280</a> +<a name="281" href="#281">281</a> serviceHandler.doGet(req, res); +<a name="282" href="#282">282</a> +<a name="283" href="#283">283</a> } +<a name="284" href="#284">284</a> +<a name="285" href="#285">285</a> <em class="jxr_javadoccomment">/**</em> +<a name="286" href="#286">286</a> <em class="jxr_javadoccomment"> * Given a request (an HTTP Get) find the apropriate DiscoveryService (from the name).</em> +<a name="287" href="#287">287</a> <em class="jxr_javadoccomment"> * @param req desribed the request</em> +<a name="288" href="#288">288</a> <em class="jxr_javadoccomment"> * @return the apropriate DiscoveryService.</em> +<a name="289" href="#289">289</a> <em class="jxr_javadoccomment"> */</em> +<a name="290" href="#290">290</a> <strong class="jxr_keyword">private</strong> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html">DiscoveryServiceHandler</a> lookupServiceHandler(HttpServletRequest req) { +<a name="291" href="#291">291</a> +<a name="292" href="#292">292</a> Iterator<DiscoveryServiceHandler> it = discoveryServices.iterator(); +<a name="293" href="#293">293</a> String requestURL = req.getRequestURL().toString(); +<a name="294" href="#294">294</a> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html">DiscoveryServiceHandler</a> defaultHandler = <strong class="jxr_keyword">null</strong>; +<a name="295" href="#295">295</a> +<a name="296" href="#296">296</a> <strong class="jxr_keyword">while</strong> (it.hasNext()) { +<a name="297" href="#297">297</a> <a href="../../../../../edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html">DiscoveryServiceHandler</a> handler = it.next(); +<a name="298" href="#298">298</a> +<a name="299" href="#299">299</a> <strong class="jxr_keyword">if</strong> (requestURL.matches(handler.getLocation())) { +<a name="300" href="#300">300</a> <strong class="jxr_keyword">return</strong> handler; +<a name="301" href="#301">301</a> } +<a name="302" href="#302">302</a> <strong class="jxr_keyword">if</strong> (defaultHandler == <strong class="jxr_keyword">null</strong> || handler.isDefault()) { +<a name="303" href="#303">303</a> defaultHandler = handler; +<a name="304" href="#304">304</a> } +<a name="305" href="#305">305</a> } +<a name="306" href="#306">306</a> LOG.warn(<span class="jxr_string">"Could not find Discovery service Handler for "</span> + requestURL); +<a name="307" href="#307">307</a> <strong class="jxr_keyword">return</strong> defaultHandler; +<a name="308" href="#308">308</a> } +<a name="309" href="#309">309</a> } </pre> <hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body> </html> diff --git a/doc/src-xref/edu/internet2/middleware/shibboleth/wayf/package-frame.html b/doc/src-xref/edu/internet2/middleware/shibboleth/wayf/package-frame.html index 579ca32..2d58240 100644 --- a/doc/src-xref/edu/internet2/middleware/shibboleth/wayf/package-frame.html +++ b/doc/src-xref/edu/internet2/middleware/shibboleth/wayf/package-frame.html @@ -3,7 +3,7 @@ <html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
- <title>Shibboleth Discovery Service 1.1.0 Reference Package edu.internet2.middleware.shibboleth.wayf</title>
+ <title>Shibboleth Discovery Service 1.1.1 Reference Package edu.internet2.middleware.shibboleth.wayf</title>
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
</head>
<body>
@@ -19,15 +19,6 @@ <a href="IdPSite.html" target="classFrame">Compare</a>
</li>
<li>
- <a href="DiscoveryResponseBuilder.html" target="classFrame">DiscoveryResponseBuilder</a>
- </li>
- <li>
- <a href="DiscoveryResponseImpl.html" target="classFrame">DiscoveryResponseImpl</a>
- </li>
- <li>
- <a href="DiscoveryResponseUnmarshaller.html" target="classFrame">DiscoveryResponseUnmarshaller</a>
- </li>
- <li>
<a href="DiscoveryServiceHandler.html" target="classFrame">DiscoveryServiceHandler</a>
</li>
<li>
diff --git a/doc/src-xref/edu/internet2/middleware/shibboleth/wayf/package-summary.html b/doc/src-xref/edu/internet2/middleware/shibboleth/wayf/package-summary.html index 0bc1365..22bbd46 100644 --- a/doc/src-xref/edu/internet2/middleware/shibboleth/wayf/package-summary.html +++ b/doc/src-xref/edu/internet2/middleware/shibboleth/wayf/package-summary.html @@ -3,7 +3,7 @@ <html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
- <title>Shibboleth Discovery Service 1.1.0 Reference Package edu.internet2.middleware.shibboleth.wayf</title>
+ <title>Shibboleth Discovery Service 1.1.1 Reference Package edu.internet2.middleware.shibboleth.wayf</title>
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
</head>
<body>
@@ -42,21 +42,6 @@ </tr>
<tr>
<td>
- <a href="DiscoveryResponseBuilder.html" target="classFrame">DiscoveryResponseBuilder</a>
- </td>
- </tr>
- <tr>
- <td>
- <a href="DiscoveryResponseImpl.html" target="classFrame">DiscoveryResponseImpl</a>
- </td>
- </tr>
- <tr>
- <td>
- <a href="DiscoveryResponseUnmarshaller.html" target="classFrame">DiscoveryResponseUnmarshaller</a>
- </td>
- </tr>
- <tr>
- <td>
<a href="DiscoveryServiceHandler.html" target="classFrame">DiscoveryServiceHandler</a>
</td>
</tr>
diff --git a/doc/src-xref/edu/internet2/middleware/shibboleth/wayf/plugins/package-frame.html b/doc/src-xref/edu/internet2/middleware/shibboleth/wayf/plugins/package-frame.html index 856f7b5..f1f59a9 100644 --- a/doc/src-xref/edu/internet2/middleware/shibboleth/wayf/plugins/package-frame.html +++ b/doc/src-xref/edu/internet2/middleware/shibboleth/wayf/plugins/package-frame.html @@ -3,7 +3,7 @@ <html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
- <title>Shibboleth Discovery Service 1.1.0 Reference Package edu.internet2.middleware.shibboleth.wayf.plugins</title>
+ <title>Shibboleth Discovery Service 1.1.1 Reference Package edu.internet2.middleware.shibboleth.wayf.plugins</title>
<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="style" />
</head>
<body>
diff --git a/doc/src-xref/edu/internet2/middleware/shibboleth/wayf/plugins/package-summary.html b/doc/src-xref/edu/internet2/middleware/shibboleth/wayf/plugins/package-summary.html index 2c26dfd..09d4e41 100644 --- a/doc/src-xref/edu/internet2/middleware/shibboleth/wayf/plugins/package-summary.html +++ b/doc/src-xref/edu/internet2/middleware/shibboleth/wayf/plugins/package-summary.html @@ -3,7 +3,7 @@ <html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
- <title>Shibboleth Discovery Service 1.1.0 Reference Package edu.internet2.middleware.shibboleth.wayf.plugins</title>
+ <title>Shibboleth Discovery Service 1.1.1 Reference Package edu.internet2.middleware.shibboleth.wayf.plugins</title>
<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="style" />
</head>
<body>
diff --git a/doc/src-xref/edu/internet2/middleware/shibboleth/wayf/plugins/provider/BindingFilter.html b/doc/src-xref/edu/internet2/middleware/shibboleth/wayf/plugins/provider/BindingFilter.html index 9a234f3..8b1fa09 100644 --- a/doc/src-xref/edu/internet2/middleware/shibboleth/wayf/plugins/provider/BindingFilter.html +++ b/doc/src-xref/edu/internet2/middleware/shibboleth/wayf/plugins/provider/BindingFilter.html @@ -36,154 +36,152 @@ <a name="26" href="#26">26</a> <strong class="jxr_keyword">import</strong> org.opensaml.saml2.metadata.SPSSODescriptor; <a name="27" href="#27">27</a> <strong class="jxr_keyword">import</strong> org.opensaml.saml2.metadata.provider.FilterException; <a name="28" href="#28">28</a> <strong class="jxr_keyword">import</strong> org.opensaml.saml2.metadata.provider.MetadataFilter; -<a name="29" href="#29">29</a> <strong class="jxr_keyword">import</strong> org.opensaml.xml.XMLObject; -<a name="30" href="#30">30</a> <strong class="jxr_keyword">import</strong> org.slf4j.Logger; -<a name="31" href="#31">31</a> <strong class="jxr_keyword">import</strong> org.slf4j.LoggerFactory; -<a name="32" href="#32">32</a> -<a name="33" href="#33">33</a> <strong class="jxr_keyword">import</strong> edu.internet2.middleware.shibboleth.wayf.DiscoveryResponseImpl; -<a name="34" href="#34">34</a> <strong class="jxr_keyword">import</strong> edu.internet2.middleware.shibboleth.wayf.HandlerConfig; -<a name="35" href="#35">35</a> -<a name="36" href="#36">36</a> <em class="jxr_javadoccomment">/**</em> -<a name="37" href="#37">37</a> <em class="jxr_javadoccomment"> * See SDSJ-48. If we get a DS endpoint then we need to check that the binding is provided</em> -<a name="38" href="#38">38</a> <em class="jxr_javadoccomment"> * and that it is correct.</em> -<a name="39" href="#39">39</a> <em class="jxr_javadoccomment"> * </em> -<a name="40" href="#40">40</a> <em class="jxr_javadoccomment"> * @author Rod Widdowson</em> -<a name="41" href="#41">41</a> <em class="jxr_javadoccomment"> *</em> -<a name="42" href="#42">42</a> <em class="jxr_javadoccomment"> */</em> -<a name="43" href="#43">43</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../../edu/internet2/middleware/shibboleth/wayf/plugins/provider/BindingFilter.html">BindingFilter</a> implements MetadataFilter { -<a name="44" href="#44">44</a> -<a name="45" href="#45">45</a> <em class="jxr_javadoccomment">/**</em> -<a name="46" href="#46">46</a> <em class="jxr_javadoccomment"> * Log for the warning. </em> -<a name="47" href="#47">47</a> <em class="jxr_javadoccomment"> */</em> -<a name="48" href="#48">48</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Logger LOG = LoggerFactory.getLogger(BindingFilter.<strong class="jxr_keyword">class</strong>.getName()); -<a name="49" href="#49">49</a> -<a name="50" href="#50">50</a> <em class="jxr_javadoccomment">/**</em> -<a name="51" href="#51">51</a> <em class="jxr_javadoccomment"> * Set if we just want to warn on failure.</em> -<a name="52" href="#52">52</a> <em class="jxr_javadoccomment"> */</em> -<a name="53" href="#53">53</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong> warnOnFailure; -<a name="54" href="#54">54</a> -<a name="55" href="#55">55</a> <em class="jxr_javadoccomment">/**</em> -<a name="56" href="#56">56</a> <em class="jxr_javadoccomment"> * Only the protected constructor should be visible.</em> -<a name="57" href="#57">57</a> <em class="jxr_javadoccomment"> */</em> -<a name="58" href="#58">58</a> <strong class="jxr_keyword">private</strong> <a href="../../../../../../../edu/internet2/middleware/shibboleth/wayf/plugins/provider/BindingFilter.html">BindingFilter</a>() { -<a name="59" href="#59">59</a> <strong class="jxr_keyword">this</strong>.warnOnFailure = false; -<a name="60" href="#60">60</a> } -<a name="61" href="#61">61</a> -<a name="62" href="#62">62</a> <em class="jxr_javadoccomment">/**</em> -<a name="63" href="#63">63</a> <em class="jxr_javadoccomment"> * Initialize the filter.</em> -<a name="64" href="#64">64</a> <em class="jxr_javadoccomment"> * @param warn do we warn or do we fail if we see badness?</em> -<a name="65" href="#65">65</a> <em class="jxr_javadoccomment"> */</em> -<a name="66" href="#66">66</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../../edu/internet2/middleware/shibboleth/wayf/plugins/provider/BindingFilter.html">BindingFilter</a>(<strong class="jxr_keyword">boolean</strong> warn) { -<a name="67" href="#67">67</a> <strong class="jxr_keyword">this</strong>.warnOnFailure = warn; -<a name="68" href="#68">68</a> } -<a name="69" href="#69">69</a> -<a name="70" href="#70">70</a> <em class="jxr_javadoccomment">/**</em> -<a name="71" href="#71">71</a> <em class="jxr_javadoccomment"> * Apply the filter.</em> -<a name="72" href="#72">72</a> <em class="jxr_javadoccomment"> * @see org.opensaml.saml2.metadata.provider.MetadataFilter#doFilter(org.opensaml.xml.XMLObject)</em> -<a name="73" href="#73">73</a> <em class="jxr_javadoccomment"> * @param metadata what to filter.</em> -<a name="74" href="#74">74</a> <em class="jxr_javadoccomment"> * @throws FilterException if it sees any missed or bad bindings.</em> -<a name="75" href="#75">75</a> <em class="jxr_javadoccomment"> */</em> -<a name="76" href="#76">76</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> doFilter(XMLObject metadata) <strong class="jxr_keyword">throws</strong> FilterException { -<a name="77" href="#77">77</a> -<a name="78" href="#78">78</a> <strong class="jxr_keyword">if</strong> (metadata instanceof EntitiesDescriptor) { +<a name="29" href="#29">29</a> <strong class="jxr_keyword">import</strong> org.opensaml.samlext.idpdisco.DiscoveryResponse; +<a name="30" href="#30">30</a> <strong class="jxr_keyword">import</strong> org.opensaml.xml.XMLObject; +<a name="31" href="#31">31</a> <strong class="jxr_keyword">import</strong> org.slf4j.Logger; +<a name="32" href="#32">32</a> <strong class="jxr_keyword">import</strong> org.slf4j.LoggerFactory; +<a name="33" href="#33">33</a> +<a name="34" href="#34">34</a> <em class="jxr_javadoccomment">/**</em> +<a name="35" href="#35">35</a> <em class="jxr_javadoccomment"> * See SDSJ-48. If we get a DS endpoint then we need to check that the binding is provided</em> +<a name="36" href="#36">36</a> <em class="jxr_javadoccomment"> * and that it is correct.</em> +<a name="37" href="#37">37</a> <em class="jxr_javadoccomment"> * </em> +<a name="38" href="#38">38</a> <em class="jxr_javadoccomment"> * @author Rod Widdowson</em> +<a name="39" href="#39">39</a> <em class="jxr_javadoccomment"> *</em> +<a name="40" href="#40">40</a> <em class="jxr_javadoccomment"> */</em> +<a name="41" href="#41">41</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../../edu/internet2/middleware/shibboleth/wayf/plugins/provider/BindingFilter.html">BindingFilter</a> implements MetadataFilter { +<a name="42" href="#42">42</a> +<a name="43" href="#43">43</a> <em class="jxr_javadoccomment">/**</em> +<a name="44" href="#44">44</a> <em class="jxr_javadoccomment"> * Log for the warning. </em> +<a name="45" href="#45">45</a> <em class="jxr_javadoccomment"> */</em> +<a name="46" href="#46">46</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Logger LOG = LoggerFactory.getLogger(BindingFilter.<strong class="jxr_keyword">class</strong>.getName()); +<a name="47" href="#47">47</a> +<a name="48" href="#48">48</a> <em class="jxr_javadoccomment">/**</em> +<a name="49" href="#49">49</a> <em class="jxr_javadoccomment"> * Set if we just want to warn on failure.</em> +<a name="50" href="#50">50</a> <em class="jxr_javadoccomment"> */</em> +<a name="51" href="#51">51</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong> warnOnFailure; +<a name="52" href="#52">52</a> +<a name="53" href="#53">53</a> <em class="jxr_javadoccomment">/**</em> +<a name="54" href="#54">54</a> <em class="jxr_javadoccomment"> * Only the protected constructor should be visible.</em> +<a name="55" href="#55">55</a> <em class="jxr_javadoccomment"> */</em> +<a name="56" href="#56">56</a> <strong class="jxr_keyword">private</strong> <a href="../../../../../../../edu/internet2/middleware/shibboleth/wayf/plugins/provider/BindingFilter.html">BindingFilter</a>() { +<a name="57" href="#57">57</a> <strong class="jxr_keyword">this</strong>.warnOnFailure = false; +<a name="58" href="#58">58</a> } +<a name="59" href="#59">59</a> +<a name="60" href="#60">60</a> <em class="jxr_javadoccomment">/**</em> +<a name="61" href="#61">61</a> <em class="jxr_javadoccomment"> * Initialize the filter.</em> +<a name="62" href="#62">62</a> <em class="jxr_javadoccomment"> * @param warn do we warn or do we fail if we see badness?</em> +<a name="63" href="#63">63</a> <em class="jxr_javadoccomment"> */</em> +<a name="64" href="#64">64</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../../edu/internet2/middleware/shibboleth/wayf/plugins/provider/BindingFilter.html">BindingFilter</a>(<strong class="jxr_keyword">boolean</strong> warn) { +<a name="65" href="#65">65</a> <strong class="jxr_keyword">this</strong>.warnOnFailure = warn; +<a name="66" href="#66">66</a> } +<a name="67" href="#67">67</a> +<a name="68" href="#68">68</a> <em class="jxr_javadoccomment">/**</em> +<a name="69" href="#69">69</a> <em class="jxr_javadoccomment"> * Apply the filter.</em> +<a name="70" href="#70">70</a> <em class="jxr_javadoccomment"> * @see org.opensaml.saml2.metadata.provider.MetadataFilter#doFilter(org.opensaml.xml.XMLObject)</em> +<a name="71" href="#71">71</a> <em class="jxr_javadoccomment"> * @param metadata what to filter.</em> +<a name="72" href="#72">72</a> <em class="jxr_javadoccomment"> * @throws FilterException if it sees any missed or bad bindings.</em> +<a name="73" href="#73">73</a> <em class="jxr_javadoccomment"> */</em> +<a name="74" href="#74">74</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> doFilter(XMLObject metadata) <strong class="jxr_keyword">throws</strong> FilterException { +<a name="75" href="#75">75</a> +<a name="76" href="#76">76</a> <strong class="jxr_keyword">if</strong> (metadata instanceof EntitiesDescriptor) { +<a name="77" href="#77">77</a> +<a name="78" href="#78">78</a> checkEntities((EntitiesDescriptor) metadata); <a name="79" href="#79">79</a> -<a name="80" href="#80">80</a> checkEntities((EntitiesDescriptor) metadata); -<a name="81" href="#81">81</a> -<a name="82" href="#82">82</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (metadata instanceof EntityDescriptor) { -<a name="83" href="#83">83</a> EntityDescriptor entity = (EntityDescriptor) metadata; -<a name="84" href="#84">84</a> -<a name="85" href="#85">85</a> <strong class="jxr_keyword">if</strong> (!checkEntity(entity)) { -<a name="86" href="#86">86</a> <strong class="jxr_keyword">if</strong> (warnOnFailure) { -<a name="87" href="#87">87</a> LOG.warn(<span class="jxr_string">"Badly formatted binding for "</span> + entity.getEntityID()); -<a name="88" href="#88">88</a> } <strong class="jxr_keyword">else</strong> { -<a name="89" href="#89">89</a> LOG.error(<span class="jxr_string">"Badly formatted binding for top level entity "</span> + entity.getEntityID()); -<a name="90" href="#90">90</a> } -<a name="91" href="#91">91</a> } -<a name="92" href="#92">92</a> } -<a name="93" href="#93">93</a> } -<a name="94" href="#94">94</a> -<a name="95" href="#95">95</a> <em class="jxr_javadoccomment">/**</em> -<a name="96" href="#96">96</a> <em class="jxr_javadoccomment"> * If the entity has an SP characteristic, and it has a DS endpoint</em> -<a name="97" href="#97">97</a> <em class="jxr_javadoccomment"> * then check its binding.</em> -<a name="98" href="#98">98</a> <em class="jxr_javadoccomment"> * </em> -<a name="99" href="#99">99</a> <em class="jxr_javadoccomment"> * @param entity what to check.</em> -<a name="100" href="#100">100</a> <em class="jxr_javadoccomment"> * @return true if all is OK.</em> -<a name="101" href="#101">101</a> <em class="jxr_javadoccomment"> */</em> -<a name="102" href="#102">102</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">boolean</strong> checkEntity(EntityDescriptor entity) { -<a name="103" href="#103">103</a> List<RoleDescriptor> roles = entity.getRoleDescriptors(); -<a name="104" href="#104">104</a> -<a name="105" href="#105">105</a> <strong class="jxr_keyword">for</strong> (RoleDescriptor role:roles) { -<a name="106" href="#106">106</a> +<a name="80" href="#80">80</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (metadata instanceof EntityDescriptor) { +<a name="81" href="#81">81</a> EntityDescriptor entity = (EntityDescriptor) metadata; +<a name="82" href="#82">82</a> +<a name="83" href="#83">83</a> <strong class="jxr_keyword">if</strong> (!checkEntity(entity)) { +<a name="84" href="#84">84</a> <strong class="jxr_keyword">if</strong> (warnOnFailure) { +<a name="85" href="#85">85</a> LOG.warn(<span class="jxr_string">"Badly formatted binding for "</span> + entity.getEntityID()); +<a name="86" href="#86">86</a> } <strong class="jxr_keyword">else</strong> { +<a name="87" href="#87">87</a> LOG.error(<span class="jxr_string">"Badly formatted binding for top level entity "</span> + entity.getEntityID()); +<a name="88" href="#88">88</a> } +<a name="89" href="#89">89</a> } +<a name="90" href="#90">90</a> } +<a name="91" href="#91">91</a> } +<a name="92" href="#92">92</a> +<a name="93" href="#93">93</a> <em class="jxr_javadoccomment">/**</em> +<a name="94" href="#94">94</a> <em class="jxr_javadoccomment"> * If the entity has an SP characteristic, and it has a DS endpoint</em> +<a name="95" href="#95">95</a> <em class="jxr_javadoccomment"> * then check its binding.</em> +<a name="96" href="#96">96</a> <em class="jxr_javadoccomment"> * </em> +<a name="97" href="#97">97</a> <em class="jxr_javadoccomment"> * @param entity what to check.</em> +<a name="98" href="#98">98</a> <em class="jxr_javadoccomment"> * @return true if all is OK.</em> +<a name="99" href="#99">99</a> <em class="jxr_javadoccomment"> */</em> +<a name="100" href="#100">100</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">boolean</strong> checkEntity(EntityDescriptor entity) { +<a name="101" href="#101">101</a> List<RoleDescriptor> roles = entity.getRoleDescriptors(); +<a name="102" href="#102">102</a> +<a name="103" href="#103">103</a> <strong class="jxr_keyword">for</strong> (RoleDescriptor role:roles) { +<a name="104" href="#104">104</a> +<a name="105" href="#105">105</a> <em class="jxr_comment">//</em> +<a name="106" href="#106">106</a> <em class="jxr_comment">// Check every role</em> <a name="107" href="#107">107</a> <em class="jxr_comment">//</em> -<a name="108" href="#108">108</a> <em class="jxr_comment">// Check every role</em> -<a name="109" href="#109">109</a> <em class="jxr_comment">//</em> -<a name="110" href="#110">110</a> <strong class="jxr_keyword">if</strong> (role instanceof SPSSODescriptor) { -<a name="111" href="#111">111</a> +<a name="108" href="#108">108</a> <strong class="jxr_keyword">if</strong> (role instanceof SPSSODescriptor) { +<a name="109" href="#109">109</a> +<a name="110" href="#110">110</a> <em class="jxr_comment">//</em> +<a name="111" href="#111">111</a> <em class="jxr_comment">// Grab hold of all the extensions for SPSSO descriptors</em> <a name="112" href="#112">112</a> <em class="jxr_comment">//</em> -<a name="113" href="#113">113</a> <em class="jxr_comment">// Grab hold of all the extensions for SPSSO descriptors</em> -<a name="114" href="#114">114</a> <em class="jxr_comment">//</em> -<a name="115" href="#115">115</a> -<a name="116" href="#116">116</a> Extensions exts = role.getExtensions(); -<a name="117" href="#117">117</a> <strong class="jxr_keyword">if</strong> (exts != <strong class="jxr_keyword">null</strong>) { +<a name="113" href="#113">113</a> +<a name="114" href="#114">114</a> Extensions exts = role.getExtensions(); +<a name="115" href="#115">115</a> <strong class="jxr_keyword">if</strong> (exts != <strong class="jxr_keyword">null</strong>) { +<a name="116" href="#116">116</a> <em class="jxr_comment">//</em> +<a name="117" href="#117">117</a> <em class="jxr_comment">// We have some children check them form <DiscoveryResponse></em> <a name="118" href="#118">118</a> <em class="jxr_comment">//</em> -<a name="119" href="#119">119</a> <em class="jxr_comment">// We have some children check them form <DiscoveryResponse></em> -<a name="120" href="#120">120</a> <em class="jxr_comment">//</em> -<a name="121" href="#121">121</a> List<XMLObject> children = exts.getOrderedChildren(); -<a name="122" href="#122">122</a> -<a name="123" href="#123">123</a> <strong class="jxr_keyword">for</strong> (XMLObject obj : children) { -<a name="124" href="#124">124</a> <strong class="jxr_keyword">if</strong> (obj instanceof DiscoveryResponseImpl) { +<a name="119" href="#119">119</a> List<XMLObject> children = exts.getOrderedChildren(); +<a name="120" href="#120">120</a> +<a name="121" href="#121">121</a> <strong class="jxr_keyword">for</strong> (XMLObject obj : children) { +<a name="122" href="#122">122</a> <strong class="jxr_keyword">if</strong> (obj instanceof DiscoveryResponse) { +<a name="123" href="#123">123</a> <em class="jxr_comment">//</em> +<a name="124" href="#124">124</a> <em class="jxr_comment">// And check or the binding</em> <a name="125" href="#125">125</a> <em class="jxr_comment">//</em> -<a name="126" href="#126">126</a> <em class="jxr_comment">// And check or the binding</em> -<a name="127" href="#127">127</a> <em class="jxr_comment">//</em> -<a name="128" href="#128">128</a> <a href="../../../../../../../edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseImpl.html">DiscoveryResponseImpl</a> ds = (DiscoveryResponseImpl) obj; -<a name="129" href="#129">129</a> String binding = ds.getBinding(); -<a name="130" href="#130">130</a> -<a name="131" href="#131">131</a> <strong class="jxr_keyword">if</strong> (!DiscoveryResponseImpl.METADATA_NS.equals(binding)) { -<a name="132" href="#132">132</a> <strong class="jxr_keyword">return</strong> false; -<a name="133" href="#133">133</a> } -<a name="134" href="#134">134</a> } -<a name="135" href="#135">135</a> } -<a name="136" href="#136">136</a> } -<a name="137" href="#137">137</a> } -<a name="138" href="#138">138</a> } -<a name="139" href="#139">139</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>; -<a name="140" href="#140">140</a> } -<a name="141" href="#141">141</a> -<a name="142" href="#142">142</a> <em class="jxr_javadoccomment">/**</em> -<a name="143" href="#143">143</a> <em class="jxr_javadoccomment"> * Check an EntitiesDescriptor call checkentities for the Entities and ourselves</em> -<a name="144" href="#144">144</a> <em class="jxr_javadoccomment"> * recursively for the EntitesDescriptors.</em> -<a name="145" href="#145">145</a> <em class="jxr_javadoccomment"> * </em> -<a name="146" href="#146">146</a> <em class="jxr_javadoccomment"> * @param entities what to check.</em> -<a name="147" href="#147">147</a> <em class="jxr_javadoccomment"> */</em> -<a name="148" href="#148">148</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> checkEntities(EntitiesDescriptor entities) { -<a name="149" href="#149">149</a> List<EntitiesDescriptor> childEntities = entities.getEntitiesDescriptors(); -<a name="150" href="#150">150</a> List<EntityDescriptor> children = entities.getEntityDescriptors(); -<a name="151" href="#151">151</a> -<a name="152" href="#152">152</a> <strong class="jxr_keyword">if</strong> (children != <strong class="jxr_keyword">null</strong>) { -<a name="153" href="#153">153</a> Iterator<EntityDescriptor> itr; -<a name="154" href="#154">154</a> EntityDescriptor entity; -<a name="155" href="#155">155</a> itr = children.iterator(); -<a name="156" href="#156">156</a> -<a name="157" href="#157">157</a> <strong class="jxr_keyword">while</strong> (itr.hasNext()) { -<a name="158" href="#158">158</a> entity = itr.next(); -<a name="159" href="#159">159</a> <strong class="jxr_keyword">if</strong> (!checkEntity(entity)) { -<a name="160" href="#160">160</a> <strong class="jxr_keyword">if</strong> (warnOnFailure) { -<a name="161" href="#161">161</a> LOG.warn(<span class="jxr_string">"Badly formatted binding for "</span> + entity.getEntityID()); -<a name="162" href="#162">162</a> } <strong class="jxr_keyword">else</strong> { -<a name="163" href="#163">163</a> LOG.error(<span class="jxr_string">"Badly formatted binding for "</span> + entity.getEntityID() + <span class="jxr_string">". Entity has been removed"</span>); -<a name="164" href="#164">164</a> itr.remove(); -<a name="165" href="#165">165</a> } -<a name="166" href="#166">166</a> } -<a name="167" href="#167">167</a> } -<a name="168" href="#168">168</a> } -<a name="169" href="#169">169</a> -<a name="170" href="#170">170</a> <strong class="jxr_keyword">if</strong> (childEntities != <strong class="jxr_keyword">null</strong>) { -<a name="171" href="#171">171</a> <strong class="jxr_keyword">for</strong> (EntitiesDescriptor descriptor : childEntities) { -<a name="172" href="#172">172</a> checkEntities(descriptor); -<a name="173" href="#173">173</a> } -<a name="174" href="#174">174</a> } -<a name="175" href="#175">175</a> } -<a name="176" href="#176">176</a> } +<a name="126" href="#126">126</a> DiscoveryResponse ds = (DiscoveryResponse) obj; +<a name="127" href="#127">127</a> String binding = ds.getBinding(); +<a name="128" href="#128">128</a> +<a name="129" href="#129">129</a> <strong class="jxr_keyword">if</strong> (!DiscoveryResponse.IDP_DISCO_NS.equals(binding)) { +<a name="130" href="#130">130</a> <strong class="jxr_keyword">return</strong> false; +<a name="131" href="#131">131</a> } +<a name="132" href="#132">132</a> } +<a name="133" href="#133">133</a> } +<a name="134" href="#134">134</a> } +<a name="135" href="#135">135</a> } +<a name="136" href="#136">136</a> } +<a name="137" href="#137">137</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>; +<a name="138" href="#138">138</a> } +<a name="139" href="#139">139</a> +<a name="140" href="#140">140</a> <em class="jxr_javadoccomment">/**</em> +<a name="141" href="#141">141</a> <em class="jxr_javadoccomment"> * Check an EntitiesDescriptor call checkentities for the Entities and ourselves</em> +<a name="142" href="#142">142</a> <em class="jxr_javadoccomment"> * recursively for the EntitesDescriptors.</em> +<a name="143" href="#143">143</a> <em class="jxr_javadoccomment"> * </em> +<a name="144" href="#144">144</a> <em class="jxr_javadoccomment"> * @param entities what to check.</em> +<a name="145" href="#145">145</a> <em class="jxr_javadoccomment"> */</em> +<a name="146" href="#146">146</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> checkEntities(EntitiesDescriptor entities) { +<a name="147" href="#147">147</a> List<EntitiesDescriptor> childEntities = entities.getEntitiesDescriptors(); +<a name="148" href="#148">148</a> List<EntityDescriptor> children = entities.getEntityDescriptors(); +<a name="149" href="#149">149</a> +<a name="150" href="#150">150</a> <strong class="jxr_keyword">if</strong> (children != <strong class="jxr_keyword">null</strong>) { +<a name="151" href="#151">151</a> Iterator<EntityDescriptor> itr; +<a name="152" href="#152">152</a> EntityDescriptor entity; +<a name="153" href="#153">153</a> itr = children.iterator(); +<a name="154" href="#154">154</a> +<a name="155" href="#155">155</a> <strong class="jxr_keyword">while</strong> (itr.hasNext()) { +<a name="156" href="#156">156</a> entity = itr.next(); +<a name="157" href="#157">157</a> <strong class="jxr_keyword">if</strong> (!checkEntity(entity)) { +<a name="158" href="#158">158</a> <strong class="jxr_keyword">if</strong> (warnOnFailure) { +<a name="159" href="#159">159</a> LOG.warn(<span class="jxr_string">"Badly formatted binding for "</span> + entity.getEntityID()); +<a name="160" href="#160">160</a> } <strong class="jxr_keyword">else</strong> { +<a name="161" href="#161">161</a> LOG.error(<span class="jxr_string">"Badly formatted binding for "</span> + entity.getEntityID() + <span class="jxr_string">". Entity has been removed"</span>); +<a name="162" href="#162">162</a> itr.remove(); +<a name="163" href="#163">163</a> } +<a name="164" href="#164">164</a> } +<a name="165" href="#165">165</a> } +<a name="166" href="#166">166</a> } +<a name="167" href="#167">167</a> +<a name="168" href="#168">168</a> <strong class="jxr_keyword">if</strong> (childEntities != <strong class="jxr_keyword">null</strong>) { +<a name="169" href="#169">169</a> <strong class="jxr_keyword">for</strong> (EntitiesDescriptor descriptor : childEntities) { +<a name="170" href="#170">170</a> checkEntities(descriptor); +<a name="171" href="#171">171</a> } +<a name="172" href="#172">172</a> } +<a name="173" href="#173">173</a> } +<a name="174" href="#174">174</a> } </pre> <hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body> </html> diff --git a/doc/src-xref/edu/internet2/middleware/shibboleth/wayf/plugins/provider/ListFilter.html b/doc/src-xref/edu/internet2/middleware/shibboleth/wayf/plugins/provider/ListFilter.html index 270ec3e..d0b7acc 100644 --- a/doc/src-xref/edu/internet2/middleware/shibboleth/wayf/plugins/provider/ListFilter.html +++ b/doc/src-xref/edu/internet2/middleware/shibboleth/wayf/plugins/provider/ListFilter.html @@ -41,157 +41,156 @@ <a name="31" href="#31">31</a> <strong class="jxr_keyword">import</strong> org.w3c.dom.Element; <a name="32" href="#32">32</a> <strong class="jxr_keyword">import</strong> org.w3c.dom.NodeList; <a name="33" href="#33">33</a> -<a name="34" href="#34">34</a> <strong class="jxr_keyword">import</strong> edu.internet2.middleware.shibboleth.wayf.HandlerConfig; -<a name="35" href="#35">35</a> <strong class="jxr_keyword">import</strong> edu.internet2.middleware.shibboleth.wayf.XMLConstants; -<a name="36" href="#36">36</a> -<a name="37" href="#37">37</a> <em class="jxr_javadoccomment">/**</em> -<a name="38" href="#38">38</a> <em class="jxr_javadoccomment"> * See SDSJ-57. Explicit </em> -<a name="39" href="#39">39</a> <em class="jxr_javadoccomment"> * </em> -<a name="40" href="#40">40</a> <em class="jxr_javadoccomment"> * @author Rod Widdowson</em> -<a name="41" href="#41">41</a> <em class="jxr_javadoccomment"> *</em> -<a name="42" href="#42">42</a> <em class="jxr_javadoccomment"> */</em> -<a name="43" href="#43">43</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../../edu/internet2/middleware/shibboleth/wayf/plugins/provider/ListFilter.html">ListFilter</a> implements MetadataFilter { -<a name="44" href="#44">44</a> -<a name="45" href="#45">45</a> <em class="jxr_javadoccomment">/**</em> -<a name="46" href="#46">46</a> <em class="jxr_javadoccomment"> * Log for any messages.</em> -<a name="47" href="#47">47</a> <em class="jxr_javadoccomment"> */</em> -<a name="48" href="#48">48</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Logger LOG = LoggerFactory.getLogger(ListFilter.<strong class="jxr_keyword">class</strong>.getName()); -<a name="49" href="#49">49</a> -<a name="50" href="#50">50</a> <em class="jxr_javadoccomment">/**</em> -<a name="51" href="#51">51</a> <em class="jxr_javadoccomment"> * Set if this is a blacklist.</em> -<a name="52" href="#52">52</a> <em class="jxr_javadoccomment"> */</em> -<a name="53" href="#53">53</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> excludeEntries; -<a name="54" href="#54">54</a> -<a name="55" href="#55">55</a> <em class="jxr_javadoccomment">/**</em> -<a name="56" href="#56">56</a> <em class="jxr_javadoccomment"> * The list of entities.</em> -<a name="57" href="#57">57</a> <em class="jxr_javadoccomment"> */</em> -<a name="58" href="#58">58</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Set<String> filterEntities; -<a name="59" href="#59">59</a> -<a name="60" href="#60">60</a> <em class="jxr_javadoccomment">/**</em> -<a name="61" href="#61">61</a> <em class="jxr_javadoccomment"> * The name of the filter (needed for debug).</em> -<a name="62" href="#62">62</a> <em class="jxr_javadoccomment"> */</em> -<a name="63" href="#63">63</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String filterName; -<a name="64" href="#64">64</a> -<a name="65" href="#65">65</a> <em class="jxr_javadoccomment">/**</em> -<a name="66" href="#66">66</a> <em class="jxr_javadoccomment"> * Only the protected constructor should be visible.</em> -<a name="67" href="#67">67</a> <em class="jxr_javadoccomment"> */</em> -<a name="68" href="#68">68</a> <strong class="jxr_keyword">private</strong> <a href="../../../../../../../edu/internet2/middleware/shibboleth/wayf/plugins/provider/ListFilter.html">ListFilter</a>() { -<a name="69" href="#69">69</a> <strong class="jxr_keyword">this</strong>.excludeEntries = false; -<a name="70" href="#70">70</a> <strong class="jxr_keyword">this</strong>.filterEntities = <strong class="jxr_keyword">new</strong> HashSet<String>(0); -<a name="71" href="#71">71</a> <strong class="jxr_keyword">this</strong>.filterName = <span class="jxr_string">"anonymous"</span>; -<a name="72" href="#72">72</a> } -<a name="73" href="#73">73</a> -<a name="74" href="#74">74</a> <em class="jxr_javadoccomment">/**</em> -<a name="75" href="#75">75</a> <em class="jxr_javadoccomment"> * Initialize the filter.</em> -<a name="76" href="#76">76</a> <em class="jxr_javadoccomment"> * @param config the configuration</em> -<a name="77" href="#77">77</a> <em class="jxr_javadoccomment"> *</em> -<a name="78" href="#78">78</a> <em class="jxr_javadoccomment"> * The configuration looks liken this</em> -<a name="79" href="#79">79</a> <em class="jxr_javadoccomment"> * <code> <Filter identifier="WhiteList" </em> -<a name="80" href="#80">80</a> <em class="jxr_javadoccomment"> * type ="edu.internet2.middleware.shibboleth.wayf.plugins.provider.ListFilter"</em> -<a name="81" href="#81">81</a> <em class="jxr_javadoccomment"> * excludeEntries = "true" ></em> -<a name="82" href="#82">82</a> <em class="jxr_javadoccomment"> * <EntityId>foo</EntityId></em> -<a name="83" href="#83">83</a> <em class="jxr_javadoccomment"> * [...]</em> -<a name="84" href="#84">84</a> <em class="jxr_javadoccomment"> * </Filter></em> -<a name="85" href="#85">85</a> <em class="jxr_javadoccomment"> * </code></em> -<a name="86" href="#86">86</a> <em class="jxr_javadoccomment"> */</em> -<a name="87" href="#87">87</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../../edu/internet2/middleware/shibboleth/wayf/plugins/provider/ListFilter.html">ListFilter</a>(Element config) { -<a name="88" href="#88">88</a> String excludeEntriesValue; -<a name="89" href="#89">89</a> <strong class="jxr_keyword">this</strong>.filterEntities = <strong class="jxr_keyword">new</strong> HashSet<String>(10); -<a name="90" href="#90">90</a> <strong class="jxr_keyword">this</strong>.filterName = config.getAttribute(<span class="jxr_string">"identifier"</span>); -<a name="91" href="#91">91</a> excludeEntriesValue = config.getAttribute(<span class="jxr_string">"excludeEntries"</span>); -<a name="92" href="#92">92</a> -<a name="93" href="#93">93</a> <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> == excludeEntriesValue || 0 == excludeEntriesValue.length()) { -<a name="94" href="#94">94</a> <strong class="jxr_keyword">this</strong>.excludeEntries = <strong class="jxr_keyword">true</strong>; -<a name="95" href="#95">95</a> } <strong class="jxr_keyword">else</strong> { -<a name="96" href="#96">96</a> <strong class="jxr_keyword">this</strong>.excludeEntries = Boolean.getBoolean(excludeEntriesValue); -<a name="97" href="#97">97</a> } -<a name="98" href="#98">98</a> -<a name="99" href="#99">99</a> NodeList itemElements = config.getElementsByTagNameNS(XMLConstants.CONFIG_NS, <span class="jxr_string">"EntityId"</span>); -<a name="100" href="#100">100</a> -<a name="101" href="#101">101</a> <strong class="jxr_keyword">if</strong> (excludeEntries) { -<a name="102" href="#102">102</a> LOG.debug(<span class="jxr_string">"Populating blacklist "</span> + filterName); -<a name="103" href="#103">103</a> } <strong class="jxr_keyword">else</strong> { -<a name="104" href="#104">104</a> LOG.debug(<span class="jxr_string">"Populating whitelist "</span> + filterName); -<a name="105" href="#105">105</a> } -<a name="106" href="#106">106</a> -<a name="107" href="#107">107</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < itemElements.getLength(); i++) { -<a name="108" href="#108">108</a> Element element = (Element) itemElements.item(i); -<a name="109" href="#109">109</a> String entityId = element.getTextContent(); -<a name="110" href="#110">110</a> -<a name="111" href="#111">111</a> LOG.debug(<span class="jxr_string">"\t"</span> + entityId); -<a name="112" href="#112">112</a> <strong class="jxr_keyword">this</strong>.filterEntities.add(entityId); -<a name="113" href="#113">113</a> } -<a name="114" href="#114">114</a> } -<a name="115" href="#115">115</a> -<a name="116" href="#116">116</a> <em class="jxr_javadoccomment">/**</em> -<a name="117" href="#117">117</a> <em class="jxr_javadoccomment"> * Apply the filter.</em> -<a name="118" href="#118">118</a> <em class="jxr_javadoccomment"> * @see org.opensaml.saml2.metadata.provider.MetadataFilter#doFilter(org.opensaml.xml.XMLObject)</em> -<a name="119" href="#119">119</a> <em class="jxr_javadoccomment"> * @param metadata what to filter.</em> -<a name="120" href="#120">120</a> <em class="jxr_javadoccomment"> * @throws FilterException if it sees any missed or bad bindings.</em> -<a name="121" href="#121">121</a> <em class="jxr_javadoccomment"> */</em> -<a name="122" href="#122">122</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> doFilter(XMLObject metadata) <strong class="jxr_keyword">throws</strong> FilterException { -<a name="123" href="#123">123</a> -<a name="124" href="#124">124</a> <strong class="jxr_keyword">if</strong> (metadata instanceof EntitiesDescriptor) { -<a name="125" href="#125">125</a> filterEntities((EntitiesDescriptor)metadata); -<a name="126" href="#126">126</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (metadata instanceof EntityDescriptor) { -<a name="127" href="#127">127</a> EntityDescriptor entity = (EntityDescriptor) metadata; -<a name="128" href="#128">128</a> String entityName = entity.getEntityID(); -<a name="129" href="#129">129</a> -<a name="130" href="#130">130</a> <strong class="jxr_keyword">if</strong> (excludeEntries) { -<a name="131" href="#131">131</a> <strong class="jxr_keyword">if</strong> (filterEntities.contains(entityName)) { -<a name="132" href="#132">132</a> LOG.error(<span class="jxr_string">"Metadata provider contains a single <EntityDescriptor> ("</span> + entityName + -<a name="133" href="#133">133</a> <span class="jxr_string">") which is in exclude list"</span>); -<a name="134" href="#134">134</a> } -<a name="135" href="#135">135</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (!filterEntities.contains(entity.getEntityID())) { -<a name="136" href="#136">136</a> LOG.error(<span class="jxr_string">"Metadata provider contains a single <EntityDescriptor> ("</span> + entityName + -<a name="137" href="#137">137</a> <span class="jxr_string">") which is not on include list"</span>); -<a name="138" href="#138">138</a> } -<a name="139" href="#139">139</a> } -<a name="140" href="#140">140</a> } -<a name="141" href="#141">141</a> -<a name="142" href="#142">142</a> <em class="jxr_javadoccomment">/**</em> -<a name="143" href="#143">143</a> <em class="jxr_javadoccomment"> * Filter an EntitiesDescriptor . We do this explictly for the Entities and call ourselves</em> -<a name="144" href="#144">144</a> <em class="jxr_javadoccomment"> * recursively for the EntitesDescriptors.</em> -<a name="145" href="#145">145</a> <em class="jxr_javadoccomment"> * </em> -<a name="146" href="#146">146</a> <em class="jxr_javadoccomment"> * @param entities what to check.</em> -<a name="147" href="#147">147</a> <em class="jxr_javadoccomment"> */</em> -<a name="148" href="#148">148</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> filterEntities(EntitiesDescriptor entities) { -<a name="149" href="#149">149</a> String entitiesName = entities.getName(); -<a name="150" href="#150">150</a> List<EntitiesDescriptor> childEntities = entities.getEntitiesDescriptors(); -<a name="151" href="#151">151</a> List<EntityDescriptor> children = entities.getEntityDescriptors(); -<a name="152" href="#152">152</a> -<a name="153" href="#153">153</a> <em class="jxr_comment">//</em> -<a name="154" href="#154">154</a> <em class="jxr_comment">// Go through and apply the filter</em> -<a name="155" href="#155">155</a> <em class="jxr_comment">//</em> -<a name="156" href="#156">156</a> -<a name="157" href="#157">157</a> <strong class="jxr_keyword">if</strong> (children != <strong class="jxr_keyword">null</strong>) { -<a name="158" href="#158">158</a> Iterator<EntityDescriptor> itr; -<a name="159" href="#159">159</a> EntityDescriptor entity; -<a name="160" href="#160">160</a> itr = children.iterator(); -<a name="161" href="#161">161</a> -<a name="162" href="#162">162</a> <strong class="jxr_keyword">while</strong> (itr.hasNext()) { -<a name="163" href="#163">163</a> entity = itr.next(); -<a name="164" href="#164">164</a> String entityName = entity.getEntityID(); -<a name="165" href="#165">165</a> <strong class="jxr_keyword">if</strong> (excludeEntries) { -<a name="166" href="#166">166</a> -<a name="167" href="#167">167</a> <strong class="jxr_keyword">if</strong> (filterEntities.contains(entityName)) { -<a name="168" href="#168">168</a> LOG.debug(<span class="jxr_string">"Filter "</span> + filterName + <span class="jxr_string">": Removing blacklisted "</span> + entityName + <span class="jxr_string">" from "</span> + entitiesName); -<a name="169" href="#169">169</a> itr.remove(); -<a name="170" href="#170">170</a> } -<a name="171" href="#171">171</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (!filterEntities.contains(entityName)) { -<a name="172" href="#172">172</a> LOG.debug(<span class="jxr_string">"Filter "</span> + filterName + <span class="jxr_string">": Removing non-whitelisted "</span> + entityName + <span class="jxr_string">" from "</span> + entitiesName); -<a name="173" href="#173">173</a> itr.remove(); -<a name="174" href="#174">174</a> } -<a name="175" href="#175">175</a> } -<a name="176" href="#176">176</a> } -<a name="177" href="#177">177</a> -<a name="178" href="#178">178</a> <strong class="jxr_keyword">if</strong> (childEntities != <strong class="jxr_keyword">null</strong>) { -<a name="179" href="#179">179</a> <strong class="jxr_keyword">for</strong> (EntitiesDescriptor descriptor : childEntities) { -<a name="180" href="#180">180</a> filterEntities(descriptor); -<a name="181" href="#181">181</a> } -<a name="182" href="#182">182</a> } -<a name="183" href="#183">183</a> } -<a name="184" href="#184">184</a> } +<a name="34" href="#34">34</a> <strong class="jxr_keyword">import</strong> edu.internet2.middleware.shibboleth.wayf.XMLConstants; +<a name="35" href="#35">35</a> +<a name="36" href="#36">36</a> <em class="jxr_javadoccomment">/**</em> +<a name="37" href="#37">37</a> <em class="jxr_javadoccomment"> * See SDSJ-57. Explicit </em> +<a name="38" href="#38">38</a> <em class="jxr_javadoccomment"> * </em> +<a name="39" href="#39">39</a> <em class="jxr_javadoccomment"> * @author Rod Widdowson</em> +<a name="40" href="#40">40</a> <em class="jxr_javadoccomment"> *</em> +<a name="41" href="#41">41</a> <em class="jxr_javadoccomment"> */</em> +<a name="42" href="#42">42</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../../edu/internet2/middleware/shibboleth/wayf/plugins/provider/ListFilter.html">ListFilter</a> implements MetadataFilter { +<a name="43" href="#43">43</a> +<a name="44" href="#44">44</a> <em class="jxr_javadoccomment">/**</em> +<a name="45" href="#45">45</a> <em class="jxr_javadoccomment"> * Log for any messages.</em> +<a name="46" href="#46">46</a> <em class="jxr_javadoccomment"> */</em> +<a name="47" href="#47">47</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Logger LOG = LoggerFactory.getLogger(ListFilter.<strong class="jxr_keyword">class</strong>.getName()); +<a name="48" href="#48">48</a> +<a name="49" href="#49">49</a> <em class="jxr_javadoccomment">/**</em> +<a name="50" href="#50">50</a> <em class="jxr_javadoccomment"> * Set if this is a blacklist.</em> +<a name="51" href="#51">51</a> <em class="jxr_javadoccomment"> */</em> +<a name="52" href="#52">52</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> excludeEntries; +<a name="53" href="#53">53</a> +<a name="54" href="#54">54</a> <em class="jxr_javadoccomment">/**</em> +<a name="55" href="#55">55</a> <em class="jxr_javadoccomment"> * The list of entities.</em> +<a name="56" href="#56">56</a> <em class="jxr_javadoccomment"> */</em> +<a name="57" href="#57">57</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Set<String> filterEntities; +<a name="58" href="#58">58</a> +<a name="59" href="#59">59</a> <em class="jxr_javadoccomment">/**</em> +<a name="60" href="#60">60</a> <em class="jxr_javadoccomment"> * The name of the filter (needed for debug).</em> +<a name="61" href="#61">61</a> <em class="jxr_javadoccomment"> */</em> +<a name="62" href="#62">62</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String filterName; +<a name="63" href="#63">63</a> +<a name="64" href="#64">64</a> <em class="jxr_javadoccomment">/**</em> +<a name="65" href="#65">65</a> <em class="jxr_javadoccomment"> * Only the protected constructor should be visible.</em> +<a name="66" href="#66">66</a> <em class="jxr_javadoccomment"> */</em> +<a name="67" href="#67">67</a> <strong class="jxr_keyword">private</strong> <a href="../../../../../../../edu/internet2/middleware/shibboleth/wayf/plugins/provider/ListFilter.html">ListFilter</a>() { +<a name="68" href="#68">68</a> <strong class="jxr_keyword">this</strong>.excludeEntries = false; +<a name="69" href="#69">69</a> <strong class="jxr_keyword">this</strong>.filterEntities = <strong class="jxr_keyword">new</strong> HashSet<String>(0); +<a name="70" href="#70">70</a> <strong class="jxr_keyword">this</strong>.filterName = <span class="jxr_string">"anonymous"</span>; +<a name="71" href="#71">71</a> } +<a name="72" href="#72">72</a> +<a name="73" href="#73">73</a> <em class="jxr_javadoccomment">/**</em> +<a name="74" href="#74">74</a> <em class="jxr_javadoccomment"> * Initialize the filter.</em> +<a name="75" href="#75">75</a> <em class="jxr_javadoccomment"> * @param config the configuration</em> +<a name="76" href="#76">76</a> <em class="jxr_javadoccomment"> *</em> +<a name="77" href="#77">77</a> <em class="jxr_javadoccomment"> * The configuration looks liken this</em> +<a name="78" href="#78">78</a> <em class="jxr_javadoccomment"> * <code> <Filter identifier="WhiteList" </em> +<a name="79" href="#79">79</a> <em class="jxr_javadoccomment"> * type ="edu.internet2.middleware.shibboleth.wayf.plugins.provider.ListFilter"</em> +<a name="80" href="#80">80</a> <em class="jxr_javadoccomment"> * excludeEntries = "true" ></em> +<a name="81" href="#81">81</a> <em class="jxr_javadoccomment"> * <EntityId>foo</EntityId></em> +<a name="82" href="#82">82</a> <em class="jxr_javadoccomment"> * [...]</em> +<a name="83" href="#83">83</a> <em class="jxr_javadoccomment"> * </Filter></em> +<a name="84" href="#84">84</a> <em class="jxr_javadoccomment"> * </code></em> +<a name="85" href="#85">85</a> <em class="jxr_javadoccomment"> */</em> +<a name="86" href="#86">86</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../../edu/internet2/middleware/shibboleth/wayf/plugins/provider/ListFilter.html">ListFilter</a>(Element config) { +<a name="87" href="#87">87</a> String excludeEntriesValue; +<a name="88" href="#88">88</a> <strong class="jxr_keyword">this</strong>.filterEntities = <strong class="jxr_keyword">new</strong> HashSet<String>(10); +<a name="89" href="#89">89</a> <strong class="jxr_keyword">this</strong>.filterName = config.getAttribute(<span class="jxr_string">"identifier"</span>); +<a name="90" href="#90">90</a> excludeEntriesValue = config.getAttribute(<span class="jxr_string">"excludeEntries"</span>); +<a name="91" href="#91">91</a> +<a name="92" href="#92">92</a> <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> == excludeEntriesValue || 0 == excludeEntriesValue.length()) { +<a name="93" href="#93">93</a> <strong class="jxr_keyword">this</strong>.excludeEntries = <strong class="jxr_keyword">true</strong>; +<a name="94" href="#94">94</a> } <strong class="jxr_keyword">else</strong> { +<a name="95" href="#95">95</a> <strong class="jxr_keyword">this</strong>.excludeEntries = Boolean.getBoolean(excludeEntriesValue); +<a name="96" href="#96">96</a> } +<a name="97" href="#97">97</a> +<a name="98" href="#98">98</a> NodeList itemElements = config.getElementsByTagNameNS(XMLConstants.CONFIG_NS, <span class="jxr_string">"EntityId"</span>); +<a name="99" href="#99">99</a> +<a name="100" href="#100">100</a> <strong class="jxr_keyword">if</strong> (excludeEntries) { +<a name="101" href="#101">101</a> LOG.debug(<span class="jxr_string">"Populating blacklist "</span> + filterName); +<a name="102" href="#102">102</a> } <strong class="jxr_keyword">else</strong> { +<a name="103" href="#103">103</a> LOG.debug(<span class="jxr_string">"Populating whitelist "</span> + filterName); +<a name="104" href="#104">104</a> } +<a name="105" href="#105">105</a> +<a name="106" href="#106">106</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < itemElements.getLength(); i++) { +<a name="107" href="#107">107</a> Element element = (Element) itemElements.item(i); +<a name="108" href="#108">108</a> String entityId = element.getTextContent(); +<a name="109" href="#109">109</a> +<a name="110" href="#110">110</a> LOG.debug(<span class="jxr_string">"\t"</span> + entityId); +<a name="111" href="#111">111</a> <strong class="jxr_keyword">this</strong>.filterEntities.add(entityId); +<a name="112" href="#112">112</a> } +<a name="113" href="#113">113</a> } +<a name="114" href="#114">114</a> +<a name="115" href="#115">115</a> <em class="jxr_javadoccomment">/**</em> +<a name="116" href="#116">116</a> <em class="jxr_javadoccomment"> * Apply the filter.</em> +<a name="117" href="#117">117</a> <em class="jxr_javadoccomment"> * @see org.opensaml.saml2.metadata.provider.MetadataFilter#doFilter(org.opensaml.xml.XMLObject)</em> +<a name="118" href="#118">118</a> <em class="jxr_javadoccomment"> * @param metadata what to filter.</em> +<a name="119" href="#119">119</a> <em class="jxr_javadoccomment"> * @throws FilterException if it sees any missed or bad bindings.</em> +<a name="120" href="#120">120</a> <em class="jxr_javadoccomment"> */</em> +<a name="121" href="#121">121</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> doFilter(XMLObject metadata) <strong class="jxr_keyword">throws</strong> FilterException { +<a name="122" href="#122">122</a> +<a name="123" href="#123">123</a> <strong class="jxr_keyword">if</strong> (metadata instanceof EntitiesDescriptor) { +<a name="124" href="#124">124</a> filterEntities((EntitiesDescriptor)metadata); +<a name="125" href="#125">125</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (metadata instanceof EntityDescriptor) { +<a name="126" href="#126">126</a> EntityDescriptor entity = (EntityDescriptor) metadata; +<a name="127" href="#127">127</a> String entityName = entity.getEntityID(); +<a name="128" href="#128">128</a> +<a name="129" href="#129">129</a> <strong class="jxr_keyword">if</strong> (excludeEntries) { +<a name="130" href="#130">130</a> <strong class="jxr_keyword">if</strong> (filterEntities.contains(entityName)) { +<a name="131" href="#131">131</a> LOG.error(<span class="jxr_string">"Metadata provider contains a single <EntityDescriptor> ("</span> + entityName + +<a name="132" href="#132">132</a> <span class="jxr_string">") which is in exclude list"</span>); +<a name="133" href="#133">133</a> } +<a name="134" href="#134">134</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (!filterEntities.contains(entity.getEntityID())) { +<a name="135" href="#135">135</a> LOG.error(<span class="jxr_string">"Metadata provider contains a single <EntityDescriptor> ("</span> + entityName + +<a name="136" href="#136">136</a> <span class="jxr_string">") which is not on include list"</span>); +<a name="137" href="#137">137</a> } +<a name="138" href="#138">138</a> } +<a name="139" href="#139">139</a> } +<a name="140" href="#140">140</a> +<a name="141" href="#141">141</a> <em class="jxr_javadoccomment">/**</em> +<a name="142" href="#142">142</a> <em class="jxr_javadoccomment"> * Filter an EntitiesDescriptor . We do this explictly for the Entities and call ourselves</em> +<a name="143" href="#143">143</a> <em class="jxr_javadoccomment"> * recursively for the EntitesDescriptors.</em> +<a name="144" href="#144">144</a> <em class="jxr_javadoccomment"> * </em> +<a name="145" href="#145">145</a> <em class="jxr_javadoccomment"> * @param entities what to check.</em> +<a name="146" href="#146">146</a> <em class="jxr_javadoccomment"> */</em> +<a name="147" href="#147">147</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> filterEntities(EntitiesDescriptor entities) { +<a name="148" href="#148">148</a> String entitiesName = entities.getName(); +<a name="149" href="#149">149</a> List<EntitiesDescriptor> childEntities = entities.getEntitiesDescriptors(); +<a name="150" href="#150">150</a> List<EntityDescriptor> children = entities.getEntityDescriptors(); +<a name="151" href="#151">151</a> +<a name="152" href="#152">152</a> <em class="jxr_comment">//</em> +<a name="153" href="#153">153</a> <em class="jxr_comment">// Go through and apply the filter</em> +<a name="154" href="#154">154</a> <em class="jxr_comment">//</em> +<a name="155" href="#155">155</a> +<a name="156" href="#156">156</a> <strong class="jxr_keyword">if</strong> (children != <strong class="jxr_keyword">null</strong>) { +<a name="157" href="#157">157</a> Iterator<EntityDescriptor> itr; +<a name="158" href="#158">158</a> EntityDescriptor entity; +<a name="159" href="#159">159</a> itr = children.iterator(); +<a name="160" href="#160">160</a> +<a name="161" href="#161">161</a> <strong class="jxr_keyword">while</strong> (itr.hasNext()) { +<a name="162" href="#162">162</a> entity = itr.next(); +<a name="163" href="#163">163</a> String entityName = entity.getEntityID(); +<a name="164" href="#164">164</a> <strong class="jxr_keyword">if</strong> (excludeEntries) { +<a name="165" href="#165">165</a> +<a name="166" href="#166">166</a> <strong class="jxr_keyword">if</strong> (filterEntities.contains(entityName)) { +<a name="167" href="#167">167</a> LOG.debug(<span class="jxr_string">"Filter "</span> + filterName + <span class="jxr_string">": Removing blacklisted "</span> + entityName + <span class="jxr_string">" from "</span> + entitiesName); +<a name="168" href="#168">168</a> itr.remove(); +<a name="169" href="#169">169</a> } +<a name="170" href="#170">170</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (!filterEntities.contains(entityName)) { +<a name="171" href="#171">171</a> LOG.debug(<span class="jxr_string">"Filter "</span> + filterName + <span class="jxr_string">": Removing non-whitelisted "</span> + entityName + <span class="jxr_string">" from "</span> + entitiesName); +<a name="172" href="#172">172</a> itr.remove(); +<a name="173" href="#173">173</a> } +<a name="174" href="#174">174</a> } +<a name="175" href="#175">175</a> } +<a name="176" href="#176">176</a> +<a name="177" href="#177">177</a> <strong class="jxr_keyword">if</strong> (childEntities != <strong class="jxr_keyword">null</strong>) { +<a name="178" href="#178">178</a> <strong class="jxr_keyword">for</strong> (EntitiesDescriptor descriptor : childEntities) { +<a name="179" href="#179">179</a> filterEntities(descriptor); +<a name="180" href="#180">180</a> } +<a name="181" href="#181">181</a> } +<a name="182" href="#182">182</a> } +<a name="183" href="#183">183</a> } </pre> <hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body> </html> diff --git a/doc/src-xref/edu/internet2/middleware/shibboleth/wayf/plugins/provider/package-frame.html b/doc/src-xref/edu/internet2/middleware/shibboleth/wayf/plugins/provider/package-frame.html index 5eb51b5..b7af423 100644 --- a/doc/src-xref/edu/internet2/middleware/shibboleth/wayf/plugins/provider/package-frame.html +++ b/doc/src-xref/edu/internet2/middleware/shibboleth/wayf/plugins/provider/package-frame.html @@ -3,7 +3,7 @@ <html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
- <title>Shibboleth Discovery Service 1.1.0 Reference Package edu.internet2.middleware.shibboleth.wayf.plugins.provider</title>
+ <title>Shibboleth Discovery Service 1.1.1 Reference Package edu.internet2.middleware.shibboleth.wayf.plugins.provider</title>
<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="style" />
</head>
<body>
diff --git a/doc/src-xref/edu/internet2/middleware/shibboleth/wayf/plugins/provider/package-summary.html b/doc/src-xref/edu/internet2/middleware/shibboleth/wayf/plugins/provider/package-summary.html index 2f91e22..206dc1d 100644 --- a/doc/src-xref/edu/internet2/middleware/shibboleth/wayf/plugins/provider/package-summary.html +++ b/doc/src-xref/edu/internet2/middleware/shibboleth/wayf/plugins/provider/package-summary.html @@ -3,7 +3,7 @@ <html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
- <title>Shibboleth Discovery Service 1.1.0 Reference Package edu.internet2.middleware.shibboleth.wayf.plugins.provider</title>
+ <title>Shibboleth Discovery Service 1.1.1 Reference Package edu.internet2.middleware.shibboleth.wayf.plugins.provider</title>
<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="style" />
</head>
<body>
diff --git a/doc/src-xref/index.html b/doc/src-xref/index.html index 3089332..30d4aa2 100644 --- a/doc/src-xref/index.html +++ b/doc/src-xref/index.html @@ -3,7 +3,7 @@ <html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
- <title>Shibboleth Discovery Service 1.1.0 Reference</title>
+ <title>Shibboleth Discovery Service 1.1.1 Reference</title>
</head>
<frameset cols="20%,80%">
<frameset rows="30%,70%">
diff --git a/doc/src-xref/overview-frame.html b/doc/src-xref/overview-frame.html index fe1cf4b..27cbaf8 100644 --- a/doc/src-xref/overview-frame.html +++ b/doc/src-xref/overview-frame.html @@ -3,7 +3,7 @@ <html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
- <title>Shibboleth Discovery Service 1.1.0 Reference</title>
+ <title>Shibboleth Discovery Service 1.1.1 Reference</title>
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="style" />
</head>
<body>
diff --git a/doc/src-xref/overview-summary.html b/doc/src-xref/overview-summary.html index edb673b..60f1511 100644 --- a/doc/src-xref/overview-summary.html +++ b/doc/src-xref/overview-summary.html @@ -3,7 +3,7 @@ <html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
- <title>Shibboleth Discovery Service 1.1.0 Reference</title>
+ <title>Shibboleth Discovery Service 1.1.1 Reference</title>
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="style" />
</head>
<body>
@@ -24,7 +24,7 @@ </ul>
</div>
- <h2>Shibboleth Discovery Service 1.1.0 Reference</h2>
+ <h2>Shibboleth Discovery Service 1.1.1 Reference</h2>
<table class="summary">
<thead>
diff --git a/doc/style/checkstyle.html b/doc/style/checkstyle.html index 3e7122f..673b530 100644 --- a/doc/style/checkstyle.html +++ b/doc/style/checkstyle.html @@ -20,7 +20,7 @@ </div> </div> <div id="breadcrumbs"> -<div class="xleft">Last Published: Wed Jan 14 13:49:27 CET 2009</div> +<div class="xleft">Last Published: Fri Aug 21 09:03:33 CEST 2009</div> <div class="xright"></div> <div class="clear"> <hr/> @@ -39,7 +39,7 @@ </div></div> <div id="bodyColumn"> <div id="contentBox"> -<div class="section"><h2>Checkstyle Results</h2><p>The following document contains the results of <a href="http://checkstyle.sourceforge.net/">Checkstyle</a>.</p></div><div class="section"><h2>Summary</h2><table class="bodyTable"><tr class="a"><th>Files</th><th>Infos <img alt="Infos" src="images/icon_info_sml.gif" /></th><th>Warnings <img alt="Warnings" src="images/icon_warning_sml.gif" /></th><th>Errors <img alt="Errors" src="images/icon_error_sml.gif" /></th></tr><tr class="b"><td>22</td><td>0</td><td>79</td><td>0</td></tr></table></div><div class="section"><h2>Files</h2><table class="bodyTable"><tr class="a"><th>Files</th><th>I <img alt="Infos" src="images/icon_info_sml.gif" /></th><th>W <img alt="Warnings" src="images/icon_warning_sml.gif" /></th><th>E <img alt="Errors" src="images/icon_error_sml.gif" /></th></tr><tr class="b"><td><a href="#edu.internet2.middleware.shibboleth.wayf.DiscoveryResponseBuilder.java">edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseBuilder.java</a></td><td>0</td><td>2</td><td>0</td></tr><tr class="a"><td><a href="#edu.internet2.middleware.shibboleth.wayf.DiscoveryServiceHandler.java">edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.java</a></td><td>0</td><td>23</td><td>0</td></tr><tr class="b"><td><a href="#edu.internet2.middleware.shibboleth.wayf.HandlerConfig.java">edu/internet2/middleware/shibboleth/wayf/HandlerConfig.java</a></td><td>0</td><td>3</td><td>0</td></tr><tr class="a"><td><a href="#edu.internet2.middleware.shibboleth.wayf.IdPSite.java">edu/internet2/middleware/shibboleth/wayf/IdPSite.java</a></td><td>0</td><td>12</td><td>0</td></tr><tr class="b"><td><a href="#edu.internet2.middleware.shibboleth.wayf.IdPSiteSet.java">edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.java</a></td><td>0</td><td>15</td><td>0</td></tr><tr class="a"><td><a href="#edu.internet2.middleware.shibboleth.wayf.LogbackLoggingService.java">edu/internet2/middleware/shibboleth/wayf/LogbackLoggingService.java</a></td><td>0</td><td>1</td><td>0</td></tr><tr class="b"><td><a href="#edu.internet2.middleware.shibboleth.wayf.Version.java">edu/internet2/middleware/shibboleth/wayf/Version.java</a></td><td>0</td><td>1</td><td>0</td></tr><tr class="a"><td><a href="#edu.internet2.middleware.shibboleth.wayf.WayfService.java">edu/internet2/middleware/shibboleth/wayf/WayfService.java</a></td><td>0</td><td>8</td><td>0</td></tr><tr class="b"><td><a href="#edu.internet2.middleware.shibboleth.wayf.XMLConstants.java">edu/internet2/middleware/shibboleth/wayf/XMLConstants.java</a></td><td>0</td><td>1</td><td>0</td></tr><tr class="a"><td><a href="#edu.internet2.middleware.shibboleth.wayf.plugins.Plugin.java">edu/internet2/middleware/shibboleth/wayf/plugins/Plugin.java</a></td><td>0</td><td>3</td><td>0</td></tr><tr class="b"><td><a href="#edu.internet2.middleware.shibboleth.wayf.plugins.provider.BindingFilter.java">edu/internet2/middleware/shibboleth/wayf/plugins/provider/BindingFilter.java</a></td><td>0</td><td>1</td><td>0</td></tr><tr class="a"><td><a href="#edu.internet2.middleware.shibboleth.wayf.plugins.provider.ListFilter.java">edu/internet2/middleware/shibboleth/wayf/plugins/provider/ListFilter.java</a></td><td>0</td><td>3</td><td>0</td></tr><tr class="b"><td><a href="#edu.internet2.middleware.shibboleth.wayf.plugins.provider.SamlCookiePlugin.java">edu/internet2/middleware/shibboleth/wayf/plugins/provider/SamlCookiePlugin.java</a></td><td>0</td><td>6</td><td>0</td></tr></table></div><div class="section"><h2>Rules</h2><table class="bodyTable"><tr class="a"><th>Rules</th><th>Violations</th><th>Severity</th></tr><tr class="b"><td>JavadocMethod<ul><li><b>suppressLoadErrors</b>: <tt>"true"</tt></li><li><b>allowThrowsTagsForSubclasses</b>: <tt>"true"</tt></li></ul></td><td>17</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>JavadocType</td><td>1</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>JavadocVariable</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>JavadocStyle<ul><li><b>checkEmptyJavadoc</b>: <tt>"true"</tt></li></ul></td><td>6</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>ConstantName</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>LocalFinalVariableName</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>LocalVariableName</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>MemberName</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>MethodName</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>PackageName</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>ParameterName</td><td>2</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>StaticVariableName</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>TypeName</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>AvoidStarImport</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>IllegalImport</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>RedundantImport</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>UnusedImports</td><td>3</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>FileLength<ul><li><b>max</b>: <tt>"1000"</tt></li></ul></td><td>1</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>LineLength<ul><li><b>max</b>: <tt>"120"</tt></li></ul></td><td>10</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>MethodLength<ul><li><b>max</b>: <tt>"50"</tt></li></ul></td><td>8</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>ParameterNumber<ul><li><b>max</b>: <tt>"5"</tt></li></ul></td><td>4</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>EmptyForIteratorPad</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>MethodParamPad</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>TabCharacter</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>ModifierOrder</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>AvoidNestedBlocks</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>EmptyBlock</td><td>1</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>LeftCurly</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>NeedBraces</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>RightCurly</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>AvoidInlineConditionals</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>DoubleCheckedLocking</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>EmptyStatement</td><td>1</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>EqualsHashCode</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>HiddenField</td><td>3</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>IllegalInstantiation</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>InnerAssignment</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>MissingSwitchDefault</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>RedundantThrows</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>SimplifyBooleanExpression</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>SimplifyBooleanReturn</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>FinalClass</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>HideUtilityClassConstructor</td><td>3</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>InterfaceIsType</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>VisibilityModifier</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>ArrayTypeStyle</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>UpperEll</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>AbstractClassName<ul><li><b>format</b>: <tt>"^Abstract.*$|^Base.*$"</tt></li></ul></td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>AnonInnerLength</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>EmptyForInitializerPad</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>CovariantEquals</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>DefaultComesLast</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>DeclarationOrder</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>ExplicitInitialization</td><td>1</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>FallThrough</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>IllegalCatch</td><td>3</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>IllegalThrows</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>JUnitTestCase</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>MultipleVariableDeclarations</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>PackageDeclaration</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>ParameterAssignment</td><td>2</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>ReturnCount<ul><li><b>max</b>: <tt>"4"</tt></li></ul></td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>StringLiteralEquality</td><td>1</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>SuperFinalize</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>ArrayTrailingComma</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>UnnecessaryParentheses</td><td>4</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>MutableException</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>ThrowsCount<ul><li><b>max</b>: <tt>"3"</tt></li></ul></td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>CyclomaticComplexity</td><td>8</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>TrailingComment</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>PackageHtml<ul><li><b>fileExtensions</b>: <tt>"html"</tt></li></ul></td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr></table></div><div class="section"><h2>Details</h2><div class="section"><h3><a name="edu.internet2.middleware.shibboleth.wayf.DiscoveryResponseBuilder.java"></a>edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseBuilder.java</h3><table class="bodyTable"><tr class="a"><th>Violation</th><th>Message</th><th>Line</th></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>First sentence should end with a period.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseBuilder.html#31">31</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Line is longer than 120 characters.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseBuilder.html#40">40</a></td></tr></table></div><div class="section"><h3><a name="edu.internet2.middleware.shibboleth.wayf.DiscoveryServiceHandler.java"></a>edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.java</h3><table class="bodyTable"><tr class="b"><th>Violation</th><th>Message</th><th>Line</th></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>File length is 1,002 lines (max allowed is 1,000).</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html#1">1</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Cyclomatic Complexity is 12 (max allowed is 10).</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html#165">165</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Method length is 91 lines (max allowed is 50).</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html#165">165</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>'config' hides a field.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html#165">165</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>'plugins' hides a field.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html#167">167</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Line is longer than 120 characters.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html#211">211</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Line is longer than 120 characters.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html#213">213</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Cyclomatic Complexity is 11 (max allowed is 10).</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html#286">286</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Missing a Javadoc comment.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html#286">286</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Must have at least one statement.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html#327">327</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Cyclomatic Complexity is 25 (max allowed is 10).</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html#399">399</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Method length is 141 lines (max allowed is 50).</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html#399">399</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Expected an @return tag.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html#549">549</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Expected @param tag for 'discovery'.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html#549">549</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Expected @param tag for 'providedName'.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html#549">549</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Cyclomatic Complexity is 35 (max allowed is 10).</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html#582">582</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Method length is 216 lines (max allowed is 50).</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html#582">582</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Unnecessary parentheses around assignment right-hand side.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html#588">588</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Unnecessary parentheses around assignment right-hand side.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html#589">589</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Cyclomatic Complexity is 14 (max allowed is 10).</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html#833">833</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Method length is 99 lines (max allowed is 50).</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html#833">833</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Unnecessary parentheses around assignment right-hand side.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html#838">838</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Missing a Javadoc comment.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html#974">974</a></td></tr></table></div><div class="section"><h3><a name="edu.internet2.middleware.shibboleth.wayf.HandlerConfig.java"></a>edu/internet2/middleware/shibboleth/wayf/HandlerConfig.java</h3><table class="bodyTable"><tr class="b"><th>Violation</th><th>Message</th><th>Line</th></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Cyclomatic Complexity is 16 (max allowed is 10).</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/HandlerConfig.html#82">82</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Method length is 68 lines (max allowed is 50).</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/HandlerConfig.html#82">82</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>First sentence should end with a period.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/HandlerConfig.html#214">214</a></td></tr></table></div><div class="section"><h3><a name="edu.internet2.middleware.shibboleth.wayf.IdPSite.java"></a>edu/internet2/middleware/shibboleth/wayf/IdPSite.java</h3><table class="bodyTable"><tr class="b"><th>Violation</th><th>Message</th><th>Line</th></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>First sentence should end with a period.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSite.html#41">41</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>First sentence should end with a period.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSite.html#60">60</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>First sentence should end with a period.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSite.html#78">78</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>First sentence should end with a period.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSite.html#118">118</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Unused @param tag for 'lang'.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSite.html#120">120</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Expected @param tag for 'req'.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSite.html#134">134</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Missing a Javadoc comment.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSite.html#190">190</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Variable 'req' explicitly initialized to 'null' (default value for its type).</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSite.html#198">198</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Missing a Javadoc comment.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSite.html#200">200</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Missing a Javadoc comment.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSite.html#205">205</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>'req' hides a field.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSite.html#205">205</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Missing a Javadoc comment.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSite.html#209">209</a></td></tr></table></div><div class="section"><h3><a name="edu.internet2.middleware.shibboleth.wayf.IdPSiteSet.java"></a>edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.java</h3><table class="bodyTable"><tr class="a"><th>Violation</th><th>Message</th><th>Line</th></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Line is longer than 120 characters.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.html#105">105</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Cyclomatic Complexity is 19 (max allowed is 10).</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.html#105">105</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Method length is 110 lines (max allowed is 50).</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.html#105">105</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Catching 'Exception' is not allowed.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.html#168">168</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Method length is 51 lines (max allowed is 50).</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.html#274">274</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Name 'SPName' must match pattern '^[a-z][a-zA-Z0-9]*$'.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.html#353">353</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Name 'IdPName' must match pattern '^[a-z][a-zA-Z0-9]*$'.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.html#394">394</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Expected @param tag for 'plugin'.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.html#444">444</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Line is longer than 120 characters.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.html#450">450</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Missing a Javadoc comment.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.html#452">452</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Unnecessary parentheses around expression.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.html#463">463</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Expected @param tag for 'entity'.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.html#502">502</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Expected @param tag for 'entity'.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.html#521">521</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Expected @throws tag for 'WayfException'.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.html#541">541</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Missing a Javadoc comment.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.html#552">552</a></td></tr></table></div><div class="section"><h3><a name="edu.internet2.middleware.shibboleth.wayf.LogbackLoggingService.java"></a>edu/internet2/middleware/shibboleth/wayf/LogbackLoggingService.java</h3><table class="bodyTable"><tr class="a"><th>Violation</th><th>Message</th><th>Line</th></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Utility classes should not have a public or default constructor.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/LogbackLoggingService.html#34">34</a></td></tr></table></div><div class="section"><h3><a name="edu.internet2.middleware.shibboleth.wayf.Version.java"></a>edu/internet2/middleware/shibboleth/wayf/Version.java</h3><table class="bodyTable"><tr class="a"><th>Violation</th><th>Message</th><th>Line</th></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Utility classes should not have a public or default constructor.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/Version.html#20">20</a></td></tr></table></div><div class="section"><h3><a name="edu.internet2.middleware.shibboleth.wayf.WayfService.java"></a>edu/internet2/middleware/shibboleth/wayf/WayfService.java</h3><table class="bodyTable"><tr class="a"><th>Violation</th><th>Message</th><th>Line</th></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Unused import - javax.servlet.GenericServlet.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/WayfService.html#27">27</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Cyclomatic Complexity is 26 (max allowed is 10).</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/WayfService.html#77">77</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Method length is 196 lines (max allowed is 50).</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/WayfService.html#77">77</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Line is longer than 120 characters.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/WayfService.html#102">102</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Line is longer than 120 characters.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/WayfService.html#158">158</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Line is longer than 120 characters.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/WayfService.html#175">175</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Catching 'Exception' is not allowed.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/WayfService.html#237">237</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Catching 'Exception' is not allowed.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/WayfService.html#261">261</a></td></tr></table></div><div class="section"><h3><a name="edu.internet2.middleware.shibboleth.wayf.XMLConstants.java"></a>edu/internet2/middleware/shibboleth/wayf/XMLConstants.java</h3><table class="bodyTable"><tr class="b"><th>Violation</th><th>Message</th><th>Line</th></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Utility classes should not have a public or default constructor.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/XMLConstants.html#22">22</a></td></tr></table></div><div class="section"><h3><a name="edu.internet2.middleware.shibboleth.wayf.plugins.Plugin.java"></a>edu/internet2/middleware/shibboleth/wayf/plugins/Plugin.java</h3><table class="bodyTable"><tr class="b"><th>Violation</th><th>Message</th><th>Line</th></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>More than 5 parameters.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/plugins/Plugin.html#106">106</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>More than 5 parameters.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/plugins/Plugin.html#136">136</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Expected @param tag for 'idP'.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/plugins/Plugin.html#158">158</a></td></tr></table></div><div class="section"><h3><a name="edu.internet2.middleware.shibboleth.wayf.plugins.provider.BindingFilter.java"></a>edu/internet2/middleware/shibboleth/wayf/plugins/provider/BindingFilter.java</h3><table class="bodyTable"><tr class="b"><th>Violation</th><th>Message</th><th>Line</th></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Unused import - edu.internet2.middleware.shibboleth.wayf.HandlerConfig.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/plugins/provider/BindingFilter.html#34">34</a></td></tr></table></div><div class="section"><h3><a name="edu.internet2.middleware.shibboleth.wayf.plugins.provider.ListFilter.java"></a>edu/internet2/middleware/shibboleth/wayf/plugins/provider/ListFilter.java</h3><table class="bodyTable"><tr class="b"><th>Violation</th><th>Message</th><th>Line</th></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Unused import - edu.internet2.middleware.shibboleth.wayf.HandlerConfig.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/plugins/provider/ListFilter.html#34">34</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Line is longer than 120 characters.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/plugins/provider/ListFilter.html#168">168</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Line is longer than 120 characters.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/plugins/provider/ListFilter.html#172">172</a></td></tr></table></div><div class="section"><h3><a name="edu.internet2.middleware.shibboleth.wayf.plugins.provider.SamlCookiePlugin.java"></a>edu/internet2/middleware/shibboleth/wayf/plugins/provider/SamlCookiePlugin.java</h3><table class="bodyTable"><tr class="b"><th>Violation</th><th>Message</th><th>Line</th></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>More than 5 parameters.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/plugins/provider/SamlCookiePlugin.html#170">170</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Empty statement.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/plugins/provider/SamlCookiePlugin.html#201">201</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>More than 5 parameters.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/plugins/provider/SamlCookiePlugin.html#248">248</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Assignment of parameter 'codedData' is not allowed.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/plugins/provider/SamlCookiePlugin.html#352">352</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Assignment of parameter 'codedData' is not allowed.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/plugins/provider/SamlCookiePlugin.html#356">356</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Literal Strings should be compared using equals(), not '!='.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/plugins/provider/SamlCookiePlugin.html#475">475</a></td></tr></table></div></div> +<div class="section"><h2>Checkstyle Results</h2><p>The following document contains the results of <a href="http://checkstyle.sourceforge.net/">Checkstyle</a>.</p></div><div class="section"><h2>Summary</h2><table class="bodyTable"><tr class="a"><th>Files</th><th>Infos <img alt="Infos" src="images/icon_info_sml.gif" /></th><th>Warnings <img alt="Warnings" src="images/icon_warning_sml.gif" /></th><th>Errors <img alt="Errors" src="images/icon_error_sml.gif" /></th></tr><tr class="b"><td>19</td><td>0</td><td>74</td><td>0</td></tr></table></div><div class="section"><h2>Files</h2><table class="bodyTable"><tr class="a"><th>Files</th><th>I <img alt="Infos" src="images/icon_info_sml.gif" /></th><th>W <img alt="Warnings" src="images/icon_warning_sml.gif" /></th><th>E <img alt="Errors" src="images/icon_error_sml.gif" /></th></tr><tr class="b"><td><a href="#edu.internet2.middleware.shibboleth.wayf.DiscoveryServiceHandler.java">edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.java</a></td><td>0</td><td>23</td><td>0</td></tr><tr class="a"><td><a href="#edu.internet2.middleware.shibboleth.wayf.HandlerConfig.java">edu/internet2/middleware/shibboleth/wayf/HandlerConfig.java</a></td><td>0</td><td>3</td><td>0</td></tr><tr class="b"><td><a href="#edu.internet2.middleware.shibboleth.wayf.IdPSite.java">edu/internet2/middleware/shibboleth/wayf/IdPSite.java</a></td><td>0</td><td>12</td><td>0</td></tr><tr class="a"><td><a href="#edu.internet2.middleware.shibboleth.wayf.IdPSiteSet.java">edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.java</a></td><td>0</td><td>15</td><td>0</td></tr><tr class="b"><td><a href="#edu.internet2.middleware.shibboleth.wayf.LogbackLoggingService.java">edu/internet2/middleware/shibboleth/wayf/LogbackLoggingService.java</a></td><td>0</td><td>1</td><td>0</td></tr><tr class="a"><td><a href="#edu.internet2.middleware.shibboleth.wayf.Version.java">edu/internet2/middleware/shibboleth/wayf/Version.java</a></td><td>0</td><td>1</td><td>0</td></tr><tr class="b"><td><a href="#edu.internet2.middleware.shibboleth.wayf.WayfService.java">edu/internet2/middleware/shibboleth/wayf/WayfService.java</a></td><td>0</td><td>7</td><td>0</td></tr><tr class="a"><td><a href="#edu.internet2.middleware.shibboleth.wayf.XMLConstants.java">edu/internet2/middleware/shibboleth/wayf/XMLConstants.java</a></td><td>0</td><td>1</td><td>0</td></tr><tr class="b"><td><a href="#edu.internet2.middleware.shibboleth.wayf.plugins.Plugin.java">edu/internet2/middleware/shibboleth/wayf/plugins/Plugin.java</a></td><td>0</td><td>3</td><td>0</td></tr><tr class="a"><td><a href="#edu.internet2.middleware.shibboleth.wayf.plugins.provider.ListFilter.java">edu/internet2/middleware/shibboleth/wayf/plugins/provider/ListFilter.java</a></td><td>0</td><td>2</td><td>0</td></tr><tr class="b"><td><a href="#edu.internet2.middleware.shibboleth.wayf.plugins.provider.SamlCookiePlugin.java">edu/internet2/middleware/shibboleth/wayf/plugins/provider/SamlCookiePlugin.java</a></td><td>0</td><td>6</td><td>0</td></tr></table></div><div class="section"><h2>Rules</h2><table class="bodyTable"><tr class="a"><th>Rules</th><th>Violations</th><th>Severity</th></tr><tr class="b"><td>JavadocMethod<ul><li><b>suppressLoadErrors</b>: <tt>"true"</tt></li><li><b>allowThrowsTagsForSubclasses</b>: <tt>"true"</tt></li></ul></td><td>17</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>JavadocType</td><td>1</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>JavadocVariable</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>JavadocStyle<ul><li><b>checkEmptyJavadoc</b>: <tt>"true"</tt></li></ul></td><td>5</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>ConstantName</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>LocalFinalVariableName</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>LocalVariableName</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>MemberName</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>MethodName</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>PackageName</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>ParameterName</td><td>2</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>StaticVariableName</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>TypeName</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>AvoidStarImport</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>IllegalImport</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>RedundantImport</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>UnusedImports</td><td>1</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>FileLength<ul><li><b>max</b>: <tt>"1000"</tt></li></ul></td><td>1</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>LineLength<ul><li><b>max</b>: <tt>"120"</tt></li></ul></td><td>8</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>MethodLength<ul><li><b>max</b>: <tt>"50"</tt></li></ul></td><td>8</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>ParameterNumber<ul><li><b>max</b>: <tt>"5"</tt></li></ul></td><td>4</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>EmptyForIteratorPad</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>MethodParamPad</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>TabCharacter</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>ModifierOrder</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>AvoidNestedBlocks</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>EmptyBlock</td><td>1</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>LeftCurly</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>NeedBraces</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>RightCurly</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>AvoidInlineConditionals</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>DoubleCheckedLocking</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>EmptyStatement</td><td>1</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>EqualsHashCode</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>HiddenField</td><td>3</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>IllegalInstantiation</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>InnerAssignment</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>MissingSwitchDefault</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>RedundantThrows</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>SimplifyBooleanExpression</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>SimplifyBooleanReturn</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>FinalClass</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>HideUtilityClassConstructor</td><td>3</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>InterfaceIsType</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>VisibilityModifier</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>ArrayTypeStyle</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>UpperEll</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>AbstractClassName<ul><li><b>format</b>: <tt>"^Abstract.*$|^Base.*$"</tt></li></ul></td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>AnonInnerLength</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>EmptyForInitializerPad</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>CovariantEquals</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>DefaultComesLast</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>DeclarationOrder</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>ExplicitInitialization</td><td>1</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>FallThrough</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>IllegalCatch</td><td>3</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>IllegalThrows</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>JUnitTestCase</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>MultipleVariableDeclarations</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>PackageDeclaration</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>ParameterAssignment</td><td>2</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>ReturnCount<ul><li><b>max</b>: <tt>"4"</tt></li></ul></td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>StringLiteralEquality</td><td>1</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>SuperFinalize</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>ArrayTrailingComma</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>UnnecessaryParentheses</td><td>4</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>MutableException</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>ThrowsCount<ul><li><b>max</b>: <tt>"3"</tt></li></ul></td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>CyclomaticComplexity</td><td>8</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="a"><td>TrailingComment</td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr><tr class="b"><td>PackageHtml<ul><li><b>fileExtensions</b>: <tt>"html"</tt></li></ul></td><td>0</td><td><img alt="Warnings" src="images/icon_warning_sml.gif" /> Warning</td></tr></table></div><div class="section"><h2>Details</h2><div class="section"><h3><a name="edu.internet2.middleware.shibboleth.wayf.DiscoveryServiceHandler.java"></a>edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.java</h3><table class="bodyTable"><tr class="a"><th>Violation</th><th>Message</th><th>Line</th></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>File length is 1,003 lines (max allowed is 1,000).</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html#1">1</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Cyclomatic Complexity is 12 (max allowed is 10).</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html#166">166</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Method length is 91 lines (max allowed is 50).</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html#166">166</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>'config' hides a field.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html#166">166</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>'plugins' hides a field.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html#168">168</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Line is longer than 120 characters.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html#212">212</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Line is longer than 120 characters.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html#214">214</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Cyclomatic Complexity is 11 (max allowed is 10).</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html#287">287</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Missing a Javadoc comment.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html#287">287</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Must have at least one statement.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html#328">328</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Cyclomatic Complexity is 25 (max allowed is 10).</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html#400">400</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Method length is 141 lines (max allowed is 50).</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html#400">400</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Expected an @return tag.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html#550">550</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Expected @param tag for 'discovery'.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html#550">550</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Expected @param tag for 'providedName'.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html#550">550</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Cyclomatic Complexity is 35 (max allowed is 10).</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html#583">583</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Method length is 216 lines (max allowed is 50).</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html#583">583</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Unnecessary parentheses around assignment right-hand side.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html#589">589</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Unnecessary parentheses around assignment right-hand side.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html#590">590</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Cyclomatic Complexity is 14 (max allowed is 10).</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html#834">834</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Method length is 99 lines (max allowed is 50).</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html#834">834</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Unnecessary parentheses around assignment right-hand side.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html#839">839</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Missing a Javadoc comment.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html#975">975</a></td></tr></table></div><div class="section"><h3><a name="edu.internet2.middleware.shibboleth.wayf.HandlerConfig.java"></a>edu/internet2/middleware/shibboleth/wayf/HandlerConfig.java</h3><table class="bodyTable"><tr class="a"><th>Violation</th><th>Message</th><th>Line</th></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Cyclomatic Complexity is 16 (max allowed is 10).</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/HandlerConfig.html#82">82</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Method length is 68 lines (max allowed is 50).</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/HandlerConfig.html#82">82</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>First sentence should end with a period.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/HandlerConfig.html#214">214</a></td></tr></table></div><div class="section"><h3><a name="edu.internet2.middleware.shibboleth.wayf.IdPSite.java"></a>edu/internet2/middleware/shibboleth/wayf/IdPSite.java</h3><table class="bodyTable"><tr class="a"><th>Violation</th><th>Message</th><th>Line</th></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>First sentence should end with a period.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSite.html#41">41</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>First sentence should end with a period.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSite.html#60">60</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>First sentence should end with a period.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSite.html#78">78</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>First sentence should end with a period.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSite.html#118">118</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Unused @param tag for 'lang'.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSite.html#120">120</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Expected @param tag for 'req'.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSite.html#134">134</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Missing a Javadoc comment.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSite.html#190">190</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Variable 'req' explicitly initialized to 'null' (default value for its type).</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSite.html#198">198</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Missing a Javadoc comment.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSite.html#200">200</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Missing a Javadoc comment.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSite.html#205">205</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>'req' hides a field.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSite.html#205">205</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Missing a Javadoc comment.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSite.html#209">209</a></td></tr></table></div><div class="section"><h3><a name="edu.internet2.middleware.shibboleth.wayf.IdPSiteSet.java"></a>edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.java</h3><table class="bodyTable"><tr class="b"><th>Violation</th><th>Message</th><th>Line</th></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Line is longer than 120 characters.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.html#105">105</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Cyclomatic Complexity is 19 (max allowed is 10).</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.html#105">105</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Method length is 110 lines (max allowed is 50).</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.html#105">105</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Catching 'Exception' is not allowed.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.html#168">168</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Method length is 51 lines (max allowed is 50).</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.html#274">274</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Name 'SPName' must match pattern '^[a-z][a-zA-Z0-9]*$'.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.html#353">353</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Name 'IdPName' must match pattern '^[a-z][a-zA-Z0-9]*$'.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.html#394">394</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Expected @param tag for 'plugin'.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.html#444">444</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Line is longer than 120 characters.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.html#450">450</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Missing a Javadoc comment.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.html#452">452</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Unnecessary parentheses around expression.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.html#463">463</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Expected @param tag for 'entity'.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.html#502">502</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Expected @param tag for 'entity'.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.html#521">521</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Expected @throws tag for 'WayfException'.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.html#541">541</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Missing a Javadoc comment.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.html#552">552</a></td></tr></table></div><div class="section"><h3><a name="edu.internet2.middleware.shibboleth.wayf.LogbackLoggingService.java"></a>edu/internet2/middleware/shibboleth/wayf/LogbackLoggingService.java</h3><table class="bodyTable"><tr class="b"><th>Violation</th><th>Message</th><th>Line</th></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Utility classes should not have a public or default constructor.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/LogbackLoggingService.html#34">34</a></td></tr></table></div><div class="section"><h3><a name="edu.internet2.middleware.shibboleth.wayf.Version.java"></a>edu/internet2/middleware/shibboleth/wayf/Version.java</h3><table class="bodyTable"><tr class="b"><th>Violation</th><th>Message</th><th>Line</th></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Utility classes should not have a public or default constructor.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/Version.html#20">20</a></td></tr></table></div><div class="section"><h3><a name="edu.internet2.middleware.shibboleth.wayf.WayfService.java"></a>edu/internet2/middleware/shibboleth/wayf/WayfService.java</h3><table class="bodyTable"><tr class="b"><th>Violation</th><th>Message</th><th>Line</th></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Unused import - javax.servlet.GenericServlet.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/WayfService.html#27">27</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Cyclomatic Complexity is 26 (max allowed is 10).</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/WayfService.html#75">75</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Method length is 189 lines (max allowed is 50).</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/WayfService.html#75">75</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Line is longer than 120 characters.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/WayfService.html#100">100</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Line is longer than 120 characters.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/WayfService.html#156">156</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Catching 'Exception' is not allowed.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/WayfService.html#228">228</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Catching 'Exception' is not allowed.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/WayfService.html#252">252</a></td></tr></table></div><div class="section"><h3><a name="edu.internet2.middleware.shibboleth.wayf.XMLConstants.java"></a>edu/internet2/middleware/shibboleth/wayf/XMLConstants.java</h3><table class="bodyTable"><tr class="b"><th>Violation</th><th>Message</th><th>Line</th></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Utility classes should not have a public or default constructor.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/XMLConstants.html#22">22</a></td></tr></table></div><div class="section"><h3><a name="edu.internet2.middleware.shibboleth.wayf.plugins.Plugin.java"></a>edu/internet2/middleware/shibboleth/wayf/plugins/Plugin.java</h3><table class="bodyTable"><tr class="b"><th>Violation</th><th>Message</th><th>Line</th></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>More than 5 parameters.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/plugins/Plugin.html#106">106</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>More than 5 parameters.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/plugins/Plugin.html#136">136</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Expected @param tag for 'idP'.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/plugins/Plugin.html#158">158</a></td></tr></table></div><div class="section"><h3><a name="edu.internet2.middleware.shibboleth.wayf.plugins.provider.ListFilter.java"></a>edu/internet2/middleware/shibboleth/wayf/plugins/provider/ListFilter.java</h3><table class="bodyTable"><tr class="b"><th>Violation</th><th>Message</th><th>Line</th></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Line is longer than 120 characters.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/plugins/provider/ListFilter.html#167">167</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Line is longer than 120 characters.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/plugins/provider/ListFilter.html#171">171</a></td></tr></table></div><div class="section"><h3><a name="edu.internet2.middleware.shibboleth.wayf.plugins.provider.SamlCookiePlugin.java"></a>edu/internet2/middleware/shibboleth/wayf/plugins/provider/SamlCookiePlugin.java</h3><table class="bodyTable"><tr class="a"><th>Violation</th><th>Message</th><th>Line</th></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>More than 5 parameters.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/plugins/provider/SamlCookiePlugin.html#170">170</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Empty statement.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/plugins/provider/SamlCookiePlugin.html#201">201</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>More than 5 parameters.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/plugins/provider/SamlCookiePlugin.html#248">248</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Assignment of parameter 'codedData' is not allowed.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/plugins/provider/SamlCookiePlugin.html#352">352</a></td></tr><tr class="b"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Assignment of parameter 'codedData' is not allowed.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/plugins/provider/SamlCookiePlugin.html#356">356</a></td></tr><tr class="a"><td><img alt="Warnings" src="images/icon_warning_sml.gif" /></td><td>Literal Strings should be compared using equals(), not '!='.</td><td><a href="./xref/edu/internet2/middleware/shibboleth/wayf/plugins/provider/SamlCookiePlugin.html#475">475</a></td></tr></table></div></div> </div> </div> <div class="clear"> diff --git a/doc/unitTest/surefire-report.html b/doc/unitTest/surefire-report.html index 539d195..bb8c441 100644 --- a/doc/unitTest/surefire-report.html +++ b/doc/unitTest/surefire-report.html @@ -34,7 +34,7 @@ function toggleDisplay(elementId) { </div> </div> <div id="breadcrumbs"> -<div class="xleft">Last Published: Wed Jan 14 13:49:28 CET 2009</div> +<div class="xleft">Last Published: Fri Aug 21 09:03:34 CEST 2009</div> <div class="xright"></div> <div class="clear"> <hr/> diff --git a/install.sh b/install.sh index 327bf90..327bf90 100644..100755 --- a/install.sh +++ b/install.sh diff --git a/src/installer/resources/build.xml b/src/installer/resources/build.xml index ae85dfa..ba7a5cd 100644 --- a/src/installer/resources/build.xml +++ b/src/installer/resources/build.xml @@ -10,23 +10,37 @@ <!-- Load ant-contrib tasks --> <taskdef resource="net/sf/antcontrib/antlib.xml" /> + + <!-- Load Internet2 ant extensions --> + <taskdef resource="edu/internet2/middleware/ant/antlib.xml" /> <!-- install - for deployment --> <target name="install" description="Creates the discovery service home directory, install configuration files, and create the service's WAR."> - <input message="Is this a new installation? Answering 'yes' will overwrite your current configuration." - addproperty="new.install" - validargs="yes,no" - defaultvalue="no" /> - + <input message="Where should the Shibboleth Discovert Service software be installed?" + addproperty="ds.home.input" + defaultvalue="${ds.home}" /> + <var name="ds.home" value="${ds.home.input}" /> + + <pathToAbsolutePath path="${ds.home}" addproperty="ds.home.path" /> + <pathToUrl path="${ds.home}" addproperty="ds.home.url" /> + <if> - <equals arg1="${new.install}" arg2="yes" /> + <available file="${ds.home.path}" property="ds.home.exists"/> <then> - <input message="Where should the Shibboleth Discovert Service software be installed?" - addproperty="ds.home.input" - defaultvalue="${ds.home}" /> - <var name="ds.home" value="${ds.home.input}" /> + <input message="The directory '${ds.home.path}' already exists. Would you like to overwrite your existing configuration?" + addproperty="install.config" + validargs="yes,no" + defaultvalue="no" /> + </then> + <else> + <var name="install.config" value="yes"/> + </else> + </if> + <if> + <equals arg1="${install.config}" arg2="yes" /> + <then> <propertyfile file="${resources.dir}/install.properties"> <entry key="ds.home" value="${ds.home}" /> </propertyfile> diff --git a/src/installer/resources/install.properties b/src/installer/resources/install.properties index c37d1c1..6de85c4 100644 --- a/src/installer/resources/install.properties +++ b/src/installer/resources/install.properties @@ -1 +1,2 @@ -ds.home = /etc/DiscoveryService
\ No newline at end of file +#Mon Jun 28 14:25:15 CEST 2010 +ds.home=/opt/shibboleth-ds diff --git a/src/installer/resources/wayfconfig.xml b/src/installer/resources/wayfconfig.xml index 1cd22d7..a797b54 100644 --- a/src/installer/resources/wayfconfig.xml +++ b/src/installer/resources/wayfconfig.xml @@ -18,11 +18,12 @@ The jspFile & errorJspFile attributes control the display The provideList attribute controls whether a single list of all - possible IdPs is presented. The default wayf.jsp works best - if this is true when provideListofList is true. + possible IdPs is presented. This also controls whether the + Quick search dialog is presented. The provideListOfList attribute controls whether multiple lists - are presented (one for each MetadataProvider). + are presented (one for each MetadataProvider). Rather than all + the entities as one. The showUsableIdPs attribute controls the contents of the above lists. The single list (provideList=true) is trimmed by @@ -43,8 +44,8 @@ <Default jspFile="wayf.jsp" errorJspFile="wayferror.jsp" - provideList="false" - provideListOfList="true" + provideList="true" + provideListOfList="false" warnOnBadBinding="false" showUnusableIdPs="false"> <SearchIgnore> @@ -156,4 +157,17 @@ </DiscoveryServiceHandler> --> +<!-- The Javascript handler downloads javascript arrays with the IdPs and the cookies --> + <DiscoveryServiceHandler + location=".+/js.wayf" + provideList="true" + provideListOfList="false" + default="false" + jspFile="/javascript.jsp"> + <Federation identifier="FirstSite"/> + <PluginInstance identifier="CookiePlugin"/> + </DiscoveryServiceHandler> + + + </WayfConfig> diff --git a/src/main/webapp/wayf.css b/src/main/webapp/wayf.css index 4056aa3..0eeb26c 100644 --- a/src/main/webapp/wayf.css +++ b/src/main/webapp/wayf.css @@ -102,3 +102,21 @@ span.warning { text-align: center; margin-top: 1.5em; } + +div.dropdown { + -moz-box-sizing: border-box; + box-sizing: border-box; + border: 1px solid black; + position: absolute; +} + +div.dropdown div { + background-color: white; + cursor: default; + padding: 0px 3px; +} + +div.dropdown div.current { + background-color: #3366cc; + color: white; +} diff --git a/src/main/webapp/wayf.jsp b/src/main/webapp/wayf.jsp index 74ba11d..3a9e258 100644 --- a/src/main/webapp/wayf.jsp +++ b/src/main/webapp/wayf.jsp @@ -123,6 +123,7 @@ 10 - Recently used sites hyperlinks 20 - <clear button for above> + 25 - AutoSuggestion 30 Federation selection 40 IdP within Selection 50 Select button @@ -158,15 +159,14 @@ Select an identity provider <!--CONFIG--> The Service you are trying to reach requires that you -authenticate with your home institution, please select it from the -list below. +authenticate with your home organization, enter the name below. </p> <logic:present name="cookieList" scope="request"> <h2> -Recently used institutions: +Recently used organizations: </h2> @@ -178,6 +178,7 @@ Recently used institutions: simulating the user having specified a permanent cookie --> </logic:present> + <logic:iterate id="site" name="cookieList"> <p class="text"> <logic:present name="entityID" scope="request"> @@ -230,13 +231,54 @@ Recently used institutions: </div> </form> - </logic:present> + </logic:present> <!-- Previous Selections --> - <div class="list"> +<logic:present name="showComments" scope="Request"> + +<!-- PROGRAMMING NOTE + + Add the "instant serach" dialogue. + +</logic:present> + <div class="list"> + <logic:present name="sites" scope="request"> + <h2> + Enter insititution name: + </h2> + <form autocomplete="OFF" action=""> + <div> + <logic:notPresent name="entityID" scope="request"> + <input type="hidden" name="shire" value="<bean:write name="shire" />" /> + <input type="hidden" name="target" value="<bean:write name="target" />" /> + <input type="hidden" name="providerId" value="<bean:write name="providerId" />" /> + <logic:present name="time" scope="request"> + <input type="hidden" name="time" value="<bean:write name="time" />" /> + </logic:present> + </logic:notPresent> + <logic:present name="entityID" scope="request"> + <input type="hidden" name="entityID" value="<bean:write name="entityID" />" /> + <input type="hidden" name="returnX" value="<bean:write name="returnX" />" /> + <input type="hidden" name="returnIDParam" value="<bean:write name="returnIDParam" />" /> + </logic:present> + <input type="hidden" id="enterOrigin" name="origin" value="unspec" /> + <input type="hidden" id="enterType" name="action" value="search" /> + <input type="text" id="enterText" name="string" value="" tabindex="25" size="54"/> + <input type="submit" id="enterSubmit" value="Search"/> + <input type="hidden" name="cache" value="perm"/> + </div> + </form> + </logic:present> + <h2> -Choose from a list: +<logic:present name="showComments" scope="Request"> + +Provide a static drop down or a dynamically republished one. - you may wish to remove this code + +</logic:present> + +Or choose from a list: </h2> @@ -259,7 +301,7 @@ Choose from a list: <input type="hidden" name="returnIDParam" value="<bean:write name="returnIDParam" />" /> </logic:present> <input type="hidden" name="action" value="selection" /> - <select name="origin" tabindex="40"> + <select name="origin" id="hackForie6" tabindex="40"> <logic:iterate id="site" name="sites"> <option value="<jsp:getProperty name="site" property="name" />"> <jsp:getProperty name="site" property="displayName" /> @@ -314,7 +356,7 @@ Choose from a list: <table id="tab"> <tr> <th>Federation </th> - <th>Institution</th> + <th>organization</th> </tr> <tr><td> <select name="FedSelector" size="10" id="FedSelect" tabindex="30" @@ -378,7 +420,14 @@ Choose from a list: </form> </logic:present> </div> + + <div class="search"> + +<logic:present name="showComments" scope="Request"> + +<!-- This is here for completeness - it shows the "old fashioned way" to do search --> + <span class="option">or</span> <h2> @@ -412,6 +461,9 @@ Search by keyword: </div> </form> +<!-- The end of the old code. Below is where search results go 00> + +</logic:present> <logic:present name="searchResultsEmpty" scope="request"> <p class="error"> @@ -540,7 +592,54 @@ function changedFed(X, Selected) { --> </script> </logic:present> - + +<logic:present name="sites" scope="request"> + +<logic:present name="showComments" scope="Request"> + <!-- Load the autosuggest code. + + PROGRAMMING NOTE - the "ie6Hack" is to do with an issue in ie6 in which the + psuedo drop down floats below the real dropdown. The hack is that we jsut disable + the real drop down when the pseudo one is about. This can seem weird for some + layouts and so if you are not deploying against ie6 you can just send an + empty array. + --> +</logic:present> + <script language="javascript" type="text/javascript" src="Suggest.js"></script> + <script language="javascript" type="text/javascript"> +<!-- +window.onload = function() { + +<logic:notPresent name="siteLists" scope="request"> + var ie6Hack = [ document.getElementById("hackForie6")]; +</logic:notPresent> + +<logic:present name="siteLists" scope="request"> + var ie6Hack = [ document.getElementById("FedSelect"), document.getElementById("originIdp")]; +</logic:present> + var control = new TypeAheadControl(theElements, + document.getElementById("enterText"), + document.getElementById("enterOrigin"), + document.getElementById("enterSubmit"), + document.getElementById("enterType"), + ie6Hack); + + + document.getElementById("enterText").focus(); +} + + +var theElements = [ + <logic:iterate id="site" name="sites"> + ["<%= ((edu.internet2.middleware.shibboleth.wayf.IdPSite)site).getDisplayName().replace("\n","").toString() %>", + "<jsp:getProperty name="site" property="name" />"], + </logic:iterate> + ]; + +--> + </script> +</logic:present> + </body> </html> |