opennebula 5.12.0 → 5.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56a4d4714f58633bd2aa93a39a0a0bf794782d64
-  data.tar.gz: baf93114e6465fbca2a66a71d458638d9ff54061
+  metadata.gz: 27c05d144109ae5a8e3995f035226e3cd5cf6adf
+  data.tar.gz: fa20b6ab2793fbce18a6e4f70cda6353edc61b95
 SHA512:
-  metadata.gz: cd7c9416854f0a4b6b9d9148ffe800dbee1f39706737aebc8c8692eb36041352704fca815aac338a1886478756fbaec08cc812f1511c3f7b3780de7b9a59be9e
-  data.tar.gz: 3d12e853e46eac65b0f2023bb38158db72f9beedd704e842b31f9e0b19d96713a2e654146a6b37db4db8f3abae55e919437606343ef22280da977cc3bba48843
+  metadata.gz: 425276a4cc8b3cc09132b444778dd4a1a58713d15aba34d30fd367819105b712bf50ebe5ba62c07156ef122173423c61481e647b164e08daef434fcc632b42b3
+  data.tar.gz: 9e1e231bf00191417afbcf6140ab6dc64f8180fe262076acfe632743df1fa13a1f9e8fa9a3fe80c1325ce135ecb2580be831bf1520a0c61cc1a9af60a106cdcf

data/lib/cloud/CloudClient.rb

@@ -51,7 +51,7 @@ end
 module CloudClient
 
     # OpenNebula version
-    VERSION = '5.12.0'
+    VERSION = '5.12.1'
 
     # #########################################################################
     # Default location for the authentication file

data/lib/opennebula.rb

@@ -74,5 +74,5 @@ require 'opennebula/hook_log'
 module OpenNebula
 
     # OpenNebula version
-    VERSION = '5.12.0'
+    VERSION = '5.12.1'
 end

data/lib/opennebula/document_pool_json.rb

@@ -41,7 +41,7 @@ module OpenNebula
 
                 hash['DOCUMENT_POOL']['DOCUMENT'].each { |doc|
                     body = doc['TEMPLATE']["#{TEMPLATE_TAG}"]
-                    if body
+                    if body && !body.empty?
                         b_hash = JSON.parse(body)
                         doc['TEMPLATE']["#{TEMPLATE_TAG}"] = b_hash
                     end
@@ -55,4 +55,4 @@ module OpenNebula
             end
         end
     end
-end
+end

data/lib/opennebula/ldap_auth.rb

@@ -222,3 +222,68 @@ class OpenNebula::LdapAuth
         groups.compact.uniq
     end
 end
+
+
+# ---------------------------------------------------------------------------- #
+# Helper functions to parse ldap_auth.conf server entries
+# ---------------------------------------------------------------------------- #
+def to_array(name)
+    if name.is_a? Array
+        name
+    elsif name.is_a? Hash
+        if name.keys.size == 1
+            [name.values].flatten
+        else
+            STDERR.puts "invalid group configuration: #{name}"
+            exit(-1)
+        end
+    else
+        [name]
+    end
+end
+
+def get_server_order(opts, user)
+    order = []
+
+    if opts[:order] && opts[:match_user_regex]
+        STDERR.puts ":order and :match_user_regex are mutually exclusive"
+        exit(-1)
+    end
+
+    if opts[:order]
+        if opts[:order].class != Array
+            STDERR.puts ":order value malformed, must be an Array"
+            exit(-1)
+        end
+
+        opts[:order].each do |name|
+            order << to_array(name)
+        end
+
+    elsif opts[:match_user_regex]
+        if opts[:match_user_regex].class != Hash || opts[:match_user_regex].empty?
+            STDERR.puts ":match_user_regex value malformed, must be an Hash"
+            exit(-1)
+        end
+
+        opts[:match_user_regex].each do |regex, server|
+            if m = user.match(/#{regex}/i)
+
+                # update user with the capture
+                user = m[1] if m[1]
+
+                order << to_array(server)
+            end
+        end
+
+        if order.empty?
+            STDERR.puts "User #{user} does not mach any regex"
+        end
+
+    else
+        STDERR.puts "missing either :order or :match_user_regex in configuration"
+        exit(-1)
+    end
+
+    return [order, user]
+end

data/lib/vcenter_driver.rb

@@ -37,8 +37,9 @@ end
 ENV['LANG'] = 'C'
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << LIB_LOCATION + '/ruby/vendors/rbvmomi/lib'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula
 version: !ruby/object:Gem::Version
-  version: 5.12.0
+  version: 5.12.1
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-14 00:00:00.000000000 Z
+date: 2020-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri