spior 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99feec0241976ee0c1fb2113f6b4ac1c72d8593e5d5901e559e642408c37f0ef
-  data.tar.gz: b74ce8165d4fc6538651769fac0ce6b7c79a1d05ab5ddcb68763f548569b2925
+  metadata.gz: '01991c016f887cb41723c10909810d4bc7c762ad844d85a3bd094653123b891f'
+  data.tar.gz: 6df20aa83ef6b7c2201bde879f4927183476b3b35d41eec6415ca7d0c3d0c8c5
 SHA512:
-  metadata.gz: d98ee9554cc7218957d7d3ff00240af12e5fb7e373ce2f080903182354f2cbb09d2fb7e2caa3b45a4a5065dd55b698d2c62d267007ca0d4ef03899529643e3cc
-  data.tar.gz: eb7ab480de17e9ab34ccae56c6da96408ce2206492f7071083702f8cbc8df0ad2cb183ba42bf9bf98173e3cca69d14293dc7caa06c6d98a01a93d5f00412eab6
+  metadata.gz: 4b0d5ab4e4ccd4a8563eaae7e1aee31f77041b5d1dd593e79719ec82cb51868b24958cd8b92973fbc03303d8e54d9f0f9d9837913af9474e3099f4c867e14902
+  data.tar.gz: f3bf8c16db8f5d8ec3e42b65f30567921ac4b0de3fffe2615e5ad045228920eed77ca5520c77b4b776ab75cbeda9455dab5bfe715a14b351e5711b5ca7b46ec9

data/CHANGELOG.md

@@ -1,4 +1,11 @@
-## 0.0.9
+## 0.1.0, release 2020-05-08
+* Will manage differents version of torrc, if your distro fail to start TOR, report an issue.
+* Ensure than TOR is start before proceed.
+* New option -p|--persist, work with systemd for now.
+* Remove duplicate code at lib/spior/mac.rb.
+* Correct apt-get install.
+
+## 0.0.9, release 2020-05-07
 * Add an option to reload TOR -r|--reload
 * Cleanup few characters from -s|--status
 * Correct path for search config files

data/conf/torrc/torrc_archlinux

@@ -0,0 +1,18 @@
+DataDirectory /var/lib/tor/data
+
+Log notice stdout
+
+GeoIPExcludeUnknown 1
+
+## Torified DNS
+DNSPort 127.0.0.1:9061
+AutomapHostsOnResolve 1
+AutomapHostsSuffixes .exit,.onion
+
+SocksPort 9050
+
+VirtualAddrNetworkIPv4 10.192.0.0/10
+TransPort 9040 IsolateClientAddr IsolateClientProtocol IsolateDestAddr IsolateDestPort
+
+TestSocks 1
+MaxCircuitDirtiness 600

data/lib/spior/clear.rb

@@ -24,7 +24,7 @@ module Spior
       elsif File.exist?("/etc/iptables.rules")
         ipt_restore "/etc/iptables.rules"
       else
-        Msg.report "Do not known where search you previous iptables rules"
+        Msg.p "I couldn't find any old rules for iptables to restore, skipping..."
       end
     end
 

data/lib/spior/copy.rb

@@ -1,4 +1,4 @@
-require 'pathname'
+require 'nomansland'
 require 'date'
 require 'digest'
 require_relative 'msg'
@@ -8,7 +8,7 @@ module Spior
 
     def self.config_files
       @conf_dir = File.expand_path('../..' + '/conf', __dir__)
-      copy_file(@conf_dir + "/torrc", "/etc/tor/torrc")
+      copy_torrc
       copy_file(@conf_dir + "/resolv.conf", "/etc/resolv.conf")
       copy_file(@conf_dir + "/ipt_mod.conf", "/etc/modules-load.d/ipt_mod.conf")
     end
@@ -18,6 +18,26 @@ module Spior
       backup_exist("/etc/resolv.conf")
     end
 
+    def self.search_systemd_dir
+      if Dir.exist?("/usr/lib/systemd/system")
+        @systemd_dir = '/usr/lib/systemd/system'
+      elsif Dir.exist?("/lib/systemd/system")
+        @systemd_dir = '/lib/systemd/system'
+      else
+        Msg.report "Directory systemd/system is no found on your system."
+        exit(-1)
+      end
+    end
+
+    def self.systemd_services
+      search_systemd_dir
+      case Nomansland::installer?
+      when :gentoo
+        Msg.p "Copy #{@conf_dir}/iptables.service"
+        copy_file(@conf_dir + "/iptables.service", @systemd_dir + "/iptables.service")
+      end
+    end
+
     private
 
     def self.copy_file(conf, target)
@@ -26,14 +46,23 @@ module Spior
       if File.exist? target then
         if ! previous_copy target
           backup_file(target)
-        else
-          add_file target
-        end
+        end 
+        add_file target
       else
         add_file target
       end
     end
 
+    def self.copy_torrc
+      case Nomansland::distro?
+      when :archlinux
+        copy_file(@conf_dir + "/torrc/torrc_archlinux", "/etc/tor/torrc")
+      else
+        copy_file(@conf_dir + "/torrc/torrc_default", "/etc/tor/torrc")
+        Msg.report "If tor fail to start with the default torrc"
+      end
+    end
+
     def self.previous_copy(target)
       backup=`ls #{target}.backup-* | head -n 1`.chomp
       return false if !File.exist?(backup)

data/lib/spior/install.rb

@@ -12,6 +12,7 @@ module Spior
 
     def self.check_base
       base_packages
+      verify_services
     end
 
     def self.check_mac
@@ -30,11 +31,17 @@ module Spior
         when :yum
           system('sudo yum install tor iptables')
         else
-          system('sudo apt-get tor iptables')
+          system('sudo apt-get install tor iptables')
         end
       end
     end
 
+    def self.verify_services
+      if TTY::Which.exist?('systemctl')
+        system('if ! systemctl is-active tor ; then sudo systemctl start tor ; fi')
+      end
+    end
+
     def self.pkg_mac
       pkg_name="deceitmac"
       if not TTY::Which.exist?(pkg_name)

data/lib/spior/mac.rb

@@ -3,21 +3,9 @@ require_relative "msg"
 
 module Spior
   module MAC
-    extend self
-
-    def randomize(interface)
+    def self.randomize(interface)
       @network_int = interface
-      check_dep
       system("deceitmac --interface #{@network_int} --random --dhcpcd --tor --no-banner")
     end
-
-    private
-
-    def check_dep
-      if ! Pathname.new("/usr/local/bin/deceitmac") then
-        Msg.error "deceitmac is not installed, please, exec spior --install"
-        exit(-1)
-      end
-    end
   end
 end

data/lib/spior/msg.rb

@@ -13,9 +13,13 @@ module Msg
     puts Rainbow("[").red + Rainbow("-").white + Rainbow("]").red + " " + text
   end
 
+  def self.info(text)
+    puts Rainbow("-").blue + Rainbow("-").white + Rainbow("-").blue + " " + text + " " + Rainbow("-").blue + Rainbow("-").white + Rainbow("-").blue
+  end
+
   def self.report(text)
     puts ""
-    self.err text
+    info text
     puts "Please, report this issue at https://github.com/szorfein/spior/issues"
   end
 end

data/lib/spior/options.rb

@@ -5,12 +5,13 @@ require_relative 'clear'
 
 module Spior
   class Options
-    attr_reader :install , :mac , :interface , :tor
+    attr_reader :install , :mac , :interface , :tor , :persist
 
     def initialize(argv)
       @install = false
       @mac = false
       @tor = false
+      @persist = false
       parse(argv)
     end
 
@@ -46,6 +47,10 @@ module Spior
           Spior::Status::info
         end
 
+        opts.on("-p", "--persist", "Active Spior at every boot.") do
+          @persist = true
+        end
+
         opts.on("-h", "--help", "Show this message") do
           puts opts
           exit

data/lib/spior/persist.rb

@@ -0,0 +1,39 @@
+require 'nomansland'
+require 'tty-which'
+require_relative 'copy'
+require_relative 'msg'
+
+module Spior
+  module Persist
+    extend self
+
+    def all(card_name)
+      @card_name = card_name
+      @services=[ "tor", "iptables", "deceitmac@" + @card_name ]
+      search_for_systemd
+    end
+
+    private
+
+    def search_for_systemd
+      return if !TTY::Which.exist?('systemctl') 
+      Spior::Copy::systemd_services
+      @services.each do |service|
+        Msg.p "Search for service #{service}..."
+        system("if ! systemctl is-enabled #{service} ; then sudo systemctl enable #{service} ; fi")
+      end
+      iptables_systemd
+    end
+
+    def iptables_systemd
+      case Nomansland::installer?
+      when :pacman
+        system('sudo iptables-save -f /etc/iptables/iptables.rules')
+      when :emerge
+        system('sudo systemctl start iptables-store')
+      else
+        Msg.report "Fail for save iptables-rule, your system is not yet supported"
+      end
+    end
+  end
+end

data/lib/spior/runner.rb

@@ -4,6 +4,7 @@ require_relative 'copy'
 require_relative 'mac'
 require_relative 'iptables'
 require_relative 'network'
+require_relative 'persist'
 require_relative 'msg'
 
 module Spior
@@ -36,6 +37,12 @@ module Spior
         end
         Spior::Iptables::tor(@network.card)
       end
+      if @options.persist then
+        if not @network
+          @network = Spior::Network.new(@options.interface)
+        end
+        Spior::Persist::all(@network.card)
+      end
     end
   end
 end

data/spior.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
     "wiki_uri" => "https://github.com/szorfein/spior"
   }
 
-  s.version = "0.0.9"
+  s.version = "0.1.0"
   s.requirements << 'tor'
   s.requirements << 'sudo'
   s.requirements << 'iptables'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spior
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - szorfein
@@ -35,7 +35,7 @@ cert_chain:
   J/zT/q2Ac7BWpSLbv6p9lChBiEnD9j24x463LR5QQjDNS5SsjzRQfFuprsa9Nqf2
   Tw==
   -----END CERTIFICATE-----
-date: 2020-05-07 00:00:00.000000000 Z
+date: 2020-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -111,7 +111,8 @@ files:
 - conf/ssh.conf
 - conf/sshd.conf
 - conf/sshuttle.service
-- conf/torrc
+- conf/torrc/torrc_archlinux
+- conf/torrc/torrc_default
 - lib/spior/clear.rb
 - lib/spior/copy.rb
 - lib/spior/install.rb
@@ -120,6 +121,7 @@ files:
 - lib/spior/msg.rb
 - lib/spior/network.rb
 - lib/spior/options.rb
+- lib/spior/persist.rb
 - lib/spior/reload.rb
 - lib/spior/runner.rb
 - lib/spior/status.rb