geos_one/CASA
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Continuation of changes to switch over to using log4j.

Browse Source
This commit is contained in:
Juan Carlos Luciani
2007-02-21 18:08:09 +00:00
parent a5d4983177
commit f33278929d
12 changed files with 143 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CASA-auth-token/server-java/Jaas/linux/Makefile.am
View File

@@ -47,7 +47,7 @@ BUILDDIR = ../build
CLASSES = $(addprefix $(BUILDDIR)/, $(JAVAFILES:%.java=%.class))
LIBS =
LIBS = :/usr/share/java/log4j.jar
CLASSPATH = $(LIBDIR)/java/CasaAuthToken.jar:$(LIBS)
all: $(BUILDDIR)/$(MODULE_NAME).$(MODULE_EXT)

17
CASA-auth-token/server-java/Jaas/src/com/novell/casa/jaas/CasaLoginModule.java
View File

@@ -27,6 +27,8 @@ package com.novell.casa.jaas;
import java.util.Map;
import java.util.Set;
import org.apache.log4j.Logger;
import javax.security.auth.Subject;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
@@ -49,6 +51,8 @@ import com.novell.casa.authtoksvc.CasaIdentityToken;
*/
public final class CasaLoginModule implements LoginModule
{
private static final Logger m_log = Logger.getLogger(CasaLoginModule.class);
private final static String casaUsername = "CasaIdentityUser";
private Subject m_subject = null;
@@ -96,7 +100,7 @@ public final class CasaLoginModule implements LoginModule
}
catch (Exception e)
{
System.err.println("CasaLoginModule.commit()- Exception caught associating principal, msg: " + e.getMessage());
m_log.error("CasaLoginModule.commit()- Exception caught associating principal, msg: " + e.getMessage());
throw new LoginException("Error encountered");
}
}
@@ -119,7 +123,7 @@ public final class CasaLoginModule implements LoginModule
// Verify that a CallbackHandler was specified
if (m_callbackHandler == null)
{
System.err.println("CasaLoginModule.login()- Null CallbackHandler");
m_log.error("CasaLoginModule.login()- Null CallbackHandler");
throw new LoginException("Null CallbackHandler");
}
@@ -153,7 +157,7 @@ public final class CasaLoginModule implements LoginModule
}
catch (Exception e)
{
System.err.println("CasaLoginModule.login()- Exception caught during nameCallback, msg: " + e.getMessage());
m_log.warn("CasaLoginModule.login()- Exception caught during nameCallback, msg: " + e.getMessage());
}
// Check the username
@@ -187,7 +191,7 @@ public final class CasaLoginModule implements LoginModule
}
catch (Exception e)
{
System.err.println("CasaLoginModule.login()- Exception caught during passwordCallback, msg: " + e.getMessage());
m_log.warn("CasaLoginModule.login()- Exception caught during passwordCallback, msg: " + e.getMessage());
}
// Check the CasaAuthenticationToken
@@ -209,15 +213,14 @@ public final class CasaLoginModule implements LoginModule
catch (Exception e)
{
// The validation of one of the tokens failed
// tbd - Log
System.err.println("CasaLoginModule.login()- Exception caught during token processing, msg: " + e.getMessage());
m_log.info("CasaLoginModule.login()- Exception caught during token processing, msg: " + e.getMessage());
throw new FailedLoginException("Token validation failed");
}
}
else
{
// Token not provided
System.err.println("CasaLoginModule.login()- Token not provided");
m_log.warn("CasaLoginModule.login()- Token not provided");
throw new FailedLoginException("CasaAuthenticationToken not obtained");
}