vmpooler 1.1.2 → 1.2.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 +7 -5
- data/lib/vmpooler/version.rb +1 -1
- data/lib/vmpooler.rb +5 -0
- 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: da4a010ab09d34f4fbfa9993526ad18dec205dfbc72f427a250304b2147bdf31
|
|
4
|
+
data.tar.gz: 61193bec61a1385754487f107e601c1fc76959ae81fc27a47d4f11a881553e91
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 13399e493bcaaf5c18541c2125366bb88325936746b715550c6e438d31de77eed9b0f42d9e6140c7529eb0dbd27e4335529f368e6b190c1d047f0cd2710f801e
|
|
7
|
+
data.tar.gz: 0f8551abcbb4cfbaf7bbf60d52f6630ce8334fff620ef1e05bad35e53fb7448c69da074494f8df5efa97053ad6b1e3dd2e55c942e97b359156b0ec07b26de912
|
data/lib/vmpooler/api/helpers.rb
CHANGED
|
@@ -56,14 +56,11 @@ module Vmpooler
|
|
|
56
56
|
return false
|
|
57
57
|
end
|
|
58
58
|
|
|
59
|
-
def authenticate_ldap(port, host, user_object, base, username_str, password_str)
|
|
59
|
+
def authenticate_ldap(port, host, encryption_hash, user_object, base, username_str, password_str)
|
|
60
60
|
ldap = Net::LDAP.new(
|
|
61
61
|
:host => host,
|
|
62
62
|
:port => port,
|
|
63
|
-
:encryption =>
|
|
64
|
-
:method => :start_tls,
|
|
65
|
-
:tls_options => { :ssl_version => 'TLSv1' }
|
|
66
|
-
},
|
|
63
|
+
:encryption => encryption_hash,
|
|
67
64
|
:base => base,
|
|
68
65
|
:auth => {
|
|
69
66
|
:method => :simple,
|
|
@@ -86,6 +83,10 @@ module Vmpooler
|
|
|
86
83
|
ldap_port = auth[:ldap]['port'] || 389
|
|
87
84
|
ldap_user_obj = auth[:ldap]['user_object']
|
|
88
85
|
ldap_host = auth[:ldap]['host']
|
|
86
|
+
ldap_encryption_hash = auth[:ldap]['encryption'] || {
|
|
87
|
+
:method => :start_tls,
|
|
88
|
+
:tls_options => { :ssl_version => 'TLSv1' }
|
|
89
|
+
}
|
|
89
90
|
|
|
90
91
|
unless ldap_base.is_a? Array
|
|
91
92
|
ldap_base = ldap_base.split
|
|
@@ -100,6 +101,7 @@ module Vmpooler
|
|
|
100
101
|
result = authenticate_ldap(
|
|
101
102
|
ldap_port,
|
|
102
103
|
ldap_host,
|
|
104
|
+
ldap_encryption_hash,
|
|
103
105
|
search_user_obj,
|
|
104
106
|
search_base,
|
|
105
107
|
username_str,
|
data/lib/vmpooler/version.rb
CHANGED
data/lib/vmpooler.rb
CHANGED
|
@@ -119,6 +119,11 @@ module Vmpooler
|
|
|
119
119
|
parsed_config[:auth][:ldap]['port'] = string_to_int(ENV['LDAP_PORT']) if ENV['LDAP_PORT']
|
|
120
120
|
parsed_config[:auth][:ldap]['base'] = ENV['LDAP_BASE'] if ENV['LDAP_BASE']
|
|
121
121
|
parsed_config[:auth][:ldap]['user_object'] = ENV['LDAP_USER_OBJECT'] if ENV['LDAP_USER_OBJECT']
|
|
122
|
+
if parsed_config[:auth]['provider'] == 'ldap' && parsed_config[:auth][:ldap].key?('encryption')
|
|
123
|
+
parsed_config[:auth][:ldap]['encryption'] = parsed_config[:auth][:ldap]['encryption']
|
|
124
|
+
elsif parsed_config[:auth]['provider'] == 'ldap'
|
|
125
|
+
parsed_config[:auth][:ldap]['encryption'] = {}
|
|
126
|
+
end
|
|
122
127
|
end
|
|
123
128
|
|
|
124
129
|
# Create an index of pool aliases
|
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: 1.
|
|
4
|
+
version: 1.2.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Puppet
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2021-
|
|
11
|
+
date: 2021-09-15 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: concurrent-ruby
|