- SSO finalized

- SSO Session is not closed if a new single authentication operation is started
- PVP2 Configuration from Database (but without Metadata) --> TODO: change MetaDataProvider
- Add additional UserFrame in case of SSO
- MOASession encryption

TODO: MetaDataProvider, IdentityLink resign, SSO with Mandates, Legacy Template generation

1 files changed, 6 insertions, 15 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/signer/CredentialProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/signer/CredentialProvider.java
index 4a1cd45da..38251ab56 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/signer/CredentialProvider.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/signer/CredentialProvider.java
@@ -57,23 +57,14 @@ public class CredentialProvider {
 
 	public static Credential getSPTrustedCredential(String entityID)
 			throws CredentialsNotAvailableException {
-		String filename = PVPConfiguration.getInstance()
-				.getTrustEntityCertificate(entityID);
 
-		iaik.x509.X509Certificate cert;
-		try {
-			cert = new X509Certificate(new FileInputStream(new File(filename)));
-		} catch (CertificateException e) {
-			e.printStackTrace();
-			throw new CredentialsNotAvailableException(e.getMessage(), null);
-		} catch (FileNotFoundException e) {
-			e.printStackTrace();
-			throw new CredentialsNotAvailableException(e.getMessage(), null);
-		} catch (IOException e) {
-			e.printStackTrace();
-			throw new CredentialsNotAvailableException(e.getMessage(), null);
+		iaik.x509.X509Certificate cert = PVPConfiguration.getInstance()
+				.getTrustEntityCertificate(entityID);
+		
+		if (cert == null) {
+			throw new CredentialsNotAvailableException("ServiceProvider Certificate can not be loaded from Database", null);
 		}
-
+		
 		BasicX509Credential credential = new BasicX509Credential();
 		credential.setEntityId(entityID);
 		credential.setUsageType(UsageType.SIGNING);