[java-identity-provider COMMIT] in /trunk: idp-cas-impl/src/main/java/net/shibboleth/idp/cas/proxy/HttpClientProxyAut...

[noreply at shibboleth.net]

Author: serac
Date: Thu Nov  6 15:27:01 2014
New Revision: 6854

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6854&view=rev
Log:
Complete CAS ticket validation flow test coverage.

Added:
    trunk/idp-conf/src/main/resources/system/views/cas/validateFailure.vm
      - copied unchanged from r6850, trunk/idp-conf/src/main/resources/system/views/cas/serviceValidateFailure.vm
    trunk/idp-conf/src/main/resources/system/views/cas/validateSuccess.vm
      - copied unchanged from r6850, trunk/idp-conf/src/main/resources/system/views/cas/serviceValidateSuccess.vm
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/ProxyValidateFlowTest.java
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/ServiceValidateFlowTest.java
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/TestProxyAuthenticator.java
Modified:
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/proxy/HttpClientProxyAuthenticator.java
    trunk/idp-conf/pom.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/abstractValidate/abstractValidate-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/proxyValidate/proxyValidate-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/samlValidate/samlValidate-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/serviceValidate/serviceValidate-flow.xml
    trunk/idp-conf/src/main/resources/system/views/cas/serviceValidateFailure.vm
    trunk/idp-conf/src/main/resources/system/views/cas/serviceValidateSuccess.vm
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/SamlValidateFlowTest.java
    trunk/idp-conf/src/test/resources/test/test-cas-beans.xml

Modified: trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/proxy/HttpClientProxyAuthenticator.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/proxy/HttpClientProxyAuthenticator.java?rev=6854&r1=6853&r2=6854&view=diff
==============================================================================
--- trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/proxy/HttpClientProxyAuthenticator.java (original)
+++ trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/proxy/HttpClientProxyAuthenticator.java Thu Nov  6 15:27:01 2014
@@ -130,14 +130,14 @@
             response = httpClient.execute(request);
             return response.getStatusLine().getStatusCode();
         } catch (ClientProtocolException e) {
-            throw new RuntimeException("HTTP protocol error", e);
+            throw new GeneralSecurityException("HTTP protocol error", e);
         } catch (SSLException e) {
             if (e.getCause() instanceof CertificateException) {
                 throw (CertificateException) e.getCause();
             }
             throw new GeneralSecurityException("SSL connection error", e);
         } catch (IOException e) {
-            throw new RuntimeException("IO error", e);
+            throw new GeneralSecurityException("IO error", e);
         } finally {
             close(response);
             close(httpClient);

Modified: trunk/idp-conf/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/pom.xml?rev=6854&r1=6853&r2=6854&view=diff
==============================================================================
--- trunk/idp-conf/pom.xml (original)
+++ trunk/idp-conf/pom.xml Thu Nov  6 15:27:01 2014
@@ -121,6 +121,11 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
 
         <!-- Managed Dependencies -->
     </dependencies>

Modified: trunk/idp-conf/src/main/resources/system/flows/cas/abstractValidate/abstractValidate-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/cas/abstractValidate/abstractValidate-flow.xml?rev=6854&r1=6853&r2=6854&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/cas/abstractValidate/abstractValidate-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/cas/abstractValidate/abstractValidate-flow.xml Thu Nov  6 15:27:01 2014
@@ -16,25 +16,25 @@
 
     <action-state id="validateTicket">
         <evaluate expression="validateTicketAction" />
-        <transition on="invalidTicketFormat" to="serviceValidateFailure" />
-        <transition on="serviceMismatch" to="serviceValidateFailure" />
-        <transition on="ticketExpired" to="serviceValidateFailure" />
-        <transition on="ticketRetrievalError" to="serviceValidateFailure" />
+        <transition on="invalidTicketFormat" to="validateFailure" />
+        <transition on="serviceMismatch" to="validateFailure" />
+        <transition on="ticketExpired" to="validateFailure" />
+        <transition on="ticketRetrievalError" to="validateFailure" />

[... 275 lines stripped ...]