From 3bee4536dce4136d83d6d815e6118e94f1efe8fd Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 24 Feb 2016 14:02:43 +0100
Subject: add or move some log messages

---
 .../moa/id/auth/MOAIDAuthInitializer.java          | 22 +++++++++++++++++++---
 .../AbstractAuthProtocolModulController.java       |  2 ++
 .../oauth20/protocol/OAuth20AuthAction.java        |  7 ++++---
 3 files changed, 25 insertions(+), 6 deletions(-)

(limited to 'id')

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java
index 5968736f8..ce158d7fe 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java
@@ -5,6 +5,8 @@ package at.gv.egovernment.moa.id.auth;
 
 import java.io.IOException;
 import java.security.GeneralSecurityException;
+import java.security.Provider;
+import java.security.Security;
 
 import javax.activation.CommandMap;
 import javax.activation.MailcapCommandMap;
@@ -204,12 +206,11 @@ public class MOAIDAuthInitializer implements WebApplicationInitializer {
             Logger.warn(MOAIDMessageProvider.getInstance().getMessage(
                     "init.01", null), e);
         }
-        
-		Logger.info("Loading security providers.");
+
+        Logger.info("Loading Java security providers.");
         IAIK.addAsProvider();                
         ECCProvider.addAsProvider();
         
-        
         // Initializes SSLSocketFactory store
         SSLUtils.initialize();
 
@@ -242,6 +243,21 @@ public class MOAIDAuthInitializer implements WebApplicationInitializer {
             
          }
         	        	
+				
+        //IAIK.addAsProvider();                
+        //ECCProvider.addAsProvider();
+        
+        Security.insertProviderAt(IAIK.getInstance(), 0);
+        Security.addProvider(new ECCProvider());
+        
+        if (Logger.isDebugEnabled()) {
+        	Logger.debug("Loaded Security Provider:");
+        	Provider[] providerList = Security.getProviders();
+        	for (int i=0; i<providerList.length; i++)
+        		Logger.debug(i + ": " + providerList[i].getName() + " Version " + providerList[i].getVersion());        		
+        	
+        }
+        
         
         // Starts the session cleaner thread to remove unpicked authentication data
         AuthenticationSessionCleaner sessioncleaner = rootContext.getBean("AuthenticationSessionCleaner", AuthenticationSessionCleaner.class);
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/AbstractAuthProtocolModulController.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/AbstractAuthProtocolModulController.java
index bb89f2e03..0b2fe879a 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/AbstractAuthProtocolModulController.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/AbstractAuthProtocolModulController.java
@@ -119,6 +119,8 @@ public abstract class AbstractAuthProtocolModulController extends AbstractContro
 		//if Single Sign-On functionality is enabled for this request
 		if (pendingReq.needSingleSignOnFunctionality()) {
 			
+			Logger.debug("Add SSO information to MOASession.");
+			
 			//Store SSO information into database
 			newSSOSessionId = ssomanager.createSSOSessionInformations(moaSession.getSessionID(), 
 					pendingReq.getOAURL());
diff --git a/id/server/modules/moa-id-module-openID/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/protocol/OAuth20AuthAction.java b/id/server/modules/moa-id-module-openID/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/protocol/OAuth20AuthAction.java
index 17d0738e3..e7594954b 100644
--- a/id/server/modules/moa-id-module-openID/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/protocol/OAuth20AuthAction.java
+++ b/id/server/modules/moa-id-module-openID/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/protocol/OAuth20AuthAction.java
@@ -76,8 +76,8 @@ class OAuth20AuthAction implements IAction {
 		try {
 			
 			String accessToken = UUID.randomUUID().toString();
-			
-			Logger.debug("Stored session with id: " + code);
+						
+			Logger.debug("Build OAuth20SessionObject from authenticationData.");
 			OAuth20SessionObject o = new OAuth20SessionObject();
 			if (responseType.equals(OAuth20Constants.RESPONSE_CODE)) {
 				o.setScope(oAuthRequest.getScope());
@@ -91,7 +91,8 @@ class OAuth20AuthAction implements IAction {
 				throw new OAuth20ResponseTypeException();
 			}
 			
-			// store data in oath session			
+			// store data in oath session
+			
 			transactionStorage.put(code, o);
 			
 			Logger.debug("Saved OAuth20SessionObject in session with id: " + code);
-- 
cgit v1.2.3