net-ldap 0.14.0 → 0.16.3

data/test/test_password.rb

@@ -4,7 +4,7 @@ require_relative 'test_helper'
 
 class TestPassword < Test::Unit::TestCase
   def test_psw
-    assert_equal("{MD5}xq8jwrcfibi0sZdZYNkSng==", Net::LDAP::Password.generate( :md5, "cashflow" ))
-    assert_equal("{SHA}YE4eGkN4BvwNN1f5R7CZz0kFn14=", Net::LDAP::Password.generate( :sha, "cashflow" ))
+    assert_equal("{MD5}xq8jwrcfibi0sZdZYNkSng==", Net::LDAP::Password.generate(:md5, "cashflow"))
+    assert_equal("{SHA}YE4eGkN4BvwNN1f5R7CZz0kFn14=", Net::LDAP::Password.generate(:sha, "cashflow"))
   end
 end

data/test/test_snmp.rb

@@ -1,7 +1,7 @@
 # $Id: testsnmp.rb 231 2006-12-21 15:09:29Z blackhedd $
 
 require_relative 'test_helper'
-require 'net/snmp'
+require_relative '../lib/net/snmp'
 
 class TestSnmp < Test::Unit::TestCase
   def self.raw_string(s)
@@ -17,7 +17,7 @@ class TestSnmp < Test::Unit::TestCase
   def test_invalid_packet
     data = "xxxx"
     assert_raise(Net::BER::BerError) do
-ary = data.read_ber(Net::SNMP::AsnSyntax)
+      data.read_ber(Net::SNMP::AsnSyntax)
     end
   end
 
@@ -41,7 +41,7 @@ ary = data.read_ber(Net::SNMP::AsnSyntax)
 
   def test_weird_packet
     assert_raise(Net::SnmpPdu::Error) do
-Net::SnmpPdu.parse("aaaaaaaaaaaaaa")
+      Net::SnmpPdu.parse("aaaaaaaaaaaaaa")
     end
   end
 
@@ -93,7 +93,7 @@ Net::SnmpPdu.parse("aaaaaaaaaaaaaa")
 
   def test_make_bad_response
     pdu = Net::SnmpPdu.new
-    assert_raise(Net::SnmpPdu::Error) {pdu.to_ber_string}
+    assert_raise(Net::SnmpPdu::Error) { pdu.to_ber_string }
     pdu.pdu_type = :get_response
     pdu.request_id = 999
     pdu.to_ber_string
@@ -115,5 +115,4 @@ Net::SnmpPdu.parse("aaaaaaaaaaaaaa")
     pdu = Net::SnmpPdu.parse(ary)
     assert_equal("xxxxxx", pdu.community)
   end
-
 end

data/test/test_ssl_ber.rb

@@ -5,7 +5,7 @@ class TestSSLBER < Test::Unit::TestCase
   # Transmits str to @to and reads it back from @from.
   #
   def transmit(str)
-    Timeout::timeout(1) do
+    Timeout.timeout(1) do
       @to.write(str)
       @to.close
 
@@ -22,18 +22,22 @@ class TestSSLBER < Test::Unit::TestCase
     #
     # TODO: Replace test with real socket
     # https://github.com/ruby-ldap/ruby-net-ldap/pull/121#discussion_r18746386
-    flexmock(OpenSSL::SSL::SSLSocket).
-      new_instances.should_receive(:connect => nil)
+    flexmock(OpenSSL::SSL::SSLSocket)
+      .new_instances.should_receive(:connect => nil)
 
     @to   = Net::LDAP::Connection.wrap_with_ssl(@to)
     @from = Net::LDAP::Connection.wrap_with_ssl(@from)
   end
 
   def test_transmit_strings
+    omit_if RUBY_PLATFORM == "java", "JRuby throws an error without a real socket"
+
     assert_equal "foo", transmit("foo")
   end
 
   def test_transmit_ber_encoded_numbers
+    omit_if RUBY_PLATFORM == "java", "JRuby throws an error without a real socket"
+
     @to.write 1234.to_ber
     assert_equal 1234, @from.read_ber
   end

data/testserver/ldapserver.rb

@@ -15,7 +15,6 @@
 #------------------------------------------------
 
 module LdapServer
-
   LdapServerAsnSyntax = {
     :application => {
       :constructed => {
@@ -46,7 +45,7 @@ module LdapServer
     @data ||= ""; @data << data
     while pdu = @data.read_ber!(LdapServerAsnSyntax)
       begin
-      handle_ldap_pdu pdu
+        handle_ldap_pdu pdu
       rescue
         $logger.error "closing connection due to error #{$!}"
         close_connection
@@ -87,9 +86,7 @@ module LdapServer
     end
   end
 
-
-
-  #--
+  # --
   # Search Response ::=
   #       CHOICE {
   #            entry          [APPLICATION 4] SEQUENCE {
@@ -119,9 +116,9 @@ module LdapServer
     # pdu[1][7] is the list of requested attributes.
     # If it's an empty array, that means that *all* attributes were requested.
     requested_attrs = if pdu[1][7].length > 0
-      pdu[1][7].map(&:downcase)
-    else
-      :all
+                        pdu[1][7].map(&:downcase)
+                      else
+                        :all
     end
 
     filters = pdu[1][6]
@@ -131,13 +128,13 @@ module LdapServer
     end
 
     # TODO, what if this returns nil?
-    filter = Net::LDAP::Filter.parse_ldap_filter( filters )
+    filter = Net::LDAP::Filter.parse_ldap_filter(filters)
 
     $ldif.each do |dn, entry|
-      if filter.match( entry )
+      if filter.match(entry)
         attrs = []
         entry.each do |k, v|
-          if requested_attrs == :all or requested_attrs.include?(k.downcase)
+          if requested_attrs == :all || requested_attrs.include?(k.downcase)
             attrvals = v.map(&:to_ber).to_ber_set
             attrs << [k.to_ber, attrvals].to_ber_sequence
           end
@@ -149,32 +146,27 @@ module LdapServer
       end
     end
 
-
     send_ldap_response 5, pdu[0].to_i, 0, "", "Was that what you wanted?"
   end
 
-
-
   def send_ldap_response pkt_tag, msgid, code, dn, text
-    send_data( [msgid.to_ber, [code.to_ber, dn.to_ber, text.to_ber].to_ber_appsequence(pkt_tag)].to_ber )
+    send_data([msgid.to_ber, [code.to_ber, dn.to_ber, text.to_ber].to_ber_appsequence(pkt_tag)].to_ber)
   end
-
 end
 
-
 #------------------------------------------------
 
 # Rather bogus, a global method, which reads a HARDCODED filename
 # parses out LDIF data. It will be used to serve LDAP queries out of this server.
 #
 def load_test_data
-  ary = File.readlines( "./testdata.ldif" )
+  ary = File.readlines("./testdata.ldif")
   hash = {}
-  while line = ary.shift and line.chomp!
+  while (line = ary.shift) && line.chomp!
     if line =~ /^dn:[\s]*/i
       dn = $'
       hash[dn] = {}
-      while attr = ary.shift and attr.chomp! and attr =~ /^([\w]+)[\s]*:[\s]*/
+      while (attr = ary.shift) && attr.chomp! && attr =~ /^([\w]+)[\s]*:[\s]*/
         hash[dn][$1.downcase] ||= []
         hash[dn][$1.downcase] << $'
       end
@@ -183,7 +175,6 @@ def load_test_data
   hash
 end
 
-
 #------------------------------------------------
 
 if __FILE__ == $0
@@ -204,6 +195,6 @@ if __FILE__ == $0
   EventMachine.run do
     $logger.info "starting LDAP server on 127.0.0.1 port 3890"
     EventMachine.start_server "127.0.0.1", 3890, LdapServer
-    EventMachine.add_periodic_timer 60, proc {$logger.info "heartbeat"}
+    EventMachine.add_periodic_timer 60, proc { $logger.info "heartbeat" }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-ldap
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.16.3
 platform: ruby
 authors:
 - Francis Cianfrocca
@@ -10,10 +10,10 @@ authors:
 - Kaspar Schiess
 - Austin Ziegler
 - Michael Schaarschmidt
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-02-05 00:00:00.000000000 Z
+date: 2020-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flexmock
@@ -35,28 +35,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.49.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.49.0
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -151,17 +151,15 @@ files:
 - lib/net/snmp.rb
 - net-ldap.gemspec
 - script/changelog
-- script/install-openldap
+- script/ldap-docker
 - script/package
 - script/release
 - test/ber/core_ext/test_array.rb
 - test/ber/core_ext/test_string.rb
 - test/ber/test_ber.rb
-- test/fixtures/cacert.pem
-- test/fixtures/openldap/memberof.ldif
-- test/fixtures/openldap/retcode.ldif
-- test/fixtures/openldap/slapd.conf.ldif
-- test/fixtures/seed.ldif
+- test/fixtures/ca/docker-ca.pem
+- test/fixtures/ldif/06-retcode.ldif
+- test/fixtures/ldif/50-seed.ldif
 - test/integration/test_add.rb
 - test/integration/test_ber.rb
 - test/integration/test_bind.rb
@@ -171,8 +169,6 @@ files:
 - test/integration/test_return_codes.rb
 - test/integration/test_search.rb
 - test/support/vm/openldap/.gitignore
-- test/support/vm/openldap/README.md
-- test/support/vm/openldap/Vagrantfile
 - test/test_auth_adapter.rb
 - test/test_dn.rb
 - test/test_entry.rb
@@ -194,7 +190,7 @@ homepage: http://github.com/ruby-ldap/ruby-net-ldap
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - README.rdoc
@@ -211,9 +207,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Net::LDAP for Ruby (also called net-ldap) implements client access for the
   Lightweight Directory Access Protocol (LDAP), an IETF standard protocol for accessing
@@ -222,11 +217,9 @@ test_files:
 - test/ber/core_ext/test_array.rb
 - test/ber/core_ext/test_string.rb
 - test/ber/test_ber.rb
-- test/fixtures/cacert.pem
-- test/fixtures/openldap/memberof.ldif
-- test/fixtures/openldap/retcode.ldif
-- test/fixtures/openldap/slapd.conf.ldif
-- test/fixtures/seed.ldif
+- test/fixtures/ca/docker-ca.pem
+- test/fixtures/ldif/06-retcode.ldif
+- test/fixtures/ldif/50-seed.ldif
 - test/integration/test_add.rb
 - test/integration/test_ber.rb
 - test/integration/test_bind.rb
@@ -236,8 +229,6 @@ test_files:
 - test/integration/test_return_codes.rb
 - test/integration/test_search.rb
 - test/support/vm/openldap/.gitignore
-- test/support/vm/openldap/README.md
-- test/support/vm/openldap/Vagrantfile
 - test/test_auth_adapter.rb
 - test/test_dn.rb
 - test/test_entry.rb

data/script/install-openldap

@@ -1,115 +0,0 @@
-#!/usr/bin/env sh
-set -e
-set -x
-
-BASE_PATH="$( cd `dirname $0`/../test/fixtures/openldap && pwd )"
-SEED_PATH="$( cd `dirname $0`/../test/fixtures          && pwd )"
-
-dpkg -s slapd time ldap-utils gnutls-bin ssl-cert > /dev/null ||\
-  DEBIAN_FRONTEND=noninteractive apt-get update  -y --force-yes && \
-  DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes slapd time ldap-utils gnutls-bin ssl-cert
-
-/etc/init.d/slapd stop
-
-TMPDIR=$(mktemp -d)
-cd $TMPDIR
-
-# Delete data and reconfigure.
-cp -v /var/lib/ldap/DB_CONFIG ./DB_CONFIG
-rm -rf /etc/ldap/slapd.d/*
-rm -rf /var/lib/ldap/*
-cp -v ./DB_CONFIG /var/lib/ldap/DB_CONFIG
-slapadd -F /etc/ldap/slapd.d -b "cn=config" -l $BASE_PATH/slapd.conf.ldif
-# Load memberof and ref-int overlays and configure them.
-slapadd -F /etc/ldap/slapd.d -b "cn=config" -l $BASE_PATH/memberof.ldif
-# Load retcode overlay and configure
-slapadd -F /etc/ldap/slapd.d -b "cn=config" -l $BASE_PATH/retcode.ldif
-
-# Add base domain.
-slapadd -F /etc/ldap/slapd.d <<EOM
-dn: dc=rubyldap,dc=com
-objectClass: top
-objectClass: domain
-dc: rubyldap
-EOM
-
-chown -R openldap.openldap /etc/ldap/slapd.d
-chown -R openldap.openldap /var/lib/ldap
-
-/etc/init.d/slapd start
-
-# Import seed data.
-# NOTE: use ldapadd in order for memberOf and refint to apply, instead of:
-# cat $SEED_PATH/seed.ldif | slapadd -F /etc/ldap/slapd.d
-/usr/bin/time ldapadd -x -D "cn=admin,dc=rubyldap,dc=com" -w passworD1 \
-             -h localhost -p 389 \
-             -f $SEED_PATH/seed.ldif
-
-rm -rf $TMPDIR
-
-# SSL
-
-sh -c "certtool --generate-privkey > /etc/ssl/private/cakey.pem"
-
-sh -c "cat > /etc/ssl/ca.info <<EOF
-cn = rubyldap
-ca
-cert_signing_key
-EOF"
-
-# Create the self-signed CA certificate:
-certtool --generate-self-signed \
---load-privkey /etc/ssl/private/cakey.pem \
---template /etc/ssl/ca.info \
---outfile /etc/ssl/certs/cacert.pem
-
-# Make a private key for the server:
-certtool --generate-privkey \
---bits 1024 \
---outfile /etc/ssl/private/ldap01_slapd_key.pem
-
-sh -c "cat > /etc/ssl/ldap01.info <<EOF
-organization = Example Company
-cn = ldap01.example.com
-tls_www_server
-encryption_key
-signing_key
-expiration_days = 3650
-EOF"
-
-# Create the server certificate
-certtool --generate-certificate \
-  --load-privkey /etc/ssl/private/ldap01_slapd_key.pem \
-  --load-ca-certificate /etc/ssl/certs/cacert.pem \
-  --load-ca-privkey /etc/ssl/private/cakey.pem \
-  --template /etc/ssl/ldap01.info \
-  --outfile /etc/ssl/certs/ldap01_slapd_cert.pem
-
-ldapmodify -Y EXTERNAL -H ldapi:/// <<EOF | true
-dn: cn=config
-add: olcTLSCACertificateFile
-olcTLSCACertificateFile: /etc/ssl/certs/cacert.pem
--
-add: olcTLSCertificateFile
-olcTLSCertificateFile: /etc/ssl/certs/ldap01_slapd_cert.pem
--
-add: olcTLSCertificateKeyFile
-olcTLSCertificateKeyFile: /etc/ssl/private/ldap01_slapd_key.pem
-EOF
-
-# LDAP over TLS/SSL (ldaps://) is deprecated in favour of StartTLS. The latter
-# refers to an existing LDAP session (listening on TCP port 389) becoming
-# protected by TLS/SSL whereas LDAPS, like HTTPS, is a distinct
-# encrypted-from-the-start protocol that operates over TCP port 636. But we
-# enable it for testing here.
-sed -i -e 's|^SLAPD_SERVICES="\(.*\)"|SLAPD_SERVICES="ldap:/// ldapi:/// ldaps:///"|' /etc/default/slapd
-
-adduser openldap ssl-cert
-chgrp ssl-cert /etc/ssl/private/ldap01_slapd_key.pem
-chmod g+r /etc/ssl/private/ldap01_slapd_key.pem
-chmod o-r /etc/ssl/private/ldap01_slapd_key.pem
-
-# Drop packets on a secondary port used to specific timeout tests
-iptables -A OUTPUT -p tcp -j DROP --dport 8389
-
-service slapd restart

data/test/fixtures/cacert.pem

@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDRzCCAf+gAwIBAgIEVHpbmjANBgkqhkiG9w0BAQsFADATMREwDwYDVQQDEwhy
-dWJ5bGRhcDAeFw0xNDExMjkyMzQ5NDZaFw0xNTExMjkyMzQ5NDZaMBMxETAPBgNV
-BAMTCHJ1YnlsZGFwMIIBUjANBgkqhkiG9w0BAQEFAAOCAT8AMIIBOgKCATEA4pKe
-cDCNuL53fkpO/WSAS+gmMTsOs+oOK71kZlk2QT/MBz8TxC6m358qCADjnXcMVVxa
-ySQbQlVKZMkIvLNciZbiLDgC5II0NbHACNa8rqenoKRjS4J9W3OhA8EmnXn/Me+8
-uMCI9tfnKNRZYdkQZlra4I+Idn+xYfl/5q5b/7ZjPS2zY/585hFEYE+5vfOZVBSU
-3HMNSeuJvTehLv7dD7aQfXNM4cRgHXequkJQ/HLLFAO4AgJ+LJrFWpj7GWz3crgr
-9G5px4T78wJH3NQiOsG6UBXPw8c4T+Z6GAWX2l1zs1gZsaiCVbAraqK3404lL7yp
-+ThbsW3ifzgNPhmjScXBLdbEDrrAKosW7kkTOGzxiMCBmNlj2SKhcztoduAtfF1f
-Fs2Jk8MRTHwO8ThD7wIDAQABo0MwQTAPBgNVHRMBAf8EBTADAQH/MA8GA1UdDwEB
-/wQFAwMHBAAwHQYDVR0OBBYEFJDm67ekyFu4/Z7VcO6Vk/5pinGcMA0GCSqGSIb3
-DQEBCwUAA4IBMQDHeEPzfYRtjynpUKyrtxx/6ZVOfCLuz4eHkBZggz/pJacDCv/a
-I//W03XCk8RWq/fWVVUzvxXgPwnYcw992PLM7XW81zp6ruRUDWooYnjHZZz3bRhe
-kC4QvM2mZhcsMVmhmWWKZn81qXgVdUY1XNRhk87cuXjF/UTpEieFvWAsCUkFZkqB
-AmySCuI/FuPaauT1YAltkIlYAEIGNJGZDMf2BTVUQpXhTXeS9/AZWLNDBwiq+fwo
-YYnsr9MnBXCEmg1gVSR/Ay2AZmbYfiYtb5kU8uq2lSWAUb4LX6HZl82wo3OilrJ2
-WXl6Qf+Fcy4qqkRt4AKHjtzizpEDCOVYuuG0Zoy+QnxNXRsEzpb8ymnJFrcgYfk/
-6Lv2gWAFl5FqCZp7gBWg55eL2coT4C+mbNTF
------END CERTIFICATE-----