devel

1 files changed, 52 insertions, 47 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/advancedlogging/StatisticLogger.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/advancedlogging/StatisticLogger.java
index cd1acaa8c..67547d8a2 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/advancedlogging/StatisticLogger.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/advancedlogging/StatisticLogger.java
@@ -26,6 +26,7 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Date;
+import java.util.List;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
@@ -43,18 +44,15 @@ import at.gv.egovernment.moa.id.auth.exception.MISSimpleClientException;
 import at.gv.egovernment.moa.id.auth.exception.MOAIDException;
 import at.gv.egovernment.moa.id.auth.exception.ServiceException;
 import at.gv.egovernment.moa.id.client.SZRGWClientException;
-import at.gv.egovernment.moa.id.commons.db.ConfigurationDBRead;
 import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils;
 import at.gv.egovernment.moa.id.commons.db.StatisticLogDBUtils;
-import at.gv.egovernment.moa.id.commons.db.dao.config.AuthComponentOA;
-import at.gv.egovernment.moa.id.commons.db.dao.config.BKUURLS;
-import at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication;
 import at.gv.egovernment.moa.id.commons.db.dao.statistic.StatisticLog;
 import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;
 import at.gv.egovernment.moa.id.config.ConfigurationException;
 import at.gv.egovernment.moa.id.config.auth.AuthConfiguration;
 import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProviderFactory;
 import at.gv.egovernment.moa.id.config.auth.IOAAuthParameters;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
 import at.gv.egovernment.moa.id.data.IAuthData;
 import at.gv.egovernment.moa.id.moduls.IRequest;
 import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage;
@@ -106,20 +104,27 @@ public class StatisticLogger {
 		
 		if ( isAktive && protocolRequest != null && authData != null) {
 			
-			OnlineApplication dbOA = ConfigurationDBRead.getOnlineApplication(protocolRequest.getOAURL());
-			
-			if (dbOA == null) {
-				Logger.warn("Advanced logging failed: OA can not be found in database.");
+			OAAuthParameter dbOA = null;
+			try {
+				dbOA = AuthConfigurationProviderFactory.getInstance().getOnlineApplicationParameter(protocolRequest.getOAURL());
+
+				if (dbOA == null) {
+					Logger.warn("Advanced logging failed: OA can not be found in database.");
+					return;
+				}
+				
+			} catch (ConfigurationException e1) {
+				Logger.error("Access MOA-ID configuration FAILED.", e1);
 				return;
 			}
-							
+			
 			StatisticLog dblog = new StatisticLog();
 			
 			//set actual date and time
 			dblog.setTimestamp(new Date());
 			
 			//set OA databaseID
-			dblog.setOaID(dbOA.getHjid());
+			//dblog.setOaID(dbOA.getHjid());
 			
 			//log basic AuthInformation
 			dblog.setOaurlprefix(protocolRequest.getOAURL());
@@ -258,40 +263,46 @@ public class StatisticLogger {
 			dblog.setProtocoltype(errorRequest.requestedModule());
 			dblog.setProtocolsubtype(errorRequest.requestedAction());
 			
-			OnlineApplication dbOA = ConfigurationDBRead.getOnlineApplication(errorRequest.getOAURL());
-			if (dbOA != null) {
-				dblog.setOafriendlyName(dbOA.getFriendlyName());
-				dblog.setOatarget(dbOA.getTarget());
-				dblog.setOaID(dbOA.getHjid());
-				dblog.setBusinessservice(isBusinessService(dbOA));
-			}
+			try { 
+				OAAuthParameter dbOA = AuthConfigurationProviderFactory.getInstance().getOnlineApplicationParameter(errorRequest.getOAURL());
+				if (dbOA != null) {
+					dblog.setOafriendlyName(dbOA.getFriendlyName());
+					dblog.setOatarget(dbOA.getTarget());
+					//dblog.setOaID(dbOA.getHjid());
+					dblog.setBusinessservice(isBusinessService(dbOA));
+					
 			
-			AuthenticationSession moasession = AuthenticationSessionStoreage.getSessionWithPendingRequestID(errorRequest.getRequestID());
-			if (moasession != null) {
-				if (MiscUtil.isNotEmpty(moasession.getBkuURL())) {
-					dblog.setBkuurl(moasession.getBkuURL());
-					dblog.setBkutype(findBKUType(moasession.getBkuURL(), dbOA));
-				}
+					AuthenticationSession moasession = AuthenticationSessionStoreage.getSessionWithPendingRequestID(errorRequest.getRequestID());
+					if (moasession != null) {
+						if (MiscUtil.isNotEmpty(moasession.getBkuURL())) {
+							dblog.setBkuurl(moasession.getBkuURL());
+							dblog.setBkutype(findBKUType(moasession.getBkuURL(), dbOA));
+						}
 				
-				dblog.setMandatelogin(moasession.getUseMandate());
-			}
+						dblog.setMandatelogin(moasession.getUseMandate());
+					}
 			
-			generateErrorLogFormThrowable(throwable, dblog);
-
-			ConfigurationDBUtils.closeSession();
+					generateErrorLogFormThrowable(throwable, dblog);
+					
+					ConfigurationDBUtils.closeSession();
 			
-			try {
-				StatisticLogDBUtils.saveOrUpdate(dblog);
+					try {
+						StatisticLogDBUtils.saveOrUpdate(dblog);
 				
-			} catch (MOADatabaseException e) {
-				Logger.warn("Statistic Log can not be stored into Database", e);
+					} catch (MOADatabaseException e) {
+						Logger.warn("Statistic Log can not be stored into Database", e);
+					}
+				}
+			} catch (ConfigurationException e) {
+				Logger.error("Access MOA-ID configuration FAILED.", e);
+				return;
 			}
 		}
 	}
 	
-	private boolean isBusinessService(OnlineApplication oa) {
+	private boolean isBusinessService(OAAuthParameter dbOA) {
 		
-		if (oa.getType().equals("businessService"))
+		if (dbOA.getOaType().equals("businessService"))
 			return true;
 		else
 			return false;
@@ -352,23 +363,17 @@ public class StatisticLogger {
 		
 	}
 	
-	private String findBKUType(String bkuURL, OnlineApplication dbOA) {
+	private String findBKUType(String bkuURL, OAAuthParameter dbOA) {
 		
 		if (dbOA != null) {
-			AuthComponentOA oaAuth = dbOA.getAuthComponentOA();
-			if (oaAuth != null) {
-				BKUURLS bkuurls = oaAuth.getBKUURLS();
-				if (bkuurls != null) {
-					if (bkuURL.equals(bkuurls.getHandyBKU()))
-						return IOAAuthParameters.HANDYBKU;
+			if (bkuURL.equals(dbOA.getBKUURL(OAAuthParameter.HANDYBKU)))
+				return IOAAuthParameters.HANDYBKU;
 					
-					if (bkuURL.equals(bkuurls.getLocalBKU()))
-						return IOAAuthParameters.LOCALBKU;
+			if (bkuURL.equals(dbOA.getBKUURL(OAAuthParameter.LOCALBKU)))
+				return IOAAuthParameters.LOCALBKU;
 					
-					if (bkuURL.equals(bkuurls.getOnlineBKU()))
-						return IOAAuthParameters.ONLINEBKU;	
-				}	
-			}
+			if (bkuURL.equals(dbOA.getBKUURL(OAAuthParameter.ONLINEBKU)))
+				return IOAAuthParameters.ONLINEBKU;	
 		}
 		
 		Logger.trace("Staticic Log search BKUType from DefaultBKUs");