Merge branch 'master' into master

Author: HarlemSquirrel

.travis.yml

@@ -8,6 +8,7 @@ rvm:
   - 2.5
   - 2.6
   - 2.7
+  - jruby-9.2
   # optional
   - ruby-head
   - jruby-19mode

CONTRIBUTING.md

@@ -49,6 +49,6 @@ MyClass.new \
   baz: 'garply'
 ```
 
-[issues]: https://github.com/ruby-net-ldap/ruby-net-ldap/issues
+[issues]: https://github.com/ruby-ldap/ruby-net-ldap/issues
 [pr]: https://help.github.com/articles/using-pull-requests
 [travis]: https://travis-ci.org/ruby-ldap/ruby-net-ldap

README.rdoc

@@ -21,7 +21,7 @@ the most recent LDAP RFCs (4510–4519, plus portions of 4520–4532).
 
 == Synopsis
 
-See Net::LDAP for documentation and usage samples.
+See {Net::LDAP on rubydoc.info}[https://www.rubydoc.info/gems/net-ldap/Net/LDAP] for documentation and usage samples.
 
 == Requirements
 

lib/net/ldap/connection.rb

@@ -610,7 +610,7 @@ def password_modify(args)
     pdu = queued_read(message_id)
 
     if !pdu || pdu.app_tag != Net::LDAP::PDU::ExtendedResponse
-      raise Net::LDAP::ResponseMissingError, "response missing or invalid"
+      raise Net::LDAP::ResponseMissingOrInvalidError, "response missing or invalid"
     end
 
     pdu

lib/net/ldap/password.rb

@@ -20,23 +20,21 @@ class << self
     # * Should we provide sha1 as a synonym for sha1? I vote no because then
     #   should you also provide ssha1 for symmetry?
     #
-    attribute_value = ""
     def generate(type, str)
       case type
       when :md5
-         attribute_value = '{MD5}' + Base64.strict_encode64(Digest::MD5.digest(str))
+         '{MD5}' + Base64.strict_encode64(Digest::MD5.digest(str))
       when :sha
-         attribute_value = '{SHA}' + Base64.strict_encode64(Digest::SHA1.digest(str))
+         '{SHA}' + Base64.strict_encode64(Digest::SHA1.digest(str))
       when :ssha
          salt = SecureRandom.random_bytes(16)
-         attribute_value = '{SSHA}' + Base64.strict_encode64(Digest::SHA1.digest(str + salt) + salt)
+         '{SSHA}' + Base64.strict_encode64(Digest::SHA1.digest(str + salt) + salt)
       when :ssha256
         salt = SecureRandom.random_bytes(16)
-        attribute_value = '{SSHA256}' + Base64.strict_encode64(Digest::SHA256.digest(str + salt) + salt)
+        '{SSHA256}' + Base64.strict_encode64(Digest::SHA256.digest(str + salt) + salt)
       else
          raise Net::LDAP::HashTypeUnsupportedError, "Unsupported password-hash type (#{type})"
       end
-      return attribute_value
     end
   end
 end

net-ldap.gemspec

@@ -33,5 +33,5 @@ the most recent LDAP RFCs (4510-4519, plutions of 4520-4532).}
   s.add_development_dependency("rake", "~> 10.0")
   s.add_development_dependency("rubocop", "~> 0.49.0")
   s.add_development_dependency("test-unit")
-  s.add_development_dependency("byebug")
+  s.add_development_dependency("byebug") unless RUBY_PLATFORM == "java"
 end

test/integration/test_password_modify.rb

@@ -3,7 +3,7 @@
 class TestPasswordModifyIntegration < LDAPIntegrationTestCase
   def setup
     super
-    @admin_account = {dn: 'cn=admin,dc=example,dc=org', password: 'admin', 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=example,dc=org'

test/test_ldap.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require_relative 'test_helper'
 
 class TestLDAPInstrumentation < Test::Unit::TestCase
   # Fake Net::LDAP::Connection for testing

test/test_ldap_connection.rb

@@ -340,6 +340,18 @@ def test_queued_read_bind_sasl
     assert result.success?
     assert_equal 2, result.message_id
   end
+
+  def test_invalid_pdu_type
+    options = {
+      code: Net::LDAP::ResultCodeSuccess,
+      matched_dn: "",
+      error_message: "",
+    }
+    ber = Net::BER::BerIdentifiedArray.new([options[:code], options[:matched_dn], options[:error_message]])
+    assert_raise Net::LDAP::PDU::Error do
+      Net::LDAP::PDU.new([0, ber])
+    end
+  end
 end
 
 class TestLDAPConnectionErrors < Test::Unit::TestCase

test/test_ssl_ber.rb

@@ -30,10 +30,16 @@ def setup
   end
 
   def test_transmit_strings
+    omit "JRuby throws an error without a real socket"
+    omit_if RUBY_PLATFORM == "java"
+
     assert_equal "foo", transmit("foo")
   end
 
   def test_transmit_ber_encoded_numbers
+    omit "JRuby throws an error without a real socket"
+    omit_if RUBY_PLATFORM == "java"
+
     @to.write 1234.to_ber
     assert_equal 1234, @from.read_ber
   end