github-ldap 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13b19164520b8ed69dc3defdfa76b747767d9006
-  data.tar.gz: f34f58a9d8d91a89b5f9873b7a17daf251b9ac3d
+  metadata.gz: e3c051d99422a820839d27fcc09ca5d06018df60
+  data.tar.gz: 296977c9678d88bf38af56b8fee0f78efd41cc81
 SHA512:
-  metadata.gz: 7c492ec6ceba65de3683871843f7c1ae878e08dea0be24cbe1096723858d7b6b68bb37e7ab1a27c60453e65d4cac26b1bd84f3c79206cbcb5c289f03cf945a67
-  data.tar.gz: 4b8bc4c463f7b29b12983e245615f99f6908be16d6bc491b06a7433d86ef2d482bf0f8da647834e176ed1d4128afc6e5cc521811c7a17ce9c028405923c924b6
+  metadata.gz: 05fbc6dcef6451fd9076b7055df46fbddcfac1ef04d31c3dab3485c23302caaa53ca9ee477d47f269666a8cc7cae5ed6e4a26e1312bd25df62d4ba2a67cf71b8
+  data.tar.gz: bfb3e6b09a2b95c582ed1ce94c4b15b1cdf98cceb27fe1dcb5b193c1e7a91bbe1a5397cf32061190fea5c3f6cb3c6d3ffadb0c602c38e8143470ff12b031a35c

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## v1.7.0
+
+* Accept `:depth` option for Recursive membership validator strategy instance [#73](https://github.com/github/github-ldap/pull/73)
+* Deprecate `depth` argument to `Recursive` membership validator `perform` method
+* Bump net-ldap dependency to 0.10.0 at minimum [#72](https://github.com/github/github-ldap/pull/72)
+
 ## v1.6.0
 
 * Expose `GitHub::Ldap::Group.group?` for testing if entry is a group [#67](https://github.com/github/github-ldap/pull/67)

data/github-ldap.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "github-ldap"
-  spec.version       = "1.6.0"
+  spec.version       = "1.7.0"
   spec.authors       = ["David Calavera", "Matt Todd"]
   spec.email         = ["david.calavera@gmail.com", "chiology@gmail.com"]
   spec.description   = %q{LDAP authentication for humans}
@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'net-ldap', '~> 0.9.0'
+  spec.add_dependency 'net-ldap', '~> 0.10.0'
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency 'ladle'

data/lib/github/ldap/membership_validators/base.rb

@@ -13,9 +13,11 @@ module GitHub
         #
         # - ldap:   GitHub::Ldap object
         # - groups: Array of Net::LDAP::Entry group objects
-        def initialize(ldap, groups)
-          @ldap   = ldap
-          @groups = groups
+        # - options: Hash of options
+        def initialize(ldap, groups, options = {})
+          @ldap    = ldap
+          @groups  = groups
+          @options = options
         end
 
         # Abstract: Performs the membership validation check.

data/lib/github/ldap/membership_validators/recursive.rb

@@ -21,7 +21,31 @@ module GitHub
         DEFAULT_MAX_DEPTH = 9
         ATTRS             = %w(dn cn)
 
-        def perform(entry, depth = DEFAULT_MAX_DEPTH)
+        # Internal: The maximum depth to search for membership.
+        attr_reader :depth
+
+        # Public: Instantiate new search strategy.
+        #
+        # - ldap:    GitHub::Ldap object
+        # - groups:  Array of Net::LDAP::Entry group objects
+        # - options: Hash of options
+        #   depth:   Integer limit of recursion
+        #
+        # NOTE: This overrides default behavior to configure `depth`.
+        def initialize(ldap, groups, options = {})
+          super
+          @depth = options[:depth] || DEFAULT_MAX_DEPTH
+        end
+
+        def perform(entry, depth_override = nil)
+          if depth_override
+            warn "DEPRECATION WARNING: Calling Recursive#perform with a second argument is deprecated."
+            warn "Usage:"
+            warn "  strategy = GitHub::Ldap::MembershipValidators::Recursive.new \\"
+            warn "    ldap, depth: 5"
+            warn "  strategy#perform(entry)"
+          end
+
           # short circuit validation if there are no groups to check against
           return true if groups.empty?
 
@@ -36,7 +60,7 @@ module GitHub
             next if membership.empty?
 
             # recurse to at most `depth`
-            depth.times do |n|
+            (depth_override || depth).times do |n|
               # find groups whose members include membership groups
               membership = domain.search(filter: membership_filter(membership), attributes: ATTRS)
 

data/test/membership_validators/recursive_test.rb

@@ -8,9 +8,9 @@ class GitHubLdapRecursiveMembershipValidatorsTest < GitHub::Ldap::Test
     @validator = GitHub::Ldap::MembershipValidators::Recursive
   end
 
-  def make_validator(groups)
+  def make_validator(groups, options = {})
     groups = @domain.groups(groups)
-    @validator.new(@ldap, groups)
+    @validator.new(@ldap, groups, options)
   end
 
   def test_validates_user_in_group
@@ -34,8 +34,8 @@ class GitHubLdapRecursiveMembershipValidatorsTest < GitHub::Ldap::Test
   end
 
   def test_does_not_validate_user_in_great_granchild_group_with_depth
-    validator = make_validator(%w(n-depth-nested-group3))
-    refute validator.perform(@entry, 2)
+    validator = make_validator(%w(n-depth-nested-group3), depth: 2)
+    refute validator.perform(@entry)
   end
 
   def test_does_not_validate_user_not_in_group

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: github-ldap
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - David Calavera
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-06 00:00:00.000000000 Z
+date: 2014-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ldap
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement