spior 0.1.0 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '01991c016f887cb41723c10909810d4bc7c762ad844d85a3bd094653123b891f'
-  data.tar.gz: 6df20aa83ef6b7c2201bde879f4927183476b3b35d41eec6415ca7d0c3d0c8c5
+  metadata.gz: 52ad58e21c256642931525e2625cb10e14a74ad17ea95825940b87f6d667fdac
+  data.tar.gz: 143940314f5a3e3387f094cdeb6c371a0e34a2227b803f9cb0eaeebc8ebb512d
 SHA512:
-  metadata.gz: 4b0d5ab4e4ccd4a8563eaae7e1aee31f77041b5d1dd593e79719ec82cb51868b24958cd8b92973fbc03303d8e54d9f0f9d9837913af9474e3099f4c867e14902
-  data.tar.gz: f3bf8c16db8f5d8ec3e42b65f30567921ac4b0de3fffe2615e5ad045228920eed77ca5520c77b4b776ab75cbeda9455dab5bfe715a14b351e5711b5ca7b46ec9
+  metadata.gz: eadbf46e6b47eb820fbd88fd3d71c31183ca49a611ac0c6e0576724abc6357d6409fbf2edc9f69d38441889f262102af47f6fecadc2fe82bcbeea856d0557dc1
+  data.tar.gz: f774d5a4bec3474eccaf71e8495fc813cf71681fe609e7f7d1b6bf8e386d46c525bb138b4538f23cb4634706a578cbca96bac80fc85bb37c9700c99aff984ef1

data/CHANGELOG.md

@@ -1,3 +1,35 @@
+## 0.1.5, release 2020-11-01
+* Simplify lib/spior/copy, lib/spior/clear
+* Write iptables rules for --clearnet and --tor
+* Refacto code
+* Enhance --status with open-uri and json
+* Remove argument --net-card
+
+## 0.1.4, release 2020-05-21
+* torrc and resolv.conf are generate dynamically
+* Remove conf/resolv
+* Correct path of conf_dir for the install on gentoo
+* Remove self from lib/copy
+* Correct little error on lib/copy with undefined method `deps`
+
+## 0.1.3, release 2020-05-14
+* Rename conf dir by ext
+* Clearing all codes about MAC
+* Remove deceitmac
+* Mac change and other randomize features will go on another gem amnesie
+
+## 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
+* New option -m|--menu
+* Reorder the spior.gemspec
+
 ## 0.1.0, release 2020-05-08
 * Will manage differents version of torrc, if your distro fail to start TOR, report an issue.
 * Ensure than TOR is start before proceed.

data/README.md

@@ -1,5 +1,5 @@
 # spior
-(Spider|Tor) A tool to make TOR your default gateway and randomize your hardware (MAC).
+(Spider|Tor) A tool to make TOR your default gateway.
 
 ## Install
 Spior is cryptographically signed, so add my public key (if you haven’t already) as a trusted certificate.
@@ -15,18 +15,21 @@ And install the gem
     $ spior -h
 
 ### Examples
-To change the MAC address for eth0
+Redirect traffic through TOR:
 
-    $ spior -n eth0 -m
+    $ spior --tor
 
-Redirect traffic through TOR
+Change your ip address by reloading the TOR circuit:
 
-    $ spior -t
-    $ spior -t -n eth0
+    $ spior --reload
 
-Look informations about your current ip address
+Look informations about your current ip address:
 
-    $ spior -s
+    $ spior --status
+
+Return to clearnet navigation
+
+    $ spior --clearnet
 
 ## Left Over
 

data/Rakefile

@@ -0,0 +1,20 @@
+# https://github.com/seattlerb/minitest#running-your-tests-
+require "rake/testtask"
+require File.dirname(__FILE__) + "/lib/spior/version"
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList["test/test_*.rb"]
+end
+
+namespace :gem do
+  desc "build the gem"
+  task :build do
+    Dir["spior*.gem"].each {|f| File.unlink(f) }
+    system("gem build spior.gemspec")
+    system("gem install spior-#{Spior::VERSION}.gem -P MediumSecurity")
+  end
+end
+
+task :default => :test

data/bin/spior

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'spior/runner'
+require 'spior'
 
-runner = Spior::Runner.new(ARGV)
-runner.run
+Spior::Main.new(ARGV)

data/lib/spior.rb

@@ -0,0 +1,42 @@
+require_relative 'spior/clear'
+require_relative 'spior/copy'
+require_relative 'spior/install'
+require_relative 'spior/iptables'
+require_relative 'spior/msg'
+require_relative 'spior/options'
+require_relative 'spior/status'
+require_relative 'spior/tor'
+require_relative 'spior/persist'
+require_relative 'spior/network'
+require_relative 'spior/menu'
+require_relative 'spior/helpers'
+
+module Spior
+  class Main
+    def initialize(argv)
+      @argv = argv
+      run
+    end
+
+    private
+
+    def run
+      options = Options.new(@argv)
+
+      if options.install
+        Msg.head
+        Install::check_deps
+        Copy.new.save
+      end
+
+      if options.tor
+        Msg.head
+        Iptables::Tor.new.run!
+      end
+
+      if options.persist
+        Persist.enable
+      end
+    end
+  end
+end

data/lib/spior/clear.rb

@@ -1,7 +1,5 @@
 require 'tty-which'
 require 'nomansland'
-require_relative 'copy'
-require_relative 'msg'
 
 module Spior
   module Clear
@@ -9,32 +7,30 @@ module Spior
 
     def all
       iptables
-      rez_configs
+      Spior::Copy.new.restore
     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.p "I couldn't find any old rules for iptables to restore, skipping..."
-      end
+      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}..."
-      system("sudo iptables-restore #{path}")
-    end
-
-    def rez_configs
-      Spior::Copy::restore_files
+      Helpers::Exec.new("iptables-restore").run("#{path}")
     end
   end
 end

data/lib/spior/copy.rb

@@ -1,103 +1,85 @@
-require 'nomansland'
-require 'date'
 require 'digest'
-require_relative 'msg'
 
 module Spior
   class Copy
-
-    def self.config_files
-      @conf_dir = File.expand_path('../..' + '/conf', __dir__)
-      copy_torrc
-      copy_file(@conf_dir + "/resolv.conf", "/etc/resolv.conf")
-      copy_file(@conf_dir + "/ipt_mod.conf", "/etc/modules-load.d/ipt_mod.conf")
-    end
-
-    def self.restore_files
-      backup_exist("/etc/tor/torrc")
-      backup_exist("/etc/resolv.conf")
+    def initialize
+      @cp = Helpers::Exec.new("cp -a")
+      @files = []
+      search_conf_dir
+      config_files
+      list
     end
 
-    def self.search_systemd_dir
-      if Dir.exist?("/usr/lib/systemd/system")
-        @systemd_dir = '/usr/lib/systemd/system'
-      elsif Dir.exist?("/lib/systemd/system")
-        @systemd_dir = '/lib/systemd/system'
-      else
-        Msg.report "Directory systemd/system is no found on your system."
-        exit(-1)
-      end
+    def save
+      @files.each { |f|
+        backup = "#{f}_backup"
+        if ! File.exist? backup
+          Msg.p "#{f} saved"
+          @cp.run("#{f} #{backup}")
+        end
+      }
     end
 
-    def self.systemd_services
-      search_systemd_dir
-      case Nomansland::installer?
-      when :gentoo
-        Msg.p "Copy #{@conf_dir}/iptables.service"
-        copy_file(@conf_dir + "/iptables.service", @systemd_dir + "/iptables.service")
-      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 self.copy_file(conf, target)
-      @config_file = conf
-      return if check_hash(@config_file, target)
-      if File.exist? target then
-        if ! previous_copy target
-          backup_file(target)
-        end 
-        add_file target
-      else
-        add_file target
-      end
+    def config_files
+      copy_file("#{@conf_dir}/ipt_mod.conf", "/etc/modules-load.d/ipt_mod.conf")
     end
 
-    def self.copy_torrc
-      case Nomansland::distro?
-      when :archlinux
-        copy_file(@conf_dir + "/torrc/torrc_archlinux", "/etc/tor/torrc")
-      else
-        copy_file(@conf_dir + "/torrc/torrc_default", "/etc/tor/torrc")
-        Msg.report "If tor fail to start with the default torrc"
-      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 self.previous_copy(target)
-      backup=`ls #{target}.backup-* | head -n 1`.chomp
-      return false if !File.exist?(backup)
-      check_hash(backup, target)
+    def add(file)
+      @files << file if File.exist? file
     end
 
