susi-qemu 0.0.2 → 0.0.5

data/lib/novnc/vendor/pako/lib/zlib/zstream.js

@@ -0,0 +1,24 @@
+export default function ZStream() {
+  /* next input byte */
+  this.input = null; // JS specific, because we have no pointers
+  this.next_in = 0;
+  /* number of bytes available at input */
+  this.avail_in = 0;
+  /* total number of input bytes read so far */
+  this.total_in = 0;
+  /* next output byte should be put there */
+  this.output = null; // JS specific, because we have no pointers
+  this.next_out = 0;
+  /* remaining free space at output */
+  this.avail_out = 0;
+  /* total number of bytes output so far */
+  this.total_out = 0;
+  /* last error message, NULL if no error */
+  this.msg = ''/*Z_NULL*/;
+  /* not visible by applications */
+  this.state = null;
+  /* best guess about the data type: binary or text */
+  this.data_type = 2/*Z_UNKNOWN*/;
+  /* adler32 value of the uncompressed data */
+  this.adler = 0;
+}

data/lib/output.rb

@@ -0,0 +1,11 @@
+module Susi
+  DEBUG = false
+
+  def self.debug(msg)
+    puts msg if DEBUG
+  end
+
+  def self.info(msg)
+    puts msg
+  end
+end

data/lib/qmp.rb

@@ -1,9 +1,13 @@
 require 'socket'
 require 'json'
 
+require_relative 'output'
+
 module Susi
   class QMP
     def initialize(port)
+      Susi::debug "Connecting to QMP on port #{port}"
+
       @port = port
       @server = TCPSocket.new('localhost', @port)
 
@@ -47,9 +51,11 @@ module Susi
 
     def quit
       @server.puts('{"execute":"quit"}')
+      close
     end
 
     def close
+      Susi::debug "Closing QMP connection"
       @server.close
     end
   end

data/lib/ssh.rb

@@ -1,6 +1,8 @@
 require 'socket'
 require 'net/ssh'
 
+require_relative 'output'
+
 module Susi
   class SSH
     def self.open(name)
@@ -11,7 +13,7 @@ module Susi
     def self.set_hostname(name)
       vm = VM.new(name)
       Net::SSH.start(vm.ip, 'dabo', port: vm.ssh_port, keys: [File.expand_path('~/.ssh/id_ed25519')]) do |ssh|
-        puts "setting up VM..."
+        Susi::debug "setting up VM..."
         ssh.exec!("sudo hostnamectl set-hostname #{name}")
       end
     end

data/lib/susi.rb

@@ -5,6 +5,7 @@ require_relative 'vm'
 require_relative 'ssh'
 require_relative 'vnc'
 require_relative 'disk'
+require_relative 'output'
 
 require 'yaml'
 require 'securerandom'
@@ -59,15 +60,15 @@ YAML
     # check if disk exist, if not clone it
     disk_name = "#{DISK_DIR}/#{id}"
     if !File.exist?("#{disk_name}.qcow2")
-      puts "Disk not found, cloning..."
-      Susi::Disk.clone(disk_template, disk_name)
+      Susi::debug "Disk not found, cloning..."
+      Disk.clone(disk_template, disk_name)
 
-      Susi::VM.start(name, disk_name)
+      VM.start(name, disk_name)
 
       # SSH into VM and set hostname
-      Susi::SSH.set_hostname(name)
+      SSH.set_hostname(name)
     else
-      Susi::VM.start(name, disk_name)
+      VM.start(name, disk_name)
     end
   end
 
@@ -83,7 +84,7 @@ YAML
 
     if File.exist?(disk_name)
       # verbose remove file
-      puts "removing #{disk_name}"
+      Susi::debug "removing #{disk_name}"
       File.delete(disk_name)
     end
   end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Susi
-  VERSION = '0.0.2'
+  VERSION = '0.0.5'
 end

data/lib/vm.rb

@@ -1,3 +1,5 @@
+require_relative 'output'
+
 module Susi
   class VM
     def self.running?(name)
@@ -13,60 +15,78 @@ module Susi
 
     def initialize(name)
       @name = name
+      @qmp = nil
       @qmp_port = nil
       @vnc_port = nil
       @ssh_port = nil
 
+      Susi::debug "Searching for VM #{name}"
+
       ps = `ps aux | grep qemu-system-x86_64`
+      Susi::debug ps
       ps.split("\n").each do |line|
         next unless line.match /\-name/
-        m = line.match(/-name (\w+)/)
+        m = line.match(/-name ([a-zA-Z0-9\-_\.]+)\s/)
+        Susi::debug "match: #{m[1]}"
         n = m[1]
         next unless n == @name
+        Susi::debug "Found VM #{n}"
 
         m = line.match(/-qmp tcp:localhost:(\d+)/)
         @qmp_port = m[1].to_i
+        Susi::debug "Found QMP port #{@qmp_port}"
+      end
+      @qmp = QMP.new(@qmp_port)
+
+      if block_given?
+        yield(self)
+
+        @qmp.close
       end
     end
 
     def quit
-      QMP.new(@qmp_port) { |q| q.quit }
+      #QMP.new(@qmp_port) { |q| q.quit }
+      @qmp.quit
     end
 
     def disk
       d = ''
-      QMP.new(@qmp_port) { |q| d = q.execute("query-block")[0]['inserted']['file'] }
+      #QMP.new(@qmp_port) { |q| d = q.execute("query-block")[0]['inserted']['file'] }
+      d = @qmp.execute("query-block")[0]['inserted']['file']
       d
     end
 
     def vnc_port
       @vnc_port ||= begin
         port = -1
-        QMP.new(@qmp_port) { |q| port = q.execute("query-vnc")['service'] }
+        #QMP.new(@qmp_port) { |q| port = q.execute("query-vnc")['service'] }
+        port = @qmp.execute("query-vnc")['service']
         port.to_i
       end
     end
 
     def vnc_www_port
-      vnc_port - 5900 + 5800
+      vnc_port - 100
     end
 
     def vnc_websocket_port
-      vnc_port - 5900 + 5700
+      vnc_port - 200
     end
 
     def ssh_port
       @ssh_port ||= begin
         port = -1
-        QMP.new(@qmp_port) do |q|
-          resp = q.execute_with_args("human-monitor-command", {"command-line" => "info usernet"})
+        #QMP.new(@qmp_port) do |q|
+          #resp = q.execute_with_args("human-monitor-command", {"command-line" => "info usernet"})
+          resp = @qmp.execute_with_args("human-monitor-command", {"command-line" => "info usernet"})
           resp = resp.split("\r\n")[2].split
           src_port = resp[3].to_i
           dst_port = resp[5].to_i
           if dst_port == 22
             port = src_port
           end
-        end
+        #end
         port.to_i
       end
     end
@@ -106,14 +126,10 @@ module Susi
       qmp_port = self.get_free_port(4000, 4099)
       ssh_port = self.get_free_port(2000, 2099)
       vnc_port = self.get_free_port(5900, 5999)
-      vnc_www_port = 5800 + vnc_port - 5900
-      vnc_websocket_port = 5700 + vnc_port - 5900
+      vnc_www_port = vnc_port - 100
+      vnc_websocket_port = vnc_port - 200
 
-      puts "QMP Port: #{qmp_port}"
-      puts "SSH Port: #{ssh_port}"
-      puts "VNC Port: #{vnc_port}"
-      puts "VNC WWW Port: #{vnc_www_port}"
-      puts "VNC WebSocket Port: #{vnc_websocket_port}"
+      Susi::debug "Starting VM #{name} with QMP on port #{qmp_port}, VNC on port #{vnc_port}, SSH on port #{ssh_port}"
 
       cmd = []
 
@@ -138,8 +154,9 @@ module Susi
         cmd << "-cdrom #{cdrom}"
       end
 
-      puts cmd.join(" ")
-      system(cmd.join(" "))
+      cmd = cmd.join(" ")
+      Susi::debug cmd
+      system(cmd)
 
       QMP.new(qmp_port).close
     end
@@ -152,19 +169,20 @@ module Susi
         # get VM access
         m = line.match(/-name (\w+)/)
         n = m[1]
-        vm = VM.new(n)
+        VM.new(n) do |vm|
+          # get local device name or IP
+          ip = vm.ip
 
-        # get local device name or IP
-        ip = Socket.ip_address_list.find { |ai| ai.ipv4? && !ai.ipv4_loopback? }
-
-        puts <<-EOF
+          puts <<-EOF
 VM: #{n}
   - Disk: #{vm.disk}
   - QMP: #{vm.qmp_port}
-  - VNC: vnc://#{ip.ip_address}:#{vm.vnc_port}
-  - Screen: http://#{ip.ip_address}:#{vm.vnc_www_port}/
-  - SSH: ssh -p #{vm.ssh_port} dabo@#{ip.ip_address}
+  - VNC: vnc://#{ip}:#{vm.vnc_port}
+  - Screen: http://#{ip}:#{vm.vnc_www_port}/
+  - Websocket: ws://#{ip}:#{vm.vnc_websocket_port}/
+  - SSH: ssh -p #{vm.ssh_port} dabo@#{ip}
 EOF
+        end
       end
     end
   end

data/lib/vnc.rb

@@ -1,46 +1,49 @@
 require 'socket'
 require 'webrick'
 
+require_relative 'output'
+
 module Susi
   class VNC
     def self.open(name)
-      vm = VM.new(name)
-      port = vm.vnc_www_port
-      ip = Socket.ip_address_list.find { |ai| ai.ipv4? && !ai.ipv4_loopback? }
-      token = (0...8).map { (65 + rand(26)).chr }.join
-      url = "http://#{ip.ip_address}:#{port}/#{token}.html"
+      VM.new(name) do |vm|
+        port = vm.vnc_www_port
+        token = (0...8).map { (65 + rand(26)).chr }.join
+        url = "http://#{vm.ip}:#{port}/#{token}.html"
+        Susi::info "VNC: #{url}"
 
-      # prepare paths and files
-      path = File.expand_path(File.dirname(__FILE__))
-      novnc_path = File.join(path, "novnc")
-      html = File.read(File.join(novnc_path, "screen.html"))
-      html.gsub!("###TOKEN###", token)
-      html.gsub!("###HOST###", ip.ip_address)
-      html.gsub!("###PORT###", vm.vnc_websocket_port.to_s)
+        # prepare paths and files
+        path = File.expand_path(File.dirname(__FILE__))
+        novnc_path = File.join(path, "novnc")
+        html = File.read(File.join(novnc_path, "screen.html"))
+        html.gsub!("###TOKEN###", token)
+        html.gsub!("###HOST###", vm.ip)
+        html.gsub!("###PORT###", vm.vnc_websocket_port.to_s)
 
-      server = WEBrick::HTTPServer.new(:Port => port,
+        server = WEBrick::HTTPServer.new(:Port => port,
                                        :Logger => WEBrick::Log.new("/dev/null"),
                                        :AccessLog => [])
-      server.mount_proc "/#{token}.html" do |req, res|
-        # print access by someone on command line
-        puts "[#{Time.now}] Access by: #{req.peeraddr[3]}"
-        res.body = html
-      end
-      server.mount_proc "/#{token}.close.html" do |req, res|
-        puts "[#{Time.now}] Closing VNC..."
-        res.body = "Closing VNC..."
-        server.shutdown
-      end
-      server.mount("/core",
-                   WEBrick::HTTPServlet::FileHandler,
-                   File.join(novnc_path, "core"))
-      server.mount("/vendor",
-                   WEBrick::HTTPServlet::FileHandler,
-                   File.join(novnc_path, "vendor"))
+        server.mount_proc "/#{token}.html" do |req, res|
+          # print access by someone on command line
+          Susi.info "[#{Time.now}] Access by: #{req.peeraddr[3]}"
+          res.body = html
+        end
+        server.mount_proc "/#{token}.close.html" do |req, res|
+          Susi.info "[#{Time.now}] Closing by #{req.peeraddr[3]}"
+          res.body = "Closing VNC..."
+          server.shutdown
+        end
+        server.mount("/core",
+                     WEBrick::HTTPServlet::FileHandler,
+                     File.join(novnc_path, "core"))
+        server.mount("/vendor",
+                     WEBrick::HTTPServlet::FileHandler,
+                     File.join(novnc_path, "vendor"))
 
-      puts "[#{Time.now}] VNC screen: #{url}"
+        Susi::debug "[#{Time.now}] VNC screen: #{url}"
 
-      server.start
+        server.start
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: susi-qemu
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.5
 platform: ruby
 authors:
 - Daniel Bovensiepen
@@ -33,6 +33,62 @@ extra_rdoc_files: []
 files:
 - bin/susi
 - lib/disk.rb
+- lib/novnc/core/base64.js
+- lib/novnc/core/crypto/aes.js
+- lib/novnc/core/crypto/bigint.js
+- lib/novnc/core/crypto/crypto.js
+- lib/novnc/core/crypto/des.js
+- lib/novnc/core/crypto/dh.js
+- lib/novnc/core/crypto/md5.js
+- lib/novnc/core/crypto/rsa.js
+- lib/novnc/core/decoders/copyrect.js
+- lib/novnc/core/decoders/h264.js
+- lib/novnc/core/decoders/hextile.js
+- lib/novnc/core/decoders/jpeg.js
+- lib/novnc/core/decoders/raw.js
+- lib/novnc/core/decoders/rre.js
+- lib/novnc/core/decoders/tight.js
+- lib/novnc/core/decoders/tightpng.js
+- lib/novnc/core/decoders/zlib.js
+- lib/novnc/core/decoders/zrle.js
+- lib/novnc/core/deflator.js
+- lib/novnc/core/display.js
+- lib/novnc/core/encodings.js
+- lib/novnc/core/inflator.js
+- lib/novnc/core/input/domkeytable.js
+- lib/novnc/core/input/fixedkeys.js
+- lib/novnc/core/input/gesturehandler.js
+- lib/novnc/core/input/keyboard.js
+- lib/novnc/core/input/keysym.js
+- lib/novnc/core/input/keysymdef.js
+- lib/novnc/core/input/util.js
+- lib/novnc/core/input/vkeys.js
+- lib/novnc/core/input/xtscancodes.js
+- lib/novnc/core/ra2.js
+- lib/novnc/core/rfb.js
+- lib/novnc/core/util/browser.js
+- lib/novnc/core/util/cursor.js
+- lib/novnc/core/util/element.js
+- lib/novnc/core/util/events.js
+- lib/novnc/core/util/eventtarget.js
+- lib/novnc/core/util/int.js
+- lib/novnc/core/util/logging.js
+- lib/novnc/core/util/strings.js
+- lib/novnc/core/websock.js
+- lib/novnc/screen.html
+- lib/novnc/vendor/pako/lib/utils/common.js
+- lib/novnc/vendor/pako/lib/zlib/adler32.js
+- lib/novnc/vendor/pako/lib/zlib/constants.js
+- lib/novnc/vendor/pako/lib/zlib/crc32.js
+- lib/novnc/vendor/pako/lib/zlib/deflate.js
+- lib/novnc/vendor/pako/lib/zlib/gzheader.js
+- lib/novnc/vendor/pako/lib/zlib/inffast.js
+- lib/novnc/vendor/pako/lib/zlib/inflate.js
+- lib/novnc/vendor/pako/lib/zlib/inftrees.js
+- lib/novnc/vendor/pako/lib/zlib/messages.js
+- lib/novnc/vendor/pako/lib/zlib/trees.js
+- lib/novnc/vendor/pako/lib/zlib/zstream.js
+- lib/output.rb
 - lib/qmp.rb
 - lib/ssh.rb
 - lib/susi.rb