spior 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90c671028fd720819222b9ef6e9b68801900077b10eb449bd97bf2780ae139df
-  data.tar.gz: 39036dd8a1671de7861d5af14f0506802c059764953b3ba9c77a3c0b7bd27f63
+  metadata.gz: 8d390bbd0a1fa448b101166b42ee255f3c1f0c27f65e188892ad2727f2dfabf8
+  data.tar.gz: dfeab1802b567bafd759636739f7c0717de2112fd098020434cd5393acdafb95
 SHA512:
-  metadata.gz: 9e6003b20ae3ca7267233b01f2ad00d7fac0035869121aaffed0ea8d53de6c4abfe4f665ded35e6fa14c69121514cd56e3d9310f6d5fc3fb7a938377aa1f0292
-  data.tar.gz: 42e2674b7cb4439d120b93fb7f2b865dd3e9579be3dc62978e684f4eb33faf2ad8cc2bb9adf6c9f3c25f94b79a5d7e1e95b80cbc9347ba489753bed279d99772
+  metadata.gz: aa1aa9c06607c26ec58db34ff6b6915ae5b0a57d9292ca563f4ef31dca2fd7e87b3c6d34139aec1dea727aca619acf2ddf23258f88d5c3994e578a5d1d880137
+  data.tar.gz: b0a896265a665ce3c8cb35485ee05195cac56f15668d638f1fe411a6d94e42bcbb88b210afa81d2546634aa502d933deeaffff7154f7c88eb19c4845a1bf2424

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 0.0.7, release 2020-05-05
+* Execute the option -t|--tor verify if config files are present.
+* Correct --copy, does not make more than one backup of the same file.
+* Correct --install, do not check for reinstall package if they exist.
+* --clear restore config files
+* --clear tries to restore the old rules if he finds them.
+* New option -c|--clear
+* Remove option --copy, it is start with --install
+* Change option --card with -n|--net-card
+* Add the Gem tty-which as dependencies
+
 ## 0.0.6, release 2020-05-04
 * README, Add examples
 * lib/spior/iptables - rename var input incoming

data/README.md

@@ -24,12 +24,12 @@ Please, post an issue if your distro linux fail.
 ### Examples
 To change the MAC address for eth0
 
-    $ spior -c eth0 -m
+    $ spior -n eth0 -m
 
 Redirect traffic through TOR
 
     $ spior -t
-    $ spior -t -c eth0
+    $ spior -t -n eth0
 
 Look informations about your current ip address
 

data/lib/spior/clear.rb

@@ -0,0 +1,40 @@
+require 'tty-which'
+require 'nomansland'
+require_relative 'msg'
+
+module Spior
+  module Clear
+    extend self
+
+    def all
+      iptables
+      rez_configs
+    end
+
+    private
+
+    def iptables
+      puts "Clearing rules.."
+      Spior::Iptables::flush_rules
+      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.report "Do not known where search you previous iptables rules"
+      end
+    end
+
+    def ipt_restore(path)
+      puts "Restoring rules #{path}..."
+      system("sudo iptables-restore #{path}")
+    end
+
+    def rez_configs
+      system("sudo cp -a /etc/resolv.conf.backup-* /etc/resolv.conf")
+      #system("sudo cp -a /etc/tor/torrc.backup-* /etc/tor/torrc")
+    end
+  end
+end

data/lib/spior/copy.rb

@@ -16,12 +16,16 @@ module Spior
 
     def self.copy_file(conf, target)
       @config_file = "conf/#{conf}"
-      return if check_hash(target)
+      return if check_hash(@config_file, target)
       if File.exist? target then
-        print "Target #{target} exist, backup and replace? [N/y] "
-        choice = gets.chomp
-        if choice =~ /y|Y/ then
-          backup_file(target)
+        if not backup_exist target
+          print "Target #{target} exist, backup and replace? [N/y] "
+          choice = gets.chomp
+          if choice =~ /y|Y/ then
+            backup_file(target)
+            add_file target
+          end
+        else
           add_file target
         end
       else
@@ -29,18 +33,19 @@ module Spior
       end
     end
 
-    def self.check_hash(target)
+    def self.check_hash(src, target)
       return unless File.exist? target
-      sha256conf = Digest::SHA256.file @config_file
+      sha256conf = Digest::SHA256.file src
       sha256target = Digest::SHA256.file target
       if sha256conf === sha256target then
-        Msg.p "File #{target} alrealy exist, skip"
+        Msg.p "File #{src} alrealy exist, skip"
         return true
       end
       return false
     end
 
     def self.backup_file(target)
+      return if check_hash(target, target + ".backup-*")
       d = DateTime.now
       backup = target + ".backup-" + d.strftime('%b-%d_%I-%M')
       system("sudo cp -a #{target} #{backup}")
@@ -51,5 +56,10 @@ module Spior
       system("sudo cp -a #{@config_file} #{target}")
       Msg.p "File #{@config_file} has been successfully copied at #{target}"
     end
+
+    def self.backup_exist(target)
+      backup=`ls #{target}.backup-* | head -n 1`.chomp
+      check_hash(target, backup)
+    end
   end
 end

data/lib/spior/install.rb

@@ -1,4 +1,5 @@
 require 'nomansland'
+require 'tty-which'
 require_relative 'msg'
 
 module Spior
@@ -12,21 +13,23 @@ module Spior
     private
 
     def self.base_packages
-      case Nomansland::installer?
-      when :emerge
-        system('sudo emerge -av --changed-use tor iptables')
-      when :pacman
-        system('sudo pacman -S --needed tor iptables')
-      when :yum
-        system('sudo yum install tor iptables')
-      else
-        system('sudo apt-get tor iptables')
+      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')
+        when :pacman
+          system('sudo pacman -S --needed tor iptables')
+        when :yum
+          system('sudo yum install tor iptables')
+        else
+          system('sudo apt-get tor iptables')
+        end
       end
     end
 
     def self.pkg_mac
       pkg_name="deceitmac"
-      if File.exist?("/usr/local/bin/#{pkg_name}")
+      if TTY::Which.exist?(pkg_name)
         print "Target #{pkg_name} exist, update? [N/y] "
         choice = gets.chomp
         if choice =~ /y|Y/ then

data/lib/spior/iptables.rb

@@ -1,5 +1,6 @@
 require 'interfacez'
 require_relative 'tor'
+require_relative 'copy'
 require_relative 'msg'
 
 module Spior
@@ -21,9 +22,20 @@ module Spior
       drop_all
     end
 
+    def self.flush_rules
+      select_cmd
+      ipt "-F"
+      ipt "-X"
+      ipt "-t nat -F"
+      ipt "-t nat -X"
+      ipt "-t mangle -F"
+      ipt "-t mangle -X"
+    end
+
     private
 
     def self.initialize(interface)
+      check_dep
       @lo = Interfacez.loopback
       @lo_addr = Interfacez.ipv4_address_of(@lo)
       @tor = Spior::Tor.new
@@ -32,6 +44,10 @@ module Spior
       @incoming_addr = Interfacez.ipv4_address_of(@incoming)
     end
 
+    def self.check_dep
+      Spior::Copy::config_files
+    end
+
     def self.select_cmd
       id=`id -u`
       if id == 0 then
@@ -46,16 +62,6 @@ module Spior
       #puts "added - #{@i} #{line}"
     end
 
-    def self.flush_rules
-      puts "flush"
-      ipt "-F"
-      ipt "-X"
-      ipt "-t nat -F"
-      ipt "-t nat -X"
-      ipt "-t mangle -F"
-      ipt "-t mangle -X"
-    end
-
     def self.drop_all
       ipt "-P INPUT DROP"
       ipt "-P FORWARD DROP"

data/lib/spior/msg.rb

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

data/lib/spior/options.rb

@@ -1,13 +1,13 @@
 require 'optparse'
 require_relative 'status'
+require_relative 'clear'
 
 module Spior
   class Options
-    attr_reader :install , :copy, :mac , :interface , :tor
+    attr_reader :install , :mac , :interface , :tor
 
     def initialize(argv)
       @install = false
-      @copy = false
       @mac = false
       @tor = false
       parse(argv)
@@ -17,16 +17,11 @@ module Spior
 
     def parse(argv)
       OptionParser.new do |opts|
-
         opts.on("-i", "--install", "Install dependencies") do
           @install = true
         end
 
-        opts.on("-c", "--copy", "Copy config files") do
-          @copy = true
-        end
-
-        opts.on("-c", "--card NAME", "The name of the target network card") do |net|
+        opts.on("-n", "--net-card NAME", "The name of the target network card") do |net|
           @interface = net
         end
 
@@ -38,6 +33,10 @@ module Spior
           @tor = true
         end
 
+        opts.on("-c", "--clear", "Clear iptables rules and restore files") do
+          Spior::Clear::all
+        end
+
         opts.on("-s", "--status", "Look infos about your current ip") do
           Spior::Status::info
         end

data/lib/spior/runner.rb

@@ -17,9 +17,6 @@ module Spior
       if @options.install then
         Msg.head
         Spior::Install::dependencies
-      end
-      if @options.copy then
-        Msg.head
         Spior::Copy::config_files
       end
       if @options.mac then

data/spior.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
     "wiki_uri" => "https://github.com/szorfein/spior"
   }
 
-  s.version = "0.0.6"
+  s.version = "0.0.7"
   s.requirements << 'tor'
   s.requirements << 'sudo'
   s.requirements << 'iptables'
@@ -33,4 +33,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('rainbow', '3.0.0')
   s.add_runtime_dependency('interfacez', '1.0.3')
   s.add_runtime_dependency('nomansland', '0.0.2')
+  s.add_runtime_dependency('tty-which', '0.4.2')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spior
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - szorfein
@@ -79,6 +79,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.0.2
+- !ruby/object:Gem::Dependency
+  name: tty-which
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.4.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.4.2
 description: "    A tool to make TOR your default gateway and randomize your hardware.\n"
 email: szorfein@protonmail.com
 executables:
@@ -98,6 +112,7 @@ files:
 - conf/sshd.conf
 - conf/sshuttle.service
 - conf/torrc
+- lib/spior/clear.rb
 - lib/spior/copy.rb
 - lib/spior/install.rb
 - lib/spior/iptables.rb