vagrant-ovirt4 1.2.0 → 2.1.0

data/SECURITY.md

@@ -0,0 +1,23 @@
+## Security
+
+If you believe you have found a security vulnerability, please report it to me as described below.
+
+## Reporting Security Issues
+
+**Please do not report security vulnerabilities through public GitHub issues.** Instead, please report them to me directly at [myoung34@my.apsu.edu](mailto:myoung34@my.apsu.edu).  
+
+If you'd like to communicate securely, my keybase is [here](https://keybase.io/3vilpenguin)
+
+Please include the requested information listed below (as much as you can provide) to help better understand the nature and scope of the possible issue:
+
+  * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
+  * Full paths of source file(s) related to the manifestation of the issue
+  * The location of the affected source code (tag/branch/commit or direct URL)
+  * Any special configuration required to reproduce the issue
+  * Step-by-step instructions to reproduce the issue
+  * Proof-of-concept or exploit code (if possible)
+  * Impact of the issue, including how an attacker might exploit the issue
+
+## Preferred Languages
+
+I prefer all communications to be in English.

data/lib/vagrant-ovirt4.rb

@@ -1,3 +1,4 @@
+require 'log4r'
 require 'pathname'
 require 'vagrant-ovirt4/plugin'
 
@@ -8,9 +9,11 @@ module VagrantPlugins
     autoload :Errors, lib_path.join("errors")
     autoload :Util,   lib_path.join("util")
 
+    @@logger = Log4r::Logger.new("vagrant_ovirt4::provider")
     @@ovirt_connection = nil
     @@vms_service = nil
     def self.ovirt_connection
+      @@logger.warn('Use of deprecated OVirtProvider.ovirt_connection detected.')
       @@ovirt_connection
     end
 
@@ -19,6 +22,7 @@ module VagrantPlugins
     end
 
     def self.vms_service
+      @@logger.warn('Use of deprecated OVirtProvider.vms_service detected.')
       @@vms_service
     end
 

data/lib/vagrant-ovirt4/action.rb

@@ -9,11 +9,15 @@ module VagrantPlugins
       # This action is called to bring the box up from nothing.
       def self.action_up
         Vagrant::Action::Builder.new.tap do |b|
+          b.use HandleBox
           b.use ConfigValidate
           b.use ConnectOVirt
           b.use Call, ReadState do |env, b2|
+            # synced_folders defaults to NFS on linux. Make it default to rsync as before.
+            env[:machine].config.nfs.functional = false
             if env[:machine_state_id] == :up
-              b2.use SyncFolders
+              b2.use SyncedFolderCleanup
+              b2.use SyncedFolders
               b2.use MessageAlreadyUp
               next
             end
@@ -26,7 +30,7 @@ module VagrantPlugins
             if env[:machine_state_id] == :not_created
               b2.use SetNameOfDomain
               b2.use CreateVM
-              #b2.use ResizeDisk
+              b2.use ResizeDisk
 
               b2.use Provision
               b2.use CreateNetworkInterfaces
@@ -36,8 +40,10 @@ module VagrantPlugins
 
             b2.use StartVM
             b2.use WaitTillUp
-            b2.use SyncFolders
+            b2.use SyncedFolderCleanup
+            b2.use SyncedFolders
           end
+          b.use DisconnectOVirt
         end
       end
 
@@ -52,9 +58,10 @@ module VagrantPlugins
 
             b2.use ConnectOVirt
             b2.use ProvisionerCleanup, :before if defined?(ProvisionerCleanup)
-            b2.use HaltVM
-            b2.use WaitTillDown
+            b2.use HaltVM unless env[:machine].state.id == :down
+            b2.use WaitTillDown unless env[:machine].state.id == :down
             b2.use DestroyVM
+            b2.use DisconnectOVirt
           end
         end
       end
@@ -63,12 +70,15 @@ module VagrantPlugins
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
           b.use Call, IsCreated do |env, b2|
+            # synced_folders defaults to NFS on linux. Make it default to rsync as before.
+            env[:machine].config.nfs.functional = false
             if !env[:result]
               b2.use MessageNotCreated
               next
             end
             b2.use Provision
-            b2.use SyncFolders
+            b2.use SyncedFolderCleanup
+            b2.use SyncedFolders
           end
         end
       end
@@ -77,9 +87,11 @@ module VagrantPlugins
       # state is expected to be put into the `:machine_state_id` key.
       def self.action_read_state
         Vagrant::Action::Builder.new.tap do |b|
+          b.use HandleBox
           b.use ConfigValidate
           b.use ConnectOVirt
           b.use ReadState
+          b.use DisconnectOVirt
         end
       end
 
@@ -91,6 +103,7 @@ module VagrantPlugins
           b.use ConfigValidate
           b.use ConnectOVirt
           b.use ReadSSHInfo
+          b.use DisconnectOVirt
         end
       end
 
@@ -111,6 +124,7 @@ module VagrantPlugins
             raise Errors::NoIPError if env[:ip_address].nil?
             b2.use SSHExec
           end
+          b.use DisconnectOVirt
         end
       end
 
@@ -131,6 +145,7 @@ module VagrantPlugins
             raise Errors::NoIPError if env[:ip_address].nil?
             b2.use SSHRun
           end
+          b.use DisconnectOVirt
         end
       end
 
@@ -153,7 +168,7 @@ module VagrantPlugins
       end
 
       def self.action_reload
-        with_ovirt do |env, b|
+        Vagrant::Action::Builder.new.tap do |b|
           b.use action_halt
           b.use action_up
         end
@@ -186,7 +201,8 @@ module VagrantPlugins
             b.use MessageNotSuspended
             next
           end
-          b.use action_up
+          b.use StartVM
+          b.use WaitTillUp
         end
       end
 
@@ -210,6 +226,7 @@ module VagrantPlugins
 
       action_root = Pathname.new(File.expand_path("../action", __FILE__))
       autoload :ConnectOVirt, action_root.join("connect_ovirt")
+      autoload :DisconnectOVirt, action_root.join("disconnect_ovirt")
       autoload :CreateNetworkInterfaces, action_root.join("create_network_interfaces")
       autoload :CreateVM, action_root.join("create_vm")
       autoload :DestroyVM, action_root.join("destroy_vm")
@@ -218,13 +235,15 @@ module VagrantPlugins
       autoload :IsRunning, action_root.join("is_running")
       autoload :ReadSSHInfo, action_root.join("read_ssh_info")
       autoload :ReadState, action_root.join("read_state")
+      autoload :ResizeDisk, action_root.join("resize_disk")
       autoload :SetNameOfDomain, action_root.join("set_name_of_domain")
       autoload :SnapshotDelete, action_root.join("snapshot_delete")
       autoload :SnapshotList, action_root.join("snapshot_list")
       autoload :SnapshotSave, action_root.join("snapshot_save")
       autoload :StartVM, action_root.join("start_vm")
       autoload :SuspendVM, action_root.join("suspend_vm")
-      autoload :SyncFolders, action_root.join("sync_folders")
+      autoload :SyncedFolders, 'vagrant/action/builtin/synced_folders'
+      autoload :SyncedFolderCleanup, 'vagrant/action/builtin/synced_folder_cleanup'
       autoload :WaitTillDown, action_root.join("wait_till_down")
       autoload :WaitTillUp, action_root.join("wait_till_up")
       autoload :WaitTilSuspended, action_root.join("wait_til_suspended")
@@ -248,6 +267,7 @@ module VagrantPlugins
             end
             yield env, b2
           end
+          b.use DisconnectOVirt
         end
       end
     end

data/lib/vagrant-ovirt4/action/connect_ovirt.rb

@@ -21,14 +21,27 @@ module VagrantPlugins
           conn_attr[:password] = config.password if config.password
           conn_attr[:debug] = config.debug if config.debug
           conn_attr[:insecure] = true if config.insecure
+          conn_attr[:headers] = {'Filter' => true} if config.filtered_api
 
           @logger.info("Connecting to oVirt (#{config.url}) ...")
