diff options
Diffstat (limited to 'jetty-plus/src/main/java/org/eclipse/jetty/plus/jaas')
5 files changed, 36 insertions, 21 deletions
diff --git a/jetty-plus/src/main/java/org/eclipse/jetty/plus/jaas/JAASLoginService.java b/jetty-plus/src/main/java/org/eclipse/jetty/plus/jaas/JAASLoginService.java index 03bd39bf39..6914605977 100644 --- a/jetty-plus/src/main/java/org/eclipse/jetty/plus/jaas/JAASLoginService.java +++ b/jetty-plus/src/main/java/org/eclipse/jetty/plus/jaas/JAASLoginService.java @@ -38,6 +38,7 @@ import org.eclipse.jetty.server.UserIdentity; import org.eclipse.jetty.util.Loader; import org.eclipse.jetty.util.component.AbstractLifeCycle; import org.eclipse.jetty.util.log.Log; +import org.eclipse.jetty.util.log.Logger; /* ---------------------------------------------------- */ /** JAASLoginService @@ -46,6 +47,8 @@ import org.eclipse.jetty.util.log.Log; */ public class JAASLoginService extends AbstractLifeCycle implements LoginService { + private static final Logger LOG = Log.getLogger(JAASLoginService.class); + public static String DEFAULT_ROLE_CLASS_NAME = "org.eclipse.jetty.plus.jaas.JAASRole"; public static String[] DEFAULT_ROLE_CLASS_NAMES = {DEFAULT_ROLE_CLASS_NAME}; @@ -221,27 +224,27 @@ public class JAASLoginService extends AbstractLifeCycle implements LoginService } catch (LoginException e) { - Log.warn(e); + LOG.warn(e); } catch (IOException e) { - Log.warn(e); + LOG.warn(e); } catch (UnsupportedCallbackException e) { - Log.warn(e); + LOG.warn(e); } catch (InstantiationException e) { - Log.warn(e); + LOG.warn(e); } catch (IllegalAccessException e) { - Log.warn(e); + LOG.warn(e); } catch (ClassNotFoundException e) { - Log.warn(e); + LOG.warn(e); } return null; } @@ -272,7 +275,7 @@ public class JAASLoginService extends AbstractLifeCycle implements LoginService } catch (LoginException e) { - Log.warn(e); + LOG.warn(e); } } diff --git a/jetty-plus/src/main/java/org/eclipse/jetty/plus/jaas/spi/AbstractDatabaseLoginModule.java b/jetty-plus/src/main/java/org/eclipse/jetty/plus/jaas/spi/AbstractDatabaseLoginModule.java index 9537e6f0ce..1747463e85 100644 --- a/jetty-plus/src/main/java/org/eclipse/jetty/plus/jaas/spi/AbstractDatabaseLoginModule.java +++ b/jetty-plus/src/main/java/org/eclipse/jetty/plus/jaas/spi/AbstractDatabaseLoginModule.java @@ -26,6 +26,7 @@ import javax.security.auth.callback.CallbackHandler; import org.eclipse.jetty.http.security.Credential; import org.eclipse.jetty.util.log.Log; +import org.eclipse.jetty.util.log.Logger; /** * AbstractDatabaseLoginModule @@ -37,6 +38,8 @@ import org.eclipse.jetty.util.log.Log; */ public abstract class AbstractDatabaseLoginModule extends AbstractLoginModule { + private static final Logger LOG = Log.getLogger(AbstractDatabaseLoginModule.class); + private String userQuery; private String rolesQuery; private String dbUserTable; @@ -130,7 +133,7 @@ public abstract class AbstractDatabaseLoginModule extends AbstractLoginModule rolesQuery = "select "+dbUserRoleTableRoleField+" from "+dbUserRoleTable+" where "+dbUserRoleTableUserField+"=?"; - if(Log.isDebugEnabled())Log.debug("userQuery = "+userQuery); - if(Log.isDebugEnabled())Log.debug("rolesQuery = "+rolesQuery); + if(LOG.isDebugEnabled())LOG.debug("userQuery = "+userQuery); + if(LOG.isDebugEnabled())LOG.debug("rolesQuery = "+rolesQuery); } } diff --git a/jetty-plus/src/main/java/org/eclipse/jetty/plus/jaas/spi/JDBCLoginModule.java b/jetty-plus/src/main/java/org/eclipse/jetty/plus/jaas/spi/JDBCLoginModule.java index 73c9158c3e..101c5a9437 100644 --- a/jetty-plus/src/main/java/org/eclipse/jetty/plus/jaas/spi/JDBCLoginModule.java +++ b/jetty-plus/src/main/java/org/eclipse/jetty/plus/jaas/spi/JDBCLoginModule.java @@ -22,6 +22,7 @@ import javax.security.auth.callback.CallbackHandler; import org.eclipse.jetty.util.Loader; import org.eclipse.jetty.util.log.Log; +import org.eclipse.jetty.util.log.Logger; @@ -42,6 +43,8 @@ import org.eclipse.jetty.util.log.Log; */ public class JDBCLoginModule extends AbstractDatabaseLoginModule { + private static final Logger LOG = Log.getLogger(JDBCLoginModule.class); + private String dbDriver; private String dbUrl; private String dbUserName; @@ -62,7 +65,7 @@ public class JDBCLoginModule extends AbstractDatabaseLoginModule (dbUrl != null))) throw new IllegalStateException ("Database connection information not configured"); - if(Log.isDebugEnabled())Log.debug("Connecting using dbDriver="+dbDriver+"+ dbUserName="+dbUserName+", dbPassword="+dbUrl); + if(LOG.isDebugEnabled())LOG.debug("Connecting using dbDriver="+dbDriver+"+ dbUserName="+dbUserName+", dbPassword="+dbUrl); return DriverManager.getConnection (dbUrl, dbUserName, diff --git a/jetty-plus/src/main/java/org/eclipse/jetty/plus/jaas/spi/LdapLoginModule.java b/jetty-plus/src/main/java/org/eclipse/jetty/plus/jaas/spi/LdapLoginModule.java index c4c78c8a09..5b1e7e92c3 100644 --- a/jetty-plus/src/main/java/org/eclipse/jetty/plus/jaas/spi/LdapLoginModule.java +++ b/jetty-plus/src/main/java/org/eclipse/jetty/plus/jaas/spi/LdapLoginModule.java @@ -38,6 +38,7 @@ import javax.security.auth.login.LoginException; import org.eclipse.jetty.http.security.Credential; import org.eclipse.jetty.plus.jaas.callback.ObjectCallback; import org.eclipse.jetty.util.log.Log; +import org.eclipse.jetty.util.log.Logger; /** * A LdapLoginModule for use with JAAS setups @@ -80,6 +81,8 @@ import org.eclipse.jetty.util.log.Log; */ public class LdapLoginModule extends AbstractLoginModule { + private static final Logger LOG = Log.getLogger(LdapLoginModule.class); + /** * hostname of the ldap server */ @@ -252,14 +255,14 @@ public class LdapLoginModule extends AbstractLoginModule String filter = "(&(objectClass={0})({1}={2}))"; - Log.debug("Searching for users with filter: \'" + filter + "\'" + " from base dn: " + _userBaseDn); + LOG.debug("Searching for users with filter: \'" + filter + "\'" + " from base dn: " + _userBaseDn); try { Object[] filterArguments = {_userObjectClass, _userIdAttribute, username}; NamingEnumeration<SearchResult> results = _rootContext.search(_userBaseDn, filter, filterArguments, ctls); - Log.debug("Found user?: " + results.hasMoreElements()); + LOG.debug("Found user?: " + results.hasMoreElements()); if (!results.hasMoreElements()) { @@ -281,7 +284,7 @@ public class LdapLoginModule extends AbstractLoginModule } catch (NamingException e) { - Log.debug("no password available under attribute: " + _userPasswordAttribute); + LOG.debug("no password available under attribute: " + _userPasswordAttribute); } } } @@ -290,7 +293,7 @@ public class LdapLoginModule extends AbstractLoginModule throw new LoginException("Root context binding failure."); } - Log.debug("user cred is: " + ldapCredential); + LOG.debug("user cred is: " + ldapCredential); return ldapCredential; } @@ -329,7 +332,7 @@ public class LdapLoginModule extends AbstractLoginModule Object[] filterArguments = {_roleObjectClass, _roleMemberAttribute, userDn}; NamingEnumeration<SearchResult> results = dirContext.search(_roleBaseDn, filter, filterArguments, ctls); - Log.debug("Found user roles?: " + results.hasMoreElements()); + LOG.debug("Found user roles?: " + results.hasMoreElements()); while (results.hasMoreElements()) { @@ -466,7 +469,7 @@ public class LdapLoginModule extends AbstractLoginModule String userDn = searchResult.getNameInNamespace(); - Log.info("Attempting authentication: " + userDn); + LOG.info("Attempting authentication: " + userDn); Hashtable<Object,Object> environment = getEnvironment(); environment.put(Context.SECURITY_PRINCIPAL, userDn); @@ -491,7 +494,7 @@ public class LdapLoginModule extends AbstractLoginModule String filter = "(&(objectClass={0})({1}={2}))"; - Log.info("Searching for users with filter: \'" + filter + "\'" + " from base dn: " + _userBaseDn); + LOG.info("Searching for users with filter: \'" + filter + "\'" + " from base dn: " + _userBaseDn); Object[] filterArguments = new Object[]{ _userObjectClass, @@ -500,7 +503,7 @@ public class LdapLoginModule extends AbstractLoginModule }; NamingEnumeration<SearchResult> results = _rootContext.search(_userBaseDn, filter, filterArguments, ctls); - Log.info("Found user?: " + results.hasMoreElements()); + LOG.info("Found user?: " + results.hasMoreElements()); if (!results.hasMoreElements()) { diff --git a/jetty-plus/src/main/java/org/eclipse/jetty/plus/jaas/spi/PropertyFileLoginModule.java b/jetty-plus/src/main/java/org/eclipse/jetty/plus/jaas/spi/PropertyFileLoginModule.java index aa84bb68a9..67a207042f 100644 --- a/jetty-plus/src/main/java/org/eclipse/jetty/plus/jaas/spi/PropertyFileLoginModule.java +++ b/jetty-plus/src/main/java/org/eclipse/jetty/plus/jaas/spi/PropertyFileLoginModule.java @@ -27,6 +27,7 @@ import javax.security.auth.callback.CallbackHandler; import org.eclipse.jetty.http.security.Credential; import org.eclipse.jetty.util.log.Log; +import org.eclipse.jetty.util.log.Logger; /** * PropertyFileLoginModule @@ -35,6 +36,8 @@ import org.eclipse.jetty.util.log.Log; */ public class PropertyFileLoginModule extends AbstractLoginModule { + private static final Logger LOG = Log.getLogger(PropertyFileLoginModule.class); + public static final String DEFAULT_FILENAME = "realm.properties"; public static final Map<String, Map<String, UserInfo>> fileMap = new HashMap<String, Map<String, UserInfo>>(); @@ -80,7 +83,7 @@ public class PropertyFileLoginModule extends AbstractLoginModule //give up, can't find a property file to load if (!propsFile.exists()) { - Log.warn("No property file found"); + LOG.warn("No property file found"); throw new IllegalStateException ("No property file specified in login module configuration file"); } @@ -91,7 +94,7 @@ public class PropertyFileLoginModule extends AbstractLoginModule this.propertyFileName = propsFile.getCanonicalPath(); if (fileMap.get(propertyFileName) != null) { - if (Log.isDebugEnabled()) {Log.debug("Properties file "+propertyFileName+" already in cache, skipping load");} + if (LOG.isDebugEnabled()) {LOG.debug("Properties file "+propertyFileName+" already in cache, skipping load");} return; } @@ -133,7 +136,7 @@ public class PropertyFileLoginModule extends AbstractLoginModule } catch (Exception e) { - Log.warn("Error loading properties from file", e); + LOG.warn("Error loading properties from file", e); throw new RuntimeException(e); } } |