spior 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 464734f8ed0ffa37558b7ef2601d91b8fb718cc77dc778cc0cb24be6f2c88da3
-  data.tar.gz: c47daf892c550c4d67316a576c22140d35a4897aa61cb626f7762f22b70e4ba7
+  metadata.gz: 967b9db246b956fa477b0fcc62212846720f4722799997aff7fa95eb45ff9775
+  data.tar.gz: 3469b8d3829a26bc46b576da7c15cc7bf420516e498d37fde8a39453cd2cff75
 SHA512:
-  metadata.gz: 49ae19e3346500ef07e62bccc11697e3fb26420528ab7853aa9fdb6e1295dbba6cab69fd630d52fa1511fbb775c6bae947ffae3491d919c1d8e3c62c93f32f27
-  data.tar.gz: 6cb403b201d4b2cbb22cd9640477aba3c4ce87ae0219abb661c01987c41961ded3d9b444edb0154f3ca47a71c818886dc3bc3cce9acfcf6878900f3294a630a0
+  metadata.gz: 9a0e6279b2427995067d4bf4dded5ed0b7a412724009cab08ef5c779558b8e4e80f54b82b0520ca4e949ce7d445ec2fb86a7f954e426358a2162fcd333bd689e
+  data.tar.gz: 2154da0c94cce48f71ff39fac3832ba3145388176b480a392f810ffeb5fa40e7dc66592bdf7aaf695bd2d26d6f27a4f03700a2dcaf375cfd5069afa5eeba8a3c

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.1.2, release 2020-05-13
+* Add instructions for the persistent mode
+* Add dependency iptables-persistant for distro based on debian
+* Avoid to use sudo if no need
+* Add lib/spior/helpers
+
 ## 0.1.1, release 2020-05-09
 * The tor class now check for dependencies and service start|restart
 * Call Spior without arguments now display the interactive menu

data/README.md

@@ -10,6 +10,13 @@ And install the gem
 
     $ gem install spior -P MediumSecurity
 
+To be able to use the `persist mode` (with systemd for now), the gem should be installed system-wide:  
++ For gentoo, a package is available on my repo [ninjatools](https://github.com/szorfein/ninjatools/tree/master/dev-ruby/spior).  
++ Arch seem to use [Quarry](https://wiki.archlinux.org/index.php/Ruby#Quarry).  
++ On distro based on debian, gem are installed system-wide.  
+
+If you can, i recommend that you create a package for your distribution.  
+
 ## Usage
 
     $ spior -h

data/lib/spior/clear.rb

@@ -2,6 +2,7 @@ require 'tty-which'
 require 'nomansland'
 require_relative 'copy'
 require_relative 'msg'
+require_relative 'helpers'
 
 module Spior
   module Clear
@@ -30,7 +31,7 @@ module Spior
 
     def ipt_restore(path)
       puts "Restoring rules #{path}..."
-      system("sudo iptables-restore #{path}")
+      Helpers::Exec.new("iptables-restore").run("#{path}")
     end
 
     def rez_configs

data/lib/spior/copy.rb

@@ -2,11 +2,13 @@ require 'nomansland'
 require 'date'
 require 'digest'
 require_relative 'msg'
+require_relative 'helpers'
 
 module Spior
   class Copy
 
     def self.config_files
+      @cp = Helpers::Exec.new("cp -a")
       @conf_dir = File.expand_path('../..' + '/conf', __dir__)
       copy_torrc
       copy_file(@conf_dir + "/resolv.conf", "/etc/resolv.conf")
@@ -14,6 +16,7 @@ module Spior
     end
 
     def self.restore_files
+      @cp = Helpers::Exec.new("cp -a")
       backup_exist("/etc/tor/torrc")
       backup_exist("/etc/resolv.conf")
     end
@@ -30,6 +33,7 @@ module Spior
     end
 
     def self.systemd_services
+      @cp = Helpers::Exec.new("cp -a")
       search_systemd_dir
       case Nomansland::installer?
       when :gentoo
@@ -79,12 +83,12 @@ module Spior
     def self.backup_file(target)
       d = DateTime.now
       backup = target + ".backup-" + d.strftime('%b-%d_%I-%M')
-      system("sudo cp -a #{target} #{backup}")
+      @cp.run("#{target} #{backup}")
       puts "Renamed file #{backup}"
     end
 
     def self.add_file(target)
-      system("sudo cp -a #{@config_file} #{target}")
+      @cp.run("#{@config_file} #{target}")
       Msg.p "File #{@config_file} has been successfully copied at #{target}"
     end
 
@@ -92,7 +96,7 @@ module Spior
       backup=`ls #{target}.backup-* | head -n 1`.chomp
       if File.exist? backup
         if ! check_hash(target, backup)
-          system("sudo cp -a #{backup} #{target}")
+          @cp.run("#{backup} #{target}")
           Msg.p "Restored #{backup}"
         end
       else

data/lib/spior/helpers.rb

@@ -0,0 +1,19 @@
+module Helpers
+  class Exec
+    def initialize(name)
+      @search_uid=`id -u`.chomp
+      @search_uid ||= 1000 unless $?.success?
+      @name = name
+    end
+
+    def run(args)
+      if @search_uid == '0' then
+        #puts "found root - uid #{@search_uid}"
+        system(@name + " " + args)
+      else
+        #puts "no root - call sudo - uid #{@search_uid}"
+        system("sudo " + @name + " " + args)
+      end
+    end
+  end
+end

data/lib/spior/install.rb

@@ -1,6 +1,7 @@
 require 'nomansland'
 require 'tty-which'
 require_relative 'msg'
+require_relative 'helpers'
 
 module Spior
   class Install
@@ -24,13 +25,17 @@ module Spior
       if not TTY::Which.exist?('iptables') or not TTY::Which.exist?('tor')
         case Nomansland::installer?
         when :emerge
-          system('sudo emerge -av --changed-use tor iptables')
+          emerge = Helpers::Exec.new("emerge -av --changed-use")
+          emerge.run("tor iptables")
         when :pacman
-          system('sudo pacman -S --needed tor iptables')
+          pacman = Helpers::Exec.new("pacman -S --needed")
+          pacman.run("tor iptables")
         when :yum
-          system('sudo yum install tor iptables')
+          yum = Helpers::Exec.new("yum install")
+          yum.run("tor iptables")
         else
-          system('sudo apt-get install tor iptables')
+          apt_get = Helpers::Exec.new("apt-get install")
+          apt_get.run("tor iptables iptables-persistent")
         end
       end
     end

data/lib/spior/iptables.rb

@@ -1,13 +1,13 @@
 require 'interfacez'
 require_relative 'tor'
 require_relative 'msg'
+require_relative 'helpers'
 
 module Spior
   class Iptables
 
     def self.tor(interface = false)
       initialize(interface)
-      select_cmd
       flush_rules
       bogus_tcp_flags
       bad_packets
@@ -22,7 +22,7 @@ module Spior
     end
 
     def self.flush_rules
-      select_cmd
+      @i = Helpers::Exec.new("iptables")
       ipt "-F"
       ipt "-X"
       ipt "-t nat -F"
@@ -46,17 +46,8 @@ module Spior
       Spior::Copy::config_files
     end
 
-    def self.select_cmd
-      id=`id -u`
-      if id == 0 then
-        @i = "iptables"
-      else
-        @i = "sudo iptables"
-      end
-    end
-
     def self.ipt(line)
-      system("#{@i} #{line}")
+      @i.run("#{line}")
       #puts "added - #{@i} #{line}"
     end
 

data/lib/spior/persist.rb

@@ -2,6 +2,7 @@ require 'nomansland'
 require 'tty-which'
 require_relative 'copy'
 require_relative 'msg'
+require_relative 'helpers'
 
 module Spior
   module Persist
@@ -17,10 +18,15 @@ module Spior
 
     def search_for_systemd
       return if !TTY::Which.exist?('systemctl') 
+      @systemctl = Helpers::Exec.new("systemctl")
+      @iptables_save = Helpers::Exec.new("iptables-save")
       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")
+        `systemctl is-enabled #{service}`
+        if not $?.success? then
+          @systemctl.run("enable #{service}")
+        end
       end
       iptables_systemd
     end
@@ -28,9 +34,11 @@ module Spior
     def iptables_systemd
       case Nomansland::installer?
       when :pacman
-        system('sudo iptables-save -f /etc/iptables/iptables.rules')
+        @iptables_save.run("-f /etc/iptables/iptables.rules")
       when :emerge
-        system('sudo systemctl start iptables-store')
+        @systemctl.run("start iptables-store")
+      when :apt_get
+        @iptables_save.run("> /etc/iptables/rules.v4")
       else
         Msg.report "Fail for save iptables-rule, your system is not yet supported"
       end

data/lib/spior/reload.rb

@@ -1,11 +1,12 @@
 require 'tty-which'
 require_relative 'msg'
+require_relative 'helpers'
 
 module Spior
   module Reload
     def self.tor
       if TTY::Which.exist?('systemctl')
-        system('sudo systemctl restart tor')
+        Helpers::Exec.new("systemctl").run("restart tor")
         Msg.p "ip changed"
       end
     end

data/lib/spior/tor.rb

@@ -4,12 +4,14 @@ require 'tty-which'
 require_relative 'msg'
 require_relative 'install'
 require_relative 'copy'
+require_relative 'helpers'
 
 module Spior
   class Tor
     attr_accessor :dns, :uid, :trans_port, :virt_addr
 
     def initialize
+      @systemctl = Helpers::Exec.new("systemctl")
       check_deps
       @dns = search_dns
       @uid = search_uid
@@ -53,10 +55,10 @@ module Spior
         state = `systemctl is-active tor`.chomp
         if state == 'active'
           #puts "Restart tor"
-          system('sudo systemctl restart tor')
+          @systemctl.run('restart tor')
         else
           #puts "Start tor"
-          system('sudo systemctl start tor')
+          @systemctl.run('start tor')
         end
       else
         Msg.for_no_systemd

data/spior.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "spior"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
   s.summary = "A tool to make TOR your default gateway and randomize your hardware"
   s.description = <<-EOF 
     A tool to make TOR your default gateway and randomize your hardware.
@@ -30,7 +30,6 @@ Gem::Specification.new do |s|
   s.signing_key = File.expand_path("~/.ssh/gem-private_key.pem") if $0 =~ /gem\z/
 
   s.requirements << 'tor'
-  s.requirements << 'sudo'
   s.requirements << 'iptables'
 
   s.required_ruby_version = '>=2.4'

data.tar.gz.sig

@@ -1,2 +1 @@
-`��Ǽ��ݥݨa�����mu��
V��ݮ�����)G�^����Y��1-��J��%p0�1eE��� �.���*H��8,␼\JU��&�>�����f��������6"���g���mS���S�\�
-����gJ�x{����?��O�d ��3[�G9�qojz�,�?ky{Gиo_ۈ_�efY�9���$��/C�9�y�Ŭ#�+�K�9
+<�c*��2C'�E�>�@@sO�

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spior
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - szorfein
@@ -35,7 +35,7 @@ cert_chain:
   J/zT/q2Ac7BWpSLbv6p9lChBiEnD9j24x463LR5QQjDNS5SsjzRQfFuprsa9Nqf2
   Tw==
   -----END CERTIFICATE-----
-date: 2020-05-09 00:00:00.000000000 Z
+date: 2020-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -117,6 +117,7 @@ files:
 - conf/torrc/torrc_default
 - lib/spior/clear.rb
 - lib/spior/copy.rb
+- lib/spior/helpers.rb
 - lib/spior/install.rb
 - lib/spior/iptables.rb
 - lib/spior/mac.rb
@@ -155,7 +156,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - tor
-- sudo
 - iptables
 rubygems_version: 3.1.2
 signing_key: