spior 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d390bbd0a1fa448b101166b42ee255f3c1f0c27f65e188892ad2727f2dfabf8
-  data.tar.gz: dfeab1802b567bafd759636739f7c0717de2112fd098020434cd5393acdafb95
+  metadata.gz: e9da29ea66a46968397265faf097f4fcdb111849af6563ca1157b7a1ca0606da
+  data.tar.gz: 8406d29cdd50d1bbe4c0048f1c6030f8159c7156a0f63066465a6b0624a19c76
 SHA512:
-  metadata.gz: aa1aa9c06607c26ec58db34ff6b6915ae5b0a57d9292ca563f4ef31dca2fd7e87b3c6d34139aec1dea727aca619acf2ddf23258f88d5c3994e578a5d1d880137
-  data.tar.gz: b0a896265a665ce3c8cb35485ee05195cac56f15668d638f1fe411a6d94e42bcbb88b210afa81d2546634aa502d933deeaffff7154f7c88eb19c4845a1bf2424
+  metadata.gz: 47ce8c96a9aab4f5c3f156445cd114f522e4b66c5d7b614b6fb19c0697a41670dd4b6cbba905558d2ca27d509cbfd0160dceb8ad3ddb48d5d9c9ebff16ff0d99
+  data.tar.gz: d4c5cf050ad3cb485a9e9f09c80d634ea837b6bd0d8b5a648c29a3518126b56da0c0ddbc9a85e66f6e9c4d00219b2f95116e38300e95969cd4a8b3d1c2b53744

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.0.8, release 2020-05-06
+* Always make a copy and replace original file, do not ask, the program is dependent of his config file for now.
+* Correct install where Dir.chdir don't back to the previous location.
+* --install also place the deceitmac.service if your system use systemd.
+* Simplify lib/spior/copy check\_hash.
+* The use of the option -i|--install is optionnal, deps are checked during the execution.
+
 ## 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.

data/README.md

@@ -10,13 +10,6 @@ And install the gem
 
     $ gem install spior -P MediumSecurity
 
-## Dependencies
-You can install all the dependencies with:
-
-    $ spior --install
-
-Please, post an issue if your distro linux fail.
-
 ## Usage
 
     $ spior -h

data/lib/spior/clear.rb

@@ -1,5 +1,6 @@
 require 'tty-which'
 require 'nomansland'
+require_relative 'copy'
 require_relative 'msg'
 
 module Spior
@@ -33,8 +34,7 @@ module Spior
     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")
+      Spior::Copy::restore_files
     end
   end
 end

data/lib/spior/copy.rb

@@ -12,19 +12,19 @@ module Spior
       copy_file("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")
+    end
+
     private
 
     def self.copy_file(conf, target)
       @config_file = "conf/#{conf}"
       return if check_hash(@config_file, target)
       if File.exist? target then
-        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
+        if ! previous_copy target
+          backup_file(target)
         else
           add_file target
         end
@@ -33,19 +33,19 @@ module Spior
       end
     end
 
+    def self.previous_copy(target)
+      backup=`ls #{target}.backup-* | head -n 1`.chomp
+      return false if !File.exist?(backup)
+      check_hash(backup, target)
+    end
+
     def self.check_hash(src, target)
-      return unless File.exist? target
       sha256conf = Digest::SHA256.file src
       sha256target = Digest::SHA256.file target
-      if sha256conf === sha256target then
-        Msg.p "File #{src} alrealy exist, skip"
-        return true
-      end
-      return false
+      sha256conf === sha256target
     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}")
@@ -59,7 +59,14 @@ module Spior
 
     def self.backup_exist(target)
       backup=`ls #{target}.backup-* | head -n 1`.chomp
-      check_hash(target, backup)
+      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
     end
   end
 end

data/lib/spior/install.rb

@@ -7,6 +7,14 @@ module Spior
 
     def self.dependencies
       base_packages
+      mac_update
+    end
+
+    def self.check_base
+      base_packages
+    end
+
+    def self.check_mac
       pkg_mac
     end
 
@@ -28,6 +36,13 @@ module Spior
     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] "
@@ -43,13 +58,24 @@ module Spior
     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/")
+        end
+      end
       Msg.p "pkg #{name} installed"
+      Dir.chdir(old_path)
     rescue => e
       Msg.err e
     end

data/lib/spior/iptables.rb

@@ -1,6 +1,5 @@
 require 'interfacez'
 require_relative 'tor'
-require_relative 'copy'
 require_relative 'msg'
 
 module Spior
@@ -35,7 +34,6 @@ module Spior
     private
 
     def self.initialize(interface)
-      check_dep
       @lo = Interfacez.loopback
       @lo_addr = Interfacez.ipv4_address_of(@lo)
       @tor = Spior::Tor.new

data/lib/spior/runner.rb

@@ -21,6 +21,7 @@ module Spior
       end
       if @options.mac then
         Msg.head
+        Spior::Install::check_mac
         if not @network
           @network = Spior::Network.new(@options.interface)
         end
@@ -28,6 +29,8 @@ module Spior
       end
       if @options.tor then
         Msg.head
+        Spior::Install::check_base
+        Spior::Copy::config_files
         if not @network
           @network = Spior::Network.new(@options.interface)
         end

data/spior.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
     "wiki_uri" => "https://github.com/szorfein/spior"
   }
 
-  s.version = "0.0.7"
+  s.version = "0.0.8"
   s.requirements << 'tor'
   s.requirements << 'sudo'
   s.requirements << 'iptables'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spior
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - szorfein
@@ -35,7 +35,7 @@ cert_chain:
   J/zT/q2Ac7BWpSLbv6p9lChBiEnD9j24x463LR5QQjDNS5SsjzRQfFuprsa9Nqf2
   Tw==
   -----END CERTIFICATE-----
-date: 2020-05-05 00:00:00.000000000 Z
+date: 2020-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow