opennebula 5.12.0.1 → 5.12.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 933620472113a1196dbe64b6eee36dd6d09af83b
-  data.tar.gz: c3539422575fd62a0d8e951f2f9216e66c1e2df5
+  metadata.gz: 9b77dc0532f6cfb629081a6de695a1255d5d0afd
+  data.tar.gz: 7568d30195b4a031c263300279f3c98602bf3fe0
 SHA512:
-  metadata.gz: 1fbff4650f7e89c6fe7282296268f2bb13077f8273aceb6cfc7af7051f5803adc54d00b6174ab8846e5797252fb8089dfa5b7f35367ad36cd9f007dbcfad276e
-  data.tar.gz: 64213c2df7678dbbacf63d3634b96b6b3ab5ec01d1619deeaf884e8499dabfe3dfd966e706e2043c0bacbc1bf5c5749882d2ad893d5cf5318181c7a49f23afcf
+  metadata.gz: 8fb01acb555f25d1e3e0578c321c054fcb83f7a6f25b841defa07ba633a6540547dac67f96c7270b271336164f2db04f2aac4104eb9eac018bd71ef47c50dc80
+  data.tar.gz: 265caa4291b12f82446d82d74aea931796451babba552bad80c3b8fe05e0d4a088a0080cf9ae7c7530927201dc4cce6dc1caf3004d848408dbece181dd986dd5

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

@@ -82,7 +82,7 @@ require 'resolv'
 # vCenter Library                                                              #
 # ---------------------------------------------------------------------------- #
 
-require 'vcenter_importer.rb'
+require 'vcenter_importer'
 require 'memoize'
 require 'vi_client'
 begin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula
 version: !ruby/object:Gem::Version
-  version: 5.12.0.1
+  version: 5.12.0.2
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-15 00:00:00.000000000 Z
+date: 2020-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -75,6 +75,7 @@ files:
 - lib/opennebula/document.rb
 - lib/opennebula/document_json.rb
 - lib/opennebula/document_pool.rb
+- lib/opennebula/document_pool_json.rb
 - lib/opennebula/error.rb
 - lib/opennebula/group.rb
 - lib/opennebula/group_pool.rb
@@ -87,10 +88,8 @@ files:
 - lib/opennebula/image_pool.rb
 - lib/opennebula/marketplace.rb
 - lib/opennebula/marketplace_pool.rb
-- lib/opennebula/marketplaceapp.rb
 - lib/opennebula/marketplaceapp_pool.rb
 - lib/opennebula/oneflow_client.rb
-- lib/opennebula/pool.rb
 - lib/opennebula/pool_element.rb
 - lib/opennebula/security_group.rb
 - lib/opennebula/security_group_pool.rb
@@ -102,7 +101,6 @@ files:
 - lib/opennebula/utils.rb
 - lib/opennebula/vdc.rb
 - lib/opennebula/vdc_pool.rb
-- lib/opennebula/virtual_machine.rb
 - lib/opennebula/virtual_machine_pool.rb
 - lib/opennebula/virtual_network.rb
 - lib/opennebula/virtual_network_pool.rb
@@ -117,9 +115,11 @@ files:
 - lib/opennebula/xml_utils.rb
 - lib/opennebula/zone.rb
 - lib/opennebula/zone_pool.rb
-- lib/opennebula/document_pool_json.rb
-- lib/opennebula/ldap_auth_spec.rb
+- lib/opennebula/marketplaceapp.rb
+- lib/opennebula/pool.rb
+- lib/opennebula/virtual_machine.rb
 - lib/opennebula/ldap_auth.rb
+- lib/opennebula/ldap_auth_spec.rb
 - lib/opennebula/server_cipher_auth.rb
 - lib/opennebula/server_x509_auth.rb
 - lib/opennebula/ssh_auth.rb