spior 0.1.4 → 0.1.5

data/lib/spior/tor.rb

@@ -1,107 +1,7 @@
-require 'pathname'
-require 'nomansland'
-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
-      @trans_port = search_trans_port
-      @virt_addr = search_virt_addr
-    end
-
-    private 
-
-    def check_deps
-      Spior::Install::check_deps
-      Spior::Copy::config_files
-      add_resolv
-      add_torrc
-      verify_service
-    end
-
-    def add_resolv
-      string = "nameserver 127.0.0.1"
-      Spior::Copy::backup("/etc/resolv.conf", /nameserver 127.0.0.1$/)
-      new_file = Helpers::NewFile.new(string, "resolv.conf", "/etc")
-      new_file.add
-      new_file.perm("root", "644")
-    end
-
-    def add_torrc
-      user = ""
-      pid = ""
-      dir = "DataDirectory /var/lib/tor/data"
-      case Nomansland::distro?
-      when :gentoo
-        user = "User tor"
-        pid = "PIDFile /run/tor/tor.pid"
-      end
-      string = <<EOF
-# Generated by Spior
-#{user}
-#{pid}
-#{dir}
-GeoIPExcludeUnknown 1
-DNSPort 127.0.0.1:9061
-AutomapHostsOnResolve 1
-AutomapHostsSuffixes .exit,.onion
-SocksPort 9050
-VirtualAddrNetworkIPv4 10.192.0.0/10
-TransPort 9040 IsolateClientAddr IsolateClientProtocol IsolateDestAddr IsolateDestPort
-TestSocks 1
-MaxCircuitDirtiness 600
-EOF
-      re = /# Generated by Spior/
-      Spior::Copy::backup("/etc/tor/torrc", re)
-      new_file = Helpers::NewFile.new(string, "torrc", "/etc/tor")
-      new_file.add
-      new_file.perm("root", "644")
-    end
-
-    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
-
-    def verify_service
-      if TTY::Which.exist?('systemctl')
-        state = `systemctl is-active tor`.chomp
-        if state == 'active'
-          @systemctl.run('restart tor')
-        else
-          @systemctl.run('start tor')
-        end
-      else
-        Msg.for_no_systemd
-      end
-    end
+  module Tor
   end
 end
+
+require_relative 'tor/info'
+require_relative 'tor/restart'

data/lib/spior/tor/info.rb

@@ -0,0 +1,113 @@
+require 'pathname'
+require 'nomansland'
+require 'tty-which'
+
+module Spior
+  module Tor
+    class Info
+      attr_accessor :dns, :uid, :trans_port, :virt_addr
+
+      def initialize
+        @systemctl = Helpers::Exec.new("systemctl")
+        check_deps
+        @dns = search_dns
+        @uid = search_uid
+        @trans_port = search_trans_port
+        @virt_addr = search_virt_addr
+      end
+
+      private 
+
+      def check_deps
+        Spior::Install::check_deps
+        Spior::Copy.new.save
+        add_resolv
+        add_torrc
+        verify_service
+      end
+
+      def add_resolv
+        string = "nameserver 127.0.0.1"
+        new_file = Helpers::NewFile.new(string, "resolv.conf", "/etc")
+        new_file.add
+        new_file.perm("root", "644")
+      end
+
+      def self.grep?(file, regex)
+        is_found = false
+        return is_found if ! File.exist? file
+        File.open(file) do |f|
+          f.each do |line|
+            is_found = true if line.match(regex)
+          end
+        end
+        is_found
+      end
+
+      def add_torrc
+        user = ""
+        pid = ""
+        dir = "DataDirectory /var/lib/tor/data"
+        case Nomansland::distro?
+        when :gentoo
+          user = "User tor"
+          pid = "PIDFile /run/tor/tor.pid"
+        end
+        string = <<EOF
+# Generated by Spior
+#{user}
+#{pid}
+#{dir}
+GeoIPExcludeUnknown 1
+DNSPort 127.0.0.1:9061
+AutomapHostsOnResolve 1
+AutomapHostsSuffixes .exit,.onion
+SocksPort 9050
+VirtualAddrNetworkIPv4 10.192.0.0/10
+TransPort 9040 IsolateClientAddr IsolateClientProtocol IsolateDestAddr IsolateDestPort
+TestSocks 1
+MaxCircuitDirtiness 600
+EOF
+        new_file = Helpers::NewFile.new(string, "torrc", "/etc/tor")
+        new_file.add
+        new_file.perm("root", "644")
+      end
+
+      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
+
+      def verify_service
+        if TTY::Which.exist?('systemctl')
+          state = `systemctl is-active tor`.chomp
+          if state == 'active'
+            @systemctl.run('restart tor')
+          else
+            @systemctl.run('start tor')
+          end
+        else
+          Msg.for_no_systemd
+        end
+      end
+    end
+  end
+end

data/lib/spior/{reload.rb → tor/restart.rb}

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

data/lib/spior/version.rb

@@ -0,0 +1,3 @@
+module Spior
+  VERSION = '0.1.5'.freeze
+end

data/spior.gemspec

@@ -1,6 +1,8 @@
+require File.dirname(__FILE__) + "/lib/spior/version"
+
 Gem::Specification.new do |s|
   s.name = "spior"
-  s.version = "0.1.4"
+  s.version = Spior::VERSION
   s.summary = "A tool to make TOR your default gateway"
   s.description = <<-EOF 
     A tool to make TOR your default gateway

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spior
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - szorfein
@@ -35,7 +35,7 @@ cert_chain:
   J/zT/q2Ac7BWpSLbv6p9lChBiEnD9j24x463LR5QQjDNS5SsjzRQfFuprsa9Nqf2
   Tw==
   -----END CERTIFICATE-----
-date: 2020-05-21 00:00:00.000000000 Z
+date: 2020-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -110,23 +110,25 @@ files:
 - bin/spior
 - ext/ipt_mod.conf
 - ext/iptables.service
-- ext/ssh.conf
-- ext/sshd.conf
-- ext/sshuttle.service
+- lib/spior.rb
 - lib/spior/clear.rb
 - lib/spior/copy.rb
 - lib/spior/helpers.rb
 - lib/spior/install.rb
 - lib/spior/iptables.rb
+- lib/spior/iptables/default.rb
+- lib/spior/iptables/root.rb
+- lib/spior/iptables/tor.rb
 - lib/spior/menu.rb
 - lib/spior/msg.rb
 - lib/spior/network.rb
 - lib/spior/options.rb
 - lib/spior/persist.rb
-- lib/spior/reload.rb
-- lib/spior/runner.rb
 - lib/spior/status.rb
 - lib/spior/tor.rb
+- lib/spior/tor/info.rb
+- lib/spior/tor/restart.rb
+- lib/spior/version.rb
 - spior.gemspec
 - test/test_install.rb
 - test/test_options.rb
@@ -154,10 +156,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - tor
 - iptables
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A tool to make TOR your default gateway
 test_files:
-- test/test_options.rb
 - test/test_install.rb
+- test/test_options.rb

data/ext/ssh.conf

@@ -1,29 +0,0 @@
-Host *.onion
-  ProxyCommand socat - SOCKS4A:localhost:%h:%p,socksport=9050
-
-Host github.com
-  KexAlgorithms curve25519-sha256@libssh.org,ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,diffie-hellman-group14-sha1,diffie-hellman-group1-sha1 
-  Ciphers chacha20-poly1305@openssh.com,aes256-ctr,aes192-ctr,aes128-ctr,aes256-cbc,aes192-cbc,aes128-cbc
-  MACs hmac-sha2-256,hmac-sha2-512,hmac-sha1
-
-Host *
-  Protocol 2
-  KexAlgorithms curve25519-sha256@libssh.org,diffie-hellman-group-exchange-sha256
-
-  MACs hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com,umac-128-etm@openssh.com,hmac-sha2-512,hmac-sha2-256,umac-128@openssh.com
-
-  Ciphers chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes128-gcm@openssh.com,aes256-ctr,aes192-ctr,aes128-ctr
-
-  PasswordAuthentication no
-  ChallengeResponseAuthentication no
-  PubkeyAuthentication yes
-  ForwardX11Trusted no
-  ForwardX11 no
-  ForwardAgent no
-  ConnectTimeout 40
-
-# Send locale environment variables. #367017
-SendEnv LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME LANGUAGE LC_ADDRESS LC_IDENTIFICATION LC_MEASUREMENT LC_NAME LC_PAPER LC_TELEPHONE
-
-# Send COLORTERM to match TERM. #658540
-SendEnv COLORTERM

data/ext/sshd.conf

@@ -1,46 +0,0 @@
-# ref https://github.com/stribika/stribika.github.io/wiki/Secure-Secure-Shell
-# ref https://github.com/jumanjihouse/devenv/blob/master/app/etc/ssh/sshd_config
-# ref https://www.ssh.com/ssh/sshd_config/
-
-# Support for curve25519 KEX and chacha20 are on the wishlist.
-KexAlgorithms curve25519-sha256@libssh.org,diffie-hellman-group-exchange-sha256
-
-hostkeyalgorithms ssh-ed25519-cert-v01@openssh.com,ssh-rsa-cert-v01@openssh.com,ssh-ed25519,rsa-sha2-512,rsa-sha2-256
-
-Ciphers chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes128-gcm@openssh.com,aes256-ctr,aes192-ctr,aes128-ctr
-
-MACs hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com,umac-128-etm@openssh.com,hmac-sha2-512,hmac-sha2-256,umac-128@openssh.com
-
-Protocol 2
-AllowGroups ssh-user
-
-# Only allow 4096-byte RSA key
-HostKey /etc/ssh/ssh_host_rsa_key
-HostKey /etc/ssh/ssh_host_ed25519_key
-
-PermitEmptyPasswords no
-
-# Change to no to disable s/key passwords
-ChallengeResponseAuthentication no
-
-PubkeyAuthentication yes
-
-# With TOR
-#ListenAddress 127.0.0.1:22
-
-UsePAM yes
-PasswordAuthentication no
-PrintMotd no
-PrintLastLog no
-
-X11Forwarding no
-permitrootlogin no
-
-# override default of no subsystems
-Subsystem sftp  /usr/lib64/misc/sftp-server
-
-# Allow client to pass locale environment variables. #367017
-AcceptEnv LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME LANGUAGE LC_ADDRESS LC_IDENTIFICATION LC_MEASUREMENT LC_NAME LC_PAPER LC_TELEPHONE
-
-# Allow client to pass COLORTERM to match TERM. #658540
-AcceptEnv COLORTERM

data/ext/sshuttle.service

@@ -1,11 +0,0 @@
-[Unit]
-Description=Create a transparent proxy over SSH with sshuttle
-After=network-online.target
-
-[Service]
-Type=notify
-NotifyAccess=all
-ExecStart=/usr/bin/sshuttle -vr username@localhost 0/0
-
-[Install]
-WantedBy=multi-user.target

data/lib/spior/runner.rb

@@ -1,34 +0,0 @@
-require_relative 'options'
-require_relative 'install'
-require_relative 'copy'
-require_relative 'iptables'
-require_relative 'network'
-require_relative 'persist'
-require_relative 'msg'
-
-module Spior
-  class Runner
-    def initialize(argv)
-      @options = Options.new(argv)
-      @network = false
-    end
-
-    def run
-      if @options.install then
-        Msg.head
-        Spior::Install::check_deps
-        Spior::Copy::config_files
-      end
-      if @options.tor then
-        Msg.head
-        if not @network
-          @network = Spior::Network.new(@options.interface)
-        end
-        Spior::Iptables::tor(@network.card)
-      end
-      if @options.persist then
-        Spior::Persist::all
-      end
-    end
-  end
-end