spior 0.1.5 → 0.2.8

metadata

@@ -1,98 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: spior
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.8
 platform: ruby
 authors:
 - szorfein
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIETTCCArWgAwIBAgIBATANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDDB1zem9y
-  ZmVpbi9EQz1wcm90b25tYWlsL0RDPWNvbTAeFw0yMDA0MzAxNzAxNDBaFw0yMTA0
-  MzAxNzAxNDBaMCgxJjAkBgNVBAMMHXN6b3JmZWluL0RDPXByb3Rvbm1haWwvREM9
-  Y29tMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAxCTYZRndCTRy18rE
-  exr2wig/staa0G5kt99xqaBYD0dnIRBr/GO5dFntlBVwmefQlTrNbygVUIYTb8Vg
-  B1oX3v/LLW9SRQcWaZwou0tARqanm5WhgV1ZYQTs22endTazsDHw0uhM3V+FgDh+
-  eR5wM9vU+SkRFHWzjVS1OxyTSCBVWb3+nrYTr/OKZ5Fm3Vo1dEQdwBEWLLXuUBxs
-  dWEDmBk7iTJbvNdd5Kk2wfMKRMOl9NGicJl3Cb5yl5ITeZsXdOsrLBBPepTpNeq2
-  k1goew3mEd/4pVXrdw6S5Qr6RTbTCLpKNRxWtx01vue9NN1cQ/Ds5FRkCp/Ntw/k
-  Xroyofo4MW5fEPq+udgvVpdTfguQkpmuJg7TRiq9F5hDhEMnKUsdM2fSev9u8EvL
-  OkidKy8bnhUOoG9qDxEG/IyibjRLl1i5jtyHa8Jb/We8poZ5LI8qjHwMPjTBhDgi
-  EzaYV5rLGs5S1/m58XG6a+620x2tcQZph6FFbnQJ8QBuNz6zAgMBAAGjgYEwfzAJ
-  BgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUc8XWveAjxS5fVEOZeeZe
-  uUQmbhMwIgYDVR0RBBswGYEXc3pvcmZlaW5AcHJvdG9ubWFpbC5jb20wIgYDVR0S
-  BBswGYEXc3pvcmZlaW5AcHJvdG9ubWFpbC5jb20wDQYJKoZIhvcNAQELBQADggGB
-  AG4K1ZJdzcVABSnVuD83z5ne9eBlrYscHHSXev5FX32jFdKxl19FQ+eorjSOTsNq
-  SIgKneQOKdsWIlv8M6NDiUDcc1s504fOpIVtMbP+6n47hBGz4bzGlAdtvTO1PewK
-  tW6ii8TOCOJ3Pv6bTzQlsaQrADi2MHuVHTb14H7uoSFJNzfU4sYJn1C3PRMC3G7n
-  Qe/zVOdMf0bkwBnfQNojbwx3Vy1jr2JSQWjK25NYimpuKV0skanU0iBiqru6VCbK
-  zhDNufCgCnWLwXXET3onVQMZsiLTUFf30BXX7PY1O0Km15MQn1HzOecJ3ZIDBWtS
-  d/lg1MHB7+/FQAY5FujZqvVv5i2M9wLx+7N4ONRA7MsWD86hLiYN68QeRsHI+LNf
-  AnVdw7i28f3GhZldcdllblGeTOjSfwl9wL4yBb1UwVjvcwMR5SDed0yPmHPXBiAC
-  J/zT/q2Ac7BWpSLbv6p9lChBiEnD9j24x463LR5QQjDNS5SsjzRQfFuprsa9Nqf2
-  Tw==
+  MIIEhTCCAu2gAwIBAgIBATANBgkqhkiG9w0BAQsFADBEMREwDwYDVQQDDAhzem9y
+  ZmVpbjEaMBgGCgmSJomT8ixkARkWCnByb3Rvbm1haWwxEzARBgoJkiaJk/IsZAEZ
+  FgNjb20wHhcNMjIwOTA4MDYyNjE5WhcNMjMwOTA4MDYyNjE5WjBEMREwDwYDVQQD
+  DAhzem9yZmVpbjEaMBgGCgmSJomT8ixkARkWCnByb3Rvbm1haWwxEzARBgoJkiaJ
+  k/IsZAEZFgNjb20wggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDEJNhl
+  Gd0JNHLXysR7GvbCKD+y1prQbmS333GpoFgPR2chEGv8Y7l0We2UFXCZ59CVOs1v
+  KBVQhhNvxWAHWhfe/8stb1JFBxZpnCi7S0BGpqeblaGBXVlhBOzbZ6d1NrOwMfDS
+  6EzdX4WAOH55HnAz29T5KREUdbONVLU7HJNIIFVZvf6ethOv84pnkWbdWjV0RB3A
+  ERYste5QHGx1YQOYGTuJMlu8113kqTbB8wpEw6X00aJwmXcJvnKXkhN5mxd06yss
+  EE96lOk16raTWCh7DeYR3/ilVet3DpLlCvpFNtMIuko1HFa3HTW+57003VxD8Ozk
+  VGQKn823D+ReujKh+jgxbl8Q+r652C9Wl1N+C5CSma4mDtNGKr0XmEOEQycpSx0z
+  Z9J6/27wS8s6SJ0rLxueFQ6gb2oPEQb8jKJuNEuXWLmO3Idrwlv9Z7ymhnksjyqM
+  fAw+NMGEOCITNphXmssazlLX+bnxcbpr7rbTHa1xBmmHoUVudAnxAG43PrMCAwEA
+  AaOBgTB/MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBRzxda94CPF
+  Ll9UQ5l55l65RCZuEzAiBgNVHREEGzAZgRdzem9yZmVpbkBwcm90b25tYWlsLmNv
+  bTAiBgNVHRIEGzAZgRdzem9yZmVpbkBwcm90b25tYWlsLmNvbTANBgkqhkiG9w0B
+  AQsFAAOCAYEAPhavFyzIP60Zw7y40zJhzQpMK2IWtdw9HrRJq313Ea4UT1Kgv7F9
+  lCFtQzI5XMzooYiLMoPz7xBMXaUz+DDFOOcgGSinVrFbfPA4rOGEkBjnlwC39lBc
+  AiyXFzCV7Wqn4VhtqQQyvmoNYL4Q666K+nL8/nsXZWsXtRQ119LeAvrI2A+xmYAb
+  FPE5bD3Jx1JCoJdVN1DmE4YYdM8mVmb0XjCK9Tp1M01EDKDvAX7f3B+X6A5D7uBq
+  63X6Kx09VkntVOrifd3W4TwjDlyAMpB+50OIi3ErPnH2R4i09qnCiZmcVWATBVKw
+  e2QSloIAUZJwEFkrRqWPNVi8sr+BcMeuKpXaOwpbkP+xq/W2EKlUQKhPXMXS4jvC
+  MuTi+RjpSNKZxzBrOlK2eMIpiFrugF7nzKcM9EGnWRWUb899drCcD4VJhjPtgpn+
+  aEJeKq4/BlIwMlXPe+W5C8zp2i8hgG1/OYbwbGE1p2iRi1NIK7G/HyRqQjOqJxzE
+  LLknX69FN7/G
   -----END CERTIFICATE-----
-date: 2020-11-01 00:00:00.000000000 Z
+date: 2022-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rainbow
+  name: interfacez
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: interfacez
+  name: nomansland
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '0.0'
 - !ruby/object:Gem::Dependency
-  name: nomansland
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: tty-which
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: '0.5'
 description: "    A tool to make TOR your default gateway\n"
 email: szorfein@protonmail.com
 executables:
@@ -102,8 +103,10 @@ extra_rdoc_files:
 - README.md
 - CHANGELOG.md
 files:
+- ".github/workflows/rubocop-analysis.yml"
 - ".gitignore"
 - CHANGELOG.md
+- Gemfile
 - LICENSE
 - README.md
 - Rakefile
@@ -111,24 +114,31 @@ files:
 - ext/ipt_mod.conf
 - ext/iptables.service
 - lib/spior.rb
-- lib/spior/clear.rb
-- lib/spior/copy.rb
+- lib/spior/dep.rb
 - lib/spior/helpers.rb
-- lib/spior/install.rb
 - lib/spior/iptables.rb
 - lib/spior/iptables/default.rb
 - lib/spior/iptables/root.rb
+- lib/spior/iptables/rules.rb
 - lib/spior/iptables/tor.rb
 - lib/spior/menu.rb
 - lib/spior/msg.rb
-- lib/spior/network.rb
 - lib/spior/options.rb
-- lib/spior/persist.rb
+- lib/spior/service.rb
+- lib/spior/service/enable.rb
+- lib/spior/service/restart.rb
+- lib/spior/service/start.rb
+- lib/spior/service/stop.rb
 - lib/spior/status.rb
 - lib/spior/tor.rb
-- lib/spior/tor/info.rb
-- lib/spior/tor/restart.rb
+- lib/spior/tor/config.rb
+- lib/spior/tor/data.rb
+- lib/spior/tor/start.rb
+- lib/spior/tor/stop.rb
 - lib/spior/version.rb
+- man/spior.1
+- man/spior.1.html
+- man/spior.1.ronn
 - spior.gemspec
 - test/test_install.rb
 - test/test_options.rb
@@ -139,7 +149,7 @@ metadata:
   changelog_uri: https://github.com/szorfein/spior/blob/master/CHANGELOG.md
   bug_tracker_uri: https://github.com/szorfein/spior/issues
   wiki_uri: https://github.com/szorfein/spior
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -147,7 +157,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -156,8 +166,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - tor
 - iptables
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.19
+signing_key:
 specification_version: 4
 summary: A tool to make TOR your default gateway
 test_files:

data/lib/spior/clear.rb

@@ -1,36 +0,0 @@
-require 'tty-which'
-require 'nomansland'
-
-module Spior
-  module Clear
-    extend self
-
-    def all
-      iptables
-      Spior::Copy.new.restore
-    end
-
-    private
-
-    def iptables
-      puts "Clearing rules.."
-      ipt = Spior::Iptables::Default.new
-      ipt.stop!
-      #if File.exist?("/var/lib/iptables/rules-save")
-      #  ipt_restore "/var/lib/iptables/rules-save"
-      #elsif File.exist?("/etc/iptables/rules.save")
-      #  ipt_restore "/etc/iptables/iptables.rules"
-      #elsif File.exist?("/etc/iptables.rules")
-      #  ipt_restore "/etc/iptables.rules"
-      #else
-        #Msg.p "Couldn't find any previous rules for iptables, create basic rules..."
-        ipt.run!
-      #end
-    end
-
-    def ipt_restore(path)
-      puts "Restoring rules #{path}..."
-      Helpers::Exec.new("iptables-restore").run("#{path}")
-    end
-  end
-end

data/lib/spior/copy.rb

@@ -1,85 +0,0 @@
-require 'digest'
-
-module Spior
-  class Copy
-    def initialize
-      @cp = Helpers::Exec.new("cp -a")
-      @files = []
-      search_conf_dir
-      config_files
-      list
-    end
-
-    def save
-      @files.each { |f|
-        backup = "#{f}_backup"
-        if ! File.exist? backup
-          Msg.p "#{f} saved"
-          @cp.run("#{f} #{backup}")
-        end
-      }
-    end
-
-    def restore
-      @files.each { |f|
-        backup = "#{f}_backup"
-        if File.exist? backup
-          Msg.p "#{f} restored"
-          @cp.run("#{backup} #{f}")
-        end
-      }
-    end
-
-    private
-
-    def config_files
-      copy_file("#{@conf_dir}/ipt_mod.conf", "/etc/modules-load.d/ipt_mod.conf")
-    end
-
-    def list
-      add "/etc/resolv.conf"
-      add "/etc/tor/torrc"
-      add "/etc/systemd/resolved.conf"
-      add "/var/lib/iptables/rules-save" # gentoo
-      add "/etc/iptables/iptables.rules" # arch
-      add "/etc/iptables/rules.v4" # debian
-    end
-
-    def add(file)
-      @files << file if File.exist? file
-    end
-
-    def search_conf_dir
-      # ebuild on gentoo copy the ext dir at lib/ext
-      @conf_dir = File.expand_path('../..' + '/lib/ext', __dir__)
-      if ! Dir.exist?(@conf_dir)
-        @conf_dir = File.expand_path('../..' + '/ext', __dir__)
-      end
-    end
-
-    def previous_copy(target)
-      backup=`ls #{target}.backup-* | head -1`.chomp
-      return false if ! File.exist? backup
-      check_hash(backup, target)
-    end
-
-    def add_file(target)
-      @cp.run("#{@config_file} #{target}")
-      Msg.p "File #{@config_file} has been successfully copied at #{target}"
-    end
-
-    def copy_file(conf, target)
-      @config_file = conf
-      add_file target if ! File.exist? target
-      return if check_hash(@config_file, target)
-      add_file target
-    end
-
-    def check_hash(src, target)
-      return if not File.exist?(target)
-      sha256conf = Digest::SHA256.file src
-      sha256target = Digest::SHA256.file target
-      sha256conf === sha256target
-    end
-  end
-end

data/lib/spior/install.rb

@@ -1,33 +0,0 @@
-require 'nomansland'
-require 'tty-which'
-
-module Spior
-  class Install
-    class << self
-      def check_deps
-        base_packages
-      end
-
-      private
-
-      def base_packages
-        if not TTY::Which.exist?('iptables') or not TTY::Which.exist?('tor')
-          case Nomansland::installer?
-          when :emerge
-            emerge = Helpers::Exec.new("emerge -av --changed-use")
-            emerge.run("tor iptables")
-          when :pacman
-            pacman = Helpers::Exec.new("pacman -S --needed")
-            pacman.run("tor iptables")
-          when :yum
-            yum = Helpers::Exec.new("yum install")
-            yum.run("tor iptables")
-          else
-            apt_get = Helpers::Exec.new("apt-get install")
-            apt_get.run("tor iptables iptables-persistent")
-          end
-        end
-      end
-    end
-  end
-end

data/lib/spior/network.rb

@@ -1,45 +0,0 @@
-require 'interfacez'
-
-module Spior
-  class Network
-    attr_accessor :card
-
-    def initialize(name = false)
-      @name = name
-      @check = false
-    end
-
-    def card
-      verify_card
-      if @check == false then
-        ask_for_card
-      end
-      @name
-    end
-
-    private
-
-    def verify_card
-      return if @check or not @name
-      Interfacez.all do |interface|
-        if interface == @name then
-          @check = true
-        end
-      end
-      if not @check then
-        Msg.err "Your interface #{@name} is no found"
-      end
-    end
-
-    def ask_for_card
-      until @check == true
-        Interfacez.all do |interface|
-          print interface + " "
-        end
-        printf "\nWhat is the name of the card to be used? "
-        @name = gets.chomp
-        verify_card
-      end
-    end
-  end
-end

data/lib/spior/persist.rb

@@ -1,51 +0,0 @@
-require 'nomansland'
-require 'tty-which'
-
-module Spior
-  module Persist
-    extend self
-
-    def enable
-      case Nomansland::distro?
-      when :gentoo
-        for_gentoo
-      else
-        Msg.p "Your distro is not yet supported."
-      end
-    end
-
-    private
-
-    def for_gentoo
-      if TTY::Which.exist?('systemctl')
-        systemd_start("iptables-store")
-        systemd_enable("iptables-restore")
-        systemd_enable("tor")
-      else
-        system("sudo /etc/init.d/iptables save")
-        rc_upd = Helpers::Exec.new("rc-update")
-        rc_upd.run("rc-update add iptables boot")
-        rc_upd.run("rc-update add tor")
-        rc_upd.run("rc-update add tor default")
-      end
-    end
-
-    def systemd_enable(service)
-      systemctl = Helpers::Exec.new("systemctl")
-      Msg.p "Search for service #{service}..."
-      `systemctl is-enabled #{service}`
-      if not $?.success? then
-        systemctl.run("enable #{service}")
-      end
-    end
-
-    def systemd_start(service)
-      systemctl = Helpers::Exec.new("systemctl")
-      Msg.p "Search for service #{service}..."
-      `systemctl is-active #{service}`
-      if not $?.success? then
-        systemctl.run("start #{service}")
-      end
-    end
-  end
-end

data/lib/spior/tor/info.rb

@@ -1,113 +0,0 @@
-require 'pathname'
-require 'nomansland'
-require 'tty-which'
-
-module Spior
-  module Tor
-    class Info
-      attr_accessor :dns, :uid, :trans_port, :virt_addr
-
-      def initialize
-        @systemctl = Helpers::Exec.new("systemctl")
-        check_deps
-        @dns = search_dns
-        @uid = search_uid
-        @trans_port = search_trans_port
-        @virt_addr = search_virt_addr
-      end
-
-      private 
-
-      def check_deps
-        Spior::Install::check_deps
-        Spior::Copy.new.save
-        add_resolv
-        add_torrc
-        verify_service
-      end
-
-      def add_resolv
-        string = "nameserver 127.0.0.1"
-        new_file = Helpers::NewFile.new(string, "resolv.conf", "/etc")
-        new_file.add
-        new_file.perm("root", "644")
-      end
-
-      def self.grep?(file, regex)
-        is_found = false
-        return is_found if ! File.exist? file
-        File.open(file) do |f|
-          f.each do |line|
-            is_found = true if line.match(regex)
-          end
-        end
-        is_found
-      end
-
-      def add_torrc
-        user = ""
-        pid = ""
-        dir = "DataDirectory /var/lib/tor/data"
-        case Nomansland::distro?
-        when :gentoo
-          user = "User tor"
-          pid = "PIDFile /run/tor/tor.pid"
-        end
-        string = <<EOF
-# Generated by Spior
-#{user}
-#{pid}
-#{dir}
-GeoIPExcludeUnknown 1
-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
-EOF
-        new_file = Helpers::NewFile.new(string, "torrc", "/etc/tor")
-        new_file.add
-        new_file.perm("root", "644")
-      end
-
-      def search_dns
-        9061
-      end
-
-      def search_uid
-        case Nomansland::distro?
-        when :debian
-          `id -u debian-tor`.chomp
-        when :ubuntu
-          `id -u debian-tor`.chomp
-        else
-          `id -u tor`.chomp
-        end
-      end
-
-      def search_trans_port
-        9040
-      end
-
-      def search_virt_addr
-        "10.192.0.0/10"
-      end
-
-      def verify_service
-        if TTY::Which.exist?('systemctl')
-          state = `systemctl is-active tor`.chomp
-          if state == 'active'
-            @systemctl.run('restart tor')
-          else
-            @systemctl.run('start tor')
-          end
-        else
-          Msg.for_no_systemd
-        end
-      end
-    end
-  end
-end

data/lib/spior/tor/restart.rb

@@ -1,13 +0,0 @@
-require 'tty-which'
-
-module Spior
-  module Tor
-    module_function
-    def restart
-      if TTY::Which.exist?('systemctl')
-        Helpers::Exec.new("systemctl").run("restart tor")
-        Msg.p "ip changed"
-      end
-    end
-  end
-end