wobauth 5.0.2 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2500bebf49f08404ae7184155a6f01f82ca0aec3851932e02475fb17d58e5782
-  data.tar.gz: a09aa25804d3f786183378606d1335e1681e1830c0f4bff0ce0fea87b1cc8e0a
+  metadata.gz: 1889123fe1e0d6d4e986cb42d678b6aa474300876f66d3beeb4f060e159eff8d
+  data.tar.gz: 17554b7eb67349b71e25e377d944d3006e875e03b77981a893db5c6795edfc4c
 SHA512:
-  metadata.gz: 705ff44fd69b90cbb7410b5aaf6fb101c9ccbd9680a8250c57e595c570957f43c21fb99c7df0b57179196e1172d40628dd64d1af52a3595ad7fb4de31b5e5ab8
-  data.tar.gz: 1e01f8526e8615957dae51d02d1de285a4e17b498fdbf2793a98d50da0006da887175ce93893d37202a8f0fbb6581f3ea45e99492e714e16c95f83f84701ecb4
+  metadata.gz: 9164b9aac82455c42149d900a207e16516e3a0a706898710a1d53288932b080322d6e7e6782db9929ccd287eec83f65ca3609b1d53c99719a8cfe16078a64589
+  data.tar.gz: 694b09bae0b9e5da4ba428dcab073763fb489347f8ab785e82af244304517aa3ab9f859efa75a120627fba1d6b20822791c7d1b43db1bf9d13260ad308e63cf6

data/app/services/wobauth/search_ad_user_service.rb

@@ -17,17 +17,27 @@ module Wobauth
 	return Result.new(success: false, error_messages: ["no query given"], ad_users: [])
       end
 
-      ldap = Wobaduser::LDAP.new(ldap_options: ldap_options)
-      if ldap.errors.any?
-	return Result.new(success: false, error_messages: ldap.errors, ad_users: [])
+      errors = []
+      ad_users = []
+      ldap_options.each do |ldapopts|
+        ldap = Wobaduser::LDAP.new(ldap_options: ldapopts)
+        if ldap.errors.any?
+          errors += ldap.errors
+          next
+        end
+        search = Wobaduser::User.search(ldap: ldap, filter: user_filter(query))
+        if search.success?
+          ad_users += search.entries
+        else
+          errors += search.errors
+        end
       end
 
-      search = Wobaduser::User.search(ldap: ldap, filter: user_filter(query))
-      if search.success?
-	result = Result.new(success: true, error_messages: [], ad_users: search.entries)
+      if errors.any?
+        return Result.new(success: false, error_messages: errors, ad_users: ad_users)
       else
-	result = Result.new(success: false, error_messages: search.errors, ad_users: [])
-       end
+        result = Result.new(success: true, error_messages: errors, ad_users: ad_users)
+      end
     end
 
   private
@@ -50,5 +60,13 @@ module Wobauth
       filter += ")"
       filter = Net::LDAP::Filter.construct(filter)
     end
+
+    def ldap_options
+      if @ldap_options.kind_of? Hash
+        [@ldap_options]
+      else
+        @ldap_options
+      end
+    end
   end
-end
+ end

data/config/ldap.yml.example

@@ -1,3 +1,4 @@
+# simple 
 ldap_options:
   host: 1.2.3.4
   port: 3268
@@ -7,3 +8,34 @@ ldap_options:
     username: myusername
     password: mysecretpassword
 
+# redundant: 1 directory with 2 redundant servers
+ldap_options:
+  hosts: 
+    - [1.2.3.4, 3269]
+    - [5.6.7.8, 3269]
+  encryption: :simple_tls
+  base: dc=example,dc=com
+  auth:
+    method: :simple
+    username: myusername
+    password: mysecretpassword
+
+# multiple directories
+ldap_options:
+  - host: 1.2.3.4
+    port: 3268
+    base: dc=example,dc=com
+    auth:
+      method: :simple
+      username: myusername
+      password: mysecretpassword
+  - host: 5.6.7.8
+    port: 3269
+    base: dc=example,dc=com
+    encryption: :simple_tls
+    auth:
+      method: :simple
+      username: myusername
+      password: mysecretpassword
+
+

data/lib/wobauth.rb

@@ -45,13 +45,18 @@ module Wobauth
     config ||= Hash.new
 
     if config['ldap_options'].present?
-      opts = config['ldap_options'].symbolize_keys
-      opts.each do |k,v|
-        opts[k] = opts[k].symbolize_keys if opts[k].kind_of? Hash
+      ldapopts = config['ldap_options']
+      if ldapopts.kind_of? Hash
+        ldapopts = [ldapopts]
+      end
+      ldapopts.each do |opts|
+        opts.symbolize_keys!
+        opts.each do |k,v|
+          opts[k] = opts[k].symbolize_keys if opts[k].kind_of? Hash
+        end
       end
     else
       nil
     end
   end
-
 end

data/lib/wobauth/version.rb

@@ -1,4 +1,4 @@
 module Wobauth
-  VERSION = "5.0.2".freeze
-  RELEASEDATE = "2020-04-05".freeze
+  VERSION = "5.1.0".freeze
+  RELEASEDATE = "2020-04-12".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wobauth
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.1.0
 platform: ruby
 authors:
 - Wolfgang Barth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-05 00:00:00.000000000 Z
+date: 2020-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails