opennebula 6.4.4 → 6.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96a1db3dafa076b57aaa80ad46375d0830f6819fa0e70124b77b1ca8d648f29c
-  data.tar.gz: bbed8b41708c8c6e1a3348b320c3995bc141efbcc0e7e95a051e5ceeb25dc18f
+  metadata.gz: 1a95c466615797446ff59c56f025cd24189252b20b4ebbfe74e014dcdabae31f
+  data.tar.gz: ce36fa2c5d7e790e901a4c3d34dfb0640bff319628ccbde2d0d19c949d7a636e
 SHA512:
-  metadata.gz: 2750f136ca555d0a4e2f002bf58f6b6706d5a9a92d6094fa84d1afba3d7148e5cd9ae1b7911a90a58ae0a913ba64b9052c2e021dd5da07f7ee94e04c42a8a89c
-  data.tar.gz: 2b0252237e2513b95bf2da0355275dc6a3d797b7c5f6a5dba4ec9b64fe9cc017de031042e740921ecd870fbedda4a8ee73e047168307a3c6676e3c3527f3ae25
+  metadata.gz: d94ce7a4e3efd9dc50942606be49edcdeb1f58e94bb83ebe98ca6577e2b26943f6ba51e4c1da001f3a63e2f62ad1cf5770e79f54aaef5b2413376c6b3b6da443
+  data.tar.gz: 89bebd801fcae46af21192d7d2a93c8e65d9ee81b8c0e0e4f9621e827c7717414dde553134876ee331fdd42c559d18fd91168446dff80eb2e79b14cdd3b792ed

data/lib/DriverExecHelper.rb

@@ -189,7 +189,7 @@ module DriverExecHelper
                 cfg=file.read
             end
 
-            cfg.split(/\n/).each do |line|
+            cfg.split("\n").each do |line|
                 m=line.match(/^([^=]+)=(.*)$/)
 
                 next unless m

data/lib/cloud/CloudClient.rb

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

data/lib/host.rb

@@ -352,7 +352,7 @@ module VCenterDriver
             str_info << 'USEDMEMORY='  << (total_mem - free_mem).to_s << "\n"
 
             # DRS enabled
-            str_info << 'VCENTER_DRS='  << drs_enabled.to_s << "\n"
+            str_info << 'VCENTER_DRS=' << drs_enabled.to_s << "\n"
 
             # HA enabled
             str_info << 'VCENTER_HA=' << ha_enabled.to_s << "\n"

data/lib/models/role.rb

@@ -634,8 +634,8 @@ module OpenNebula
                 return OpenNebula::Error.new("Role #{name} is in DONE state")
             end
 
-            do_offset = (!period.nil? && period.to_i > 0 &&
-                !vms_per_period.nil? && vms_per_period.to_i > 0)
+            do_offset = !period.nil? && period.to_i > 0 &&
+                        !vms_per_period.nil? && vms_per_period.to_i > 0
 
             nodes.each_with_index do |node, index|
                 vm_id = node['deploy_id']

data/lib/opennebula/client.rb

@@ -140,9 +140,9 @@ module OpenNebula
                 @one_endpoint = endpoint
             elsif ENV["ONE_XMLRPC"]
                 @one_endpoint = ENV["ONE_XMLRPC"]
-            elsif ENV['HOME'] and File.exists?(ENV['HOME']+"/.one/one_endpoint")
+            elsif ENV['HOME'] and File.exist?(ENV['HOME']+"/.one/one_endpoint")
                 @one_endpoint = File.read(ENV['HOME']+"/.one/one_endpoint")
-            elsif File.exists?("/var/lib/one/.one/one_endpoint")
+            elsif File.exist?("/var/lib/one/.one/one_endpoint")
                 @one_endpoint = File.read("/var/lib/one/.one/one_endpoint")
             else
                 @one_endpoint = "http://localhost:2633/RPC2"

data/lib/opennebula/ldap_auth.rb

@@ -89,7 +89,7 @@ class OpenNebula::LdapAuth
         file=@options[:mapping_file_path]
         generate = false
 
-        if File.exists?(file)
+        if File.exist?(file)
             stat = File.stat(file)
             age = Time.now.to_i - stat.mtime.to_i
             generate = true if age > @options[:mapping_timeout]
@@ -124,7 +124,7 @@ class OpenNebula::LdapAuth
 
         @mapping = {}
 
-        if File.exists?(file)
+        if File.exist?(file)
             @mapping = YAML.load(File.read(file))
         end
 

data/lib/opennebula/oneflow_client.rb

@@ -339,9 +339,9 @@ module Service
                 url = opts[:url]
             elsif ENV['ONEFLOW_URL']
                 url = ENV['ONEFLOW_URL']
-            elsif ENV['HOME'] && File.exists?(ENV['HOME'] + endpoint)
+            elsif ENV['HOME'] && File.exist?(ENV['HOME'] + endpoint)
                 url = File.read(ENV['HOME'] + endpoint).strip
-            elsif File.exists?('/var/lib/one/.one/oneflow_endpoint')
+            elsif File.exist?('/var/lib/one/.one/oneflow_endpoint')
                 url = File.read('/var/lib/one/.one/oneflow_endpoint').strip
             else
                 url = 'http://localhost:2474'
@@ -454,11 +454,14 @@ module Service
 
             req['User-Agent'] = @user_agent
 
-            res = CloudClient::http_start(@uri, @timeout) do |http|
+            if !@uri.path.nil?
+                req.instance_variable_set(:@path, @uri.path + req.path)
+            end
+
+            CloudClient.http_start(@uri, @timeout) do |http|
                 http.request(req)
             end
 
-            res
         end
     end
 end

data/lib/opennebula/ssh_auth.rb

@@ -14,104 +14,127 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
 
-
-require 'pp'
 require 'openssl'
 require 'base64'
 require 'fileutils'
+require 'open3'
+require 'tempfile'
+
+module OpenNebula
+
+    # SSH key authentication class. It can be used as a driver for auth_mad
+    # as auth method is defined. It also holds some helper methods to be used
+    # by oneauth command
+    class SshAuth
+
+        # Initialize SshAuth object
+        #
+        # @param [Hash] default options for path
+        # @option options [String] :public_key public key for the user
+        # @option options [String] :private_key key private key for the user.
+        def initialize(options = {})
+            @private_key = nil
+            @public_key  = nil
+
+            # Initialize the private key
+            if options[:private_key]
+                begin
+                    @private_key = File.read(options[:private_key])
+                rescue StandardError => e
+                    raise "Cannot read #{options[:private_key]}\n #{e}"
+                end
 
-module OpenNebula; end
-
-# SSH key authentication class. It can be used as a driver for auth_mad
-# as auth method is defined. It also holds some helper methods to be used
-# by oneauth command
-class OpenNebula::SshAuth
-    # Initialize SshAuth object
-    #
-    # @param [Hash] default options for path
-    # @option options [String] :public_key public key for the user
-    # @option options [String] :private_key key private key for the user.
-    def initialize(options={})
-        @private_key = nil
-        @public_key  = nil
-
-        # Initialize the private key
-        if options[:private_key]
-            begin
-                @private_key = File.read(options[:private_key])
-            rescue Exception => e
-                raise "Cannot read #{options[:private_key]}"
+                begin
+                    @private_key_rsa = OpenSSL::PKey::RSA.new(@private_key)
+                rescue OpenSSL::PKey::RSAError
+                    private_key_pem = openssh_to_pem(@private_key)
+                    @private_key_rsa = OpenSSL::PKey::RSA.new(private_key_pem)
+                end
+            end
+
+            # Initialize the public key
+            if options[:public_key]
+                @public_key = options[:public_key]
+            elsif !@private_key.nil?
+                # Init ssh keys using private key. public key is extracted in a
+                # format compatible with openssl. The public key does not contain
+                # "---- BEGIN/END PUBLIC KEY ----" and is in a single line
+                @public_key = @private_key_rsa.public_key.to_pem.split("\n")
+                @public_key = @public_key.reject {|l| l.match(/PUBLIC KEY/) }.join('')
+            end
+
+            if @private_key.nil? && @public_key.nil?
+                raise 'You have to define at least one of the keys'
             end
 
-            @private_key_rsa = OpenSSL::PKey::RSA.new(@private_key)
+            @public_key_rsa = OpenSSL::PKey::RSA.new(Base64.decode64(@public_key))
         end
 
-        # Initialize the public key
-        if options[:public_key]
-            @public_key = options[:public_key]
-        elsif @private_key != nil
-            # Init ssh keys using private key. public key is extracted in a
-            # format compatible with openssl. The public key does not contain
-            # "---- BEGIN/END PUBLIC KEY ----" and is in a single line
-            @public_key = @private_key_rsa.public_key.to_pem.split("\n")
-            @public_key = @public_key.reject {|l| l.match(/PUBLIC KEY/) }.join('')
+        # Creates a login token for ssh authentication.
+        # By default it is valid for 1 hour but it can be changed to any number
+        # of seconds with expire parameter (in seconds)
+        def login_token(user, expire = 3600)
+            expire ||= 3600
+
+            return encrypt("#{user}:#{Time.now.to_i + expire.to_i}")
         end
 
-        if @private_key.nil? && @public_key.nil?
-            raise "You have to define at least one of the keys"
+        # Returns a valid password string to create a user using this auth driver.
+        # In this case the ssh public key.
+        def password
+            @public_key
         end
 
-        @public_key_rsa = OpenSSL::PKey::RSA.new(Base64::decode64(@public_key))
-    end
+        # Checks the proxy created with the login method
+        def authenticate(user, token)
+            begin
+                token_plain = decrypt(token)
+                t_user, time = token_plain.split(':')
 
-    # Creates a login token for ssh authentication.
-    # By default it is valid for 1 hour but it can be changed to any number
-    # of seconds with expire parameter (in seconds)
-    def login_token(user, expire=3600)
-        expire ||= 3600
+                return 'invalid credentials' unless user == t_user
+                return 'ssh proxy expired, login again to renew it' if Time.now.to_i >= time.to_i
 
-        return encrypt("#{user}:#{Time.now.to_i + expire.to_i}")
-    end
+                return true
+            rescue StandardError
+                return 'error'
+            end
+        end
 
-    # Returns a valid password string to create a user using this auth driver.
-    # In this case the ssh public key.
-    def password
-        @public_key
-    end
+        private
 
-    # Checks the proxy created with the login method
-    def authenticate(user, token)
-        begin
-            token_plain = decrypt(token)
-            _user, time = token_plain.split(':')
-
-            if user == _user
-                if Time.now.to_i >= time.to_i
-                    return "ssh proxy expired, login again to renew it"
-                else
-                    return true
-                end
-            else
-                return "invalid credentials"
-            end
-        rescue
-            return "error"
+        def openssh_to_pem(private_key)
+            temp_file = Tempfile.new('private_key')
+
+            File.write(temp_file.path, private_key)
+
+            # Use ssh-keygen to convert the key
+            command = "ssh-keygen -p -N '' -m PEM -f #{temp_file.path}"
+
+            _out, err, status = Open3.capture3(command)
+
+            raise "Failed to convert key: #{err}" unless status.success?
+
+            pem_key = File.read(temp_file.path)
+            return pem_key
+        ensure
+            temp_file.close
+            temp_file.unlink if temp_file
+        end
+
+        ###########################################################################
+        #                       Methods to handle ssh keys
+        ###########################################################################
+        # Encrypts data with the private key of the user and returns
+        # base 64 encoded output in a single line
+        def encrypt(data)
+            Base64.encode64(@private_key_rsa.private_encrypt(data)).gsub!("\n", '').strip
         end
-    end
 
-    private
+        # Decrypts base 64 encoded data with pub_key (public key)
+        def decrypt(data)
+            @public_key_rsa.public_decrypt(Base64.decode64(data))
+        end
 
-    ###########################################################################
-    #                       Methods to handle ssh keys
-    ###########################################################################
-    # Encrypts data with the private key of the user and returns
-    # base 64 encoded output in a single line
-    def encrypt(data)
-        Base64::encode64(@private_key_rsa.private_encrypt(data)).gsub!(/\n/, '').strip
     end
 
-    # Decrypts base 64 encoded data with pub_key (public key)
-    def decrypt(data)
-        @public_key_rsa.public_decrypt(Base64::decode64(data))
-    end
 end

data/lib/opennebula.rb

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

data/lib/scripts_common.rb

@@ -104,9 +104,6 @@ module OpenNebula
         file_name = 'monitord.conf'
 
         begin
-            # Suppress augeas require warning message
-            $VERBOSE = nil
-
             require 'augeas'
 
             aug = Augeas.create(:no_modl_autoload => true,

data/lib/virtual_machine.rb

@@ -2720,7 +2720,7 @@ end
             img_name = VCenterDriver::FileHelper.unescape_path(img_name_escaped)
 
             vc_disks.each do |d|
-                key_matches  = (unmanaged_key && d[:key] == unmanaged_key.to_i)
+                key_matches  = unmanaged_key && d[:key] == unmanaged_key.to_i
                 path_matches = (d[:path_wo_ds] == img_name)
 
                 if key_matches || path_matches

data/lib/virtual_wire.rb

@@ -91,7 +91,7 @@ module NSXDriver
                            .get(url)
                            .xpath(NSXConstants::NSXV_LS_XPATH)
             virtualwires.each do |virtualwire|
-                lsname_arr = name.split(/-sid-/)
+                lsname_arr = name.split('-sid-')
                 lsname = lsname_arr[-1].split('-', 2)[-1]
                 lsid = lsname_arr[0].split(/vxw-dvs-\w.-/)[-1]
                 if virtualwire.xpath('name').text == lsname &&

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula
 version: !ruby/object:Gem::Version
-  version: 6.4.4
+  version: 6.4.6
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-10 00:00:00.000000000 Z
+date: 2024-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri