a lot of more OpenSAML3 refactoring staff

This version is also NOT stable!

4 files changed, 48 insertions, 43 deletions

diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/binding/IDecoder.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/binding/IDecoder.java
index 57dd63bf..e8da499c 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/binding/IDecoder.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/binding/IDecoder.java
@@ -23,18 +23,15 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import at.gv.egiz.eaaf.modules.pvp2.api.message.InboundMessageInterface;
+import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPvp2MetadataProvider;
 import at.gv.egiz.eaaf.modules.pvp2.exception.Pvp2Exception;
 
-import org.opensaml.messaging.decoder.MessageDecodingException;
-import org.opensaml.saml2.metadata.provider.MetadataProvider;
-import org.opensaml.security.SecurityException;
-
 import net.shibboleth.utilities.java.support.net.URIComparator;
 
 public interface IDecoder {
   InboundMessageInterface decode(HttpServletRequest req, HttpServletResponse resp,
-      MetadataProvider metadataProvider, boolean isSpEndPoint, URIComparator comparator)
-      throws MessageDecodingException, SecurityException, Pvp2Exception;
+      IPvp2MetadataProvider metadataProvider, boolean isSpEndPoint, URIComparator comparator)
+      throws Pvp2Exception;
 
   boolean handleDecode(String action, HttpServletRequest req);
 
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/binding/IEncoder.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/binding/IEncoder.java
index 01f541a9..691d6574 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/binding/IEncoder.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/binding/IEncoder.java
@@ -23,13 +23,12 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import at.gv.egiz.eaaf.core.api.IRequest;
+import at.gv.egiz.eaaf.modules.pvp2.api.credential.EaafX509Credential;
 import at.gv.egiz.eaaf.modules.pvp2.exception.Pvp2Exception;
 
-import org.opensaml.messaging.encoder.MessageEncodingException;
 import org.opensaml.saml.saml2.core.RequestAbstractType;
 import org.opensaml.saml.saml2.core.StatusResponseType;
 import org.opensaml.security.SecurityException;
-import org.opensaml.security.credential.Credential;
 
 public interface IEncoder {
 
@@ -44,13 +43,11 @@ public interface IEncoder {
    * @param credentials    Credential to sign the request object
    * @param pendingReq     Internal MOA-ID request object that contains
    *                       session-state informations but never null
-   * @throws MessageEncodingException In case of an error
-   * @throws SecurityException        In case of an error
-   * @throws Pvp2Exception            In case of an error
+   * @throws Pvp2Exception In case of an error
    */
   void encodeRequest(HttpServletRequest req, HttpServletResponse resp,
-      RequestAbstractType request, String targetLocation, String relayState, Credential credentials,
-      IRequest pendingReq) throws MessageEncodingException, SecurityException, Pvp2Exception;
+      RequestAbstractType request, String targetLocation, String relayState, EaafX509Credential credentials,
+      IRequest pendingReq) throws Pvp2Exception;
 
   /**
    * Encoder SAML Response.
@@ -63,10 +60,9 @@ public interface IEncoder {
    * @param credentials    Credential to sign the response object
    * @param pendingReq     Internal MOA-ID request object that contains
    *                       session-state informations but never null
-   * @throws MessageEncodingException In case of an error
    * @throws SecurityException        In case of an error
    */
-  void encodeRespone(HttpServletRequest req, HttpServletResponse resp,
-      StatusResponseType response, String targetLocation, String relayState, Credential credentials,
-      IRequest pendingReq) throws MessageEncodingException, SecurityException, Pvp2Exception;
+  void encodeResponse(HttpServletRequest req, HttpServletResponse resp,
+      StatusResponseType response, String targetLocation, String relayState, EaafX509Credential credentials,
+      IRequest pendingReq) throws Pvp2Exception;
 }
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/credential/EaafX509Credential.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/credential/EaafX509Credential.java
new file mode 100644
index 00000000..568b617d
--- /dev/null
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/credential/EaafX509Credential.java
@@ -0,0 +1,25 @@
+package at.gv.egiz.eaaf.modules.pvp2.api.credential;
+
+import javax.annotation.Nonnull;
+
+import org.opensaml.security.x509.X509Credential;
+
+
+public interface EaafX509Credential extends X509Credential {
+
+  /**
+   * Get the signature algorithm that has to be used with this credential.
+   *
+   * @return Signature-algorithm identifier
+   */
+  @Nonnull
+  String getSignatureAlgorithmForSigning();
+
+  /**
+   * Set the signature algorithm that has to be used with this credential.
+   *
+   * @param sigAlg Signature-algorithm identifier
+   */
+  void setSignatureAlgorithmForSigning(@Nonnull String sigAlg);
+
+}
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/metadata/IPvpMetadataProvider.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/metadata/IPvp2MetadataProvider.java
index 25b2d250..e2ee0c9d 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/metadata/IPvpMetadataProvider.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/metadata/IPvp2MetadataProvider.java
@@ -23,42 +23,29 @@ import java.util.List;
 
 import javax.xml.namespace.QName;
 
-import org.opensaml.saml2.metadata.EntitiesDescriptor;
-import org.opensaml.saml2.metadata.EntityDescriptor;
-import org.opensaml.saml2.metadata.RoleDescriptor;
-import org.opensaml.saml2.metadata.provider.MetadataFilter;
-import org.opensaml.saml2.metadata.provider.MetadataProvider;
-import org.opensaml.saml2.metadata.provider.MetadataProviderException;
-import org.opensaml.xml.XMLObject;
+import at.gv.egiz.eaaf.modules.pvp2.exception.Pvp2MetadataException;
 
-public interface IPvpMetadataProvider extends MetadataProvider {
+import org.opensaml.core.xml.XMLObject;
+import org.opensaml.saml.metadata.resolver.MetadataResolver;
+import org.opensaml.saml.saml2.metadata.EntitiesDescriptor;
+import org.opensaml.saml.saml2.metadata.EntityDescriptor;
+import org.opensaml.saml.saml2.metadata.RoleDescriptor;
 
-  @Override
-  boolean requireValidMetadata();
+public interface IPvp2MetadataProvider extends MetadataResolver {
 
-  @Override
-  void setRequireValidMetadata(boolean requireValidMetadata);
+  XMLObject getMetadata() throws Pvp2MetadataException;
 
-  @Override
-  MetadataFilter getMetadataFilter();
 
-  @Override
-  void setMetadataFilter(MetadataFilter newFilter) throws MetadataProviderException;
+  EntitiesDescriptor getEntitiesDescriptor(String entitiesID) throws Pvp2MetadataException;
 
-  @Override
-  XMLObject getMetadata() throws MetadataProviderException;
 
-  @Override
-  EntitiesDescriptor getEntitiesDescriptor(String entitiesID) throws MetadataProviderException;
+  EntityDescriptor getEntityDescriptor(String entityID) throws Pvp2MetadataException;
 
-  @Override
-  EntityDescriptor getEntityDescriptor(String entityID) throws MetadataProviderException;
 
-  @Override
-  List<RoleDescriptor> getRole(String entityID, QName roleName) throws MetadataProviderException;
+  List<RoleDescriptor> getRole(String entityID, QName roleName) throws Pvp2MetadataException;
+
 
-  @Override
   RoleDescriptor getRole(String entityID, QName roleName, String supportedProtocol)
-      throws MetadataProviderException;
+      throws Pvp2MetadataException;
 
 }