-    def self.check_hash(src, target)
-      return if not File.exist?(target)
-      sha256conf = Digest::SHA256.file src
-      sha256target = Digest::SHA256.file target
-      sha256conf === sha256target
+    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 self.backup_file(target)
-      d = DateTime.now
-      backup = target + ".backup-" + d.strftime('%b-%d_%I-%M')
-      system("sudo cp -a #{target} #{backup}")
-      puts "Renamed file #{backup}"
+    def previous_copy(target)
+      backup=`ls #{target}.backup-* | head -1`.chomp
+      return false if ! File.exist? backup
+      check_hash(backup, target)
     end
 
-    def self.add_file(target)
-      system("sudo cp -a #{@config_file} #{target}")
+    def add_file(target)
+      @cp.run("#{@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
-      if File.exist? backup
-        if ! check_hash(target, backup)
-          system("sudo cp -a #{backup} #{target}")
-          Msg.p "Restored #{backup}"
-        end
-      else
-        puts "No found previous backup for #{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/helpers.rb

@@ -0,0 +1,118 @@
+require 'fileutils'
+require 'tempfile'
+require 'open3'
+
+module Helpers
+  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 |stdin, stdout_err, wait_thr|
+        while line = stdout_err.gets
+          puts line
+        end
+
+        exit_status = wait_thr.value
+        unless exit_status.success?
+          raise "Error, Running #{cmd} #{args}"
+        end
+      end
+    end
+  end
+
+  # Class Newfile
+  # Create a file and move at the dest
+  # === Example
+  # string = "nameserver 127.0.0.1"
+  # name = "resolv.conf"
+  # dest = "/etc"
+  # new_file = Helpers::Newfile.new(string, name, dest)
+  # new_file.add
+  class NewFile
+    # Method #new
+    # === Parameters
+    # * _string_ = string for the whole file
+    # * _name_ = name of the file (e.g: resolv.conf)
+    # * _dest_ = path (e.g: /etc)
+    def initialize(string, name, dest = "/tmp")
+      @string = string
+      @name = name
+      @dest = dest + "/" + @name
+    end
+
+    # Method #add
+    # Add the file at @dest
+    def add
+      @mv = Helpers::Exec.new("mv")
+      tmp = Tempfile.new(@name)
+      File.open(tmp.path, 'w') do |file|
+        file.puts @string
+      end
+      puts "move #{tmp.path} to #{@dest}"
+      @mv.run("#{tmp.path} #{@dest}")
+    end
+
+    def perm(user, perm)
+      chown = Helpers::Exec.new("chown")
+      chmod = Helpers::Exec.new("chmod")
+      chown.run("#{user}:#{user} #{@dest}")
+      chmod.run("#{perm} #{@dest}")
+    end
+  end
+
+  # Class NewSystemd
+  # Used to create a systemd service
+  #
+  # === Example:
+  # require Helpers
+  # string = <<EOF
+  # [Description]
+  #
+  # [Service]
+  # Type=simple
+  #
+  # [Installation]
+  # WantedBy =
+  # EOF
+  # new_systemd = Helpers::NewSystemd.new(string, "tor.service")
+  # new_systemd.add
+  class NewSystemd < NewFile
+    # Method #new
+    # === Parameters:
+    # * _string_ = the string of for whole content file
+    # * _name_ = the name of the service (e.g: tor.service)
+    def initialize(string, name)
+      super
+      @systemd_dir = search_systemd_dir
+      @dest = @systemd_dir + "/" + @name
+    end
+
+    # Method #add
+    # Create a temporary file and move
+    # the service @name to the systemd directory
+    def add
+      @systemctl = Helpers::Exec.new("systemctl")
+      super
+      @systemctl.run("daemon-reload")
+    end
+
+    private
+    # Method search_systemd_dir
+    # Search the current directory for systemd services
+    # + Gentoo can install at /lib/systemd/system or /usr/lib/systemd/system
+    def search_systemd_dir
+      if Dir.exist? "/lib/systemd/system"
+        "/lib/systemd/system"
+      elsif Dir.exist? "/usr/lib/systemd/system"
+        "/usr/lib/systemd/system"
+      else
+        raise "No directory systemd found"
+        exit
+      end
+    end
+  end
+end