use old ConfigTool

1 files changed, 31 insertions, 12 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAPVP2Config.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAPVP2Config.java
index bcac63a5f..07c9f5eda 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAPVP2Config.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAPVP2Config.java
@@ -35,12 +35,14 @@ import javax.servlet.http.HttpServletRequest;
 import org.apache.log4j.Logger;
 
 import iaik.x509.X509Certificate;
-import at.gv.egovernment.moa.id.commons.db.dao.config.AuthComponentOA;
-import at.gv.egovernment.moa.id.commons.db.dao.config.OAPVP2;
-import at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication;
+import at.gv.egovernment.moa.id.commons.config.MOAIDConfigurationConstants;
+import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.AuthComponentOA;
+import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.OAPVP2;
+import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.OnlineApplication;
 import at.gv.egovernment.moa.id.configuration.auth.AuthenticatedUser;
 import at.gv.egovernment.moa.id.configuration.helper.LanguageHelper;
 import at.gv.egovernment.moa.id.configuration.validation.oa.OAPVP2ConfigValidation;
+import at.gv.egovernment.moa.util.Base64Utils;
 import at.gv.egovernment.moa.util.MiscUtil;
 
 public class OAPVP2Config implements IOnlineApplicationData{
@@ -133,16 +135,33 @@ public class OAPVP2Config implements IOnlineApplicationData{
 			if (pvp2 != null) {
 				metaDataURL =  pvp2.getMetadataURL();
 				
-				try {
-					byte[] cert = pvp2.getCertificate();
-					
-					if (MiscUtil.isNotEmpty(cert)) {
-						X509Certificate x509 = new X509Certificate(cert);
-						certificateDN = x509.getSubjectDN().getName();
+				if (pvp2.getCertificate() != null && 
+						!(new String(pvp2.getCertificate())).equals(MOAIDConfigurationConstants.WEBGUI_EMPTY_ELEMENT)) {
+					try {
+						//byte[] cert = pvp2.getCertificate();
+						byte[] cert = Base64Utils.decode(new String(pvp2.getCertificate()), false);
+						if (MiscUtil.isNotEmpty(cert)) {
+							X509Certificate x509 = new X509Certificate(cert);
+							certificateDN = x509.getSubjectDN().getName();
+						}
+					} catch (CertificateException e) {
+						try {
+							byte[] cert = pvp2.getCertificate();
+							if (MiscUtil.isNotEmpty(cert)) {
+								X509Certificate x509 = new X509Certificate(cert);
+								certificateDN = x509.getSubjectDN().getName();
+							}
+						
+						} catch (CertificateException e1) {					
+							log.warn("PVP2 certificate can not be loaded from Online-Applikation with ID " + dbOAConfig.getPublicURLPrefix(), e1);
+							errors.add(LanguageHelper.getErrorString("error.oa.pvp2.certificate", request));
+						
+						}
+									
+					} catch (IOException e) {
+						log.warn("PVP2 certificate can not be loaded from Online-Applikation with ID " + dbOAConfig.getPublicURLPrefix());
+						errors.add(LanguageHelper.getErrorString("error.oa.pvp2.certificate", request));
 					}
-				} catch (CertificateException e) {
-					log.warn("PVP2 certificate can not be loaded from Online-Applikation with ID " + dbOAConfig.getPublicURLPrefix());
-					errors.add(LanguageHelper.getErrorString("error.oa.pvp2.certificate", request));
 				}
 			}
 		}