opennebula 6.4.1 → 6.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 266777cd8cbee1a5dd1a31a5a13be7cebb30ea31fb570f250e86879ba3bdbb0e
-  data.tar.gz: 3a60b62aa8040d838ba5a838ee30e53ae3f120e63c9d348329e1ed01e82f982a
+  metadata.gz: 155e44e21e61dbe4e8d4a1e544c2931601661adcca34995e9299e462cb79d2cd
+  data.tar.gz: 8e2717e2fb48ac625981a99ae93969ac12effa3d08fb55491191826d0b2dc43c
 SHA512:
-  metadata.gz: 5b62bafc5c642cef2ba2b3f9e10c656cefe8c65a2c4835f3b9aaceda2b5eec3fc40513abbd77ee592369e805d14a936a925d5168e380e2c94b7e7ec9f9d05d3a
-  data.tar.gz: c10696616d94b1acaf6bc29912d92c331b7ff0f25d543312fbbec802dcfbe466616da36a74537e06f009315d25a762f375aa989910234ecc0bb879c4cb1b667c
+  metadata.gz: 23ddfef8c3134f5c0b8479f1b4f969ea0b8224636a5754307cdcf54c7aaabf6370997bfe3df4ad50caa4abf1b0cb865d542d3e7d8eddbee4de544a12a93e313f
+  data.tar.gz: dc0958c6cb6c5222d0276c42cd865af7a4c5ab07bc506ca5c49b1c56690db3dcac0dacaf58b4b17591f025bb8d8e6a79bd1b69e2258722ff9ccb14b6a081eaac

data/lib/cloud/CloudClient.rb

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

data/lib/opennebula/flow/service_pool.rb

@@ -66,12 +66,16 @@ module OpenNebula
             super('DOCUMENT_POOL', 'DOCUMENT', @client)
         end
 
-        def client
+        def client(user_name = nil)
             # If there's a client defined use it
             return @client unless @client.nil?
 
             # If not, get one via cloud_auth
-            @cloud_auth.client
+            if user_name.nil?
+                @cloud_auth.client
+            else
+                @cloud_auth.client(user_name)
+            end
         end
 
         def info
@@ -129,14 +133,17 @@ module OpenNebula
         #   The mutex will be unlocked after the block execution.
         #
         # @return [Service, OpenNebula::Error] The Service in case of success
-        def get(service_id, external_client = nil, &block)
+        def get(service_id, external_user = nil, &block)
             service_id = service_id.to_i if service_id
             aux_client = nil
 
-            if external_client.nil?
+            # WARNING!!!
+            # No validation will be performed for external_user, the credentials
+            # for this user must be validated previously.
+            if external_user.nil?
                 aux_client = client
             else
-                aux_client = external_client
+                aux_client = client(external_user)
             end
 
             service = Service.new_with_id(service_id, aux_client)
@@ -172,7 +179,7 @@ module OpenNebula
                         return rc
                     end
 
-                    block.call(service)
+                    block.call(service, client)
                 end
 
                 @@mutex.synchronize do

data/lib/opennebula/flow/service_template.rb

@@ -549,8 +549,7 @@ module OpenNebula
                 end
 
                 if role['elasticity_policies']
-                    role['elasticity_policies'].each_with_index do |policy,
-                                                                    index|
+                    role['elasticity_policies'].each_with_index do |policy, index|
                         exp = policy['expression']
 
                         if exp.empty?

data/lib/opennebula/ldap_auth.rb

@@ -213,7 +213,9 @@ class OpenNebula::LdapAuth
         groups = []
         ldap_groups.each do |group|
             if (g = in_hash_ignore_case?(@mapping, group))
-                if ldap_groups.include? @options[:group_admin_group_dn]
+                if ldap_groups.any? {
+                        |s| s.casecmp(@options[:group_admin_group_dn])==0
+                }
                     groups << "*#{@mapping[g]}"
                 else
                     groups << @mapping[g]

data/lib/opennebula/template_ext.rb

