ruby-ldapserver 0.5.0 → 0.5.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: abccbde672eeae57c5376073590192d391e524c9
+  data.tar.gz: 51a8549b288719b8740f8f9804ae68d1dac8785c
+SHA512:
+  metadata.gz: 2a63a336eb6f1f79432459af9b847b86f4742c4e16dd7541569bf7dafbbcc8c2cb34183cae6cfcd4817f6bf4a3e1057d7b1bcb7f7fcaa5515ff5fd995bdd3cdb
+  data.tar.gz: 1d98bfe14ea67c0794ce696fd0f45b05d9b734bc672f7dbfa72b1ed3bd8bded79e18105c287b217a348fa4c066f270f72720fa8d0ecb321670cf6abd63663eb0

data/Rakefile

@@ -1 +1,15 @@
 require "bundler/gem_tasks"
+
+require 'rake/testtask'
+Rake::TestTask.new do |t|
+  t.test_files = FileList['test/*_test.rb']
+end
+
+begin
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:spec)
+rescue LoadError
+  task :spec
+end
+
+task default: [:test, :spec]

data/examples/README

@@ -11,7 +11,7 @@ $ ruby rbslapd1.rb
 
 In another window:
 
-$ ldapadd -H ldap://127.0.0.1:1389/
+$ ldapadd -x -H ldap://127.0.0.1:1389/
 dn: dc=example,dc=com
 cn: Top object
 
@@ -28,9 +28,9 @@ mail: wilma@bedrock.org
 
 Try these queries:
 
-$ ldapsearch -H ldap://127.0.0.1:1389/ -b "" "(objectclass=*)"
-$ ldapsearch -H ldap://127.0.0.1:1389/ -b "dc=example,dc=com" -s base "(objectclass=*)"
-$ ldapsearch -H ldap://127.0.0.1:1389/ -b "dc=example,dc=com" "(mail=fred*)"
+$ ldapsearch -x -H ldap://127.0.0.1:1389/ -b "" "(objectclass=*)"
+$ ldapsearch -x -H ldap://127.0.0.1:1389/ -b "dc=example,dc=com" -s base "(objectclass=*)"
+$ ldapsearch -x -H ldap://127.0.0.1:1389/ -b "dc=example,dc=com" "(mail=fred*)"
 
 If you terminate the server with Ctrl-C, its contents should be written
 to disk as a YAML file.
@@ -52,7 +52,7 @@ In rbslapd1.rb, uncomment
 and run mkcert.rb. Since this is a self-signed certificate, you'll have to
 turn off certificate verification in the client too. For example:
 
-    $ env LDAPTLS_REQCERT="allow" ldapsearch -H ldaps://127.0.0.1:1389/
+    $ env LDAPTLS_REQCERT="allow" ldapsearch -x -H ldaps://127.0.0.1:1389/
 
 Making your own CA and installing its certificate in the client, or
 generating a Certificate Signing Request and sending it to a known CA, is

data/examples/rbslapd2.rb

@@ -23,9 +23,9 @@ require 'resolv-replace'	# ruby threading DNS client
 # work even if the bind occurs on a different client connection to the search.
 #
 # To test:
-#    ldapsearch -H ldap://127.0.0.1:1389/ -b "dc=example,dc=com" "(uid=brian)"
+#    ldapsearch -x -H ldap://127.0.0.1:1389/ -b "dc=example,dc=com" "(uid=brian)"
 #
-#    ldapsearch -H ldap://127.0.0.1:1389/ -b "dc=example,dc=com" \
+#    ldapsearch -x -H ldap://127.0.0.1:1389/ -b "dc=example,dc=com" \
 #       -D "id=1,dc=example,dc=com" -W "(uid=brian)"
 
 $debug = true

data/examples/rbslapd2.sql

@@ -0,0 +1,11 @@
+CREATE TABLE logins (
+  login_id MEDIUMINT NOT NULL AUTO_INCREMENT,
+  login CHAR(30) NOT NULL,
+  passwd CHAR(30),
+  PRIMARY KEY (login_id) 
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+INSERT INTO logins(login, passwd) VALUES
+  ('brian', 'foobar'), ('caroline', 'boing');
+
+SELECT * FROM logins;

data/lib/ldap/server/operation.rb

@@ -108,7 +108,7 @@ class Server
 
       if @schema
         # normalize the attribute names
-        @attributes = @attributes.collect { |a| @schema.find_attrtype(a).to_s }
+        @attributes = @attributes.map { |a| a == '*' ? a : @schema.find_attrtype(a).to_s }
       end
 
       sendall = @attributes == [] || @attributes.include?("*")

data/lib/ldap/server/util.rb

@@ -33,10 +33,10 @@ class Server
 
     def self.split_dn(dn)
       # convert \\ to \5c, \+ to \2b etc
-      dn2 = dn.gsub(/\\([ #,+"\\<>;])/) { "\\%02x" % $1[0] }
+      dn.gsub!(/\\([ #,+"\\<>;])/) { |match| format "\\%02x", match[1].ord }
 
       # Now we know that \\ and \, do not exist, it's safe to split
-      parts = dn2.split(/\s*[,;]\s*/)
+      parts = dn.split(/\s*[,;]\s*/)
 
       parts.collect do |part|
         res = {}

data/lib/ldap/server/version.rb

@@ -1,5 +1,5 @@
 module LDAP #:nodoc:
   class Server #:nodoc:
-    VERSION = '0.5.0'
+    VERSION = '0.5.1'
   end
 end

data/ruby-ldapserver.gemspec

@@ -17,6 +17,10 @@ Gem::Specification.new do |s|
   s.summary = %q{A pure-Ruby framework for building LDAP servers}
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
 
+  s.required_ruby_version = '>= 1.9'
+
   s.add_development_dependency 'bundler', '~> 1.3'
   s.add_development_dependency 'rake', '~> 10.0'
+  s.add_development_dependency 'ruby-ldap', '~> 0.9.16'
+  s.add_development_dependency 'rspec', '~> 3.1'
 end

data/spec/operation_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+require 'ldap/server/operation'
+
+describe LDAP::Server::Operation do
+  let(:server) { double 'server' }
+  let(:connection) { double "connection", opt: { schema: schema, server: server } }
+  let(:message_id) { 337 }
+  subject(:operation) { LDAP::Server::Operation.new connection, message_id }
+
+  context 'on search' do
+    before do
+      operation.instance_variable_set :@attributes, attributes
+      operation.instance_variable_set :@rescount, 0
+    end
+
+    context 'with schema and wildcard attribute query' do
+      let(:schema) do
+        double('schema').tap do |schema|
+          allow(schema).to receive(:find_attrtype).and_return nil
+          allow(schema).to receive(:find_attrtype).with('attr')\
+              .and_return double 'attr', usage: nil
+        end
+      end
+      let(:attributes) { %w(*) }
+
+      describe '#send_SearchResultEntry' do
+        it 'correctly handles wildcard attribute' do
+          expect(connection).to receive(:write).twice do |message|
+            expect(message).to include 'val'
+          end
+
+          operation.send_SearchResultEntry 'o=foo', 'attr' => 'val'
+          operation.send_SearchResultEntry 'o=bar', 'attr' => 'val'
+        end
+      end
+    end
+  end
+end

data/test/util_test.rb

@@ -21,11 +21,11 @@ class TestLdapUtil < Test::Unit::TestCase
 	LDAP::Server::Operation.split_dn("CN=Before\\0DAfter,O=Test,C=GB")
     )
     res = LDAP::Server::Operation.split_dn("SN=Lu\\C4\\8Di\\C4\\87")
-    assert_equal([{"sn"=>"Lu\xc4\x8di\xc4\x87"}], res)
+    assert_equal([{ "sn" => "Lu\xc4\x8di\xc4\x87".force_encoding('ascii-8bit') }], res)
 
     # Just for fun, let's try parsing it as UTF8
-    r = res[0]["sn"].scan(/./u)
-    assert_equal(["L", "u", "\xc4\x8d", "i", "\xc4\x87"], r)
+    chars = res[0]["sn"].force_encoding('utf-8').scan(/./u)
+    assert_equal(["L", "u", "\xc4\x8d", "i", "\xc4\x87"], chars)
   end
 
   def test_join_dn

metadata

@@ -1,48 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: ruby-ldapserver
 version: !ruby/object:Gem::Version
-  version: 0.5.0
-  prerelease: 
+  version: 0.5.1
 platform: ruby
 authors:
 - Brian Candler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-30 00:00:00.000000000 Z
+date: 2015-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: ruby-ldap
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.16
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.16
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
 description: ruby-ldapserver is a lightweight, pure-Ruby skeleton for implementing
   LDAP server applications.
 email: B.Candler@pobox.com
@@ -50,7 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - COPYING
 - ChangeLog
 - Gemfile
@@ -60,6 +83,7 @@ files:
 - examples/mkcert.rb
 - examples/rbslapd1.rb
 - examples/rbslapd2.rb
+- examples/rbslapd2.sql
 - examples/rbslapd3.rb
 - examples/speedtest.rb
 - lib/ldap/server.rb
@@ -76,6 +100,8 @@ files:
 - lib/ldap/server/util.rb
 - lib/ldap/server/version.rb
 - ruby-ldapserver.gemspec
+- spec/operation_spec.rb
+- spec/spec_helper.rb
 - test/core.schema
 - test/encoding_test.rb
 - test/filter_test.rb
@@ -86,37 +112,32 @@ files:
 - test/util_test.rb
 homepage: https://github.com/inscitiv/ruby-ldapserver
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.txt
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 3477786009555667718
+      version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3477786009555667718
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.4.4
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A pure-Ruby framework for building LDAP servers
 test_files:
+- spec/operation_spec.rb
+- spec/spec_helper.rb
 - test/core.schema
 - test/encoding_test.rb
 - test/filter_test.rb