[java-identity-provider COMMIT] in /trunk: idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateX509Cer...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Feb 20 18:55:32 2015
New Revision: 7359

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7359&view=rev
Log:
OSJ-108: Generic parameterization of TrustEngines is too restrictive on components that evaluate an X509Credential.

Modified:
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateX509Certificate.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/X509AuthServlet.java
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/ValidateProxyCallbackAction.java
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/proxy/AbstractProxyAuthenticator.java
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/proxy/HttpClientProxyAuthenticator.java
    trunk/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/ValidateProxyCallbackActionTest.java

Modified: trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateX509Certificate.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateX509Certificate.java?rev=7359&r1=7358&r2=7359&view=diff
==============================================================================
--- trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateX509Certificate.java (original)
+++ trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateX509Certificate.java Fri Feb 20 18:55:32 2015
@@ -63,7 +63,7 @@
     @Nonnull private final Logger log = LoggerFactory.getLogger(ValidateX509Certificate.class);
 
     /** Optional trust engine to validate certificates against. */
-    @Nullable private TrustEngine<X509Credential> trustEngine;
+    @Nullable private TrustEngine<? super X509Credential> trustEngine;
     
     /** CertificateContext containing the credentials to validate. */
     @Nullable private CertificateContext certContext;
@@ -73,7 +73,7 @@
      * 
      * @param tm trust engine to use  
      */
-    public void setTrustEngine(@Nullable final TrustEngine<X509Credential> tm) {
+    public void setTrustEngine(@Nullable final TrustEngine<? super X509Credential> tm) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         
         trustEngine = tm;

Modified: trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/X509AuthServlet.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/X509AuthServlet.java?rev=7359&r1=7358&r2=7359&view=diff
==============================================================================
--- trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/X509AuthServlet.java (original)
+++ trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/X509AuthServlet.java Fri Feb 20 18:55:32 2015
@@ -65,14 +65,14 @@
     @Nonnull private final Logger log = LoggerFactory.getLogger(X509AuthServlet.class);
 
     /** Trust engine. */
-    @Nullable private TrustEngine<X509Credential> trustEngine;
+    @Nullable private TrustEngine<? super X509Credential> trustEngine;
 
     /**
      * Set the {@link TrustEngine} to use.
      * 
      * @param tm trust engine to use  
      */
-    public void setTrustEngine(@Nullable final TrustEngine<X509Credential> tm) {
+    public void setTrustEngine(@Nullable final TrustEngine<? super X509Credential> tm) {
         trustEngine = tm;
     }
     

Modified: trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/ValidateProxyCallbackAction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/ValidateProxyCallbackAction.java?rev=7359&r1=7358&r2=7359&view=diff
==============================================================================
--- trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/ValidateProxyCallbackAction.java (original)
+++ trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/ValidateProxyCallbackAction.java Fri Feb 20 18:55:32 2015
@@ -67,7 +67,7 @@
 
     /** Validates the proxy callback endpoint. */
     @Nonnull
-    private final ProxyAuthenticator<TrustEngine<X509Credential>> proxyAuthenticator;
+    private final ProxyAuthenticator<TrustEngine<? super X509Credential>> proxyAuthenticator;
 
     /** Manages CAS tickets. */
     @Nonnull
@@ -81,7 +81,7 @@
      * @param ticketService Ticket service component.
      */
     public ValidateProxyCallbackAction(
-            @Nonnull ProxyAuthenticator<TrustEngine<X509Credential>> proxyAuthenticator,
+            @Nonnull ProxyAuthenticator<TrustEngine<? super X509Credential>> proxyAuthenticator,
             @Nonnull TicketService ticketService) {
         this.proxyAuthenticator = Constraint.isNotNull(proxyAuthenticator, "ProxyAuthenticator cannot be null");
         this.ticketService = Constraint.isNotNull(ticketService, "TicketService cannot be null");
@@ -123,7 +123,7 @@
         }
         try {
             log.debug("Attempting proxy authentication to {}", proxyCallbackUri);

[... 96 lines stripped ...]