Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

JETTY-960 support ldaps 

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@762 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Jan Bartel 2009-08-26 02:03:16 +00:00
parent d7c6df193c
commit 4ae850e9e5
2 changed files with 43 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
VERSION.txt
View File

@ -1,5 +1,6 @@
jetty-7.0.0-SNAPSHOT
+ 286911 Clean out cache when recycling HTTP fields
+ JETTY-960 Support for ldaps
+ JETTY-1081 Handle null content type in GzipFilter
+ JETTY-1084 Disable GzipFilter for HEAD requests
+ JETTY-1086 Added UncheckedPrintWriter to avoid ignored EOFs

86
jetty-plus/src/main/java/org/eclipse/jetty/plus/jaas/spi/LdapLoginModule.java
View File

@ -54,6 +54,7 @@ import org.eclipse.jetty.util.log.Log;
* ldaploginmodule {
* org.eclipse.jetty.server.server.plus.jaas.spi.LdapLoginModule required
* debug="true"
* useLdaps="false"
* contextFactory="com.sun.jndi.ldap.LdapCtxFactory"
* hostname="ldap.example.com"
* port="389"
@ -164,6 +165,11 @@ public class LdapLoginModule extends AbstractLoginModule
* login checks, set this to true
*/
private boolean _forceBindingLogin = false;
/**
* When true changes the protocol to ldaps
*/
private boolean _useLdaps = false;
private DirContext _rootContext;
@ -189,10 +195,6 @@ public class LdapLoginModule extends AbstractLoginModule
}
pwdCredential = convertCredentialLdapToJetty(pwdCredential);
//String md5Credential = Credential.MD5.digest("foo");
//byte[] ba = digestMD5("foo");
//System.out.println(md5Credential + " " + ba );
Credential credential = Credential.getCredential(pwdCredential);
List roles = getUserRoles(_rootContext, username);
@ -474,9 +476,7 @@ public class LdapLoginModule extends AbstractLoginModule
List roles = getUserRolesByDn(dirContext, userDn);
UserInfo userInfo = new UserInfo(username, null, roles);
setCurrentUser(new JAASUserInfo(userInfo));
setAuthenticated(true);
return true;
@ -525,7 +525,6 @@ public class LdapLoginModule extends AbstractLoginModule
Map sharedState,
Map options)
{
super.initialize(subject, callbackHandler, sharedState, options);
_hostname = (String) options.get("hostname");
@ -543,7 +542,12 @@ public class LdapLoginModule extends AbstractLoginModule
{
_forceBindingLogin = Boolean.parseBoolean((String) options.get("forceBindingLogin"));
}
if (options.containsKey("useLdaps"))
{
_useLdaps = Boolean.parseBoolean((String) options.get("useLdaps"));
}
_userObjectClass = getOption(options, "userObjectClass", _userObjectClass);
_userRdnAttribute = getOption(options, "userRdnAttribute", _userRdnAttribute);
_userIdAttribute = getOption(options, "userIdAttribute", _userIdAttribute);
@ -562,35 +566,36 @@ public class LdapLoginModule extends AbstractLoginModule
throw new IllegalStateException("Unable to establish root context", ex);
}
}
public boolean commit() throws LoginException {
try
{
_rootContext.close();
}
catch (NamingException e)
{
throw new LoginException( "error closing root context: " + e.getMessage() );
}
return super.commit();
}
public boolean abort() throws LoginException {
try
{
_rootContext.close();
}
catch (NamingException e)
{
throw new LoginException( "error closing root context: " + e.getMessage() );
}
return super.abort();
}
private String getOption(Map options, String key, String defaultValue)
public boolean commit() throws LoginException
{
try
{
_rootContext.close();
}
catch (NamingException e)
{
throw new LoginException( "error closing root context: " + e.getMessage() );
}
return super.commit();
}
public boolean abort() throws LoginException
{
try
{
_rootContext.close();
}
catch (NamingException e)
{
throw new LoginException( "error closing root context: " + e.getMessage() );
}
return super.abort();
}
private String getOption(Map options, String key, String defaultValue)
{
Object value = options.get(key);
@ -615,14 +620,7 @@ public class LdapLoginModule extends AbstractLoginModule
if (_hostname != null)
{
if (_port != 0)
{
env.put(Context.PROVIDER_URL, "ldap://" + _hostname + ":" + _port + "/");
}
else
{
env.put(Context.PROVIDER_URL, "ldap://" + _hostname + "/");
}
env.put(Context.PROVIDER_URL, (_useLdaps?"ldaps://":"ldap://") + _hostname + (_port==0?"":":"+_port) +"/");
}
if (_authenticationMethod != null)