[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/conf/idp.properties idp-conf/src/main/resource...

[noreply at shibboleth.net]

Author: scantor
Date: Sat May 17 12:24:01 2014
New Revision: 5943

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5943&view=rev
Log:
- Replaced StatusServlet with a simple web flow and view.
- Temporary fix for Version class until this is researched

Added:
    trunk/idp-conf/src/main/resources/system/flows/status/
    trunk/idp-conf/src/main/resources/system/flows/status/status-beans.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/status/status-flow.xml   (with props)
    trunk/idp-conf/src/main/resources/views/status.vm   (with props)
Modified:
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/conf/relying-party-native.xml
    trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml
    trunk/idp-core/src/main/java/net/shibboleth/idp/StatusServlet.java
    trunk/idp-core/src/main/java/net/shibboleth/idp/Version.java
    trunk/idp-war/src/main/webapp/WEB-INF/web.xml

Modified: trunk/idp-conf/src/main/resources/conf/idp.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/idp.properties?rev=5943&r1=5942&r2=5943&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Sat May 17 12:24:01 2014
@@ -119,5 +119,8 @@
 idp.policy.messageLifetime = PT3M
 idp.policy.clockSkew = PT3M
 
+# Access control for status page
+idp.status.allowedAddresses = '127.0.0.1/32', '::1/128'
+
 idp.context.path = /idp
 idp.war.path = ${idp.home}/war/idp.war

Modified: trunk/idp-conf/src/main/resources/conf/relying-party-native.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/relying-party-native.xml?rev=5943&r1=5942&r2=5943&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/relying-party-native.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/relying-party-native.xml Sat May 17 12:24:01 2014
@@ -64,9 +64,6 @@
                         <util:constant static-field="org.opensaml.xmlsec.signature.support.SignatureConstants.ALGO_ID_DIGEST_SHA256" />
                     </util:list>
                 </property>
-                <property name="signatureCanonicalizationAlgorithm">
-                    <util:constant static-field="org.opensaml.xmlsec.signature.support.SignatureConstants.ALGO_ID_C14N_EXCL_OMIT_COMMENTS" />
-                </property>
             </bean>
         </property>
         <property name="encryptionConfiguration">
@@ -74,13 +71,11 @@
                 <property name="dataEncryptionAlgorithms">
                     <util:list>
                         <util:constant static-field="org.opensaml.xmlsec.encryption.support.EncryptionConstants.ALGO_ID_BLOCKCIPHER_AES128" />
-                        <util:constant static-field="org.opensaml.xmlsec.encryption.support.EncryptionConstants.ALGO_ID_BLOCKCIPHER_AES128_GCM" />
                     </util:list>
                 </property>
                 <property name="keyTransportEncryptionAlgorithms">
                     <util:list>
                         <util:constant static-field="org.opensaml.xmlsec.encryption.support.EncryptionConstants.ALGO_ID_KEYTRANSPORT_RSAOAEP" />
-                        <util:constant static-field="org.opensaml.xmlsec.encryption.support.EncryptionConstants.ALGO_ID_KEYTRANSPORT_RSAOAEP11" />
                     </util:list>
                 </property>
             </bean>

Modified: trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml?rev=5943&r1=5942&r2=5943&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml Sat May 17 12:24:01 2014
@@ -21,6 +21,9 @@
 
     <!-- System-supplied flows, do not modify. -->
     <webflow:flow-registry id="flowRegistry" parent="userFlowRegistry" base-path="file:///${idp.home}/system/flows" flow-builder-services="flowBuilderServices">
+
+        <!-- Status flow. -->
+        <webflow:flow-location id="status" path="/status/status-flow.xml" />
 
         <!-- Abstract flows underpinning SAML profiles. -->
         <webflow:flow-location id="saml.abstract" path="/saml/saml-abstract-flow.xml" />
@@ -53,6 +56,7 @@
         <webflow:flow-location id="authn/RemoteUser" path="/authn/remoteuser-authn-flow.xml" />
         <webflow:flow-location id="authn/JAAS" path="/authn/jaas-authn-flow.xml" />
         <webflow:flow-location id="authn/LDAP" path="/authn/ldap-authn-flow.xml" />
+        <webflow:flow-location id="authn/External" path="/authn/external-authn-flow.xml" />
 

[... 96 lines stripped ...]