First untested part: Refactor authentication modules and process management to Spring

1 files changed, 42 insertions, 66 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 5487152cf..87b3bc9ca 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
@@ -32,6 +32,8 @@ import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
 
 import org.apache.commons.lang3.StringEscapeUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import at.gv.e_government.reference.namespace.mandates._20040701_.Mandate;
 import at.gv.e_government.reference.namespace.mandates._20040701_.Mandator;
@@ -47,16 +49,16 @@ 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.data.MISMandate;
 import at.gv.egovernment.moa.id.moduls.IRequest;
-import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage;
+import at.gv.egovernment.moa.id.storage.IAuthenticationSessionStoreage;
 import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.util.MiscUtil;
 
+@Service("StatisticLogger")
 public class StatisticLogger {
 	
 	private static final String GENERIC_LOCALBKU = ":3496/https-security-layer-request";
@@ -73,45 +75,19 @@ public class StatisticLogger {
 	private static final String ERRORTYPE_MANDATE = "mandate";
 	private static final String ERRORTYPE_MOAID = "moa-id";
 	private static final String ERRORTYPE_SZRGW = "szrgw";
-	
-	private static StatisticLogger instance;
-	
-	private boolean isAktive = false;
-	
-	public static StatisticLogger getInstance() {
-		if (instance == null)
-			instance = new StatisticLogger();
 		
-		return instance;
-	}
-	
-	private StatisticLogger() {
-		try {
-			AuthConfiguration config = AuthConfigurationProviderFactory.getInstance();
-			
-			if (config != null) 
-				isAktive = config.isAdvancedLoggingActive();			
-			
-		} catch (ConfigurationException e) {
-			Logger.error("StatisticLogger can not be inizialized", e);
-		}
-	}
-	
+	@Autowired AuthConfiguration authConfig;
+	@Autowired IAuthenticationSessionStoreage authenticatedSessionStorage;
+		
 	public void logSuccessOperation(IRequest protocolRequest, IAuthData authData, boolean isSSOSession) {
 		
-		if ( isAktive && protocolRequest != null && authData != null) {
+		if ( authConfig.isAdvancedLoggingActive() && protocolRequest != null && authData != null) {
 			
-			OAAuthParameter dbOA = null;
-			try {
-				dbOA = AuthConfigurationProviderFactory.getInstance().getOnlineApplicationParameter(protocolRequest.getOAURL());
+			IOAAuthParameters dbOA = null;
+			dbOA = protocolRequest.getOnlineApplicationConfiguration();
 
-				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);
+			if (dbOA == null) {
+				Logger.warn("Advanced logging failed: OA can not be found in database.");
 				return;
 			}
 			
@@ -221,7 +197,7 @@ public class StatisticLogger {
 	}
 	
 	public void logErrorOperation(Throwable throwable) {
-		if ( isAktive )  {
+		if ( authConfig.isAdvancedLoggingActive() )  {
 			StatisticLog dblog = new StatisticLog();
 			
 			//set actual date and time
@@ -249,7 +225,7 @@ public class StatisticLogger {
 	
 	public void logErrorOperation(Throwable throwable, IRequest errorRequest) {
 		
-		if (isAktive && throwable != null && errorRequest != null) {
+		if (authConfig.isAdvancedLoggingActive() && throwable != null && errorRequest != null) {
 			StatisticLog dblog = new StatisticLog();
 			
 			//set actual date and time
@@ -260,44 +236,45 @@ public class StatisticLogger {
 			dblog.setProtocoltype(errorRequest.requestedModule());
 			dblog.setProtocolsubtype(errorRequest.requestedAction());
 			
-			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());
+			IOAAuthParameters dbOA = errorRequest.getOnlineApplicationConfiguration();
+			if (dbOA != null) {
+				dblog.setOafriendlyName(dbOA.getFriendlyName());
+				dblog.setOatarget(dbOA.getTarget());
+				//dblog.setOaID(dbOA.getHjid());
+				dblog.setBusinessservice(isBusinessService(dbOA));
+				
+				try {
+					AuthenticationSession moasession = authenticatedSessionStorage.
+							getSession(errorRequest.getMOASessionIdentifier());
 					if (moasession != null) {
 						if (MiscUtil.isNotEmpty(moasession.getBkuURL())) {
 							dblog.setBkuurl(moasession.getBkuURL());
 							dblog.setBkutype(findBKUType(moasession.getBkuURL(), dbOA));
 						}
-				
+			
 						dblog.setMandatelogin(moasession.getUseMandate());
 					}
-			
-					generateErrorLogFormThrowable(throwable, dblog);
 					
+				} catch (MOADatabaseException e) {
+					Logger.debug(e.getMessage() + " --> StatistikLog will not include MOASession information.");
 					
-			
-					try {
-						StatisticLogDBUtils.saveOrUpdate(dblog);
+				}
+
+				generateErrorLogFormThrowable(throwable, dblog);
 				
-					} catch (MOADatabaseException e) {
-						Logger.warn("Statistic Log can not be stored into Database", e);
-					}
+				
+
+				try {
+					StatisticLogDBUtils.saveOrUpdate(dblog);
+			
+				} 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(OAAuthParameter dbOA) {
+	private boolean isBusinessService(IOAAuthParameters dbOA) {
 		
 		if (dbOA.getOaType().equals("businessService"))
 			return true;
@@ -360,7 +337,7 @@ public class StatisticLogger {
 		
 	}
 	
-	private String findBKUType(String bkuURL, OAAuthParameter dbOA) {
+	private String findBKUType(String bkuURL, IOAAuthParameters dbOA) {
 		
 		if (dbOA != null) {
 			if (bkuURL.equals(dbOA.getBKUURL(OAAuthParameter.HANDYBKU)))
@@ -376,14 +353,13 @@ public class StatisticLogger {
 		Logger.trace("Staticic Log search BKUType from DefaultBKUs");
 		
 		try {
-			AuthConfiguration authconfig = AuthConfigurationProviderFactory.getInstance();
-			if (bkuURL.equals(authconfig.getDefaultBKUURL(IOAAuthParameters.ONLINEBKU)))
+			if (bkuURL.equals(authConfig.getDefaultBKUURL(IOAAuthParameters.ONLINEBKU)))
 				return IOAAuthParameters.ONLINEBKU;
 			
-			if (bkuURL.equals(authconfig.getDefaultBKUURL(IOAAuthParameters.LOCALBKU)))
+			if (bkuURL.equals(authConfig.getDefaultBKUURL(IOAAuthParameters.LOCALBKU)))
 				return IOAAuthParameters.LOCALBKU;
 			
-			if (bkuURL.equals(authconfig.getDefaultBKUURL(IOAAuthParameters.HANDYBKU)))
+			if (bkuURL.equals(authConfig.getDefaultBKUURL(IOAAuthParameters.HANDYBKU)))
 				return IOAAuthParameters.HANDYBKU;
 			
 		} catch (ConfigurationException e) {