vagrant-qubes 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36591110e893bcd699e50f7117d8eb6f9226b211ff230110bcccafaa3228a27a
-  data.tar.gz: c55ca5a7611a4d0ae2dafec3b7ec17d92882565f48ef9e318c18cdc5e8305c3b
+  metadata.gz: c705377c5a04ced31e884fb0e70dd403b28ec8533808eef7c554b4455768d4a2
+  data.tar.gz: 62c911e38e6c2d74b895dcae2587b0a87d7038f821b24a50354a5cf9c89f36a0
 SHA512:
-  metadata.gz: 1b83db0042b8f98e5ebb804ac7522f74f485a8801b8a1db026126a04749722d3a7628fe21040d5ef2a86d4e6794985596f14223db0389c7d03444374dcbb266f
-  data.tar.gz: 2ad47780a849ebb2471c33024b260e7ec6e2c6ccc3d9347c03bcb61c675b25cb211d33d79f0a855cf5b783fe9fc0e63d1d2cb09be5abaab183f3c18f6ec5132f
+  metadata.gz: '09261b413e0971e92dd441e96579a50dbe124f3743c637a434d213a7a854e67664ad2efb5afc6ceb47cfb380f48a0563749ea10bdce39be3b66892e59bb2a749'
+  data.tar.gz: 6e4accb9bf2e3aec656f9e1c9b976b227417b08b69841085c3535aa0e00e8582341067c4963e7d42e0eb01081a7b9301fec8f5763882908707ce2919766a0f07

data/Gemfile.lock

@@ -28,7 +28,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-qubes (0.0.2)
+    vagrant-qubes (0.0.3)
       i18n (~> 1.0)
       log4r (~> 1.1)
 

data/README.md

@@ -12,9 +12,9 @@ Right now, this should be considered alpha at best, basic "up" and "destroy" wor
 
 ```
 vms = {
-  "test1" => ["AppVM","red","fedora-33", 2,  2048, "sys-firewall"],
-  "test2" => ["AppVM","red","fedora-33", 2,  2048, "sys-firewall"],
-  "test3" => ["AppVM","red","fedora-33", 2,  2048, "sys-firewall"],
+  "test1" => ["AppVM","red","fedora-33", 2,  2048, "vagrant"],
+  "test2" => ["AppVM","red","fedora-33", 2,  2048, "vagrant"],
+  "test3" => ["AppVM","red","fedora-33", 2,  2048, "vagrant"],
 }
 
 Vagrant.configure("2") do |config|
@@ -43,23 +43,17 @@ This is not fully thought through or fully secured, use it at your own risk!
 
 ## Installation
 
-Add this line to your application's Gemfile:
+Run this in your AppVM
 
-```ruby
-gem 'vagrant-qubes'
+``` 
+vagrant plugin install vagrant-qubes
 ```
 
-And then execute:
+## TODO
 
-    $ bundle install
-
-Or install it yourself as:
-
-    $ gem install vagrant-qubes
-
-## Usage
-
-TODO: Write usage instructions here
+There is a lot to do, in no particular order:
+- Extend to support Standalone VMs/HVMs
+- Sort out networking, and therefore provisioning
 
 ## Contributing
 

data/lib/vagrant-qubes/action/createvm.rb

@@ -45,7 +45,7 @@ module VagrantPlugins
                 + ' ' + config.guest_numvcpus.to_s\
                 + ' ' + config.guest_memsize.to_s\
                 + ' ' + config.guest_netvm\
-                + '"| qrexec-client-vm dom0 vagrant_create+' + env[:machine].config.vm.hostname
+                + '" | qrexec-client-vm dom0 vagrant_create+' + env[:machine].config.vm.hostname
               stdout, stderr, status = Open3.capture3(command)
               if status != 0
                 raise Errors::QRExecError,

data/lib/vagrant-qubes/action/openfirewall.rb

@@ -0,0 +1,48 @@
+require 'log4r'
+require 'open3'
+require 'socket'
+
+module VagrantPlugins
+  module Qubes
+    module Action
+      class OpenFirewall
+        def initialize(app, _env)
+          @app = app
+          @logger = Log4r::Logger.new('vagrant_qubes::action::openfirewall')
+        end
+
+        def call(env)
+          openfirewall(env)
+          @app.call(env)
+        end
+
+        def openfirewall(env)
+          @logger.info('vagrant-qubes, openfirewall: start...')
+
+          # Get config
+          machine = env[:machine]
+          config = env[:machine].provider_config
+
+          if env[:machine_state].to_s == 'running'
+            vagrant_ip = Socket.ip_address_list.find {|a| a.ipv4? ? !(a.ipv4_loopback?) : !(a.ipv6_loopback?) }
+
+            env[:ui].info I18n.t('vagrant_qubes.vagrant_qubes_message',
+              message: 'vagrant ip ' + vagrant_ip.ip_address.to_s)
+
+            command = 'echo "' + vagrant_ip.ip_address.to_s\
+              + '" | qrexec-client-vm dom0 vagrant_openfw+' + env[:machine].config.vm.hostname
+
+            stdout, stderr, status = Open3.capture3(command)
+            if status != 0
+              raise Errors::QRExecError,
+                    message: 'qrexec failed with status' + status.to_s
+            end
+          else
+            raise Errors::GeneralError,
+            message: 'VM not running so cannot edit firewall policy'
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-qubes/action.rb

@@ -30,16 +30,31 @@ module VagrantPlugins
         end
       end
 
+      def self.action_ssh
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ReadState
+          b.use ReadSSHInfo
+          b.use SSHExec
+        end
+      end
+
+      def self.action_openfirewall
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ReadState
+          b.use OpenFirewall
+        end
+      end
+
       def self.action_up
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
-          # b.use HandleBox - This downloads the "box"
           b.use ReadState
           b.use CreateVM
           b.use ReadState
           b.use Boot
           b.use Call, WaitForState, :running, 240 do |env1, b1|
             if env1[:result] == 'True'
+              b1.use action_openfirewall
               b1.use action_provision
             end
           end
@@ -52,7 +67,7 @@ module VagrantPlugins
           b.use Call, WaitForState, :running, 240 do |env1, b1|
             if env1[:result] == 'True'
               b1.use ReadState
-              #b1.use Provision
+              b1.use Provision
               #b1.use SyncedFolderCleanup
               #b1.use SyncedFolders
               #b1.use SetHostname
@@ -91,6 +106,7 @@ module VagrantPlugins
       autoload :ReadSSHInfo, action_root.join('read_ssh_info')
       autoload :Halt, action_root.join('halt')
       autoload :Destroy, action_root.join('destroy')
+      autoload :OpenFirewall, action_root.join('openfirewall')
     end
   end
 end

data/lib/vagrant-qubes/version.rb

@@ -1,6 +1,6 @@
 module VagrantPlugins
   module Qubes
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
     $vagrant_qubes_version = VERSION
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-qubes
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Gary Pentland
@@ -75,6 +75,7 @@ files:
 - lib/vagrant-qubes/action/createvm.rb
 - lib/vagrant-qubes/action/destroy.rb
 - lib/vagrant-qubes/action/halt.rb
+- lib/vagrant-qubes/action/openfirewall.rb
 - lib/vagrant-qubes/action/read_ssh_info.rb
 - lib/vagrant-qubes/action/read_state.rb
 - lib/vagrant-qubes/action/wait_for_state.rb