-          OVirtProvider.ovirt_connection = OvirtSDK4::Connection.new(conn_attr)          
-          OVirtProvider.vms_service = OVirtProvider.ovirt_connection.system_service.vms_service
-          env[:connection] = OVirtProvider.ovirt_connection
-          env[:vms_service] = OVirtProvider.vms_service
-
-          @app.call(env)
+          ovirt_connection = OvirtSDK4::Connection.new(conn_attr)
+          vms_service = ovirt_connection.system_service.vms_service
+
+          # XXX: Continue setting deprecated global properties. Use of the
+          # related values from env should be preferred.
+          OVirtProvider.ovirt_connection = ovirt_connection
+          OVirtProvider.vms_service = vms_service
+
+          begin
+            ovirt_connection.test(true, 30)
+          rescue => error
+            raise Errors::ServiceConnectionError,
+              :error_message => error.message
+          else
+            env[:connection] = ovirt_connection
+            env[:vms_service] = vms_service
+            @app.call(env)
+          end
         end
 
       end

data/lib/vagrant-ovirt4/action/create_network_interfaces.rb

@@ -16,58 +16,72 @@ module VagrantPlugins
 
         def call(env)
 
-          iface_options = nil
           config = env[:machine].provider_config
-          env[:machine].config.vm.networks.each do |config|
-            type, options = config
-            # We support private networks only. They mean both the same right now.
-            next unless [:private_network].include? type
 
-            iface_options = scoped_hash_override(options, :ovirt)
+          # FIX MULTIPLE NETWORK INTERFACES
+          vagrantfile_networks = []
+          @logger.info("Found next configured networks in Vagrantfile:")
+          env[:machine].config.vm.networks.each do |network|
+            type, options = network
+
+            # We support private networks only
+            next unless type == :private_network
+            @logger.info("#{network}")
+
+            vagrantfile_networks << [type, options]
           end
 
-          begin
-            nics_service = env[:vms_service].vm_service(env[:machine].id).nics_service
-            if iface_options.nil?
-              # throw an error if they didn't provide any sort of information on interfaces _and_ the VM has none
-              raise Errors::NoNetworkError if nics_service.list.count == 0
-            else
-              # provided a network block of some sort. Search oVirt for the corresponding network_profile_ids
-              @logger.info("Finding network #{iface_options[:network_name]} for given cluster #{config.cluster}")
-              clusters_service = env[:connection].system_service.clusters_service
-              cluster = clusters_service.list(search: "name=#{config.cluster}").first
-              profiles_service = env[:connection].system_service.vnic_profiles_service
-              network_profile_ids = profiles_service.list.map do |profile|
-                if env[:connection].follow_link(profile.network).data_center.id == cluster.data_center.id and
-                     profile.name == iface_options[:network_name]
-                  profile.id
+          @logger.info("Processing each found configured network")
+          vagrantfile_networks.each do |network|
+            type, options = network
+
+            iface_options = scoped_hash_override(options, :ovirt)
+            @logger.info("Interface options: #{iface_options}")
+
+            begin
+              nics_service = env[:vms_service].vm_service(env[:machine].id).nics_service
+              if iface_options.nil?
+                # throw an error if they didn't provide any sort of information on interfaces _and_ the VM has none
+                raise Errors::NoNetworkError if nics_service.list.count == 0
+              else
+                # provided a network block of some sort. Search oVirt for the corresponding network_profile_ids
+                @logger.info("Finding network #{iface_options[:network_name]} for given cluster #{config.cluster}")
+                clusters_service = env[:connection].system_service.clusters_service
+                cluster = clusters_service.list(search: "name=#{config.cluster}").first
+                profiles_service = env[:connection].system_service.vnic_profiles_service
+                network_profile_ids = profiles_service.list.map do |profile|
+                  if env[:connection].follow_link(profile.network).data_center.id == cluster.data_center.id and
+                      profile.name == iface_options[:network_name]
+                    profile.id
+                  end
                 end
-              end
-              network_profile_id = network_profile_ids.compact.first
-              # error if they provided a 'network name' but it could not be located in the previous search
-              raise Errors::NetworkNotFoundError, :network_name => iface_options[:network_name] if network_profile_id.nil? and !iface_options[:network_name].nil?
+                network_profile_id = network_profile_ids.compact.first
+                # error if they provided a 'network name' but it could not be located in the previous search
+                raise Errors::NetworkNotFoundError, :network_name => iface_options[:network_name] if network_profile_id.nil? and !iface_options[:network_name].nil?
 
