amnesie 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b826ad698129628f09059fb95e85e661982d473377e1d8721155da1f4aaa0f6c
-  data.tar.gz: 13c076ddfb5ffa659d320724238382cfecd6c3dca6cd96c1a04afa49fbec6248
+  metadata.gz: 7406851da95a1f380d2ad273a5386ecaf28fd6695347b5891d5dcba27bef4f81
+  data.tar.gz: e8ebf031381c63faa622524cca82164ea738efadcabdb88adea7b9aef0e702ec
 SHA512:
-  metadata.gz: ebd14700e11fa9b919df3c22f1f13a520b7c1d71f916b8d597a9e3a4ca8923b604795326674d43d83a6a2e96ff6181ab96c2b1410f67e9f823b628b27806cbd4
-  data.tar.gz: dec9e3c4c51e4444d1d448bb88357f55f6499672868813be1d3c70be1021ffcf6416ce95794887e737c346a9e062bcbbac9bc49f35744dcaa0ff80c056c811c6
+  metadata.gz: fb59d06668aca29674020a415570dfee42df193facddc1b8dde571ffcf2ea24731dd359ea5e2624b6441956d159b3be0bc81363e73ef814fb6faa0e852f698dc
+  data.tar.gz: 914d52375535c0bdb3e0e5861e646d13d1b18e891d7c3e5e17018b94aa4fc5f9a07852efde1b940db7433b8c2be06118930fd4f43a12e35d76a30ecc3ba2123f

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.0.3, release 2020-05-15
+* Add stuff for kill and reload dhclient (tested on debian 10)
+
 ## 0.0.2, release 2020-05-15
 * Rakefile, add rake as dev dependencie
 * Check if process/program exist before kill/restart

data/amnesie.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "amnesie"
-  s.version = "0.0.2"
+  s.version = "0.0.3"
   s.summary = "A tool to make your computer amnesic"
   s.description = <<-EOF 
     A tool to make your computer amnesic"

data/lib/amnesie/process.rb

@@ -3,25 +3,67 @@ require_relative 'helpers'
 
 module Amnesie
   class Process
-    def initialize
-      @procs = [ "dhcpcd", "tor" ]
+    def initialize(card)
       @systemctl = Helpers::Exec.new("systemctl")
       @pkill = Helpers::Exec.new("pkill")
+      @rm = Helpers::Exec.new("rm")
+      @card = card
     end
 
     def kill
+      kill_dhcpcd
+      kill_dhclient
+    end
+
+    def restart
+      restart_dhcpcd
+      restart_dhclient
+      restart_tor
+    end
+
+    private
+
+    def kill_dhcpcd
       return if not TTY::Which.exist?('dhcpcd')
-      @pkill.run("dhcpcd")
+      `pgrep -x dhcpcd`
+      @pkill.run("dhcpcd") if $?.success?
       puts "Killed dhcpcd"
     end
 
-    def restart
-      return if not TTY::Which.exist?('systemctl')
-      @procs.each do |p|
-        if TTY::Which.exist?(p)
-          @systemctl.run("restart #{p}")
-          puts "Restarted #{p}"
-        end
+    def kill_dhclient
+      return if not TTY::Which.exist?('dhclient')
+      `pgrep -x dhclient`
+      @pkill.run("dhclient") if $?.success?
+      @rm.run("/run/dhclient.#{@card}.pid") if File.exist? "/run/dhclient.#{@card}.pid"
+      @rm.run("/var/lib/dhcp/dhclient.#{@card}.leases") if File.exist? "/var/lib/dhcp/dhclient.#{@card}.leases"
+      puts "Killed dhclient"
+    end
+
+    def restart_dhcpcd
+      return if not TTY::Which.exist?('dhcpcd')
+      if TTY::Which.exist?('systemctl') 
+        @systemctl.run("restart dhcpcd")
+      else
+        dhcpcd = Helpers::Exec.new("dhcpcd")
+        dhcpcd.run("-q")
+      end
+      puts "Restarted dhcpcd"
+    end
+
+    def restart_dhclient
+      return if not TTY::Which.exist?('dhclient')
+      dhclient = Helpers::Exec.new("dhclient")
+      # command tested on debian, not try on another system yet...
+      dhclient.run("-4 -v -i -pf /run/dhclient.#{@card}.pid -lf /var/lib/dhcp/dhclient.#{@card}.leases -I -df /var/lib/dhcp/dhclient6.#{@card}.leases #{@card}")
+      puts "Restarted dhclient"
+    end
+
+    def restart_tor
+      return if not TTY::Which.exist?('tor')
+      if TTY::Which.exist?('systemctl') 
+        `systemctl is-active tor`
+        @systemctl.run("restart tor") if $?.success?
+        puts "Restarted tor"
       end
     end
   end

data/lib/amnesie/runner.rb

@@ -16,7 +16,7 @@ module Amnesie
           @network = Amnesie::Network.new(@options.netcard)
         end
         puts @network.card
-        process = Amnesie::Process.new
+        process = Amnesie::Process.new(@network.card)
         card = Amnesie::MAC.new(@network.card)
 
         process.kill

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amnesie
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - szorfein