spior 0.2.8 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57323a089d6067de5bd331a14a2471bd5b5f266135d23fa08e54df4bd23dbb4f
-  data.tar.gz: 63b77a80284704c7798b954a3b121862d214c369fd1784e70470b9f34fa91783
+  metadata.gz: ecae8f75479fb87d8b09a28ea74c86728923802feb7b6c495af0c6e455dfc986
+  data.tar.gz: 442c8fbf6ea54e45b6b48abc4ba5de582ae09ae73bd71c1fce497ea082c929c1
 SHA512:
-  metadata.gz: 81fee9fa3884a93d3465c5344156a8daa142c5e6274041f349a8cdddb5c6d51b0d0b2a71f2c16a670058510f398be22e4300038fde61848e2cc756b1a9cd4459
-  data.tar.gz: f1e26ab4d457c04071fe43543e4c83c6f0cfbc76eb06616e7f8ef8bdb6aea9defb1bd23e07a12ba571e8566a02b2048688e68f9ba1a7f82bb5e00d665efc66fb
+  metadata.gz: fe92411f967699b8cd29129f174030bb44a0d6ea2616fa5ff579e0879da63dfce83ce7bfeadfbed7e536141a882ff118315f730d3a26e45d8756bf9aed416130
+  data.tar.gz: 2195a94c764fcdecc221d2cea1688ca241901ac948cb02fb285b2c4c234b2f73335b2c44bd227014e795e32621b8221616dcaaecada2e95e779fad543d21ffff

data/.github/workflows/rubocop-analysis.yml

@@ -3,10 +3,10 @@ name: "Rubocop"
 
 on:
   push:
-    branches: [ develop ]
+    branches: [ devel ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ develop ]
+    branches: [ devel ]
   schedule:
     - cron: '42 4 * * 6'
 

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.3.5, release 2023-10-26
+* Better code style, only 11 alerts from rubocop.
+* spior -t also block ipv6 traffic, no need to reboot.
+* Config is written at /etc/torrc.d/spior.conf and loaded with the native daemon.
+* Only '%include /etc/torrc.d/*.conf' is now added to /etc/tor/torrc.
+* Certificate update `certs/szorfein.pem`.
+
 ## 0.2.8, release 2022-09-16
 * Spior used with `--clearnet` try to restore iptables rules found on your system, e.g: `/etc/iptables/iptables.rules` and `/etc/iptables/iptables.rules-backup` for Archlinux or use `Spior::Iptables::Default`.
 * Stdout enhanced.

data/Rakefile

@@ -3,7 +3,7 @@
 # https://github.com/seattlerb/minitest#running-your-tests-
 require 'rake/testtask'
 require 'rdoc/task'
-require File.dirname(__FILE__) + '/lib/spior/version'
+require "#{File.dirname(__FILE__)}/lib/spior/version"
 
 # rake rdoc
 Rake::RDocTask.new('rdoc') do |rdoc|

data/bin/spior

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'spior'
 

data/lib/auth.rb

@@ -0,0 +1,46 @@
+# lib/auth.rb
+# frozen_string_literal: true
+
+require 'open3'
+
+# When action require privilege, Auth search on the system for sudo or doas.
+class Auth
+  def initialize
+    @auth = search_app
+  end
+
+  def mkdir(path)
+    return unless File.exist?(path)
+
+    x("mkdir -p #{path}")
+  end
+
+  def sysctl(flag, value)
+    return if flag.nil?
+
+    x("sysctl -w #{flag}=#{value}")
+  end
+
+  protected
+
+  def search_app
+    if File.exist?('/usr/bin/doas') || File.exist?('/bin/doas')
+      'doas'
+    elsif File.exist?('/usr/bin/sudo') || File.exist?('/bin/sudo')
+      'sudo'
+    else
+      warn 'No auth program found, Spior need few privileges.'
+    end
+  end
+
+  private
+
+  def x(args)
+    Open3.popen2e("#{@auth} #{args}") do |_, stdout, wait_thr|
+      puts stdout.gets while stdout.gets
+
+      exit_status = wait_thr.value
+      raise "An error expected with #{@auth} #{args}" unless exit_status.success?
+    end
+  end
+end

data/lib/spior/dep.rb

@@ -6,38 +6,31 @@ require 'tty-which'
 module Spior
   # Dep: install all dependencies for Spior
   module Dep
-    extend self
+    module_function
 
     def looking
       case Nomansland.distro?
       when :archlinux
-        Msg.p 'Looking dependencies for Archlinux...'
-        installing_deps(%w[iptables tor])
+        installing_deps('Arch', %w[iptables tor])
       when :debian
-        Msg.p 'Looking dependencies for Debian...'
-        installing_deps(%w[iptables tor])
+        installing_deps('Debian', %w[iptables tor])
       when :gentoo
-        Msg.p 'Looking dependencies for Gentoo...'
-        installing_deps(%w[iptables tor])
+        installing_deps('Gentoo', %w[iptables tor])
       when :void
-        Msg.p 'Looking dependencies for Voidlinux...'
-        installing_deps(%w[iptables tor])
+        installing_deps('Void', %w[iptables tor])
       else
         Msg.report 'Install for your distro is not yet supported.'
       end
     end
 
-    protected
-
-    def installing_deps(names)
+    def installing_deps(distro, names)
       names.map do |n|
+        Msg.p "Search #{n} for #{distro}..."
         install(n) unless search_dep(n)
       end
-      Msg.p 'Dependencies are OK.'
     end
 
     def install(name)
-      Msg.p "Installing #{name}..."
       case Nomansland.installer?
       when :apt_get
         Helpers::Exec.new('apt-get').run("install #{name}")

data/lib/spior/helpers.rb

@@ -5,6 +5,7 @@ require 'tempfile'
 require 'open3'
 
 module Helpers
+  # Execute program using sudo when permission is required
   class Exec
     def initialize(name)
       @search_uid = Process::Sys.getuid
@@ -14,14 +15,10 @@ module Helpers
     def run(args)
       cmd = (@search_uid == '0' ? @name : "sudo #{@name}")
       Open3.popen2e("#{cmd} #{args}") do |_, stdout_err, wait_thr|
-        while line = stdout_err.gets
-          puts line
-        end
+        puts stdout_err.gets while stdout_err.gets
 
         exit_status = wait_thr.value
-        unless exit_status.success?
-          raise "Error, Running #{cmd} #{args}"
-        end
+        raise "Error, Running #{cmd} #{args}" unless exit_status.success?
       end
     end
   end

data/lib/spior/iptables/root.rb

@@ -4,6 +4,7 @@ require 'interfacez'
 
 module Spior
   module Iptables
+    # Base class for iptables
     class Root
       def initialize
         @lo      = Interfacez.loopback
@@ -36,7 +37,7 @@ module Spior
       private
 
       def ipt(line)
-        @i.run("#{line}")
+        @i.run(line.to_s)
         puts "Added - iptables #{line}" if @debug
       end
 

data/lib/spior/iptables/rules.rb

@@ -6,24 +6,26 @@ require 'nomansland'
 
 module Spior
   module Iptables
+    # Iptables::Rules, used to save or restore iptables rules
     class Rules
       def initialize
         @tmp_iptables_rules = Tempfile.new('iptables_rules')
         @tmp_spior_rules = Tempfile.new('spior_rules')
-        @rules_path = search_iptables_config
+        @save_path = search_iptables_config
       end
 
-      def backup
+      def save
         save_rules(@tmp_iptables_rules)
         insert_comment(@tmp_spior_rules, @tmp_iptables_rules)
-        create_file(@tmp_spior_rules, @rules_path)
+        create_file(@tmp_spior_rules, @save_path)
+        Msg.p "Iptables rules saved at #{@save_path}"
       end
 
       def restore
-        unless restoring_older_rules(@rules_path)
-          Msg.p 'Adding clearnet navigation...'
-          Iptables::Default.new.run!
-        end
+        return if restoring_older_rules(@save_path)
+
+        Msg.p 'Adding clearnet navigation...'
+        Iptables::Default.new.run!
       end
 
       protected
@@ -70,16 +72,14 @@ module Spior
       end
 
       def restoring_older_rules(filename)
-        files = %W[#{filename} #{filename}-backup]
+        files = %W[#{filename}-backup #{filename}]
         files.each do |f|
-          next unless File.exist? f
+          next unless File.exist?(f) || search_for_comment(f)
 
-          unless search_for_comment(f)
-            Iptables::Root.new.stop!
-            Msg.p "Found older rules #{f}, restoring..."
-            Helpers::Exec.new('iptables-restore').run(f)
-            return true
-          end
+          Iptables::Root.new.stop!
+          Msg.p "Found older rules #{f}, restoring..."
+          Helpers::Exec.new('iptables-restore').run(f)
+          return true
         end
         false
       end

data/lib/spior/iptables/tor.rb

@@ -35,9 +35,7 @@ module Spior
           ipt "-t #{table} -A OUTPUT -d #{CONFIG.virt_addr} -p tcp -j #{target}"
 
           target = 'RETURN' if table == 'nat'
-          @non_tor.each { |ip|
-            ipt "-t #{table} -A OUTPUT -d #{ip} -j #{target}"
-          }
+          @non_tor.each { |ip| ipt "-t #{table} -A OUTPUT -d #{ip} -j #{target}" }
 
           target = "REDIRECT --to-ports #{CONFIG.trans_port}" if table == 'nat'
           ipt "-t #{table} -A OUTPUT -p tcp -j #{target}"

data/lib/spior/iptables.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module Spior
+  # Interact with iptables
   module Iptables
   end
 end

data/lib/spior/ipv6.rb

@@ -0,0 +1,35 @@
+# lib/ipv6.rb
+# frozen_string_literal: true
+
+require 'auth'
+
+module Spior
+  # Block or Allow ipv6 traffic with sysctl
+  class Ipv6
+    def initialize
+      @changed = false
+    end
+
+    def allow
+      apply_option('net.ipv6.conf.all.disable_ipv6', '0')
+      apply_option('net.ipv6.conf.default.disable_ipv6', '0')
+      Msg.p 'ipv6 allowed' if @changed
+    end
+
+    def block
+      apply_option('net.ipv6.conf.all.disable_ipv6', '1')
+      apply_option('net.ipv6.conf.default.disable_ipv6', '1')
+      Msg.p 'ipv6 blocked' if @changed
+    end
+
+    private
+
+    def apply_option(flag, value)
+      flag_path = flag.gsub('.', '/')
+      return unless File.exist?("/proc/sys/#{flag_path}")
+
+      Auth.new.sysctl(flag, value)
+      @changed = true
+    end
+  end
+end

data/lib/spior/menu.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module Spior
+  # Build an interactive menu for spior
   module Menu
     def self.run
       loop do
@@ -18,15 +19,15 @@ module Spior
         print '>> '
         case gets.chomp
         when '1'
-          Spior::Service.start
+          Service.start
         when '2'
-          Spior::Service.restart
+          Service.restart
         when '3'
-          Spior::Service.stop
+          Service.stop
         when '4'
-          Spior::Status.info
+          Status.info
         when '5'
-          Spior::Dep.looking
+          Dep.looking
         else
           exit
         end

data/lib/spior/msg.rb

@@ -2,6 +2,7 @@
 
 require 'rainbow'
 
+# Used to display various message
 module Msg
   module_function
 
@@ -19,17 +20,24 @@ module Msg
   end
 
   def p(text)
-    puts Rainbow('[').cyan + Rainbow('+').white + Rainbow(']').cyan + ' ' + text
+    opn = Rainbow('[').cyan
+    msg = Rainbow('+').white
+    cls = Rainbow(']').cyan
+    puts "#{opn}#{msg}#{cls} #{text}"
   end
 
   def err(text)
-    puts Rainbow('[').red + Rainbow('-').white + Rainbow(']').red + ' ' + text
+    opn = Rainbow('[').red
+    msg = Rainbow('-').white
+    cls = Rainbow(']').red
+    puts "#{opn}#{msg}#{cls} #{text}"
   end
 
   def info(text)
-    print Rainbow('-').blue + Rainbow('-').white + Rainbow('-').blue
-    print " #{text} "
-    print Rainbow('-').blue + Rainbow('-').white + Rainbow('-').blue + "\n"
+    one = Rainbow('_').blue
+    two = Rainbow('-').white
+    thr = Rainbow('_').blue
+    puts "#{one}#{two}#{thr} #{text} #{one}#{two}#{thr}"
   end
 
   def report(text)

data/lib/spior/options.rb

@@ -3,6 +3,7 @@
 require 'optparse'
 
 module Spior
+  # Options for the CLI
   class Options
     def initialize(argv)
       parse(argv)
@@ -13,33 +14,33 @@ module Spior
     def parse(argv)
       OptionParser.new do |opts|
         opts.on('-i', '--install', 'Install the dependencies.') do
-          Spior::Dep.looking
+          Dep.looking
         end
 
         opts.on('-t', '--tor', 'Redirect traffic through TOR.') do
-          Spior::Service.start
+          Service.start
         end
 
         opts.on('-r', '--reload', 'Reload TOR to change your IP.') do
-          Spior::Service.restart
+          Service.restart
           exit
         end
 
         opts.on('-c', '--clearnet', 'Reset iptables and return to clearnet navigation.') do
-          Spior::Service.stop
+          Service.stop
         end
 
         opts.on('-s', '--status', 'Look infos about your current IP.') do
-          Spior::Status.info
+          Status.info
           exit
         end
 
         opts.on('-p', '--persist', 'Active Spior at every boot.') do
-          Spior::Service.enable
+          Service::Enable.new
         end
 
         opts.on('-m', '--menu', 'Display an interactive menu.') do
-          Spior::Menu.run
+          Menu.run
         end
 
         opts.on('-h', '--help', 'Show this message.') do

data/lib/spior/service/enable.rb

@@ -3,60 +3,63 @@
 require 'nomansland'
 
 module Spior
+  # Service make Spior persistent using services on system like iptables and tor
   module Service
-    extend self
-
-    # enable the Tor redirection when you boot your system
+    # Enable the Tor redirection when you boot your system
     #
     # It should use and enable the services:
     # + tor
     # + iptables
-    def enable
-      case Nomansland.distro?
-      when :gentoo
-        for_gentoo
-      when :archlinux
-        Iptables::Rules.new.backup
+    class Enable
+      def initialize
+        case Nomansland.distro?
+        when :gentoo
+          for_gentoo
+        when :archlinux
+          for_arch
+        else
+          Msg.report 'Your distro is not yet supported.'
+        end
+      end
+
+      protected
+
+      def for_gentoo
+        Iptables::Rules.new.save
+        case Nomansland.init?
+        when :systemd
+          systemd_enable('iptables-restore', 'tor')
+        when :openrc
+          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')
+        else
+          Msg.report 'Init no yet supported for start Iptables at boot'
+        end
+      end
+
+      def for_arch
+        Iptables::Rules.new.save
         Tor::Config.new(Tempfile.new('torrc')).backup
-        Helpers::Exec.new('systemctl').run('enable iptables tor')
+        systemd_enable('iptables', 'tor')
         Msg.p 'Services enabled for Archlinux...'
-      else
-        Msg.report 'Your distro is not yet supported.'
       end
-    end
 
-    private
-
-    def for_gentoo
-      case Nomansland.init?
-      when :systemd
-        systemd_start('iptables-store')
-        systemd_enable('iptables-restore')
-        systemd_enable('tor')
-      when :openrc
-        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')
-      else
-        Msg.report 'Init no yet supported for start Iptables at boot'
-      end
-    end
+      private
 
-    def systemd_enable(service)
-      systemctl = Helpers::Exec.new('systemctl')
-      Msg.p "Search for service #{service}..."
-      unless system("systemctl is-enabled #{service}")
-        systemctl.run("enable #{service}")
+      def systemd_enable(*services)
+        systemctl = Helpers::Exec.new('systemctl')
+        services.each do |s|
+          Msg.p "Search for service #{s}..."
+          systemctl.run("enable #{s}") unless system("systemctl is-enabled #{s}")
+        end
       end
-    end
 
-    def systemd_start(service)
-      systemctl = Helpers::Exec.new('systemctl')
-      Msg.p "Search for service #{service}..."
-      unless system("systemctl is-active #{service}")
-        systemctl.run("start #{service}")
+      def systemd_start(service)
+        systemctl = Helpers::Exec.new('systemctl')
+        Msg.p "Search for service #{service}..."
+        systemctl.run("start #{service}") unless system("systemctl is-active #{service}")
       end
     end
   end

data/lib/spior/service/restart.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
 module Spior
+  # Interact with Spior::Tor and Spior::Iptables
   module Service
     module_function
 
     def restart
-      Service.stop
+      Service.stop(clean: false)
       Service.start
       Msg.p 'ip changed.'
     end

data/lib/spior/service/start.rb

@@ -1,14 +1,16 @@
 # frozen_string_literal: true
 
 module Spior
+  # Interact with Spior::Tor and Spior::Iptables
   module Service
     module_function
 
     # Service.start should start Tor if not alrealy running
     # And start to redirect the local traffic with Iptables
     def start
-      Tor.start
+      Tor::Start.new
       Iptables::Tor.new.run!
+      Ipv6.new.block
     end
   end
 end

data/lib/spior/service/stop.rb

@@ -1,12 +1,14 @@
 # frozen_string_literal: true
 
 module Spior
+  # Interact with Spior::Tor and Spior::Iptables
   module Service
     module_function
 
-    def stop
-      Tor.stop
-      Iptables::Rules.new.restore
+    def stop(clean: true)
+      Tor::Stop.new
+      Iptables::Rules.new.restore if clean
+      Ipv6.new.allow if clean
     end
   end
 end

data/lib/spior/status.rb

@@ -17,8 +17,8 @@ module Spior
         status = 'Enable' if hash['IsTor'] == true
       end
       status
-    rescue OpenURI::HTTPError => error
-      res = error.io
+    rescue OpenURI::HTTPError => e
+      res = e.io
       puts "Fail to join server #{res.status}"
     end
 
@@ -38,8 +38,8 @@ module Spior
         puts "  Timezone    ===>  #{hash['time_zone']}"
       end
       puts "  Status      ===>  #{enable}"
-    rescue OpenURI::HTTPError => error
-      res = error.io
+    rescue OpenURI::HTTPError => e
+      res = e.io
       puts "Fail to join server #{res.status}"
     end
   end

data/lib/spior/tor/config.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require 'digest'
+require 'tempfile'
+require 'auth'
 
 module Spior
   module Tor
@@ -12,37 +14,70 @@ module Spior
       #
       def initialize(filename)
         @filename = filename
-        @content = ['# Generated by Spior, don\'t edit.', 'RunAsDaemon 1',
-                    'ClientOnly 1', 'SocksPort 0']
+        @config_torrc = '/etc/tor/torrc'
+        @config_dir = '/etc/torrc.d'
+        @config_spiorrc = "#{@config_dir}/spior.conf"
+        @content = ['# Generated by Spior, don\'t edit.']
         @content_torrc = []
       end
 
       # Generate a `torrc` compatible file for Spior
       # Use value from Spior::CONFIG
       def generate
+        create_config_dir
+        configure_torrc
         generate_content(@content)
-        return if @content.length == 4
+        return if @content.length == 1
 
-        File.write @filename.path, @content.join("\n") + "\n"
-        Msg.p 'Generating Tor config...'
+        cn = @content.join("\n")
+        File.write(@filename.path, "#{cn}\n")
+        Msg.p "Generating #{@config_spiorrc}..."
+        move(@filename.path, @config_spiorrc)
+      end
+
+      def write_file(content, file, mode = 'a')
+        return if content.nil?
+
+        File.open(file, mode) do |f|
+          if content.is_a?(Array)
+            f.puts(content.join('\n'))
+          else
+            f.puts(content)
+          end
+          # f.chmod(644)
+        end
       end
 
       # Save current Tor options (Spior::CONFIG) in /etc/tor/torrc
       # Only if theses options are not alrealy present
       def backup
         generate_content(@content_torrc)
-        outfile = File.open(@filename.path, 'w')
-        outfile.puts(File.read('/etc/tor/torrc'))
-        outfile.puts(@content_torrc.join("\n")) if @content_torrc != []
-        outfile.chmod(0644)
-        outfile.close
+        write_file @content_torrc, @filename.path, 'w'
 
         Msg.p 'Saving Tor options...'
-        move(@filename.path, '/etc/tor/torrc')
+        move(@filename.path, @config_spiorrc)
       end
 
       protected
 
+      def create_config_dir
+        return if Dir.exist? @config_dir
+
+        if Process::Sys.getuid == '0'
+          File.mkdir @config_dir
+        else
+          Auth.new.mkdir @config_dir
+        end
+      end
+
+      def configure_torrc
+        temp = Tempfile.new('torrc')
+        content = File.read(@config_torrc)
+        adding content, "%include #{@config_dir}/*.conf"
+        write_file content, temp.path
+        move(temp.path, @config_torrc)
+      end
+
       def generate_content(content)
         adding content, 'AutomapHostsOnResolve 1'
         adding content, "DNSPort #{CONFIG.dns_port}"
@@ -54,9 +89,9 @@ module Spior
       private
 
       def search(option_name)
-        File.open('/etc/tor/torrc') do |f|
+        File.open(@config_torrc) do |f|
           f.each do |line|
-            return Regexp.last_match(1) if line.match(/#{option_name} ([a-z0-9]*)/i)
+            return Regexp.last_match(1) if line.match(%r{^#{option_name} ([a-z0-9./*]*)}i)
           end
         end
         false
@@ -65,12 +100,14 @@ module Spior
       def adding(content, option)
         o = option.split(' ')
         all = o[1..o.length].join(' ')
-        unless search(o[0])
-          content << "#{o[0]} #{all}"
-        end
+        return if search(o[0])
+
+        content << "#{o[0]} #{all}"
       end
 
       def digest_match?(src, dest)
+        return unless File.exist?(dest)
+
         md5_src = Digest::MD5.file src
         md5_dest = Digest::MD5.file dest
         md5_src == md5_dest

data/lib/spior/tor/data.rb

@@ -34,7 +34,7 @@ module Spior
       def search(option_name)
         File.open('/etc/tor/torrc') do |f|
           f.each do |line|
-            return Regexp.last_match(1) if line.match(/#{option_name} ([a-z0-9.\/]*)/i)
+            return Regexp.last_match(1) if line.match(%r{#{option_name} ([a-z0-9./]*)}i)
           end
         end
         false

data/lib/spior/tor/start.rb

@@ -4,56 +4,62 @@ require 'nomansland'
 require 'tempfile'
 
 module Spior
+  # Module Spior::Tor used to start/stop/restart Tor on the system.
   module Tor
-    extend self
-
     # start should start the Tor service on your distribution
-    def start
-      tmp_file = Tempfile.new('torrc')
+    class Start
+      def initialize
+        tmp_file = Tempfile.new('torrc')
 
-      Tor::Config.new(tmp_file).generate
+        Config.new(tmp_file).generate
 
-      # Use Kernel.spawn here
-      x("tor -f #{tmp_file.path}") unless File.zero? tmp_file.path
+        nomansland
+      end
 
-      case Nomansland.init?
-      when :systemd
-        start_systemd
-      when :openrc
-        Msg.p 'Starting Tor with Openrc...'
-        Helpers::Exec.new('/etc/init.d/tor').run('start')
-      when :runit
-        start_runit
-      else
-        Msg.report "Don't known yet how to start Tor for your system."
+      protected
+
+      def nomansland
+        case Nomansland.init?
+        when :systemd
+          start_systemd
+        when :openrc
+          start_openrc
+        when :runit
+          start_runit
+        else
+          Msg.report "Don't known yet how to start Tor for your system."
+        end
       end
-    end
 
-    protected
+      private
+
+      def start_systemd
+        state = `systemctl is-active tor`.chomp
+        return if state == 'active'
 
-    def start_systemd
-      state = `systemctl is-active tor`.chomp
-      unless state == 'active'
         Msg.p 'Starting Tor with Systemd...'
         Helpers::Exec.new('systemctl').run('start tor')
       end
-    end
 
-    def start_runit
-      Msg.p 'Starting Tor with Runit...'
-      if File.exist? '/var/service/tor'
-        Helpers::Exec.new('sv').run('start tor')
-      else
-        Helpers::Exec.new('ln').run('-s /etc/sv/tor /var/service/tor')
+      def start_openrc
+        Msg.p 'Starting Tor with OpenRC...'
+        Helpers::Exec.new('/etc/init.d/tor').run('start')
       end
-    end
 
-    private
+      def start_runit
+        Msg.p 'Starting Tor with Runit...'
+        if File.exist? '/var/service/tor'
+          Helpers::Exec.new('sv').run('start tor')
+        else
+          Helpers::Exec.new('ln').run('-s /etc/sv/tor /var/service/tor')
+        end
+      end
 
-    def x(arg)
-      auth = (Process::Sys.getuid == '0' ? '' : 'sudo')
-      pid = spawn("#{auth} #{arg}", out: '/dev/null') or raise 'Error'
-      Process.wait pid
+      def x(arg)
+        auth = (Process::Sys.getuid == '0' ? '' : 'sudo')
+        pid = spawn("#{auth} #{arg}", out: '/dev/null') or raise 'Error'
+        Process.wait pid
+      end
     end
   end
 end

data/lib/spior/tor/stop.rb

@@ -1,31 +1,52 @@
 # frozen_string_literal: true
 
 module Spior
+  # Module Spior::Tor used to start/stop/restart Tor on the system.
   module Tor
-    module_function
-
     # Stop Tor service on your distribution (linux)
     # It also kill previous instance run by Spior
-    def stop
-      old_pid = `pgrep -f "tor -f /tmp/torrc*"`.chomp
+    class Stop
+      def initialize
+        old_pid = `pgrep -f "tor -f /tmp/torrc*"`.chomp
+
+        if old_pid != ''
+          Msg.p "Found old pid > #{old_pid}, killing it..."
+          Helpers::Exec.new('kill').run("-9 #{old_pid}")
+        end
+
+        nomansland
+      end
+
+      protected
 
-      if old_pid != ''
-        Msg.p "Found old pid > #{old_pid}, killing it..."
-        Helpers::Exec.new('kill').run("-9 #{old_pid}")
+      def nomansland
+        case Nomansland.init?
+        when :systemd
+          stop_systemd
+        when :runit
+          stop_runit
+        when :openrc
+          stop_openrc
+        else
+          Msg.report 'Don\'t known how to stop Tor on your system.'
+        end
       end
 
-      case Nomansland.init?
-      when :systemd
+      private
+
+      def stop_systemd
         Msg.p 'Stopping Tor with Systemd...'
         Helpers::Exec.new('systemctl').run('stop tor')
-      when :runit
+      end
+
+      def stop_runit
         Msg.p 'Stopping Tor with Runit...'
         Helpers::Exec.new('sv').run('stop tor')
-      when :openrc
+      end
+
+      def stop_openrc
         Msg.p 'Stopping Tor with Openrc...'
         Helpers::Exec.new('/etc/init.d/tor').run('stop')
-      else
-        Msg.report 'Don\'t known how to stop Tor on your system.'
       end
     end
   end

data/lib/spior/tor.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 module Spior
-
   # The module Tor interract with Tor on your system.
   module Tor
   end

data/lib/spior/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Spior
-  VERSION = '0.2.8'
+  VERSION = '0.3.5'
 end

data/lib/spior.rb

@@ -9,6 +9,7 @@ require_relative 'spior/tor'
 require_relative 'spior/menu'
 require_relative 'spior/service'
 require_relative 'spior/helpers'
+require_relative 'spior/ipv6'
 
 module Spior
   # Contain value of Tor::Data
@@ -21,6 +22,7 @@ module Spior
   #   Spior::CONFIG.virt_addr = '10.192.0.0/10'
   CONFIG = Tor::Data.new
 
+  # Main for the CLI
   class Main
     def initialize(argv)
       @argv = argv

data/spior.gemspec

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.dirname(__FILE__) + '/lib/spior/version'
+require "#{File.dirname(__FILE__)}/lib/spior/version"
 
 Gem::Specification.new do |s|
   s.name = 'spior'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spior
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.3.5
 platform: ruby
 authors:
 - szorfein
@@ -12,31 +12,31 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   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
-  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
+  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
-  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
+  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
-  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
-  LLknX69FN7/G
+  AQsFAAOCAYEAFjnBWWfaMeA8hP0Q76WmBCFckGN5I42X5RQkVYRRXIaeXIS1td/t
+  O1v1iQLo6ABfASMi6We7T16+ita68xwNOmSkMNHHXBr/fdGbHExxFSX7BXNRbwla
+  SS6Vy0bXKMDJbXcvkrmIolpYhEFm1218FCRCT6ogM1oWAJAfhfF9pMeRxrxjQYFn
+  ko8XgjIHxb83miOILgdq/lgJ4gfD7PsGfJtLCLiCKCcxIb4TtmKAzRwCDVpb6wqM
+  5xJZffAmHI7v8lVer53sPzm3INPu5xFZyfZ/SXYXPKKwln0efH63K5vuXYwEN7NI
+  SBSRTN03Hb65t86m6/r084SrNnLntQjCSqApzFBt1QwJ5cmiVilODN4V7y2hZpyK
+  hSk3b2VOotDPiWIm1p/IPXQDfm5x67Z5fJQPAlBTsse4jKyVyW1lZLmERSBuRZ2O
+  urXgRIzALxd/xazPCnoLSXPzfJSI6Y77S1EBvhPd9RaSO8IyH9RhPDP9mnTvW2Kl
+  NAUnoL+txK5a
   -----END CERTIFICATE-----
-date: 2022-09-16 00:00:00.000000000 Z
+date: 2023-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: interfacez
@@ -113,6 +113,7 @@ files:
 - bin/spior
 - ext/ipt_mod.conf
 - ext/iptables.service
+- lib/auth.rb
 - lib/spior.rb
 - lib/spior/dep.rb
 - lib/spior/helpers.rb
@@ -121,6 +122,7 @@ files:
 - lib/spior/iptables/root.rb
 - lib/spior/iptables/rules.rb
 - lib/spior/iptables/tor.rb
+- lib/spior/ipv6.rb
 - lib/spior/menu.rb
 - lib/spior/msg.rb
 - lib/spior/options.rb
@@ -166,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - tor
 - iptables
-rubygems_version: 3.3.19
+rubygems_version: 3.3.25
 signing_key:
 specification_version: 4
 summary: A tool to make TOR your default gateway