vmpooler 0.11.3 → 0.12.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/vmpooler/api/helpers.rb +15 -15
- data/lib/vmpooler/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 19dd8ce83614c49e92f13e043c2ee7865f1c664d92aa8f13e47fc328eb033690
|
|
4
|
+
data.tar.gz: c3618c9c13591b1b06748ac3e5d1c2dc7ba2eb9793ea2f3f014a762fd6deb4ed
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 8dcb8f8765f9c1fac52c2d0088aaa09a589b5145d5a81e901af614b8fcbbd588669b3f14e5c42f4d56d4681165f8814ef11b22073df6f97b85cef6fcb10d04e2
|
|
7
|
+
data.tar.gz: d7c917233daee973486a6a8add55222a92bb1708521caaefdf2666824c0785cebd1ce7e298448a66736bf7e0646f02a560067e54cc1d06a07ca6abae645898c9
|
data/lib/vmpooler/api/helpers.rb
CHANGED
|
@@ -84,29 +84,29 @@ module Vmpooler
|
|
|
84
84
|
when 'ldap'
|
|
85
85
|
ldap_base = auth[:ldap]['base']
|
|
86
86
|
ldap_port = auth[:ldap]['port'] || 389
|
|
87
|
+
ldap_user_obj = auth[:ldap]['user_object']
|
|
88
|
+
ldap_host = auth[:ldap]['host']
|
|
87
89
|
|
|
88
|
-
|
|
89
|
-
ldap_base
|
|
90
|
+
unless ldap_base.is_a? Array
|
|
91
|
+
ldap_base = ldap_base.split
|
|
92
|
+
end
|
|
93
|
+
|
|
94
|
+
unless ldap_user_obj.is_a? Array
|
|
95
|
+
ldap_user_obj = ldap_user_obj.split
|
|
96
|
+
end
|
|
97
|
+
|
|
98
|
+
ldap_base.each do |search_base|
|
|
99
|
+
ldap_user_obj.each do |search_user_obj|
|
|
90
100
|
result = authenticate_ldap(
|
|
91
101
|
ldap_port,
|
|
92
|
-
|
|
93
|
-
|
|
102
|
+
ldap_host,
|
|
103
|
+
search_user_obj,
|
|
94
104
|
search_base,
|
|
95
105
|
username_str,
|
|
96
106
|
password_str
|
|
97
107
|
)
|
|
98
|
-
return true if result
|
|
108
|
+
return true if result
|
|
99
109
|
end
|
|
100
|
-
else
|
|
101
|
-
result = authenticate_ldap(
|
|
102
|
-
ldap_port,
|
|
103
|
-
auth[:ldap]['host'],
|
|
104
|
-
auth[:ldap]['user_object'],
|
|
105
|
-
ldap_base,
|
|
106
|
-
username_str,
|
|
107
|
-
password_str
|
|
108
|
-
)
|
|
109
|
-
return result
|
|
110
110
|
end
|
|
111
111
|
|
|
112
112
|
return false
|
data/lib/vmpooler/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: vmpooler
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.
|
|
4
|
+
version: 0.12.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Puppet
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2020-
|
|
11
|
+
date: 2020-05-28 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: pickup
|