@@ -63,9 +63,7 @@ module OpenNebula::TemplateExt
                 #---------------------------------------------------------------
                 logger.info 'Processing VM disks' if logger
 
-                retrieve_xmlelements('TEMPLATE/DISK').each_with_index do
-                    |disk, idx|
-
+                retrieve_xmlelements('TEMPLATE/DISK').each_with_index do |disk, idx|
                     image = image_lookup(disk)
 
                     next unless image

data/lib/opennebula/x509_auth.rb

@@ -29,9 +29,9 @@ class OpenNebula::X509Auth
     #Constants with paths to relevant files and defaults
     ###########################################################################
     if !ENV["ONE_LOCATION"]
-        ETC_LOCATION      = "/etc/one"
+        ETC_LOCATION = "/etc/one"
     else
-        ETC_LOCATION      = ENV["ONE_LOCATION"] + "/etc"
+        ETC_LOCATION = ENV["ONE_LOCATION"] + "/etc"
     end
 
     X509_AUTH_CONF_PATH = ETC_LOCATION + "/auth/x509_auth.conf"
@@ -173,8 +173,7 @@ private
         # Check start time and end time of certificates
         @cert_chain.each do |cert|
             if cert.not_before > now || cert.not_after < now
-                raise failed +  "Certificate not valid. Current time is " +
-                  now.localtime.to_s + "."
+                raise "Certificate not valid. Current time is #{now.localtime}"
             end
         end
 
@@ -187,16 +186,16 @@ private
             @cert_chain[1..-1].each do |cert|
                 if !((signee.issuer.to_s == cert.subject.to_s) &&
                      (signee.verify(cert.public_key)))
-                    raise  failed + signee.subject.to_s + " with issuer " +
-                           signee.issuer.to_s + " was not verified by " +
-                           cert.subject.to_s + "."
+                    raise "#{signee.subject} with issuer #{signee.issuer} " \
+                          "was not verified by #{cert.subject}"
                 end
+
                 signee = cert
             end
 
             # Validate the End Entity certificate
             if !@options[:ca_dir]
-                raise failed + "No certifcate authority directory was specified."
+                raise "No certifcate authority directory was specified."
             end
 
             begin
@@ -207,9 +206,8 @@ private
 
                 if !((signee.issuer.to_s == ca_cert.subject.to_s) &&
                      (signee.verify(ca_cert.public_key)))
-                    raise  failed + signee.subject.to_s + " with issuer " +
-                           signee.issuer.to_s + " was not verified by " +
-                           ca_cert.subject.to_s + "."
+                    raise "#{signee.subject} with issuer #{signee.issuer} " \
+                          "was not verified by #{ca_cert.subject}"
                 end
 
                 signee = ca_cert
@@ -229,7 +227,7 @@ private
 
         if !File.exist?(crl_path)
             if @options[:check_crl]
-                raise failed + "CRL file #{crl_path} does not exist"
+                raise "#{failed} CRL file #{crl_path} does not exist"
             else
                 return
             end
@@ -240,7 +238,7 @@ private
 
         # First verify the CRL itself with its signer
         unless crl_cert.verify( ca_cert.public_key ) then
-            raise failed + "CRL is not verified by its Signer"
+            raise "#{failed} CRL is not verified by its Signer"
         end
 
         # Extract the list of revoked certificates from the CRL
@@ -250,8 +248,8 @@ private
         # certificate
         rc_array.each do |e|
             if e.serial.eql?(signee.serial) then
-                raise failed + "#{signee.subject.to_s} is found in the "<<
-                    "CRL, i.e. it is revoked"
+                raise "#{failed} #{signee.subject} is found in the " \
+                      "CRL, i.e. it is revoked"
             end
         end
     end

data/lib/opennebula.rb

@@ -77,5 +77,5 @@ require 'opennebula/flow'
 module OpenNebula
 
     # OpenNebula version
-    VERSION = '6.4.0'
+    VERSION = '6.4.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula
 version: !ruby/object:Gem::Version
-  version: 6.4.1
+  version: 6.4.2
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-12 00:00:00.000000000 Z
+date: 2022-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri