spior 0.3.6 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07b4daf3d6c06b689e2d584b43e419eb4e9e9ea8e19c4bf71c3116428955f957
-  data.tar.gz: '08699ad87b9abc01147df75938c744268e33d313955bb046b736ad674f93820e'
+  metadata.gz: 35ecc00833e5ba627984058a35375d1773ebdb707fb9218bb5060029d91a08a8
+  data.tar.gz: d688befe355c53c3af9bdf110144f3d91f9a9f2c254b6a5b0ea995f8beec85ab
 SHA512:
-  metadata.gz: 92014306180514cf8b3f9bea57544054fc961127161a6ca8e067a7baeaec256fc365ca8c6e58fe4f88bfeb7f01c24b85350d7ac031dd44e4532b7c8c5ddbc497
-  data.tar.gz: 2971e056165009f5ef1dda7dcbc5e282ba1769076ffc99d439e3b8741a44d1aeb01197087b628e3f6103b1d23cfbb1861bfa27d1c843c52a5bb0e84caeba03f2
+  metadata.gz: df077eb2f83b2b084a2a78378fe1f46d5b8f47fc9482a60e980250fed407e4e662d9c14abe9e8880a3fb0307ad40e1be9e465a4e0ba9bf70bca082ce7b150401
+  data.tar.gz: 703939ff956cf9601aa367be2e28c987e63b3a8e5560318e7c16eb02ce5d956604a96b71270454d1d9de36fa7f26ade4ac463a2ab7ca0a67e644a6e57cafb41d

data/.github/workflows/gem-push.yml

