spior 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd5390387f810136edd22aaa9cad905c3a04883faf366278cb9384e5f54605f9
-  data.tar.gz: 6c8be038056d9407403bc72dc919a1f63dcfe2edd8c9dc940352dd05dac4f0f8
+  metadata.gz: 90c671028fd720819222b9ef6e9b68801900077b10eb449bd97bf2780ae139df
+  data.tar.gz: 39036dd8a1671de7861d5af14f0506802c059764953b3ba9c77a3c0b7bd27f63
 SHA512:
-  metadata.gz: 5cac5ac6b18fded218c40beec95e53cbb85f7e85f6c58bf681085dc28370661da6997518c575d0365852a56c8ba102037414e6b10dc69ef522346bc8b7a24eb8
-  data.tar.gz: 8d96a2e4e9f7646011bbab44615e723bb0032de3bc47c8f97e11fb36df8741f30dc6f2b2aeef75ba50a6ec4b1f3fc59007ca61dd7922bd7f4f648d5d13db7f51
+  metadata.gz: 9e6003b20ae3ca7267233b01f2ad00d7fac0035869121aaffed0ea8d53de6c4abfe4f665ded35e6fa14c69121514cd56e3d9310f6d5fc3fb7a938377aa1f0292
+  data.tar.gz: 42e2674b7cb4439d120b93fb7f2b865dd3e9579be3dc62978e684f4eb33faf2ad8cc2bb9adf6c9f3c25f94b79a5d7e1e95b80cbc9347ba489753bed279d99772

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.0.6, release 2020-05-04
+* README, Add examples
+* lib/spior/iptables - rename var input incoming
+* Remove unused rules for iptables (INPUT and OUTPUT)
+* Search tor-uid by distro (tested for gentoo,arch,debian,ubuntu)
+* Add class lib/spior/tor, to check variables and dependencies (later)
+* Add the Gem Nomansland as dependencies
+
 ## 0.0.5, release 2020-05-03
 * Spior can now redirect all the traffic through TOR
 * Add OptionParser -t|--tor

data/README.md

@@ -1,6 +1,5 @@
 # spior
-(Spider|Tor). A tool to make TOR your default gateway and randomize your hardware (MAC).  
-**Still under development !**
+(Spider|Tor) A tool to make TOR your default gateway and randomize your hardware (MAC).
 
 ## Install
 Spior is cryptographically signed, so add my public key (if you haven’t already) as a trusted certificate.
@@ -16,12 +15,26 @@ You can install all the dependencies with:
 
     $ spior --install
 
-Please, post an issue if your linux distribution fail.
+Please, post an issue if your distro linux fail.
 
 ## Usage
 
     $ spior -h
 
+### Examples
+To change the MAC address for eth0
+
+    $ spior -c eth0 -m
+
+Redirect traffic through TOR
+
+    $ spior -t
+    $ spior -t -c eth0
+
+Look informations about your current ip address
+
+    $ spior -s
+
 ## Left Over
 
 ### Issues

data/lib/spior/install.rb

@@ -1,6 +1,4 @@
-#!/usr/bin/env ruby
-
-require 'pathname'
+require 'nomansland'
 require_relative 'msg'
 
 module Spior
@@ -14,16 +12,14 @@ module Spior
     private
 
     def self.base_packages
-      if Pathname.new("/usr/bin/emerge")
-        puts "Install with emerge..."
+      case Nomansland::installer?
+      when :emerge
         system('sudo emerge -av --changed-use tor iptables')
-
-      elsif Pathname.new("/usr/bin/pacman")
-        puts "Install with pacman..."
+      when :pacman
         system('sudo pacman -S --needed tor iptables')
-
-      elsif Pathname.new("/usr/bin/apt-get")
-        puts "Install with apt-get"
+      when :yum
+        system('sudo yum install tor iptables')
+      else
         system('sudo apt-get tor iptables')
       end
     end
@@ -54,6 +50,5 @@ module Spior
     rescue => e
       Msg.err e
     end
-
   end
 end

data/lib/spior/iptables.rb

@@ -1,4 +1,5 @@
 require 'interfacez'
