spior 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 967b9db246b956fa477b0fcc62212846720f4722799997aff7fa95eb45ff9775
-  data.tar.gz: 3469b8d3829a26bc46b576da7c15cc7bf420516e498d37fde8a39453cd2cff75
+  metadata.gz: 27c8fa0d8922c53ef9e3a7105c34de378489f3e70ddd334fedca96fe354da0ca
+  data.tar.gz: 70dbfd556eecb0db121145b43478129235c26b70a01c8a5c62a1194a9f98df7d
 SHA512:
-  metadata.gz: 9a0e6279b2427995067d4bf4dded5ed0b7a412724009cab08ef5c779558b8e4e80f54b82b0520ca4e949ce7d445ec2fb86a7f954e426358a2162fcd333bd689e
-  data.tar.gz: 2154da0c94cce48f71ff39fac3832ba3145388176b480a392f810ffeb5fa40e7dc66592bdf7aaf695bd2d26d6f27a4f03700a2dcaf375cfd5069afa5eeba8a3c
+  metadata.gz: f66d9d28077922f149b01a869a77b494d22d75713f6eeffb65a856efaed6556ec686346de7e1241ede0352328dc4f0e01a9f2c4983a5197aacb28b398413828b
+  data.tar.gz: a14c7edbab9887624014b668377286efb71c5115aebd847ef28da081fedb6dd82882baf0cf8c4175822547d7322e581dd92eefbaf678d7ef69a985152f0190dd

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 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

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.
@@ -10,28 +10,21 @@ 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
 
 ### Examples
-To change the MAC address for eth0
-
-    $ spior -n eth0 -m
-
-Redirect traffic through TOR
+Redirect traffic through TOR:
 
     $ spior -t
     $ spior -t -n eth0
 
-Look informations about your current ip address
+Change your ip address by reloading the TOR circuit:
+
+    $ spior -r
+
+Look informations about your current ip address:
 
     $ spior -s
 

data/lib/spior/copy.rb

@@ -9,7 +9,7 @@ module Spior
 
     def self.config_files
       @cp = Helpers::Exec.new("cp -a")
-      @conf_dir = File.expand_path('../..' + '/conf', __dir__)
+      @conf_dir = File.expand_path('../..' + '/ext', __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")

data/lib/spior/install.rb

@@ -5,84 +5,32 @@ require_relative 'helpers'
 
 module Spior
   class Install
+    class << self
 
-    def self.dependencies
-      base_packages
-      mac_update
-    end
-
-    def self.check_base
-      base_packages
-    end
-
-    def self.check_mac
-      pkg_mac
-    end
-
-    private
-
-    def self.base_packages
-      if not TTY::Which.exist?('iptables') or not TTY::Which.exist?('tor')
-        case Nomansland::installer?
-        when :emerge
-          emerge = Helpers::Exec.new("emerge -av --changed-use")
-          emerge.run("tor iptables")
-        when :pacman
-          pacman = Helpers::Exec.new("pacman -S --needed")
-          pacman.run("tor iptables")
-        when :yum
-          yum = Helpers::Exec.new("yum install")
-          yum.run("tor iptables")
-        else
-          apt_get = Helpers::Exec.new("apt-get install")
-          apt_get.run("tor iptables iptables-persistent")
-        end
+      def check_deps
+        base_packages
       end
-    end
-
-    def self.pkg_mac
-      pkg_name="deceitmac"
-      if not TTY::Which.exist?(pkg_name)
-        build_pkg(pkg_name)
-      end
-    end
-
-    def self.mac_update
-      pkg_name="deceitmac"
-      if TTY::Which.exist?(pkg_name)
-        print "Target #{pkg_name} exist, update? [N/y] "
-        choice = gets.chomp
-        if choice =~ /y|Y/ then
-          puts "Update #{pkg_name}..."
-          build_pkg(pkg_name)
-        end
-      else
-        puts "Install #{pkg_name}..."
-        build_pkg(pkg_name)
-      end
-    end
 
-    def self.build_pkg(name)
-      old_path = Dir.pwd
-      system("rm -rf /tmp/#{name}*")
-      system("curl -L -o /tmp/#{name}.tar.gz https://github.com/szorfein/#{name}/archive/master.tar.gz")
-      Dir.chdir("/tmp")
-      system("tar xvf #{name}.tar.gz")
-      Dir.chdir("#{name}-master")
-      system("sudo make install")
-      if TTY::Which.exist?('systemctl')
-        if Dir.exist?("/lib/systemd/system")
-          puts "lib/systemd"
-          system("sudo cp deceitmac@.service /lib/systemd/system/")
-        else
-          puts "/usr/lib/systemd"
-          system("sudo cp deceitmac@.service /usr/lib/systemd/system/")
+      private
+
+      def base_packages
+        if not TTY::Which.exist?('iptables') or not TTY::Which.exist?('tor')
+          case Nomansland::installer?
+          when :emerge
+            emerge = Helpers::Exec.new("emerge -av --changed-use")
+            emerge.run("tor iptables")
+          when :pacman
+            pacman = Helpers::Exec.new("pacman -S --needed")
+            pacman.run("tor iptables")
+          when :yum
+            yum = Helpers::Exec.new("yum install")
+            yum.run("tor iptables")
+          else
+            apt_get = Helpers::Exec.new("apt-get install")
+            apt_get.run("tor iptables iptables-persistent")
+          end
         end
       end
-      Msg.p "pkg #{name} installed"
-      Dir.chdir(old_path)
-    rescue => e
-      Msg.err e
     end
   end
 end

data/lib/spior/menu.rb

@@ -1,5 +1,4 @@
 require_relative 'msg'
-require_relative 'mac'
 require_relative 'iptables'
 require_relative 'network'
 require_relative 'reload'
@@ -16,29 +15,25 @@ module Spior
         Msg.head
         puts %q{Please select an option:
 
-  1. Forge a new MAC address
-  2. Redirect traffic through tor
-  3. Reload tor and change your ip
-  4. Clear and restore your files
-  5. Check info on your current ip
-  6. Quit}
+  1. Redirect traffic through tor
+  2. Reload tor and change your ip
+  3. Clear and restore your files
+  4. Check info on your current ip
+  5. Quit}
 
         puts
         print ">> "
         case gets.chomp
           when '1'
-            check_network
-            Spior::MAC::randomize(@network.card)
-          when '2'
             check_network
             Spior::Iptables::tor(@network.card)
-          when '3'
+          when '2'
             Spior::Reload::tor
-          when '4'
+          when '3'
             Spior::Clear::all
-          when '5'
+          when '4'
             Spior::Status::info
-          when '6'
+          when '5'
             exit
         end
       end

data/lib/spior/msg.rb

@@ -1,30 +1,32 @@
 require 'rainbow'
 
 module Msg
-  def self.head
+  extend self
+
+  def head
     puts Rainbow("------------------------------------------------").cyan
   end
 
-  def self.p(text)
+  def p(text)
     puts Rainbow("[").cyan + Rainbow("+").white + Rainbow("]").cyan + " " + text
   end
 
-  def self.err(text)
+  def err(text)
     puts Rainbow("[").red + Rainbow("-").white + Rainbow("]").red + " " + text
   end
 
-  def self.info(text)
+  def info(text)
     puts Rainbow("-").blue + Rainbow("-").white + Rainbow("-").blue + " " + text + " " + Rainbow("-").blue + Rainbow("-").white + Rainbow("-").blue
   end
 
-  def self.report(text)
+  def report(text)
     puts ""
     info text
     puts "Please, report this issue at https://github.com/szorfein/spior/issues"
     puts ""
   end
 
-  def self.for_no_systemd
+  def for_no_systemd
     puts "Init system is not yet supported. You can contribute to add it."
   end
 end

data/lib/spior/options.rb

@@ -20,7 +20,7 @@ module Spior
 
     def parse(argv)
       OptionParser.new do |opts|
-        opts.on("-i", "--install", "Install and update dependencies") do
+        opts.on("-i", "--install", "Check and install dependencies") do
           @install = true
         end
 
@@ -28,10 +28,6 @@ module Spior
           @interface = net
         end
 
-        opts.on("-m", "--mac", "Change your mac") do
-          @mac = true
-        end
-
         opts.on("-t", "--tor", "Redirect traffic through TOR") do
           @tor = true
         end

data/lib/spior/persist.rb

@@ -10,7 +10,7 @@ module Spior
 
     def all(card_name)
       @card_name = card_name
-      @services=[ "tor", "iptables", "deceitmac@" + @card_name ]
+      @services=[ "tor", "iptables" ]
       search_for_systemd
     end
 

data/lib/spior/runner.rb

@@ -1,7 +1,6 @@
 require_relative 'options'
 require_relative 'install'
 require_relative 'copy'
-require_relative 'mac'
 require_relative 'iptables'
 require_relative 'network'
 require_relative 'persist'
@@ -17,17 +16,9 @@ module Spior
     def run
       if @options.install then
         Msg.head
-        Spior::Install::dependencies
+        Spior::Install::deps
         Spior::Copy::config_files
       end
-      if @options.mac then
-        Msg.head
-        Spior::Install::check_mac
-        if not @network
-          @network = Spior::Network.new(@options.interface)
-        end
-        Spior::MAC::randomize(@network.card)
-      end
       if @options.tor then
         Msg.head
         if not @network

data/lib/spior/tor.rb

@@ -22,7 +22,7 @@ module Spior
     private 
 
     def check_deps
-      Spior::Install::check_base
+      Spior::Install::check_deps
       Spior::Copy::config_files
       verify_service
     end

data/spior.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "spior"
-  s.version = "0.1.2"
+  s.version = "0.1.3"
   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.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spior
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - szorfein
@@ -35,7 +35,7 @@ cert_chain:
   J/zT/q2Ac7BWpSLbv6p9lChBiEnD9j24x463LR5QQjDNS5SsjzRQfFuprsa9Nqf2
   Tw==
   -----END CERTIFICATE-----
-date: 2020-05-13 00:00:00.000000000 Z
+date: 2020-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -107,20 +107,19 @@ files:
 - LICENSE
 - README.md
 - bin/spior
-- conf/ipt_mod.conf
-- conf/iptables.service
-- conf/resolv.conf
-- conf/ssh.conf
-- conf/sshd.conf
-- conf/sshuttle.service
-- conf/torrc/torrc_archlinux
-- conf/torrc/torrc_default
+- ext/ipt_mod.conf
+- ext/iptables.service
+- ext/resolv.conf
+- ext/ssh.conf
+- ext/sshd.conf
+- ext/sshuttle.service
+- ext/torrc/torrc_archlinux
+- ext/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
 - lib/spior/menu.rb
 - lib/spior/msg.rb
 - lib/spior/network.rb

data/lib/spior/mac.rb

@@ -1,11 +0,0 @@
-require "pathname"
-require_relative "msg"
-
-module Spior
-  module MAC
-    def self.randomize(interface)
-      @network_int = interface
-      system("deceitmac --interface #{@network_int} --random --dhcpcd --tor --no-banner")
-    end
-  end
-end