nub 0.0.119 → 0.0.125

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7c15f5f66c73221685a124f105c3cca8205d41155603111823e8d580783aea7
-  data.tar.gz: 5d1bbe7937d9befa92a78237d6554993490e3e492b2dd75c5721e4457c2e630e
+  metadata.gz: fe85adf0021df868b46e1b8f36f38d6b9f3deb42edc9721629bf6a2b915b3701
+  data.tar.gz: 5988cdcaca7111a76b345f8c434f963a9730a37aac57dc9bb2a3e3818d381ff5
 SHA512:
-  metadata.gz: 4e2d6a2b5344de24c51ddb4913dd1225de0da8e6aeead3a527138bf124bfbe96a309f50ce5cd4b5b572a33bcdaf048da9cde1197c7a4dfb76f9a037e80b740d9
-  data.tar.gz: 11bb6954b62eb0326ac9015cd517808edaaabfeed0ec3d220448a80bd91b5ad84a03c8a94deed1c63f29d00a80eae5e3b1fe87fcc43290d902566de35393f0c9
+  metadata.gz: 11ff5cd8004bca05799bd22dff24780fb06174fbe30f2292c550480b485da23125d92eedea4d8719094e19abbbb912d914dbfcd972b105758a133e4dded008aa
+  data.tar.gz: 0995e0bc2ba7f9e02e391e3cea2cc2a8771396934b3b82ad1aafa34b375acc8fb5e384787e28fa32c1165af51e4ab08c6a687dda969152dcf693a54231b2d5a5

data/README.md

@@ -33,7 +33,6 @@ Collection of ruby utils I've used in several of my projects and wanted re-usabl
 * [Module Extensions](#module-extensions)
 * [Net Module](#net-module)
   * [Network Namespaces](#network-namespaces)
-    * [Teamviewer Example](#teamviewer-example)
     * [PIA VPN Example](#pia-vpn-example)
   * [Network Proxy](#network-proxy)
 * [Pacman Module](#pacman-module)
@@ -459,37 +458,6 @@ sudo ip netns exec foo ping www.google.com
 In the following sub sections I'll show you how to automated this complicated setup using the
 ***Net*** ruby module.
 
-#### TeamViewer Example <a name="teamviewer-example"></a>
-In this example I'll be showing you how to isolate Teamviewer such that Teamviewer is only able to
-bind to the veth IPv4 address that we create for it rather than all network interfaces on the host.
-This will allow you to have a local Teamviewer instance running and accessible from your network
-facing IP but also to be able to SSH port forward other Teamviewer instances to your veth addresses.
-
-```bash
-require_relative '../lib/nub/net'
-require_relative '../lib/nub/user'
-!puts("Must be root to execute") and exit if not User.root?
-
-if ARGV.size > 0
-  cmd = ARGV[0]
-  app = ARGV[1]
-  namespace = "foo"
-  host_veth = Net::Veth.new("veth1", "192.168.100.1")
-  guest_veth = Net::Veth.new("veth2", "192.168.100.2")
-  network = Net::Network.new("192.168.100.0", "24")
-  if cmd == "isolate"
-    Net.create_namespace(namespace, host_veth, guest_veth, network, "enp+")
-    Net.namespace_connectivity?(namespace, "google.com")
-    Net.namespace_exec(namespace, "lxterminal")
-  elsif cmd == "destroy"
-    Net.delete_namespace(namespace, host_veth, network, "enp+")
-  end
-else
-  puts("Isolate: #{$0} isolate <app>")
-  puts("Destroy: #{$0} destroy")
-end
-```
-
 #### PIA VPN Example <a name="pia-vpn-example"></a>
 ```ruby
 WIP

data/lib/nub/net.rb

@@ -22,6 +22,8 @@
 
 require 'ostruct'
 require 'ipaddr'
+require 'socket'
+require 'timeout'
 require_relative 'log'
 require_relative 'sys'
 require_relative 'module'
@@ -114,6 +116,24 @@ module Net
     return [24, 16, 8, 0].collect{|x| (ip_i >> x) & 255}.join('.')
   end
 
+  # Check if the given ip:port is open
+  # @param ip [String] to check
+  # @param port [Int] to check
+  # @param timeout [Int] to wait when dead
+  def port_open?(ip, port, *args)
+    sec = args.any? ? args.first.to_i : 0.1
+    Timeout::timeout(sec){
+      begin
+        TCPSocket.new(ip, port).close
+        true
+      rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
+        false
+      end
+    }
+  rescue Timeout::Error
+    false
+  end
+
   # ----------------------------------------------------------------------------
   # Namespace related helpers
   # ----------------------------------------------------------------------------
@@ -172,36 +192,78 @@ module Net
     end
   end
 
+  # Get veths for namespace
+  # @param namespace [String] name to use for lookup
+  # @returns [host_veth, guest_veth]
+  def namespace_veths(namespace)
+    host, guest = Veth.new, Veth.new
+    if self.namespaces.include?(namespace)
+
+      # Lookup guest side
+      out = `ip netns exec #{namespace} ip a show type veth`
+      host_i = out[/([\d]+):\s+.*@if[\d]+/, 1]
+      if host_i
+        guest.name = out[/ (.*)@if[\d]+/, 1]
+        guest.ip = out[/inet\s+([\d]+\.[\d]+\.[\d]+\.[\d]+).*/, 1]
+
+        # Lookup host side
+        out = `ip a show type veth`
+        host.name = out[/ (.*)@if#{host_i}/, 1]
+        host_ip = out[/inet(.*)#{host.name}/, 1][/\s*([\d]+\.[\d]+\.[\d]+\.[\d]+\/[\d]+).*/, 1]
+        host.ip = host_ip[/(.*)\/[\d]+/, 1]
+      end
+    end
+
+    return host, guest
+  end
+
+  # Get next available pair of veth ips
+  # @returns ips [Array] of next available ips
+  def namespace_next_veth_ips
+    used = []
+    self.namespaces.each{|ns|
+      used += self.namespace_veths(ns).select{|x| x.ip}.map{|x| x.ip.split('.').last.to_i}
+    }
+    return ((1..255).to_a - used)[0..1].map{|x| self.ipinc(@@namespace_subnet, x)}
+  end
+
   # Get namespace details using defaults for missing arguments
   # veth names are generated using the '<ns>_<type>' naming pattern
   # veth ips are generated based off @@namespace_subnet/@@namespace_cidr incrementally
   # network subnet and cidr default and namespaces and nic are looked up
-  # @param namespace [String] name to use when creating it
+  # @param namespace [String] name to use for details
   # @returns [host_veth, guest_veth, network]
   def namespace_details(namespace, *args)
     host_veth, guest_veth = Veth.new, Veth.new
     network = Network.new(@@namespace_subnet, @@namespace_cidr, true)
 
+    # Pull from existing namespace first
+    if self.namespaces.include?(namespace)
+      host_veth, guest_veth = self.namespace_veths(namespace)
+
     # Handle args as either as positional or named
-    if args.size == 1 && args.first.is_a?(Hash)
-      network = args.first[:network] if args.first.key?(:network)
-      host_veth = args.first[:host_veth] if args.first.key?(:host_veth)
-      guest_veth = args.first[:guest_veth] if args.first.key?(:guest_veth)
-    elsif args.size > 1
-      host_veth = args.shift
-      guest_veth = args.shift if args.any?
-      network = args.shift if args.any?
+    else
+      if args.size == 1 && args.first.is_a?(Hash)
+        network = args.first[:network] if args.first.key?(:network)
+        host_veth = args.first[:host_veth] if args.first.key?(:host_veth)
+        guest_veth = args.first[:guest_veth] if args.first.key?(:guest_veth)
+      elsif args.size > 1
+        host_veth = args.shift
+        guest_veth = args.shift if args.any?
+        network = args.shift if args.any?
+      end
     end
 
     # Populate missing information
-    nss = self.namespaces
-    i = (nss.include?(namespace) ? nss.size - 1 : nss.size) * 2 + 1
     host_veth.name = "#{namespace}_host" if !host_veth.name
-    host_veth.ip = self.ipinc(@@namespace_subnet, i) if !host_veth.ip
     guest_veth.name = "#{namespace}_guest" if !guest_veth.name
-    guest_veth.ip = "#{self.ipinc(host_veth.ip)}" if !guest_veth.ip
     network.nic = self.primary_nic if network.nic == true
-    network.nameservers = self.nameservers if not network.nameservers
+    network.nameservers = self.nameservers if !network.nameservers
+    if !host_veth.ip or !guest_veth.ip
+      host_ip, guest_ip = self.namespace_next_veth_ips
+      host_veth.ip = host_ip if !host_veth.ip
+      guest_veth.ip = guest_ip if !guest_veth.ip
+    end
 
     return host_veth, guest_veth, network
   end
@@ -313,11 +375,11 @@ module Net
         Log.info("Removing NAT on host for namespace #{File.join(network.subnet, network.cidr).colorize(:cyan)}", newline:false)
         Sys.exec_status("iptables -t nat -D POSTROUTING -s #{File.join(network.subnet, network.cidr)} -o #{network.nic} -j MASQUERADE")
       end
-      if `iptables -S`.include?("-A FORWARD -i #{network.nic}")
+      if `iptables -S`.include?("-A FORWARD -i #{network.nic} -o #{host_veth.name}")
         Log.info("Remove forwarding to #{namespace.colorize(:cyan)} from #{host_veth.ip.colorize(:cyan)}", newline:false)
         Sys.exec_status("iptables -D FORWARD -i #{network.nic} -o #{host_veth.name} -j ACCEPT")
       end
-      if `iptables -S`.include?("-A FORWARD -i #{host_veth.name}")
+      if `iptables -S`.include?("-A FORWARD -i #{host_veth.name} -o #{network.nic}")
         Log.info("Remove forwarding from #{namespace.colorize(:cyan)} to #{host_veth.ip.colorize(:cyan)}", newline:false)
         Sys.exec_status("iptables -D FORWARD -i #{host_veth.name} -o #{network.nic} -j ACCEPT")
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nub
 version: !ruby/object:Gem::Version
-  version: 0.0.119
+  version: 0.0.125
 platform: ruby
 authors:
 - Patrick Crummett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-21 00:00:00.000000000 Z
+date: 2018-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize