amnesie 0.0.2 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b826ad698129628f09059fb95e85e661982d473377e1d8721155da1f4aaa0f6c
-  data.tar.gz: 13c076ddfb5ffa659d320724238382cfecd6c3dca6cd96c1a04afa49fbec6248
+  metadata.gz: 32a693e395e10dae6902936ee92ccee0f5c88f26dd2c3f35b4af0aaf84d6336d
+  data.tar.gz: f9f3cc186a25d643add3f3856bbbe41d18bc876cfbad76f0451d6715a9d99359
 SHA512:
-  metadata.gz: ebd14700e11fa9b919df3c22f1f13a520b7c1d71f916b8d597a9e3a4ca8923b604795326674d43d83a6a2e96ff6181ab96c2b1410f67e9f823b628b27806cbd4
-  data.tar.gz: dec9e3c4c51e4444d1d448bb88357f55f6499672868813be1d3c70be1021ffcf6416ce95794887e737c346a9e062bcbbac9bc49f35744dcaa0ff80c056c811c6
+  metadata.gz: 87c5a5990c9a64110f2db7ae5346b76be2f1190e85984cc52bb6c28b8cf62051113e8a327ef9d701c221dafc448cdbf0d89c7b77a71ce249117c9bbe4caacb0e
+  data.tar.gz: 6c095d7d1be44fff68d0527cff8509db7d8a171d74ae5e1fcba75d5610396f4b16215e3c71251cc7b0517a36ea572594fae46170249b4f2527e6008e28d07a19

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+## 0.0.7, release 2020-05-29
+* Shortcut action for service (e/d) 
+* Correct permission on amnesie-mac@.service
+* Enhance lib/amnesie/helper
+
+## 0.0.6, release 2020-05-20
+* Init a doc with RDoc.
+* Add -i|--init to start init process properly.
+* Add dhcpcd to the mac@.service, dhclient doesn't seem necessary.
+* Correct the mac@.service.
+
+## 0.0.5, release 2020-05-19
+* Create a amnesie-mac@.service (work only if the gem is install system-wide)
+* Add -p|--persist
+* Replace Makefile by a Rakefile
+
+## 0.0.4, release 2020-05-16
+* Debian10 need to reload ifup@card-name too
+* Correct path where search dhclient (/bin,/sbin)
+* Enhance stuff for kill and reload dhclient (tested on debian 10)
+
+## 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/README.md

@@ -10,7 +10,7 @@ Inspiration come from a post found on [Qubes-OS](https://www.qubes-os.org/doc/an
 ## Install
 Amnesie is cryptographically signed, so add my public key (if you haven’t already) as a trusted certificate.
 
-    $ gem cert --add <(curl -Ls https://raw.githubusercontent.com/szorfein/spior/master/certs/szorfein.pem)
+    $ gem cert --add <(curl -Ls https://raw.githubusercontent.com/szorfein/amnesie/master/certs/szorfein.pem)
 
 And install the gem
 
@@ -28,10 +28,14 @@ To change the MAC address for eth0:
 
     $ amnesie -n eth0 -m
 
+Create or Disable all systemd services for a network card:
+
+    $ amnesie -p -n wlp2s0
+
 ## Left Over
 
 ### Issues
-For any questions, comments, feedback or issues, submit a [new issue](https://github.com/szorfein/spior/issues/new).
+For any questions, comments, feedback or issues, submit a [new issue](https://github.com/szorfein/amnesie/issues/new).
 
 ### links
 + https://rubyreferences.github.io/rubyref

data/Rakefile

@@ -2,9 +2,18 @@
 require "rake/testtask"
 
 Rake::TestTask.new(:test) do |t|
-    t.libs << "test"
-    t.libs << "lib"
-    t.test_files = FileList["test/test_*.rb"]
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList["test/test_*.rb"]
+end
+
+namespace :gem do
+  desc "build the gem"
+  task :build do
+    Dir["amnesie*.gem"].each {|f| File.unlink(f) }
+    system("gem build amnesie.gemspec")
+    system("gem install amnesie-0.0.7.gem -P MediumSecurity")
+  end
 end
 
 task :default => :test

data/amnesie.gemspec

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

data/lib/amnesie/helpers.rb

@@ -1,8 +1,10 @@
+require 'fileutils'
+require 'tempfile'
+
 module Helpers
   class Exec
     def initialize(name)
-      @search_uid=`id -u`.chomp
-      @search_uid ||= 1000 unless $?.success?
+      @search_uid= Process::Sys.getuid
       @name = name
     end
 
@@ -16,4 +18,54 @@ module Helpers
       end
     end
   end
+
+  class NewFile
+    def initialize(string, name, dest = "/tmp")
+      @string = string
+      @name = name
+      @dest = dest + "/" + @name
+    end
+    
+    def add
+      @mv = Helpers::Exec.new("mv")
+      tmp = Tempfile.new(@name)
+      File.open(tmp.path, 'w') do |file|
+        file.puts @string
+      end
+      @mv.run("#{tmp.path} #{@dest}")
+    end
+
+    def perm(user, perm)
+      chown = Helpers::Exec.new("chown")
+      chmod = Helpers::Exec.new("chmod")
+      chown.run("#{user}:#{user} #{@dest}")
+      chmod.run("#{perm} #{@dest}")
+    end
+  end
+
+  class NewSystemd < NewFile
+    def initialize(string, name)
+      super
+      @systemd_dir = search_systemd_dir
+      @dest = @systemd_dir + "/" + @name
+    end
+
+    def add
+      @systemctl = Helpers::Exec.new("systemctl")
+      super
+      @systemctl.run("daemon-reload")
+    end
+
+    private
+    def search_systemd_dir
+      if Dir.exist? "/lib/systemd/system"
+        "/lib/systemd/system"
+      elsif Dir.exist? "/usr/lib/systemd/system"
+        "/usr/lib/systemd/system"
+      else
+        raise "No directory systemd found"
+        exit
+      end
+    end
+  end
 end

data/lib/amnesie/options.rb

@@ -2,7 +2,7 @@ require 'optparse'
 
 module Amnesie
   class Options
-    attr_reader :mac, :netcard
+    attr_reader :init, :mac, :netcard, :persist
 
     def initialize(argv)
       parse(argv)
@@ -11,6 +11,10 @@ module Amnesie
     def parse(argv)
       OptionParser.new do |opts|
 
+        opts.on("-i", "--init", "Used with init process (systemd, etc...)") do
+          @init = true
+        end
+
         opts.on("-m", "--mac", "What is my MAC address?") do
           @mac = true
         end
@@ -19,6 +23,10 @@ module Amnesie
           @netcard = net
         end
 
+        opts.on("-p", "--persist", "Enable systemd service") do |net|
+          @persist = true
+        end
+
         opts.on("-h", "--help", "Show this message") do
           puts opts
           exit

data/lib/amnesie/persist.rb

@@ -0,0 +1,94 @@
+require 'fileutils'
+require 'tempfile'
+require 'tty-which'
+require_relative 'helpers'
+
+module Amnesie
+  class Persist
+
+    def initialize(card)
+      @card = card
+      @systemd_dir = search_systemd_dir
+      @systemctl = Helpers::Exec.new("systemctl")
+    end
+
+    def mac_exist?
+      File.exist? "#{@systemd_dir}/amnesie-mac@.service"
+    end
+
+    def to_s
+      @systemd_dir
+    end
+
+    def mac_service
+      dhcp=''
+      if TTY::Which.exist?('dhcpcd')
+        dhcp='dhcpcd.service'
+      end
+      @string=<<EOF
+[Unit]
+Description=Spoof MAC Address on %I
+Wants=network-pre.target
+Before=network-pre.target #{dhcp}
+BindsTo=sys-subsystem-net-devices-%i.device
+After=sys-subsystem-net-devices-%i.device
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/env bash -lc "amnesie -i -m -n %I"
+TimeoutSec=30
+
+[Install]
+WantedBy=multi-user.target
+EOF
+    end
+
+    def services
+      mac_service
+      new_service = Helpers::NewSystemd.new(@string, "amnesie-mac@.service")
+      new_service.add
+      new_service.perm("root", "644")
+    end
+
+    def update_mac
+      print "Found a old amnesie-mac@.service, update? (y|n) "
+      answer = gets.chomp
+      case answer
+      when /^y|^Y/
+        services
+      end
+    end
+
+    def menu_mac
+      print "Action on amnesie-mac@.service for #{@card} (enable/disable) ? (e/d) "
+      answer = gets.chomp
+      case answer
+      when /^e|^E/
+        mac_enable
+      when /^d|^D/
+        mac_disable
+      end
+    end
+
+    private
+
+    def mac_enable
+      @systemctl.run("enable amnesie-mac@#{@card}.service")
+    end
+
+    def mac_disable
+      @systemctl.run("disable amnesie-mac@#{@card}.service")
+    end
+
+    def search_systemd_dir
+      if Dir.exist? "/lib/systemd/system"
+        "/lib/systemd/system"
+      elsif Dir.exist? "/usr/lib/systemd/system"
+        "/usr/lib/systemd/system"
+      else
+        raise "No directory systemd found"
+        exit
+      end
+    end
+  end
+end

data/lib/amnesie/process.rb

@@ -3,25 +3,71 @@ 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', paths: ['/sbin'])
+      `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', paths: ['/sbin'])
+      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}")
+      if TTY::Which.exist?('systemctl')
+        `systemctl is-active ifup@#{@card}`
+        @systemctl.run("restart ifup@#{@card}") if $?.success?
+      end
+      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

@@ -2,6 +2,7 @@ require_relative 'options'
 require_relative 'mac'
 require_relative 'process'
 require_relative 'network'
+require_relative 'persist'
 
 module Amnesie
   class Runner
@@ -10,21 +11,37 @@ module Amnesie
       @options = Options.new(argv)
       @network = false
     end
+
     def run
       if @options.mac then
         if not @network
           @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
+        process.kill unless @options.init
         card.save_origin
         card.rand
         card.apply
         puts card.to_s
-        process.restart
+        process.restart unless @options.init
+      end
+      if @options.persist then
+        if not @network
+          @network = Amnesie::Network.new(@options.netcard)
+        end
+        puts @network.card
+        persist = Amnesie::Persist.new(@network.card)
+        if ! persist.mac_exist?
+          puts "Create service..."
+          persist.services
+        elsif persist.mac_exist?
+          persist.update_mac
+        end
+        persist.menu_mac
+        puts persist.to_s
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amnesie
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.7
 platform: ruby
 authors:
 - szorfein
@@ -35,7 +35,7 @@ cert_chain:
   J/zT/q2Ac7BWpSLbv6p9lChBiEnD9j24x463LR5QQjDNS5SsjzRQfFuprsa9Nqf2
   Tw==
   -----END CERTIFICATE-----
-date: 2020-05-15 00:00:00.000000000 Z
+date: 2020-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -136,6 +136,7 @@ files:
 - lib/amnesie/mac.rb
 - lib/amnesie/network.rb
 - lib/amnesie/options.rb
+- lib/amnesie/persist.rb
 - lib/amnesie/process.rb
 - lib/amnesie/runner.rb
 - test/test_mac.rb
@@ -161,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.3
 signing_key: 
 specification_version: 4
 summary: A tool to make your computer amnesic