You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2015/09/20 23:12:58 UTC
svn commit: r1704203 - in /directory/apacheds/trunk/server-integ/src:
main/java/org/apache/directory/server/integ/
test/java/org/apache/directory/server/kerberos/
test/java/org/apache/directory/server/operations/add/
test/java/org/apache/directory/serv...
Author: seelmann
Date: Sun Sep 20 21:12:48 2015
New Revision: 1704203
URL: http://svn.apache.org/viewvc?rev=1704203&view=rev
Log:
Replace more occurrences of localhost with InetAddress.getLocalHost().getHostName()
Modified:
directory/apacheds/trunk/server-integ/src/main/java/org/apache/directory/server/integ/ServerIntegrationUtils.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/kerberos/KeyDerivationServiceIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SimpleBindIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/AddIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsUpdateCertificateIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsConfidentialityIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsUpdateCertificateIT.java
Modified: directory/apacheds/trunk/server-integ/src/main/java/org/apache/directory/server/integ/ServerIntegrationUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/main/java/org/apache/directory/server/integ/ServerIntegrationUtils.java?rev=1704203&r1=1704202&r2=1704203&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/main/java/org/apache/directory/server/integ/ServerIntegrationUtils.java (original)
+++ directory/apacheds/trunk/server-integ/src/main/java/org/apache/directory/server/integ/ServerIntegrationUtils.java Sun Sep 20 21:12:48 2015
@@ -80,7 +80,8 @@ public class ServerIntegrationUtils exte
LOG.debug( "Creating a wired context to local LDAP server on port {}", ldapServer.getPort() );
Hashtable<String, String> env = new Hashtable<String, String>();
env.put( Context.INITIAL_CONTEXT_FACTORY, CTX_FACTORY );
- env.put( Context.PROVIDER_URL, "ldap://localhost:" + ldapServer.getPort() );
+ env.put( Context.PROVIDER_URL,
+ "ldap://" + InetAddress.getLocalHost().getHostName() + ":" + ldapServer.getPort() );
env.put( Context.SECURITY_PRINCIPAL, principalDn );
env.put( Context.SECURITY_CREDENTIALS, password );
env.put( Context.SECURITY_AUTHENTICATION, "simple" );
@@ -103,7 +104,8 @@ public class ServerIntegrationUtils exte
LOG.debug( "Creating a wired context to local LDAP server on port {}", ldapServer.getPort() );
Hashtable<String, String> env = new Hashtable<String, String>();
env.put( Context.INITIAL_CONTEXT_FACTORY, CTX_FACTORY );
- env.put( Context.PROVIDER_URL, "ldap://localhost:" + ldapServer.getPort() );
+ env.put( Context.PROVIDER_URL,
+ "ldap://" + InetAddress.getLocalHost().getHostName() + ":" + ldapServer.getPort() );
env.put( Context.SECURITY_PRINCIPAL, ServerDNConstants.ADMIN_SYSTEM_DN );
env.put( Context.SECURITY_CREDENTIALS, "secret" );
env.put( Context.SECURITY_AUTHENTICATION, "simple" );
@@ -126,7 +128,8 @@ public class ServerIntegrationUtils exte
LOG.debug( "Creating a wired context to local LDAP server on port {}", ldapServer.getPort() );
Hashtable<String, String> env = new Hashtable<String, String>();
env.put( Context.INITIAL_CONTEXT_FACTORY, CTX_FACTORY );
- env.put( Context.PROVIDER_URL, "ldap://localhost:" + ldapServer.getPort() );
+ env.put( Context.PROVIDER_URL,
+ "ldap://" + InetAddress.getLocalHost().getHostName() + ":" + ldapServer.getPort() );
env.put( Context.SECURITY_PRINCIPAL, ServerDNConstants.ADMIN_SYSTEM_DN );
env.put( Context.SECURITY_CREDENTIALS, "secret" );
env.put( Context.SECURITY_AUTHENTICATION, "simple" );
@@ -149,7 +152,8 @@ public class ServerIntegrationUtils exte
LOG.debug( "Creating a wired context to local LDAP server on port {}", ldapServer.getPort() );
Hashtable<String, String> env = new Hashtable<String, String>();
env.put( Context.INITIAL_CONTEXT_FACTORY, CTX_FACTORY );
- env.put( Context.PROVIDER_URL, "ldap://localhost:" + ldapServer.getPort() );
+ env.put( Context.PROVIDER_URL,
+ "ldap://" + InetAddress.getLocalHost().getHostName() + ":" + ldapServer.getPort() );
env.put( Context.SECURITY_PRINCIPAL, ServerDNConstants.ADMIN_SYSTEM_DN );
env.put( Context.SECURITY_CREDENTIALS, "secret" );
env.put( Context.SECURITY_AUTHENTICATION, "simple" );
@@ -172,7 +176,8 @@ public class ServerIntegrationUtils exte
LOG.debug( "Creating a wired context to local LDAP server on port {}", ldapServer.getPort() );
Hashtable<String, String> env = new Hashtable<String, String>();
env.put( Context.INITIAL_CONTEXT_FACTORY, CTX_FACTORY );
- env.put( Context.PROVIDER_URL, "ldap://localhost:" + ldapServer.getPort() );
+ env.put( Context.PROVIDER_URL,
+ "ldap://" + InetAddress.getLocalHost().getHostName() + ":" + ldapServer.getPort() );
env.put( Context.SECURITY_PRINCIPAL, ServerDNConstants.ADMIN_SYSTEM_DN );
env.put( Context.SECURITY_CREDENTIALS, "secret" );
env.put( Context.SECURITY_AUTHENTICATION, "simple" );
Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/kerberos/KeyDerivationServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/kerberos/KeyDerivationServiceIT.java?rev=1704203&r1=1704202&r2=1704203&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/kerberos/KeyDerivationServiceIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/kerberos/KeyDerivationServiceIT.java Sun Sep 20 21:12:48 2015
@@ -27,6 +27,8 @@ import static org.junit.Assert.assertTru
import static org.junit.Assert.fail;
import java.io.IOException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
import java.security.InvalidKeyException;
import java.util.Arrays;
import java.util.HashMap;
@@ -222,11 +224,12 @@ public class KeyDerivationServiceIT exte
* @throws IOException on network errors
*/
@Test
- public void testAddDerivedKeys() throws NamingException, KerberosException
+ public void testAddDerivedKeys() throws NamingException, KerberosException, UnknownHostException
{
Hashtable<String, String> env = new Hashtable<String, String>();
env.put( Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory" );
- env.put( Context.PROVIDER_URL, "ldap://localhost:" + getLdapServer().getPort() );
+ env.put( Context.PROVIDER_URL, "ldap://" + InetAddress.getLocalHost().getHostName() + ":"
+ + getLdapServer().getPort() );
env.put( Context.SECURITY_AUTHENTICATION, "simple" );
env.put( Context.SECURITY_PRINCIPAL, "uid=hnelson,ou=users,dc=example,dc=com" );
@@ -295,11 +298,12 @@ public class KeyDerivationServiceIT exte
* @throws IOException on network errors
*/
@Test
- public void testModifyDerivedKeys() throws NamingException, KerberosException
+ public void testModifyDerivedKeys() throws NamingException, KerberosException, UnknownHostException
{
Hashtable<String, String> env = new Hashtable<String, String>();
env.put( Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory" );
- env.put( Context.PROVIDER_URL, "ldap://localhost:" + getLdapServer().getPort() );
+ env.put( Context.PROVIDER_URL, "ldap://" + InetAddress.getLocalHost().getHostName() + ":"
+ + getLdapServer().getPort() );
env.put( Context.SECURITY_AUTHENTICATION, "simple" );
env.put( Context.SECURITY_PRINCIPAL, "uid=hnelson,ou=users,dc=example,dc=com" );
@@ -436,11 +440,13 @@ public class KeyDerivationServiceIT exte
* @throws IOException on network errors
*/
@Test
- public void testModifyDerivedKeysWithoutPrincipalName() throws NamingException, KerberosException
+ public void testModifyDerivedKeysWithoutPrincipalName() throws NamingException, KerberosException,
+ UnknownHostException
{
Hashtable<String, String> env = new Hashtable<String, String>();
env.put( Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory" );
- env.put( Context.PROVIDER_URL, "ldap://localhost:" + getLdapServer().getPort() );
+ env.put( Context.PROVIDER_URL, "ldap://" + InetAddress.getLocalHost().getHostName() + ":"
+ + getLdapServer().getPort() );
env.put( Context.SECURITY_AUTHENTICATION, "simple" );
env.put( Context.SECURITY_PRINCIPAL, "uid=hnelson,ou=users,dc=example,dc=com" );
@@ -569,12 +575,13 @@ public class KeyDerivationServiceIT exte
* @throws InvalidKeyException if the incorrect key results
*/
@Test
- public void testAddRandomKeys() throws NamingException, KerberosException, InvalidKeyException
+ public void testAddRandomKeys() throws NamingException, KerberosException, InvalidKeyException,
+ UnknownHostException
{
Hashtable<String, String> env = new Hashtable<String, String>();
env.put( "java.naming.factory.initial", "com.sun.jndi.ldap.LdapCtxFactory" );
- env.put( "java.naming.provider.url", "ldap://localhost:" + getLdapServer().getPort()
- + "/ou=users,dc=example,dc=com" );
+ env.put( "java.naming.provider.url", "ldap://" + InetAddress.getLocalHost().getHostName() + ":"
+ + getLdapServer().getPort() + "/ou=users,dc=example,dc=com" );
env.put( "java.naming.security.principal", "uid=admin,ou=system" );
env.put( "java.naming.security.credentials", "secret" );
env.put( "java.naming.security.authentication", "simple" );
Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java?rev=1704203&r1=1704202&r2=1704203&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java Sun Sep 20 21:12:48 2015
@@ -555,8 +555,8 @@ public class AddIT extends AbstractLdapT
ne = containerCtx.search( "ou=bestFruit", "(objectClass=*)", controls );
assertTrue( ne.hasMore() );
sr = ne.next();
- assertEquals( "ldap://localhost:" + getLdapServer().getPort() + "/ou=favorite,ou=Fruits,ou=system",
- sr.getName() );
+ assertEquals( "ldap://" + InetAddress.getLocalHost().getHostName() + ":" + getLdapServer().getPort()
+ + "/ou=favorite,ou=Fruits,ou=system", sr.getName() );
assertFalse( ne.hasMore() );
// Remove alias and entry
Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java?rev=1704203&r1=1704202&r2=1704203&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java Sun Sep 20 21:12:48 2015
@@ -159,7 +159,8 @@ public class MiscBindIT extends Abstract
// Use the SUN JNDI provider to hit server port and bind as anonymous
final Hashtable<String, Object> env = new Hashtable<String, Object>();
- env.put( Context.PROVIDER_URL, "ldap://localhost:" + getLdapServer().getPort() + "/ou=system" );
+ env.put( Context.PROVIDER_URL, "ldap://" + InetAddress.getLocalHost().getHostName() + ":"
+ + getLdapServer().getPort() + "/ou=system" );
env.put( Context.SECURITY_AUTHENTICATION, "none" );
env.put( Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory" );
@@ -204,7 +205,8 @@ public class MiscBindIT extends Abstract
// Use the SUN JNDI provider to hit server port and bind as anonymous
Hashtable<String, Object> env = new Hashtable<String, Object>();
- env.put( Context.PROVIDER_URL, "ldap://localhost:" + getLdapServer().getPort() + "/" );
+ env.put( Context.PROVIDER_URL, "ldap://" + InetAddress.getLocalHost().getHostName() + ":"
+ + getLdapServer().getPort() + "/" );
env.put( Context.SECURITY_AUTHENTICATION, "none" );
env.put( Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory" );
@@ -242,7 +244,8 @@ public class MiscBindIT extends Abstract
// Use the SUN JNDI provider to hit server port and bind as anonymous
Hashtable<String, Object> env = new Hashtable<String, Object>();
- env.put( Context.PROVIDER_URL, "ldap://localhost:" + getLdapServer().getPort() + "/" );
+ env.put( Context.PROVIDER_URL, "ldap://" + InetAddress.getLocalHost().getHostName() + ":"
+ + getLdapServer().getPort() + "/" );
env.put( Context.SECURITY_AUTHENTICATION, "none" );
env.put( Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory" );
@@ -280,7 +283,8 @@ public class MiscBindIT extends Abstract
final Hashtable<String, Object> env = new Hashtable<String, Object>();
- env.put( Context.PROVIDER_URL, "ldap://localhost:" + getLdapServer().getPort() );
+ env.put( Context.PROVIDER_URL, "ldap://" + InetAddress.getLocalHost().getHostName() + ":"
+ + getLdapServer().getPort() );
env.put( "java.naming.ldap.version", "3" );
env.put( Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory" );
@@ -320,7 +324,8 @@ public class MiscBindIT extends Abstract
Hashtable<String, Object> env = new Hashtable<String, Object>();
- env.put( Context.PROVIDER_URL, "ldap://localhost:" + getLdapServer().getPort() + "/dc=aPache,dc=org" );
+ env.put( Context.PROVIDER_URL, "ldap://" + InetAddress.getLocalHost().getHostName() + ":"
+ + getLdapServer().getPort() + "/dc=aPache,dc=org" );
env.put( "java.naming.ldap.version", "3" );
env.put( Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory" );
InitialDirContext ctx = new InitialDirContext( env );
@@ -359,7 +364,8 @@ public class MiscBindIT extends Abstract
Hashtable<String, Object> env = new Hashtable<String, Object>();
- env.put( Context.PROVIDER_URL, "ldap://localhost:" + getLdapServer().getPort() + "/ou=system" );
+ env.put( Context.PROVIDER_URL, "ldap://" + InetAddress.getLocalHost().getHostName() + ":"
+ + getLdapServer().getPort() + "/ou=system" );
env.put( "java.naming.ldap.version", "3" );
env.put( Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory" );
env.put( Context.SECURITY_AUTHENTICATION, "simple" );
Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SimpleBindIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SimpleBindIT.java?rev=1704203&r1=1704202&r2=1704203&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SimpleBindIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SimpleBindIT.java Sun Sep 20 21:12:48 2015
@@ -134,11 +134,12 @@ public class SimpleBindIT extends Abstra
* Tests to make sure SIMPLE binds works.
*/
@Test
- public void testSimpleBind()
+ public void testSimpleBind() throws UnknownHostException
{
Hashtable<String, String> env = new Hashtable<String, String>();
env.put( Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory" );
- env.put( Context.PROVIDER_URL, "ldap://localhost:" + getLdapServer().getPort() );
+ env.put( Context.PROVIDER_URL, "ldap://" + InetAddress.getLocalHost().getHostName() + ":"
+ + getLdapServer().getPort() );
env.put( Context.SECURITY_AUTHENTICATION, "simple" );
env.put( Context.SECURITY_PRINCIPAL, "uid=hnelson," + BASE );
env.put( Context.SECURITY_CREDENTIALS, "secret" );
@@ -172,11 +173,12 @@ public class SimpleBindIT extends Abstra
* Tests to make sure SIMPLE binds below the RootDSE fail if the password is bad.
*/
@Test
- public void testSimpleBindBadPassword()
+ public void testSimpleBindBadPassword() throws UnknownHostException
{
Hashtable<String, String> env = new Hashtable<String, String>();
env.put( Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory" );
- env.put( Context.PROVIDER_URL, "ldap://localhost:" + getLdapServer().getPort() );
+ env.put( Context.PROVIDER_URL, "ldap://" + InetAddress.getLocalHost().getHostName() + ":"
+ + getLdapServer().getPort() );
env.put( Context.SECURITY_AUTHENTICATION, "simple" );
env.put( Context.SECURITY_PRINCIPAL, "uid=hnelson," + BASE );
env.put( Context.SECURITY_CREDENTIALS, "badsecret" );
@@ -201,12 +203,12 @@ public class SimpleBindIT extends Abstra
* try to connect using a user with an invalid Dn: we should get a invalidDNSyntax error.
*/
@Test
- public void testSimpleBindBadPrincipalAPassword()
+ public void testSimpleBindBadPrincipalAPassword() throws UnknownHostException
{
Hashtable<String, String> env = new Hashtable<String, String>();
env.put( Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory" );
- env.put( Context.PROVIDER_URL, "ldap://localhost:" + getLdapServer().getPort() );
-
+ env.put( Context.PROVIDER_URL, "ldap://" + InetAddress.getLocalHost().getHostName() + ":"
+ + getLdapServer().getPort() );
env.put( Context.SECURITY_AUTHENTICATION, "simple" );
env.put( Context.SECURITY_PRINCIPAL, "hnelson" );
env.put( Context.SECURITY_CREDENTIALS, "secret" );
@@ -231,11 +233,12 @@ public class SimpleBindIT extends Abstra
* try to connect using a unknown user: we should get a invalidCredentials error.
*/
@Test
- public void testSimpleBindUnknowPrincipalAPassword()
+ public void testSimpleBindUnknowPrincipalAPassword() throws UnknownHostException
{
Hashtable<String, String> env = new Hashtable<String, String>();
env.put( Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory" );
- env.put( Context.PROVIDER_URL, "ldap://localhost:" + getLdapServer().getPort() );
+ env.put( Context.PROVIDER_URL, "ldap://" + InetAddress.getLocalHost().getHostName() + ":"
+ + getLdapServer().getPort() );
env.put( Context.SECURITY_AUTHENTICATION, "simple" );
env.put( Context.SECURITY_PRINCIPAL, "uid=unknown,ou=system" );
env.put( Context.SECURITY_CREDENTIALS, "secret" );
@@ -259,14 +262,15 @@ public class SimpleBindIT extends Abstra
* covers the anonymous authentication : we should be able to read the rootDSE, but that's it
*/
@Test
- public void testSimpleBindNoPrincipalNoPassword()
+ public void testSimpleBindNoPrincipalNoPassword() throws UnknownHostException
{
boolean oldValue = getLdapServer().getDirectoryService().isAllowAnonymousAccess();
getLdapServer().getDirectoryService().setAllowAnonymousAccess( false );
Hashtable<String, String> env = new Hashtable<String, String>();
env.put( Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory" );
- env.put( Context.PROVIDER_URL, "ldap://localhost:" + getLdapServer().getPort() );
+ env.put( Context.PROVIDER_URL, "ldap://" + InetAddress.getLocalHost().getHostName() + ":"
+ + getLdapServer().getPort() );
env.put( Context.SECURITY_AUTHENTICATION, "simple" );
env.put( Context.SECURITY_PRINCIPAL, "" );
env.put( Context.SECURITY_CREDENTIALS, "" );
@@ -348,11 +352,12 @@ public class SimpleBindIT extends Abstra
* covers the Unauthenticated case : we should get a UnwillingToPerform error.
*/
@Test
- public void testSimpleBindPrincipalNoPassword()
+ public void testSimpleBindPrincipalNoPassword() throws UnknownHostException
{
Hashtable<String, String> env = new Hashtable<String, String>();
env.put( Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory" );
- env.put( Context.PROVIDER_URL, "ldap://localhost:" + getLdapServer().getPort() );
+ env.put( Context.PROVIDER_URL, "ldap://" + InetAddress.getLocalHost().getHostName() + ":"
+ + getLdapServer().getPort() );
env.put( Context.SECURITY_AUTHENTICATION, "simple" );
env.put( Context.SECURITY_PRINCIPAL, "uid=admin,ou=system" );
env.put( Context.SECURITY_CREDENTIALS, "" );
@@ -382,8 +387,8 @@ public class SimpleBindIT extends Abstra
{
Hashtable<String, String> env = new Hashtable<String, String>();
env.put( Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory" );
- env.put( Context.PROVIDER_URL, "ldap://localhost:" + getLdapServer().getPort() );
-
+ env.put( Context.PROVIDER_URL, "ldap://" + InetAddress.getLocalHost().getHostName() + ":"
+ + getLdapServer().getPort() );
env.put( Context.SECURITY_AUTHENTICATION, "simple" );
env.put( Context.SECURITY_PRINCIPAL, "" );
env.put( Context.SECURITY_CREDENTIALS, "secret" );
Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/AddIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/AddIT.java?rev=1704203&r1=1704202&r2=1704203&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/AddIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/AddIT.java Sun Sep 20 21:12:48 2015
@@ -556,8 +556,8 @@ public class AddIT extends AbstractLdapT
ne = containerCtx.search( "ou=bestFruit", "(objectClass=*)", controls );
assertTrue( ne.hasMore() );
sr = ne.next();
- assertEquals( "ldap://localhost:" + getLdapServer().getPort() + "/ou=favorite,ou=Fruits,ou=system",
- sr.getName() );
+ assertEquals( "ldap://" + InetAddress.getLocalHost().getHostName() + ":" + getLdapServer().getPort()
+ + "/ou=favorite,ou=Fruits,ou=system", sr.getName() );
assertFalse( ne.hasMore() );
// Remove alias and entry
Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsIT.java?rev=1704203&r1=1704202&r2=1704203&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsIT.java Sun Sep 20 21:12:48 2015
@@ -22,6 +22,7 @@ package org.apache.directory.server.ssl;
import static org.junit.Assert.assertNotNull;
+import java.net.InetAddress;
import java.util.Hashtable;
import javax.naming.NamingException;
@@ -89,7 +90,8 @@ public class LdapsIT extends AbstractLda
{
Hashtable<String, String> env = new Hashtable<String, String>();
env.put( "java.naming.factory.initial", "com.sun.jndi.ldap.LdapCtxFactory" );
- env.put( "java.naming.provider.url", "ldap://localhost:" + getLdapServer().getPortSSL() + "/ou=system" );
+ env.put( "java.naming.provider.url", "ldap://" + InetAddress.getLocalHost().getHostName() + ":"
+ + getLdapServer().getPortSSL() + "/ou=system" );
env.put( "java.naming.ldap.factory.socket", SSLSocketFactory.class.getName() );
env.put( "java.naming.security.principal", "uid=admin,ou=system" );
env.put( "java.naming.security.credentials", "secret" );
Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsUpdateCertificateIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsUpdateCertificateIT.java?rev=1704203&r1=1704202&r2=1704203&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsUpdateCertificateIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsUpdateCertificateIT.java Sun Sep 20 21:12:48 2015
@@ -23,6 +23,7 @@ package org.apache.directory.server.ssl;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import java.net.InetAddress;
import java.security.cert.X509Certificate;
import java.util.Hashtable;
@@ -91,7 +92,8 @@ public class LdapsUpdateCertificateIT ex
{
Hashtable<String, String> env = new Hashtable<String, String>();
env.put( "java.naming.factory.initial", "com.sun.jndi.ldap.LdapCtxFactory" );
- env.put( "java.naming.provider.url", "ldap://localhost:" + getLdapServer().getPortSSL() + "/ou=system" );
+ env.put( "java.naming.provider.url", "ldap://" + InetAddress.getLocalHost().getHostName() + ":"
+ + getLdapServer().getPortSSL() + "/ou=system" );
env.put( "java.naming.ldap.factory.socket", SSLSocketFactory.class.getName() );
env.put( "java.naming.security.principal", "uid=admin,ou=system" );
env.put( "java.naming.security.credentials", "secret" );
@@ -109,7 +111,8 @@ public class LdapsUpdateCertificateIT ex
// create a secure connection
Hashtable<String, String> env = new Hashtable<String, String>();
env.put( "java.naming.factory.initial", "com.sun.jndi.ldap.LdapCtxFactory" );
- env.put( "java.naming.provider.url", "ldaps://localhost:" + getLdapServer().getPortSSL() );
+ env.put( "java.naming.provider.url", "ldaps://" + InetAddress.getLocalHost().getHostName() + ":"
+ + getLdapServer().getPortSSL() );
env.put( "java.naming.ldap.factory.socket", SSLSocketFactory.class.getName() );
env.put( "java.naming.security.principal", "uid=admin,ou=system" );
env.put( "java.naming.security.credentials", "secret" );
Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsConfidentialityIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsConfidentialityIT.java?rev=1704203&r1=1704202&r2=1704203&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsConfidentialityIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsConfidentialityIT.java Sun Sep 20 21:12:48 2015
@@ -27,6 +27,7 @@ import static org.junit.Assert.fail;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileOutputStream;
+import java.net.InetAddress;
import java.security.KeyStore;
import java.security.cert.Certificate;
import java.security.cert.CertificateFactory;
@@ -167,7 +168,8 @@ public class StartTlsConfidentialityIT e
env.put( Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory" );
// Must use the name of the server that is found in its certificate?
- env.put( Context.PROVIDER_URL, "ldap://localhost:" + getLdapServer().getPort() );
+ env.put( Context.PROVIDER_URL, "ldap://" + InetAddress.getLocalHost().getHostName() + ":"
+ + getLdapServer().getPort() );
// Create initial context
LOG.debug( "About to get initial context" );
Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsIT.java?rev=1704203&r1=1704202&r2=1704203&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsIT.java Sun Sep 20 21:12:48 2015
@@ -27,6 +27,7 @@ import static org.junit.Assert.assertTru
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileOutputStream;
+import java.net.InetAddress;
import java.security.KeyStore;
import java.security.cert.Certificate;
import java.security.cert.CertificateFactory;
@@ -224,7 +225,8 @@ public class StartTlsIT extends Abstract
env.put( "java.naming.security.authentication", "simple" );
// Must use the name of the server that is found in its certificate?
- env.put( Context.PROVIDER_URL, "ldap://localhost:" + getLdapServer().getPort() );
+ env.put( Context.PROVIDER_URL, "ldap://" + InetAddress.getLocalHost().getHostName() + ":"
+ + getLdapServer().getPort() );
// Create initial context
LOG.debug( "About to get initial context" );
Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsUpdateCertificateIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsUpdateCertificateIT.java?rev=1704203&r1=1704202&r2=1704203&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsUpdateCertificateIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsUpdateCertificateIT.java Sun Sep 20 21:12:48 2015
@@ -26,6 +26,7 @@ import static org.junit.Assert.assertNot
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileOutputStream;
+import java.net.InetAddress;
import java.security.KeyStore;
import java.security.cert.Certificate;
import java.security.cert.CertificateFactory;
@@ -155,7 +156,8 @@ public class StartTlsUpdateCertificateIT
// create a secure connection
Hashtable<String, String> env = new Hashtable<String, String>();
env.put( "java.naming.factory.initial", "com.sun.jndi.ldap.LdapCtxFactory" );
- env.put( "java.naming.provider.url", "ldap://localhost:" + getLdapServer().getPort() );
+ env.put( "java.naming.provider.url", "ldap://" + InetAddress.getLocalHost().getHostName() + ":"
+ + getLdapServer().getPort() );
env.put( "java.naming.security.principal", "uid=admin,ou=system" );
env.put( "java.naming.security.credentials", "secret" );
env.put( "java.naming.security.authentication", "simple" );