@@ -0,0 +1,48 @@
+name: Ruby Gem
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+    name: Build + Publish
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Ruby 2.6
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@55283cc23133118229fd3f97f9336ee23a179fcf # v1.146.0
+      with:
+        ruby-version: 2.6.10
+
+    - name: Publish to GPR
+      run: |
+        mkdir -p $HOME/.gem
+        touch $HOME/.gem/credentials
+        chmod 0600 $HOME/.gem/credentials
+        printf -- "---\n:github: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+        gem build *.gemspec
+        gem push --KEY github --host https://rubygems.pkg.github.com/${OWNER} *.gem
+      env:
+        GEM_HOST_API_KEY: "Bearer ${{secrets.GITHUB_TOKEN}}"
+        OWNER: ${{ github.repository_owner }}
+
+#   - name: Publish to RubyGems
+#     run: |
+#       mkdir -p $HOME/.gem
+#       touch $HOME/.gem/credentials
+#       chmod 0600 $HOME/.gem/credentials
+#       printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+#       gem build *.gemspec
+#       gem push *.gem
+#     env:
+#       GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_AUTH_TOKEN}}"

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 0.5.0, release 2024-10
+* Correct runtime with openrc on Gentoo
+* Remove a lots of old codes.
+* Correct `root`, `doas` or `sudo` detection.
+* For Debian, enable iptables-legacy instead of nftables, see
+  https://wiki.debian.org/iptables (you need to use `spior -i`).
+* Persist Mode on Debian add a script under /etc/network/if-pre-up.d/iptables
+  like in the doc.
+
+## 0.3.7, release 2023-10-27
+* Persist mode may require manual intervention to work, look the [readme](https://github.com/szorfein/spior/tree/master#left-over)
+* Persist and runtime corrected on Voidlinux.
+* Spior check the presence of 'simple_firewall.rules' when you use the --clearnet
+* Create a `/etc/sysctl.d/40-ipv6.conf` with the persist mode in order to block ipv6 at boot.
+
 ## 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.

data/README.md

@@ -4,13 +4,12 @@
 <br/>
 
 [![Gem Version](https://badge.fury.io/rb/spior.svg)](https://badge.fury.io/rb/spior)
-![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/szorfein/spior/Rubocop/develop)
+![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/szorfein/spior/Rubocop/devel)
 [![Ruby Style Guide](https://img.shields.io/badge/code_style-rubocop-brightgreen.svg)](https://github.com/rubocop/rubocop)
 ![GitHub](https://img.shields.io/github/license/szorfein/spior)
 
 </div>
 
-
 (Spider|Tor) A tool to redirect all your local traffic to the [Tor](https://www.torproject.org/) network.
 
 ## Install
@@ -31,6 +30,20 @@ Spior use `iptables` and `tor`, which can be installed with (if your distro is s
 
     $ spior --install
 
+## Configuration
+Spior look the /etc/tor/torrc for any of:
+
+```conf
+DNSPort 9061
+TransPort 9040
+VirtualAddrNetworkIpv4 10.192.0.0/10
+```
+
+You can customize any of theses variables.
+
+When using `spior -c | --clearnet`, if you want Spior load custom iptables rules, place
+them at `/etc/iptables/simple_firewall.rules`.
+
 ## Usage
 
     $ spior -h
@@ -54,11 +67,22 @@ Return to clearnet navigation
 
 ## Left Over
 
+### [Check for Leak](https://github.com/brainfucksec/kalitorify#checking-for-leaks)
+### Troubleshoooting
+When you enable the `--persist` mode, Spior try to block ipv6 with sysctl. It can fail on some system, so you may need to manually disable ipv6 via kernel argument.  
+An exemple with GRUB, edit `/etc/default/grub.cfg` and change the line bellow:
+
+```
+GRUB_CMDLINE_LINUX_DEFAULT="ipv6.disable=1 quiet"
+```
+
+Reload grub after that `grub-mkconfig -o /boot/grub/grub.cfg`
+
 ### Issues
 For any questions, comments, feedback or issues, submit a [new issue](https://github.com/szorfein/spior/issues/new).
 
 ### links
-+ https://rubyreferences.github.io/rubyref
-+ https://rubystyle.guide/
 + https://gitlab.torproject.org/legacy/trac/-/wikis/doc/TransparentProxy
-+ https://github.com/epidemics-scepticism/writing/blob/master/misconception.md
++ https://github.com/epidemics-scepticism/writing/blob/master/misconception.md
++ [in perl - Nipe](https://github.com/htrgouvea/nipe)
++ [in bash - Kalitorify](https://github.com/brainfucksec/kalitorify)

data/bin/spior

@@ -2,5 +2,45 @@
 # frozen_string_literal: true
 
 require 'spior'
+require 'optparse'
 
-Spior::Main.new(ARGV)
+Msg.banner
+
+OptionParser.new do |opts|
+  opts.on('-i', '--install', 'Install the dependencies.') do
+    Spior::Dep.looking
+  end
+
+  opts.on('-t', '--tor', 'Redirect traffic through TOR.') do
+    Spior::Service.start
+  end
+
+  opts.on('-r', '--reload', 'Reload TOR to change your IP.') do
+    Spior::Service.restart
+    exit
+  end
+
+  opts.on('-c', '--clearnet', 'Reset iptables and return to clearnet navigation.') do
+    Spior::Service.stop
+  end
+
+  opts.on('-s', '--status', 'Look infos about your current IP.') do
+    Spior::Status.info
+    exit
+  end
+
+  opts.on('-p', '--persist', 'Active Spior at every boot.') do
+    Spior::Service::Enable.new
+  end
+
+  opts.on('-m', '--menu', 'Display an interactive menu.') do
+    Spior::Menu.run
+  end
+
+  begin
+    opts.parse!(['-m']) if ARGV.empty?
+  rescue OptionParser::ParseError => e
+    warn e.message, "\n", opts
+    exit(-1)
+  end
+end.parse!

data/lib/auth.rb

@@ -10,7 +10,7 @@ class Auth
   end
 
   def mkdir(path)
-    return if File.exist?(path)
+    return if Dir.exist?(path)
 
     x("mkdir -p #{path}")
   end
@@ -21,6 +21,12 @@ class Auth
     x("sysctl -w #{flag}=#{value}")
   end
 
+  def write(content, file)
+    temp = Tempfile.new
+    File.write(temp.path, "#{content}\n")
+    x("cp #{temp.path} #{file}")
+  end
+
   protected
 
   def search_app

data/lib/spior/dep.rb

@@ -11,42 +11,44 @@ module Spior
     def looking
       case Nomansland.distro?
       when :archlinux
-        installing_deps('Arch', %w[iptables tor])
+        installing_deps('pacman -S', %w[iptables tor])
       when :debian
-        installing_deps('Debian', %w[iptables tor])
+        installing_deps('apt-get install', %w[iptables tor])
+        use_iptables
       when :gentoo
-        installing_deps('Gentoo', %w[iptables tor])
+        installing_deps('emerge -av', %w[iptables tor])
       when :void
-        installing_deps('Void', %w[iptables tor])
+        installing_deps('xbps-install -S', %w[iptables tor])
+      when :fedora
+        installing_deps('dnf install -y', %w[iptables tor])
+      when :suse
+        installing_deps('zypper install -y', %w[iptables tor])
       else
         Msg.report 'Install for your distro is not yet supported.'
       end
     end
 
-    def installing_deps(distro, names)
+    def installing_deps(distro_cmd, names)
       names.map do |n|
-        Msg.p "Search #{n} for #{distro}..."
-        install(n) unless search_dep(n)
+        Msg.p "Search #{n}..."
+        install(distro_cmd, n) unless search_dep(n)
       end
     end
 
-    def install(name)
-      case Nomansland.installer?
-      when :apt_get
-        Helpers::Exec.new('apt-get').run("install #{name}")
-      when :emerge
-        Helpers::Exec.new('emerge').run("-av #{name}")
-      when :pacman
-        Helpers::Exec.new('pacman').run("-S #{name}")
-      when :void
-        Helpers::Exec.new('xbps-install').run("-y #{name}")
-      when :yum
-        Helpers::Exec.new('yum').run("install #{name}")
-      end
+    def install(cmd, package)
+      Helpers.cmd("#{cmd} #{package}")
     end
 
     def search_dep(name)
       TTY::Which.exist?(name) ? true : false
     end
+
+    # https://wiki.debian.org/iptables
+    def use_iptables
+      Helpers.cmd('update-alternatives --set iptables /usr/sbin/iptables-legacy')
+      Helpers.cmd('update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy')
+      Helpers.cmd('update-alternatives --set arptables /usr/sbin/arptables-legacy')
+      Helpers.cmd('update-alternatives --set ebtables /usr/sbin/ebtables-legacy')
+    end
   end
 end

data/lib/spior/helpers.rb

@@ -5,21 +5,47 @@ require 'tempfile'
 require 'open3'
 
 module Helpers
+  def self.auth?
+    return :root if Process.uid == '0'
+    return :doas if File.exist?('/bin/doas') || File.exist?('/sbin/doas')
+    return :sudo if File.exist?('/bin/sudo') || File.exist?('/sbin/sudo')
+  end
+
+  def self.cmd(command)
+    case auth?
+    when :root
+      syscmd(command)
+    when :doas
+      syscmd("doas #{command}")
+    when :sudo
+      syscmd("sudo #{command}")
+    end
+  end
+
+  def self.syscmd(cmd)
+    Open3.popen2e(cmd) do |_, stdout_and_stderr, wait_thr|
+      puts stdout_and_stderr.gets while stdout_and_stderr.gets
+      exit_status = wait_thr.value
+      raise "Error, Running #{cmd}" unless exit_status.success?
+    end
+  end
+
+  def self.mv(src, dest)
+    if Process::Sys.getuid == '0'
+      FileUtils.mv(src, dest)
+    else
+      cmd("mv #{src} #{dest}")
+    end
+  end
+
   # Execute program using sudo when permission is required
   class Exec
     def initialize(name)
-      @search_uid = Process::Sys.getuid
       @name = name
     end
 
     def run(args)
-      cmd = (@search_uid == '0' ? @name : "sudo #{@name}")
-      Open3.popen2e("#{cmd} #{args}") do |_, stdout_err, wait_thr|
-        puts stdout_err.gets while stdout_err.gets
-
-        exit_status = wait_thr.value
-        raise "Error, Running #{cmd} #{args}" unless exit_status.success?
-      end
+      Helpers.cmd("#{@name} #{args}")
     end
   end
 

data/lib/spior/iptables/rules.rb

@@ -10,19 +10,17 @@ module Spior
     class Rules
       def initialize
         @tmp_iptables_rules = Tempfile.new('iptables_rules')
-        @tmp_spior_rules = Tempfile.new('spior_rules')
         @save_path = search_iptables_config
       end
 
       def save
-        save_rules(@tmp_iptables_rules)
-        insert_comment(@tmp_spior_rules, @tmp_iptables_rules)
-        create_file(@tmp_spior_rules, @save_path)
+        Helpers.cmd("iptables-save > #{@tmp_iptables_rules.path}")
+        Helpers.mv(@tmp_iptables_rules.path, @save_path)
         Msg.p "Iptables rules saved at #{@save_path}"
       end
 
       def restore
-        return if restoring_older_rules(@save_path)
+        return if restoring_older_rules
 
         Msg.p 'Adding clearnet navigation...'
         Iptables::Default.new.run!
@@ -30,57 +28,15 @@ module Spior
 
       protected
 
-      def save_rules(tmp_file)
-        Msg.p 'Saving Iptables rules...'
-        Helpers::Exec.new('iptables-save').run("> #{tmp_file.path}")
-      end
-
-      def insert_comment(spior_file, iptable_file)
-        outfile = File.open(spior_file.path, 'w')
-        outfile.puts '# Rules saved by Spior.'
-        outfile.puts(File.read(iptable_file.path))
-        outfile.close
-      end
-
-      def search_for_comment(filename)
-        return unless File.exist? filename
-
-        File.open(filename) do |f|
-          f.each do |line|
-            return true if line.match(/saved by Spior/)
-          end
-        end
-        false
-      end
-
-      def move(src, dest)
-        if Process::Sys.getuid == '0'
-          FileUtils.mv(src, dest)
-        else
-          Helpers::Exec.new('mv').run("#{src} #{dest}")
-        end
-      end
-
-      def create_file(tmpfile, dest)
-        if File.exist? dest
-          if search_for_comment(dest)
-            Msg.p "Older Spior rules found #{dest}, erasing..."
-          else
-            Msg.p "File exist #{dest}, create backup #{dest}-backup..."
-            move(dest, "#{dest}-backup")
-          end
-        end
-        move(tmpfile.path, dest)
-      end
-
-      def restoring_older_rules(filename)
-        files = %W[#{filename}-backup #{filename}]
+      def restoring_older_rules
+        files = %w[/etc/iptables/simple_firewall.rules /usr/share/iptables/simple_firewall.rules]
         files.each do |f|
-          next unless File.exist?(f) || search_for_comment(f)
+          next unless File.exist?(f)
 
           Iptables::Root.new.stop!
           Msg.p "Found older rules #{f}, restoring..."
-          Helpers::Exec.new('iptables-restore').run(f)
+          Helpers.cmd("cp #{f} #{@save_path}")
+          Helpers.cmd("iptables-restore < #{@save_path}")
           return true
         end
         false
@@ -90,16 +46,12 @@ module Spior
 
       def search_iptables_config
         case Nomansland.distro?
-        when :archlinux
-          '/etc/iptables/iptables.rules'
-        when :void
-          '/etc/iptables/iptables.rules'
         when :debian
           '/etc/iptables.up.rules'
         when :gentoo
           '/var/lib/iptables/rules-save'
         else
-          Msg.report 'I don`t know where you distro save the rules for iptables yet'
+          '/etc/iptables/iptables.rules'
         end
       end
     end

data/lib/spior/ipv6.rb

@@ -1,35 +1,41 @@
-# lib/ipv6.rb
 # frozen_string_literal: true
 
 require 'auth'
+require 'interfacez'
 
 module Spior
   # Block or Allow ipv6 traffic with sysctl
   class Ipv6
     def initialize
-      @changed = false
+      @dest = '/etc/sysctl.d/40-ipv6.conf'
+      gen_flags
     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
+      @flags.each { |f| Helpers.cmd("sysctl -w '#{f}=0'") }
+      Msg.p 'ipv6 allowed'
+      Helpers.cmd("rm #{@dest}") if File.exist? @dest
     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
+      @flags.each { |f| Helpers.cmd("sysctl -w '#{f}=1'") }
+      Msg.p 'ipv6 blocked'
     end
 
-    private
+    def block_persist
+      Auth.new.mkdir '/etc/sysctl.d'
+      myflags = []
+      @flags.each { |f| myflags << "#{f}=1" }
+      File.write('/tmp/flags.conf', myflags.join("\n"))
+      Helpers.cmd("cp /tmp/flags.conf #{@dest}")
+    end
 
-    def apply_option(flag, value)
-      flag_path = flag.gsub('.', '/')
-      return unless File.exist?("/proc/sys/#{flag_path}")
+    private
 
-      Auth.new.sysctl(flag, value)
-      @changed = true
+    def gen_flags
+      @flags = ['net.ipv6.conf.all.disable_ipv6',
+                'net.ipv6.conf.default.disable_ipv6']
+      Interfacez.all { |i| @flags << "net.ipv6.conf.#{i}.disable_ipv6" }
     end
   end
 end

data/lib/spior/options.rb

@@ -1,61 +1,7 @@
 # frozen_string_literal: true
 
-require 'optparse'
-
 module Spior
   # Options for the CLI
   class Options
-    def initialize(argv)
-      parse(argv)
-    end
-
-    private
-
-    def parse(argv)
-      OptionParser.new do |opts|
-        opts.on('-i', '--install', 'Install the dependencies.') do
-          Dep.looking
-        end
-
-        opts.on('-t', '--tor', 'Redirect traffic through TOR.') do
-          Service.start
-        end
-
-        opts.on('-r', '--reload', 'Reload TOR to change your IP.') do
-          Service.restart
-          exit
-        end
-
-        opts.on('-c', '--clearnet', 'Reset iptables and return to clearnet navigation.') do
-          Service.stop
-        end
-
-        opts.on('-s', '--status', 'Look infos about your current IP.') do
-          Status.info
-          exit
-        end
-
-        opts.on('-p', '--persist', 'Active Spior at every boot.') do
-          Service::Enable.new
-        end
-
-        opts.on('-m', '--menu', 'Display an interactive menu.') do
-          Menu.run
-        end
-
-        opts.on('-h', '--help', 'Show this message.') do
-          puts opts
-          exit
-        end
-
-        begin
-          argv = ['-m'] if argv.empty?
-          opts.parse!(argv)
-        rescue OptionParser::ParseError => e
-          warn e.message, "\n", opts
-          exit(-1)
-        end
-      end
-    end
   end
 end

data/lib/spior/service/enable.rb

@@ -17,6 +17,10 @@ module Spior
           for_gentoo
         when :archlinux
           for_arch
+        when :void
+          for_void
+        when :debian
+          for_debian
         else
           Msg.report 'Your distro is not yet supported.'
         end
@@ -25,41 +29,75 @@ module Spior
       protected
 
       def for_gentoo
-        Iptables::Rules.new.save
         case Nomansland.init?
         when :systemd
+          Iptables::Rules.new.save
           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')
+          Helpers.cmd('rc-service iptables save')
+          Helpers.cmd('rc-update add iptables boot') # default or boot ?
+          Helpers.cmd('rc-update add tor default')
         else
           Msg.report 'Init no yet supported for start Iptables at boot'
         end
+        Ipv6.new.block_persist
+        Msg.p 'Persist enabled for Gentoo...'
       end
 
       def for_arch
         Iptables::Rules.new.save
         Tor::Config.new(Tempfile.new('torrc')).backup
         systemd_enable('iptables', 'tor')
-        Msg.p 'Services enabled for Archlinux...'
+        Ipv6.new.block_persist
+        Msg.p 'Persist enabled for Arch...'
+      end
+
+      def for_void
+        Iptables::Rules.new.save
+        Tor::Config.new(Tempfile.new('torrc')).backup
+        runit_enable('iptables', 'tor')
+        Ipv6.new.block_persist
+        Msg.p 'Persist enabled for Void...'
+      end
+
+      # https://wiki.debian.org/iptables
+      def for_debian
+        Iptables::Rules.new.save
+        Tor::Config.new(Tempfile.new('torrc')).backup
+        systemd_enable('tor')
+        File.write('/tmp/start_iptables',
+                   "#!/bin/sh\n/sbin/iptables-restore < /etc/iptables.up.rules\n")
+        Helpers.mv('/tmp/start_iptables', '/etc/network/if-pre-up.d/iptables')
+        Helpers.cmd('chmod +x /etc/network/if-pre-up.d/iptables')
+        Ipv6.new.block_persist
+        Msg.p 'Persist mode enabled for Debian...'
       end
 
       private
 
       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}")
+          next if system("systemctl is-enabled #{s} >/dev/null")
+
+          Helpers.cmd("systemctl enable #{s}")
+          Msg.p "Enabling #{s}..."
+        end
+      end
+
+      def runit_enable(*services)
+        services.each do |s|
+          next if File.exist? "/var/service/#{s}"
+
+          Helpers.cmd("ln -s /etc/sv/#{s} /var/service/#{s}")
+          Msg.p "Enabling #{s}"
         end
       end
 
       def systemd_start(service)
-        systemctl = Helpers::Exec.new('systemctl')
+        return if system("systemctl is-active #{service} >/dev/null")
+
         Msg.p "Search for service #{service}..."
-        systemctl.run("start #{service}") unless system("systemctl is-active #{service}")
+        Helpers.cmd("systemctl start #{service}")
       end
     end
   end

data/lib/spior/service/restart.rb

@@ -1,14 +1,24 @@
 # frozen_string_literal: true
 
+require 'nomansland'
+
 module Spior
   # Interact with Spior::Tor and Spior::Iptables
   module Service
     module_function
 
     def restart
-      Service.stop(clean: false)
-      Service.start
-      Msg.p 'ip changed.'
+      case Nomansland.init?
+      when :systemd
+        Helpers.cmd('systemctl restart tor')
+      when :openrc
+        Helpers.cmd('/etc/init.d/tor restart')
+      when :runit
+        Helpers.cmd('sv restart tor')
+      else
+        puts 'No init found (systemd, openrc, runit)...'
+      end
+      Msg.p 'Tor restarting, ip changed.'
     end
   end
 end

data/lib/spior/status.rb

@@ -38,6 +38,8 @@ module Spior
         puts "  Timezone    ===>  #{hash['time_zone']}"
       end
       puts "  Status      ===>  #{enable}"
+    rescue SocketError => e
+      Msg.err e
     rescue OpenURI::HTTPError => e
       res = e.io
       puts "Fail to join server #{res.status}"

data/lib/spior/tor/config.rb

@@ -32,7 +32,7 @@ module Spior
         cn = @content.join("\n")
         File.write(@filename.path, "#{cn}\n")
         Msg.p "Generating #{@config_spiorrc}..."
-        move(@filename.path, @config_spiorrc)
+        Helpers.mv(@filename.path, @config_spiorrc)
       end
 
       def write_file(content, file, mode = 'a')
@@ -55,7 +55,7 @@ module Spior
         write_file @content_torrc, @filename.path, 'w'
 
         Msg.p 'Saving Tor options...'
-        move(@filename.path, @config_spiorrc)
+        Helpers.mv(@filename.path, @config_spiorrc)
       end
 
       protected
@@ -64,9 +64,9 @@ module Spior
         return if Dir.exist? @config_dir
 
         if Process::Sys.getuid == '0'
-          File.mkdir @config_dir
+          FileUtils.mkdir_p @config_dir
         else
-          Auth.new.mkdir @config_dir
+          Helpers.cmd("mkdir -p #{@config_dir}")
         end
       end
 
@@ -75,7 +75,7 @@ module Spior
         content = File.read(@config_torrc)
         adding content, "%include #{@config_dir}/*.conf"
         write_file content, temp.path
-        move(temp.path, @config_torrc)
+        Helpers.mv(temp.path, @config_torrc)
       end
 
       def generate_content(content)
@@ -112,26 +112,6 @@ module Spior
         md5_dest = Digest::MD5.file dest
         md5_src == md5_dest
       end
-
-      # Permission for Archlinux on a torrc are chmod 644, chown root:root
-      def fix_perm(file)
-        if Process::Sys.getuid == '0'
-          file.chown(0, 0)
-        else
-          Helpers::Exec.new('chown').run("root:root #{file}")
-        end
-      end
-
-      def move(src, dest)
-        return if digest_match? src, dest
-
-        fix_perm(@filename.path)
-        if Process::Sys.getuid == '0'
-          FileUtils.mv(src, dest)
-        else
-          Helpers::Exec.new('mv').run("#{src} #{dest}")
-        end
-      end
     end
   end
 end

data/lib/spior/tor/data.rb

@@ -45,6 +45,8 @@ module Spior
         case Nomansland.distro?
         when :debian || :ubuntu
           `id -u debian-tor`.chomp
+        when :fedora
+          `id -u toranon`.chomp
         else
           `id -u #{@user}`.chomp
         end

data/lib/spior/tor/start.rb

@@ -38,28 +38,22 @@ module Spior
         return if state == 'active'
 
         Msg.p 'Starting Tor with Systemd...'
-        Helpers::Exec.new('systemctl').run('start tor')
+        Helpers.cmd('systemctl start tor')
       end
 
       def start_openrc
         Msg.p 'Starting Tor with OpenRC...'
-        Helpers::Exec.new('/etc/init.d/tor').run('start')
+        Helpers.cmd('/etc/init.d/tor start')
       end
 
       def start_runit
         Msg.p 'Starting Tor with Runit...'
         if File.exist? '/var/service/tor'
-          Helpers::Exec.new('sv').run('start tor')
+          Helpers.cmd('sv start tor')
         else
-          Helpers::Exec.new('ln').run('-s /etc/sv/tor /var/service/tor')
+          Helpers.cmd('ln -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
-      end
     end
   end
 end

data/lib/spior/version.rb

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

data/lib/spior.rb

@@ -21,19 +21,4 @@ module Spior
   #   Spior::CONFIG.user = 'Tor-User-System'
   #   Spior::CONFIG.virt_addr = '10.192.0.0/10'
   CONFIG = Tor::Data.new
-
-  # Main for the CLI
-  class Main
-    def initialize(argv)
-      @argv = argv
-      x
-    end
-
-    private
-
-    def x
-      Msg.banner
-      Options.new(@argv)
-    end
-  end
 end

data/spior.gemspec

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "#{File.dirname(__FILE__)}/lib/spior/version"
+require_relative "lib/spior/version"
 
 Gem::Specification.new do |s|
   s.name = 'spior'
@@ -31,8 +31,8 @@ Gem::Specification.new do |s|
 
   s.test_files = Dir['test/test_*.rb']
 
-  s.cert_chain = ['certs/szorfein.pem']
-  s.signing_key = File.expand_path('~/.ssh/gem-private_key.pem')
+  #s.cert_chain = ['certs/szorfein.pem']
+  #s.signing_key = File.expand_path('~/.ssh/gem-private_key.pem')
 
   s.requirements << 'tor'
   s.requirements << 'iptables'
@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.6'
 
   s.add_runtime_dependency('interfacez', '~> 1.0')
-  s.add_runtime_dependency('nomansland', '~> 0.0')
+  s.add_runtime_dependency('nomansland', '~> 0.0.5')
   s.add_runtime_dependency('rainbow', '~> 3.1')
-  s.add_runtime_dependency('tty-which', '~> 0.5')
+  s.add_runtime_dependency('tty-which', '~> 0.5.0')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spior
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.5.0
 platform: ruby
 authors:
 - szorfein
@@ -36,7 +36,7 @@ cert_chain:
   urXgRIzALxd/xazPCnoLSXPzfJSI6Y77S1EBvhPd9RaSO8IyH9RhPDP9mnTvW2Kl
   NAUnoL+txK5a
   -----END CERTIFICATE-----
-date: 2023-10-26 00:00:00.000000000 Z
+date: 2024-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: interfacez
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.5.0
 description: "    A tool to make TOR your default gateway\n"
 email: szorfein@protonmail.com
 executables:
@@ -103,6 +103,7 @@ extra_rdoc_files:
 - README.md
 - CHANGELOG.md
 files:
+- ".github/workflows/gem-push.yml"
 - ".github/workflows/rubocop-analysis.yml"
 - ".gitignore"
 - CHANGELOG.md