Extract interface from AbstractCredentialProvider.java

Add new interface IPvpAddableChainingMetadataProvider.java and implement it in AbstractChainingMetadataProvider.java
Fix possible nullPointer in Saml2Utils.java

1 files changed, 10 insertions, 3 deletions

diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/utils/Saml2Utils.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/utils/Saml2Utils.java
index 14e6a78a..a3154b0d 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/utils/Saml2Utils.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/utils/Saml2Utils.java
@@ -22,9 +22,11 @@ package at.gv.egiz.eaaf.modules.pvp2.impl.utils;
 import java.io.IOException;
 import java.io.InputStream;
 import java.security.PrivateKey;
+import java.security.PublicKey;
 import java.security.interfaces.ECPrivateKey;
 import java.security.interfaces.ECPublicKey;
 import java.security.interfaces.RSAPrivateKey;
+import java.security.interfaces.RSAPublicKey;
 import java.util.List;
 
 import javax.annotation.Nonnull;
@@ -229,17 +231,22 @@ public class Saml2Utils {
   public static String getKeyOperationAlgorithmFromCredential(X509Credential credentials,
       String rsaSigAlgorithm, String ecSigAlgorithm) throws SamlSigningException {
     final PrivateKey privatekey = credentials.getPrivateKey();
-    if (privatekey instanceof RSAPrivateKey) {
+    final PublicKey publickey = credentials.getPublicKey();
+    if (privatekey instanceof RSAPrivateKey
+        || publickey instanceof RSAPublicKey) {
       return rsaSigAlgorithm;
 
-    } else if (privatekey instanceof ECPrivateKey) {
+    } else if (privatekey instanceof ECPrivateKey
+        || publickey instanceof ECPublicKey) {
       return ecSigAlgorithm;
 
     } else {
       log.warn("Could NOT evaluate the Private-Key type from " + credentials.getEntityId()
           + " credential.");
       throw new SamlSigningException("internal.pvp.97",
-          new Object[] { credentials.getEntityId(), privatekey.getClass().getName() });
+          new Object[] { credentials.getEntityId(),
+              privatekey != null ? privatekey.getClass().getName() : publickey.getClass().getName()
+              });
 
     }
   }