[java-identity-provider COMMIT] /trunk/idp-conf/src/main/resources/system/conf/jetty.xml

[noreply at shibboleth.net]

Author: scantor
Date: Fri Apr  4 20:33:55 2014
New Revision: 5697

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5697&view=rev
Log:
Add port 9443 SOAP connector with our trust manager.

Modified:
    trunk/idp-conf/src/main/resources/system/conf/jetty.xml

Modified: trunk/idp-conf/src/main/resources/system/conf/jetty.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/jetty.xml?rev=5697&r1=5696&r2=5697&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/jetty.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/jetty.xml Fri Apr  4 20:33:55 2014
@@ -131,6 +131,27 @@
         </Set>
     </New>
 
+    <!-- ============================================================= -->
+    <!-- Configure a No-Validation TLS (SSL) Context Factory           -->
+    <!-- ============================================================= -->
+    <New id="shibContextFactory" class="net.shibboleth.utilities.jetty9.DelegateToApplicationSslContextFactory">
+        <Set name="KeyStorePath"><SystemProperty name="idp.home" />/<SystemProperty name="jetty.keystore.path" /></Set>
+        <Set name="KeyStoreType"><SystemProperty name="jetty.keystore.type" /></Set>
+        <Set name="KeyStorePassword"><SystemProperty name="jetty.keystore.password" /></Set>
+        <Set name="EndpointIdentificationAlgorithm">HTTPS</Set>
+        <Set name="ExcludeCipherSuites">
+            <Array type="String">
+                <Item>SSL_RSA_WITH_DES_CBC_SHA</Item>
+                <Item>SSL_DHE_RSA_WITH_DES_CBC_SHA</Item>
+                <Item>SSL_DHE_DSS_WITH_DES_CBC_SHA</Item>
+                <Item>SSL_RSA_EXPORT_WITH_RC4_40_MD5</Item>
+                <Item>SSL_RSA_EXPORT_WITH_DES40_CBC_SHA</Item>
+                <Item>SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA</Item>
+                <Item>SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA</Item>
+            </Array>
+        </Set>
+    </New>
+
     <!-- =========================================================== -->
     <!-- Create a TLS specific HttpConfiguration based on the        -->
     <!-- common HttpConfiguration defined in jetty.xml               -->
@@ -176,6 +197,43 @@
                 </Arg>
                 <Set name="host"><SystemProperty name="jetty.host" default="localhost" /></Set>
                 <Set name="port"><SystemProperty name="jetty.https.port" default="8443" /></Set>
+                <Set name="idleTimeout">30000</Set>
+            </New>
+        </Arg>
+    </Call>
+
+    <!-- =========================================================== -->
+    <!-- Add a HTTPS Connector for SOAP                              -->
+    <!-- Configure an o.e.j.server.ServerConnector with connection   -->
+    <!-- factories for TLS (aka SSL) and HTTP to provide HTTPS.      -->
+    <!-- All accepted TLS connections are wired to a HTTP connection.-->
+    <!--                                                             -->
+    <!-- Consult the javadoc of o.e.j.server.ServerConnector,        -->
+    <!-- o.e.j.server.SslConnectionFactory and                       -->
+    <!-- o.e.j.server.HttpConnectionFactory for all configuration    -->
+    <!-- that may be set here.                                       -->
+    <!-- =========================================================== -->
+    <Call id="httpsSOAPConnector" name="addConnector">
+        <Arg>
+            <New class="org.eclipse.jetty.server.ServerConnector">
+                <Arg name="server"><Ref refid="Server" /></Arg>
+                <Arg name="factories">
+                    <Array type="org.eclipse.jetty.server.ConnectionFactory">
+                        <Item>
+                            <New class="org.eclipse.jetty.server.SslConnectionFactory">
+                                <Arg name="next">http/1.1</Arg>
+                                <Arg name="sslContextFactory"><Ref refid="shibContextFactory" /></Arg>
+                            </New>
+                        </Item>
+                        <Item>
+                            <New class="org.eclipse.jetty.server.HttpConnectionFactory">
+                                <Arg name="config"><Ref refid="sslHttpConfig" /></Arg>
+                            </New>
+                        </Item>
+                    </Array>
+                </Arg>
+                <Set name="host"><SystemProperty name="jetty.host" default="localhost" /></Set>
+                <Set name="port">9443</Set>
                 <Set name="idleTimeout">30000</Set>
             </New>
         </Arg>