+require_relative 'tor'
 require_relative 'msg'
 
 module Spior
@@ -15,8 +16,9 @@ module Spior
       dns
       nat
       input
-      output
       forward
+      output
+      drop_all
     end
 
     private
@@ -24,13 +26,10 @@ module Spior
     def self.initialize(interface)
       @lo = Interfacez.loopback
       @lo_addr = Interfacez.ipv4_address_of(@lo)
-      @tor_dns = 9061
-      @trans_port = 9040
-      @tor_uid = `id -u tor 2>&1 | grep "^[0-9]*"`.chomp
-      @virt_addr= "10.192.0.0/10"
+      @tor = Spior::Tor.new
       @non_tor = ["#{@lo_addr}/8", "10.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16"]
-      @input = interface
-      @input_addr = Interfacez.ipv4_address_of(@input)
+      @incoming = interface
+      @incoming_addr = Interfacez.ipv4_address_of(@incoming)
     end
 
     def self.select_cmd
@@ -43,7 +42,8 @@ module Spior
     end
 
     def self.ipt(line)
-      system("#{@i} #{line}") 
+      system("#{@i} #{line}")
+      #puts "added - #{@i} #{line}"
     end
 
     def self.flush_rules
@@ -54,6 +54,9 @@ module Spior
       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"
       ipt "-P OUTPUT DROP"
@@ -110,22 +113,23 @@ module Spior
       ipt "-A INPUT -p icmp -m limit --limit  1/s --limit-burst 1 -j ACCEPT"
       ipt "-A INPUT -p icmp -m limit --limit 1/s --limit-burst 1 -j LOG --log-prefix PING-DROP:"
       ipt "-A INPUT -p icmp -j DROP"
+      ipt "-A OUTPUT -p icmp -j ACCEPT"
     end
 
     def self.dns
       puts "dns"
-      ipt "-t nat -A PREROUTING ! -i #{@lo} -p udp -m udp --dport 53 -j REDIRECT --to-ports #{@tor_dns}"
-      ipt "-t nat -A OUTPUT -p udp -m udp --dport 53 -j REDIRECT --to-ports #{@tor_dns}"
-      ipt "-t nat -A OUTPUT -p tcp -m tcp --dport 53 -j REDIRECT --to-ports #{@tor_dns}"
+      ipt "-t nat -A PREROUTING ! -i #{@lo} -p udp -m udp --dport 53 -j REDIRECT --to-ports #{@tor.dns}"
+      ipt "-t nat -A OUTPUT -p udp -m udp --dport 53 -j REDIRECT --to-ports #{@tor.dns}"
+      ipt "-t nat -A OUTPUT -p tcp -m tcp --dport 53 -j REDIRECT --to-ports #{@tor.dns}"
     end
 
     def self.nat
       puts "nat"
       # nat .onion addresses
-      ipt "-t nat -A OUTPUT -d #{@virt_addr} -p tcp -m tcp --tcp-flags FIN,SYN,RST,ACK SYN -j REDIRECT --to-ports #{@trans_port}"
+      ipt "-t nat -A OUTPUT -d #{@tor.virt_addr} -p tcp -m tcp --tcp-flags FIN,SYN,RST,ACK SYN -j REDIRECT --to-ports #{@tor.trans_port}"
               
       # Don't nat the Tor process, the loopback, or the local network
-      ipt "-t nat -A OUTPUT -m owner --uid-owner #{@tor_uid} -j RETURN"
+      ipt "-t nat -A OUTPUT -m owner --uid-owner #{@tor.uid} -j RETURN"
       ipt "-t nat -A OUTPUT -o #{@lo} -j RETURN"
               
       # Allow lan access for hosts in $non_tor
@@ -134,52 +138,45 @@ module Spior
       end
 
       # Redirects all other pre-routing and output to Tor's TransPort
-      ipt "-t nat -A OUTPUT -p tcp -m tcp --tcp-flags FIN,SYN,RST,ACK SYN -j REDIRECT --to-ports #{@trans_port}"
+      ipt "-t nat -A OUTPUT -p tcp -m tcp --tcp-flags FIN,SYN,RST,ACK SYN -j REDIRECT --to-ports #{@tor.trans_port}"
 
       # Redirects all other pre-routing and output to Tor's TransPort
-      ipt "-t nat -A OUTPUT -p tcp -m tcp --tcp-flags FIN,SYN,RST,ACK SYN -j REDIRECT --to-ports #{@trans_port}"
-              
-      # input
-      ipt "-A INPUT -m state --state ESTABLISHED -j ACCEPT"
-      ipt "-A INPUT -i #{@lo} -j ACCEPT"
-      
-      # output
-      ipt "-A OUTPUT -m owner --uid-owner #{@tor_uid} -p tcp -m tcp --tcp-flags FIN,SYN,RST,ACK SYN -m state --state NEW -j ACCEPT"
-
-      # Allow loopback output
-      ipt "-A OUTPUT -d #{@lo_addr}/32 -o #{@lo} -j ACCEPT"
-              
-      # tor transparent magic
-      ipt "-A OUTPUT -d #{@lo_addr}/32 -p tcp -m tcp --dport #{@trans_port} --tcp-flags FIN,SYN,RST,ACK SYN -j ACCEPT"
-
-      ipt "-t filter -A OUTPUT -p udp -j REJECT"
-      ipt "-t filter -A OUTPUT -p icmp -j REJECT"
+      ipt "-t nat -A OUTPUT -p tcp -m tcp --tcp-flags FIN,SYN,RST,ACK SYN -j REDIRECT --to-ports #{@tor.trans_port}"
     end
 
     def self.input
       puts "input"
-      ipt "-A INPUT -m conntrack --ctstate INVALID -j LOG --log-prefix \"DROP INVALID \" --log-ip-options --log-tcp-options"
-      ipt "-A INPUT -m conntrack --ctstate INVALID -j DROP"
-      ipt "-A INPUT -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT"
-      ipt "-A INPUT -i #{@input} ! -s #{@input_addr} -j LOG --log-prefix \"SPOOFED PKT \""
-      ipt "-A INPUT -i #{@input} ! -s #{@input_addr} -j DROP"
-      # ACCEPT rules
-      ipt "-A INPUT -i #{@input} -p tcp -s #{@input_addr} --dport 22 -m conntrack --ctstate NEW -j ACCEPT"
-      
-      ipt "-A INPUT ! -i #{@lo} -j LOG --log-prefix \"DROP \" --log-ip-options --log-tcp-options"
+      ipt "-A INPUT -i #{@incoming} -p tcp -s #{@incoming_addr} --dport 22 -m conntrack --ctstate NEW -j ACCEPT"
+
+      # Allow loopback, rules
+      ipt "-A INPUT -m state --state ESTABLISHED -j ACCEPT"
       ipt "-A INPUT -i #{@lo} -j ACCEPT"
+      
+      # Allow DNS lookups from connected clients and internet access through tor.
+      ipt "-A INPUT -d #{@incoming_addr} -i #{@incoming} -p udp -m udp --dport #{@tor.dns} -j ACCEPT"
+      ipt "-A INPUT -d #{@incoming_addr} -i #{@incoming} -p tcp -m tcp --dport #{@tor.trans_port} --tcp-flags FIN,SYN,RST,ACK SYN -j ACCEPT"
+      
+      # Default
+      ipt "-A INPUT -j DROP"
     end
 
     def self.output
       puts "output"
       ipt "-A OUTPUT -m conntrack --ctstate INVALID -j LOG --log-prefix \"DROP INVALID \" --log-ip-options --log-tcp-options"
       ipt "-A OUTPUT -m conntrack --ctstate INVALID -j DROP"
-      ipt "-A OUTPUT -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT"
+      ipt "-A OUTPUT -m state --state ESTABLISHED -j ACCEPT"
 
-      # ACCEPT rules
+      # output
+      ipt "-A OUTPUT -m owner --uid-owner #{@tor.uid} -p tcp -m tcp --tcp-flags FIN,SYN,RST,ACK SYN -m state --state NEW -j ACCEPT"
+
+      # Accept, allow loopback output
       ipt "-A OUTPUT -p tcp --dport 22 -m conntrack --ctstate NEW -j ACCEPT"
-      ipt "-A OUTPUT ! -o #{@lo} -j LOG --log-prefix \"DROP \" --log-ip-options --log-tcp-options"
-      ipt "-A OUTPUT -o #{@lo} -j ACCEPT"
+      ipt "-A OUTPUT -d #{@lo_addr}/32 -o #{@lo} -j ACCEPT"
+
+      # tor transparent magic
+      ipt "-A OUTPUT -d #{@lo_addr}/32 -p tcp -m tcp --dport #{@tor.trans_port} --tcp-flags FIN,SYN,RST,ACK SYN -j ACCEPT"
+
+      ipt "-A OUTPUT -j DROP"
     end
 
     def self.forward
@@ -187,8 +184,8 @@ module Spior
       ipt "-A FORWARD -m conntrack --ctstate INVALID -j LOG --log-prefix \"DROP INVALID \" --log-ip-options --log-tcp-options"
       ipt "-A FORWARD -m conntrack --ctstate INVALID -j DROP"
       ipt "-A FORWARD -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT"
-      ipt "-A FORWARD -i #{@input} ! -s #{@input_addr} -j LOG --log-prefix \"SPOOFED PKT \""
-      ipt "-A FORWARD -i #{@input} ! -s #{@input_addr} -j DROP"
+      ipt "-A FORWARD -i #{@incoming} ! -s #{@incoming_addr} -j LOG --log-prefix \"SPOOFED PKT \""
+      ipt "-A FORWARD -i #{@incoming} ! -s #{@incoming_addr} -j DROP"
     end
   end
 end

data/lib/spior/tor.rb

@@ -0,0 +1,41 @@
+require 'pathname'
+require 'nomansland'
+require_relative 'msg'
+
+module Spior
+  class Tor
+    attr_accessor :dns, :uid, :trans_port, :virt_addr
+
+    def initialize
+      @dns = search_dns
+      @uid = search_uid
+      @trans_port = search_trans_port
+      @virt_addr = search_virt_addr
+    end
+
+    private 
+
+    def search_dns
+      9061
+    end
+
+    def search_uid
+      case Nomansland::distro?
+        when :debian
+          `id -u debian-tor`.chomp
+        when :ubuntu
+          `id -u debian-tor`.chomp
+        else
+          `id -u tor`.chomp
+      end
+    end
+
+    def search_trans_port
+      9040
+    end
+
+    def search_virt_addr
+      "10.192.0.0/10"
+    end
+  end
+end

data/spior.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
     "wiki_uri" => "https://github.com/szorfein/spior"
   }
 
-  s.version = "0.0.5"
+  s.version = "0.0.6"
   s.requirements << 'tor'
   s.requirements << 'sudo'
   s.requirements << 'iptables'
@@ -32,4 +32,5 @@ Gem::Specification.new do |s|
   s.signing_key = File.expand_path("~/.ssh/gem-private_key.pem") if $0 =~ /gem\z/
   s.add_runtime_dependency('rainbow', '3.0.0')
   s.add_runtime_dependency('interfacez', '1.0.3')
+  s.add_runtime_dependency('nomansland', '0.0.2')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spior
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - szorfein
@@ -35,7 +35,7 @@ cert_chain:
   J/zT/q2Ac7BWpSLbv6p9lChBiEnD9j24x463LR5QQjDNS5SsjzRQfFuprsa9Nqf2
   Tw==
   -----END CERTIFICATE-----
-date: 2020-05-04 00:00:00.000000000 Z
+date: 2020-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -65,6 +65,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.0.3
+- !ruby/object:Gem::Dependency
+  name: nomansland
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 description: "    A tool to make TOR your default gateway and randomize your hardware.\n"
 email: szorfein@protonmail.com
 executables:
@@ -93,6 +107,7 @@ files:
 - lib/spior/options.rb
 - lib/spior/runner.rb
 - lib/spior/status.rb
+- lib/spior/tor.rb
 - spior.gemspec
 - test/test_install.rb
 - test/test_options.rb