-              # quick and dirty way to look for a 'nic#' that is not already attached to the machine
-              iface = (("nic1".."nic8").flat_map { |x| x } - env[:vms_service].vm_service(env[:machine].id).nics_service.list.map(&:name)).first rescue "vagrant_nic1"
-              @logger.info("Creating network interface #{iface}")
-              nics_service.add(
-                OvirtSDK4::Nic.new(
-                  name: iface,
-                  vnic_profile: {
-                    id: network_profile_id
-                  }
+                # quick and dirty way to look for a 'nic#' that is not already attached to the machine
+                iface = (("nic1".."nic8").flat_map { |x| x } - env[:vms_service].vm_service(env[:machine].id).nics_service.list.map(&:name)).first rescue "vagrant_nic1"
+                @logger.info("Creating network interface #{iface}")
+                nics_service.add(
+                  OvirtSDK4::Nic.new(
+                    name: iface,
+                    vnic_profile: {
+                      id: network_profile_id
+                    }
+                  )
                 )
-              )
-            end
-          rescue => e
-            if config.debug
-              raise e
-            else
-              fault_message = /Fault detail is \"\[?(.+?)\]?\".*/.match(e.message)[1] rescue e.message
-              raise Errors::AddInterfaceError,
-                :error_message => fault_message
+              end
+            rescue => e
+              if config.debug
+                raise e
+              else
+                fault_message = /Fault detail is \"\[?(.+?)\]?\".*/.match(e.message)[1] rescue e.message
+                raise Errors::AddInterfaceError,
+                  :error_message => fault_message
+              end
             end
           end
+          # END FIX MULTIPLE NETWORK INTERFACES
 
           # Continue the middleware chain.
           @app.call(env)

data/lib/vagrant-ovirt4/action/create_vm.rb

@@ -25,10 +25,19 @@ module VagrantPlugins
           env[:ui].info(" -- Cluster:       #{config.cluster}")
           env[:ui].info(" -- Template:      #{config.template}")
           env[:ui].info(" -- Console Type:  #{config.console}")
+          env[:ui].info(" -- BIOS Serial:   #{config.bios_serial}")
+          env[:ui].info(" -- Optimized For: #{config.optimized_for}")
+          env[:ui].info(" -- Description:   #{config.description}")
+          env[:ui].info(" -- Comment:       #{config.comment}")
+          env[:ui].info(" -- Disk:          #{Filesize.from("#{config.disk_size} B").to_f('GiB').to_i} GiB") unless config.disk_size.nil?
+          env[:ui].info(" -- Additional Disks:") unless config.disks.empty?
+          config.disks.each do |disk|
+            env[:ui].info(" ---- name=#{disk[:name]} size=#{Filesize.from("#{disk[:size]} B").to_f('GiB').to_i} GiB")
+          end
           env[:ui].info(" -- Memory:        ")
-          env[:ui].info(" ---- Memory:      #{Filesize.from("#{config.memory_size} B").to_f('MB').to_i} MB")
-          env[:ui].info(" ---- Maximum:     #{Filesize.from("#{config.memory_maximum} B").to_f('MB').to_i} MB")
-          env[:ui].info(" ---- Guaranteed:  #{Filesize.from("#{config.memory_guaranteed} B").to_f('MB').to_i} MB")
+          env[:ui].info(" ---- Memory:      #{Filesize.from("#{config.memory_size} B").to_f('MiB').to_i} MiB")
+          env[:ui].info(" ---- Maximum:     #{Filesize.from("#{config.memory_maximum} B").to_f('MiB').to_i} MiB")
+          env[:ui].info(" ---- Guaranteed:  #{Filesize.from("#{config.memory_guaranteed} B").to_f('MiB').to_i} MiB")
           env[:ui].info(" -- Cpu:           ")
           env[:ui].info(" ---- Cores:       #{config.cpu_cores}")
           env[:ui].info(" ---- Sockets:     #{config.cpu_sockets}")
@@ -38,6 +47,8 @@ module VagrantPlugins
           # Create oVirt VM.
           attr = {
               :name     => hostname,
+              :description => config.description,
+              :comment => config.comment,
               :cpu      => {
                 :architecture => 'x86_64',
                 :topology => {
@@ -61,15 +72,18 @@ module VagrantPlugins
               :display  => {
                 :type => config.console,
               },
+              :type => config.optimized_for,
           }
 
           begin
-            server = env[:vms_service].add(attr) 
+            server = env[:vms_service].add(attr)
           rescue OvirtSDK4::Error => e
+            fault_message = /Fault detail is \"\[?(.+?)\]?\".*/.match(e.message)[1] rescue e.message
+            retry if e.message =~ /Related operation is currently in progress/
+
             if config.debug
               raise e
             else
-              fault_message = /Fault detail is \"\[?(.+?)\]?\".*/.match(e.message)[1] rescue e.message
               raise Errors::CreateVMError,
                 :error_message => fault_message
             end
@@ -81,17 +95,21 @@ module VagrantPlugins
           # Wait till all volumes are ready.
           env[:ui].info(I18n.t("vagrant_ovirt4.wait_for_ready_vm"))
           for i in 0..300
-            ready = true
+            disk_ready = true
             vm_service = env[:vms_service].vm_service(env[:machine].id)
             disk_attachments_service = vm_service.disk_attachments_service
             disk_attachments = disk_attachments_service.list
             disk_attachments.each do |disk_attachment|
               disk = env[:connection].follow_link(disk_attachment.disk)
+              if config.debug
+                env[:ui].info("Checking disk status id=#{disk.id} name=#{disk.name} status=#{disk.status}")
+              end
               if disk.status != 'ok'
-                ready = false
+                disk_ready = false
                 break
               end
             end
+            ready = (disk_ready and env[:vms_service].vm_service(server.id).get.status.to_sym == :down)
             break if ready
             sleep 2
           end
@@ -100,6 +118,67 @@ module VagrantPlugins
             raise Errors::WaitForReadyVmTimeout
           end
 
+          # add storage disks
+          vm_service = env[:vms_service].vm_service(env[:machine].id)
+          disk_attachments_service = vm_service.disk_attachments_service
+          storage_disks = []
+          config.disks.each do |disk|
+            disk_attachment = disk_attachments_service.add(
+              OvirtSDK4::DiskAttachment.new(
+                disk: {
+                  name: disk[:name],
+                  description: '#{hostname} storage disk',
+                  format: disk[:type] == 'qcow2' ? OvirtSDK4::DiskFormat::COW : OvirtSDK4::DiskFormat::RAW,
+                  provisioned_size: disk[:size],
+                  storage_domains: [{
+                    name: disk[:storage_domain]
+                  }]
+                },
+                interface: disk[:bus] == 'virtio' ? OvirtSDK4::DiskInterface::VIRTIO : OvirtSDK4::DiskInterface::IDE,
+                bootable: false,
+                active: true
+              )
+            )
+            storage_disks << disk_attachment
+            env[:ui].info("Added storage disk id=#{disk_attachment.disk.id} name=#{disk[:name]} size=#{disk[:size]}")
+          end
+
+          disks_service = env[:connection].system_service.disks_service
+          storage_disks.each do |s_disk|
+            disk_service = disks_service.disk_service(s_disk.disk.id)
+            loop do
+              sleep(5)
+              disk = disk_service.get
+              if config.debug
+                env[:ui].info("Checking disk status id=#{disk.id} name=#{disk.name} status=#{disk.status}")
+              end
+              break if disk.status == OvirtSDK4::DiskStatus::OK
+            end
+          end
+
+          begin
+            if config.bios_serial
+              vm_service = env[:vms_service].vm_service(env[:machine].id)
+              vm_service.update(
+                serial_number: {
+                  policy: OvirtSDK4::SerialNumberPolicy::CUSTOM,
+                  value: config.bios_serial,
+                }
+              )
+            end
+          rescue OvirtSDK4::Error => e
+            fault_message = /Fault detail is \"\[?(.+?)\]?\".*/.match(e.message)[1] rescue e.message
+            retry if e.message =~ /Related operation is currently in progress/
+
+            if config.debug
+              raise e
+            else
+              raise Errors::UpdateBiosError,
+                :error_message => fault_message
+            end
+          end
+
+
           @app.call(env)
         end
 
@@ -113,6 +192,7 @@ module VagrantPlugins
           destroy_env[:config_validate] = false
           destroy_env[:force_confirm_destroy] = true
           env[:action_runner].run(Action.action_destroy, destroy_env)
+          env[:connection].close()
         end
       end
     end