change test DSN and authenticate with the right user

anonymous access is not enabled in this setup, so every test needs
to perform authentication first

Author: vroldanbet

test/integration/test_add.rb

@@ -3,9 +3,7 @@
 class TestAddIntegration < LDAPIntegrationTestCase
   def setup
     super
-    @ldap.authenticate "cn=admin,dc=rubyldap,dc=com", "passworD1"
-
-    @dn = "uid=added-user1,ou=People,dc=rubyldap,dc=com"
+    @dn = "uid=added-user1,ou=People,dc=example,dc=org"
   end
 
   def test_add

test/integration/test_ber.rb

@@ -8,7 +8,7 @@ def test_true_ber_encoding
     attrs = [:dn, :uid, :cn, :mail]
 
     assert types_entry = @ldap.search(
-      base: "dc=rubyldap,dc=com",
+      base: "dc=example,dc=org",
       filter: "(uid=user1)",
       size: 1,
       attributes: attrs,

test/integration/test_delete.rb

@@ -3,9 +3,7 @@
 class TestDeleteIntegration < LDAPIntegrationTestCase
   def setup
     super
-    @ldap.authenticate "cn=admin,dc=rubyldap,dc=com", "passworD1"
-
-    @dn = "uid=delete-user1,ou=People,dc=rubyldap,dc=com"
+    @dn = "uid=delete-user1,ou=People,dc=example,dc=org"
 
     attrs = {
       objectclass: %w(top inetOrgPerson organizationalPerson person),

test/integration/test_open.rb

@@ -4,8 +4,8 @@ class TestBindIntegration < LDAPIntegrationTestCase
   def test_binds_without_open
     events = @service.subscribe "bind.net_ldap_connection"
 
-    @ldap.search(filter: "uid=user1", base: "ou=People,dc=rubyldap,dc=com", ignore_server_caps: true)
-    @ldap.search(filter: "uid=user1", base: "ou=People,dc=rubyldap,dc=com", ignore_server_caps: true)
+    @ldap.search(filter: "uid=user1", base: "ou=People,dc=example,dc=org", ignore_server_caps: true)
+    @ldap.search(filter: "uid=user1", base: "ou=People,dc=example,dc=org", ignore_server_caps: true)
 
     assert_equal 2, events.size
   end
@@ -14,8 +14,8 @@ def test_binds_with_open
     events = @service.subscribe "bind.net_ldap_connection"
 
     @ldap.open do
-      @ldap.search(filter: "uid=user1", base: "ou=People,dc=rubyldap,dc=com", ignore_server_caps: true)
-      @ldap.search(filter: "uid=user1", base: "ou=People,dc=rubyldap,dc=com", ignore_server_caps: true)
+      @ldap.search(filter: "uid=user1", base: "ou=People,dc=example,dc=org", ignore_server_caps: true)
+      @ldap.search(filter: "uid=user1", base: "ou=People,dc=example,dc=org", ignore_server_caps: true)
     end
 
     assert_equal 1, events.size
@@ -29,9 +29,9 @@ def test_nested_search_without_open
     entries = []
     nested_entry = nil
 
-    @ldap.search(filter: "(|(uid=user1)(uid=user2))", base: "ou=People,dc=rubyldap,dc=com") do |entry|
+    @ldap.search(filter: "(|(uid=user1)(uid=user2))", base: "ou=People,dc=example,dc=org") do |entry|
       entries << entry.uid.first
-      nested_entry ||= @ldap.search(filter: "uid=user3", base: "ou=People,dc=rubyldap,dc=com").first
+      nested_entry ||= @ldap.search(filter: "uid=user3", base: "ou=People,dc=example,dc=org").first
     end
 
     assert_equal "user3", nested_entry.uid.first
@@ -43,9 +43,9 @@ def test_nested_search_with_open
     nested_entry = nil
 
     @ldap.open do
-      @ldap.search(filter: "(|(uid=user1)(uid=user2))", base: "ou=People,dc=rubyldap,dc=com") do |entry|
+      @ldap.search(filter: "(|(uid=user1)(uid=user2))", base: "ou=People,dc=example,dc=org") do |entry|
         entries << entry.uid.first
-        nested_entry ||= @ldap.search(filter: "uid=user3", base: "ou=People,dc=rubyldap,dc=com").first
+        nested_entry ||= @ldap.search(filter: "uid=user3", base: "ou=People,dc=example,dc=org").first
       end
     end
 
@@ -57,7 +57,7 @@ def test_nested_add_with_open
     entries = []
     nested_entry = nil
 
-    dn = "uid=nested-open-added-user1,ou=People,dc=rubyldap,dc=com"
+    dn = "uid=nested-open-added-user1,ou=People,dc=example,dc=org"
     attrs = {
       objectclass: %w(top inetOrgPerson organizationalPerson person),
       uid:  "nested-open-added-user1",
@@ -66,11 +66,10 @@ def test_nested_add_with_open
       mail: "nested-open-added-user1@rubyldap.com",
     }
 
-    @ldap.authenticate "cn=admin,dc=rubyldap,dc=com", "passworD1"
     @ldap.delete dn: dn
 
     @ldap.open do
-      @ldap.search(filter: "(|(uid=user1)(uid=user2))", base: "ou=People,dc=rubyldap,dc=com") do |entry|
+      @ldap.search(filter: "(|(uid=user1)(uid=user2))", base: "ou=People,dc=example,dc=org") do |entry|
         entries << entry.uid.first
 
         nested_entry ||= begin

test/integration/test_password_modify.rb

@@ -3,18 +3,18 @@
 class TestPasswordModifyIntegration < LDAPIntegrationTestCase
   def setup
     super
-    @admin_account = {dn: 'cn=admin,dc=rubyldap,dc=com', password: 'passworD1', method: :simple}
+    @admin_account = {dn: 'cn=admin,dc=example,dc=org', password: 'admin', method: :simple}
     @ldap.authenticate @admin_account[:dn], @admin_account[:password]
 
-    @dn = 'uid=modify-password-user1,ou=People,dc=rubyldap,dc=com'
+    @dn = 'uid=modify-password-user1,ou=People,dc=example,dc=org'
 
     attrs = {
       objectclass: %w(top inetOrgPerson organizationalPerson person),
       uid: 'modify-password-user1',
       cn: 'modify-password-user1',
       sn: 'modify-password-user1',
       mail: 'modify-password-user1@rubyldap.com',
-      userPassword: 'passworD1',
+      userPassword: 'admin',
     }
     unless @ldap.search(base: @dn, scope: Net::LDAP::SearchScope_BaseObject)
       assert @ldap.add(dn: @dn, attributes: attrs), @ldap.get_operation_result.inspect
@@ -24,20 +24,20 @@ def setup
     @auth = {
       method: :simple,
       username: @dn,
-      password: 'passworD1',
+      password: 'admin',
     }
   end
 
   def test_password_modify
     assert @ldap.password_modify(dn: @dn,
                                  auth: @auth,
-                                 old_password: 'passworD1',
+                                 old_password: 'admin',
                                  new_password: 'passworD2')
 
     assert @ldap.get_operation_result.extended_response.nil?,
       'Should not have generated a new password'
 
-    refute @ldap.bind(username: @dn, password: 'passworD1', method: :simple),
+    refute @ldap.bind(username: @dn, password: 'admin', method: :simple),
       'Old password should no longer be valid'
 
     assert @ldap.bind(username: @dn, password: 'passworD2', method: :simple),
@@ -47,13 +47,13 @@ def test_password_modify
   def test_password_modify_generate
     assert @ldap.password_modify(dn: @dn,
                                  auth: @auth,
-                                 old_password: 'passworD1')
+                                 old_password: 'admin')
 
     generated_password = @ldap.get_operation_result.extended_response[0][0]
 
     assert generated_password, 'Should have generated a password'
 
-    refute @ldap.bind(username: @dn, password: 'passworD1', method: :simple),
+    refute @ldap.bind(username: @dn, password: 'admin', method: :simple),
       'Old password should no longer be valid'
 
     assert @ldap.bind(username: @dn, password: generated_password, method: :simple),
@@ -68,7 +68,7 @@ def test_password_modify_generate_no_old_password
 
     assert generated_password, 'Should have generated a password'
 
-    refute @ldap.bind(username: @dn, password: 'passworD1', method: :simple),
+    refute @ldap.bind(username: @dn, password: 'admin', method: :simple),
       'Old password should no longer be valid'
 
     assert @ldap.bind(username: @dn, password: generated_password, method: :simple),
@@ -80,7 +80,7 @@ def test_password_modify_overwrite_old_password
                                  auth: @admin_account,
                                  new_password: 'passworD3')
 
-    refute @ldap.bind(username: @dn, password: 'passworD1', method: :simple),
+    refute @ldap.bind(username: @dn, password: 'admin', method: :simple),
       'Old password should no longer be valid'
 
     assert @ldap.bind(username: @dn, password: 'passworD3', method: :simple),

test/integration/test_return_codes.rb

@@ -5,31 +5,31 @@
 
 class TestReturnCodeIntegration < LDAPIntegrationTestCase
   def test_operations_error
-    refute @ldap.search(filter: "cn=operationsError", base: "ou=Retcodes,dc=rubyldap,dc=com")
+    refute @ldap.search(filter: "cn=operationsError", base: "ou=Retcodes,dc=example,dc=org")
     assert result = @ldap.get_operation_result
 
     assert_equal Net::LDAP::ResultCodeOperationsError, result.code
     assert_equal Net::LDAP::ResultStrings[Net::LDAP::ResultCodeOperationsError], result.message
   end
 
   def test_protocol_error
-    refute @ldap.search(filter: "cn=protocolError", base: "ou=Retcodes,dc=rubyldap,dc=com")
+    refute @ldap.search(filter: "cn=protocolError", base: "ou=Retcodes,dc=example,dc=org")
     assert result = @ldap.get_operation_result
 
     assert_equal Net::LDAP::ResultCodeProtocolError, result.code
     assert_equal Net::LDAP::ResultStrings[Net::LDAP::ResultCodeProtocolError], result.message
   end
 
   def test_time_limit_exceeded
-    assert @ldap.search(filter: "cn=timeLimitExceeded", base: "ou=Retcodes,dc=rubyldap,dc=com")
+    assert @ldap.search(filter: "cn=timeLimitExceeded", base: "ou=Retcodes,dc=example,dc=org")
     assert result = @ldap.get_operation_result
 
     assert_equal Net::LDAP::ResultCodeTimeLimitExceeded, result.code
     assert_equal Net::LDAP::ResultStrings[Net::LDAP::ResultCodeTimeLimitExceeded], result.message
   end
 
   def test_size_limit_exceeded
-    assert @ldap.search(filter: "cn=sizeLimitExceeded", base: "ou=Retcodes,dc=rubyldap,dc=com")
+    assert @ldap.search(filter: "cn=sizeLimitExceeded", base: "ou=Retcodes,dc=example,dc=org")
     assert result = @ldap.get_operation_result
 
     assert_equal Net::LDAP::ResultCodeSizeLimitExceeded, result.code

test/integration/test_search.rb

@@ -4,7 +4,7 @@ class TestSearchIntegration < LDAPIntegrationTestCase
   def test_search
     entries = []
 
-    result = @ldap.search(base: "dc=rubyldap,dc=com") do |entry|
+    result = @ldap.search(base: "dc=example,dc=org") do |entry|
       assert_kind_of Net::LDAP::Entry, entry
       entries << entry
     end
@@ -16,7 +16,7 @@ def test_search
   def test_search_without_result
     entries = []
 
-    result = @ldap.search(base: "dc=rubyldap,dc=com", return_result: false) do |entry|
+    result = @ldap.search(base: "dc=example,dc=org", return_result: false) do |entry|
       assert_kind_of Net::LDAP::Entry, entry
       entries << entry
     end
@@ -26,24 +26,24 @@ def test_search_without_result
   end
 
   def test_search_filter_string
-    entries = @ldap.search(base: "dc=rubyldap,dc=com", filter: "(uid=user1)")
+    entries = @ldap.search(base: "dc=example,dc=org", filter: "(uid=user1)")
     assert_equal 1, entries.size
   end
 
   def test_search_filter_object
     filter = Net::LDAP::Filter.eq("uid", "user1") | Net::LDAP::Filter.eq("uid", "user2")
-    entries = @ldap.search(base: "dc=rubyldap,dc=com", filter: filter)
+    entries = @ldap.search(base: "dc=example,dc=org", filter: filter)
     assert_equal 2, entries.size
   end
 
   def test_search_constrained_attributes
-    entry = @ldap.search(base: "uid=user1,ou=People,dc=rubyldap,dc=com", attributes: ["cn", "sn"]).first
+    entry = @ldap.search(base: "uid=user1,ou=People,dc=example,dc=org", attributes: ["cn", "sn"]).first
     assert_equal [:cn, :dn, :sn], entry.attribute_names.sort  # :dn is always included
     assert_empty entry[:mail]
   end
 
   def test_search_attributes_only
-    entry = @ldap.search(base: "uid=user1,ou=People,dc=rubyldap,dc=com", attributes_only: true).first
+    entry = @ldap.search(base: "uid=user1,ou=People,dc=example,dc=org", attributes_only: true).first
 
     assert_empty entry[:cn], "unexpected attribute value: #{entry[:cn]}"
   end
@@ -52,7 +52,7 @@ def test_search_timeout
     entries = []
     events = @service.subscribe "search.net_ldap_connection"
 
-    result = @ldap.search(base: "dc=rubyldap,dc=com", time: 5) do |entry|
+    result = @ldap.search(base: "dc=example,dc=org", time: 5) do |entry|
       assert_kind_of Net::LDAP::Entry, entry
       entries << entry
     end
@@ -66,7 +66,7 @@ def test_search_timeout
   def test_search_with_size
     entries = []
 
-    result = @ldap.search(base: "dc=rubyldap,dc=com", size: 1) do |entry|
+    result = @ldap.search(base: "dc=example,dc=org", size: 1) do |entry|
       assert_kind_of Net::LDAP::Entry, entry
       entries << entry
     end

test/test_helper.rb

@@ -20,8 +20,8 @@
 
 BIND_CREDS = {
   method:   :simple,
-  username: "uid=user1,ou=People,dc=rubyldap,dc=com",
-  password: "passworD1",
+  username: "cn=admin,dc=example,dc=org",
+  password: "admin",
 }.freeze
 
 TLS_OPTS = OpenSSL::SSL::SSLContext::DEFAULT_PARAMS.merge({}).freeze
@@ -65,10 +65,9 @@ def setup
     @ldap = Net::LDAP.new \
       host:           ENV.fetch('INTEGRATION_HOST', 'localhost'),
       port:           ENV.fetch('INTEGRATION_PORT', 389),
-      admin_user:     'uid=admin,dc=rubyldap,dc=com',
-      admin_password: 'passworD1',
-      search_domains: %w(dc=rubyldap,dc=com),
+      search_domains: %w(dc=example,dc=org),
       uid:            'uid',
       instrumentation_service: @service
+    @ldap.authenticate "cn=admin,dc=example,dc=org", "admin"
   end
 end