amnesie 0.0.3 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7406851da95a1f380d2ad273a5386ecaf28fd6695347b5891d5dcba27bef4f81
-  data.tar.gz: e8ebf031381c63faa622524cca82164ea738efadcabdb88adea7b9aef0e702ec
+  metadata.gz: 11732d798fc4f5b255df8da77dce5585e801790ce0c0b4b50f6323495b6055b7
+  data.tar.gz: dd548f98938363b93bdcdc77e3e8772dec636832f39668e64aefbbc430c9414e
 SHA512:
-  metadata.gz: fb59d06668aca29674020a415570dfee42df193facddc1b8dde571ffcf2ea24731dd359ea5e2624b6441956d159b3be0bc81363e73ef814fb6faa0e852f698dc
-  data.tar.gz: 914d52375535c0bdb3e0e5861e646d13d1b18e891d7c3e5e17018b94aa4fc5f9a07852efde1b940db7433b8c2be06118930fd4f43a12e35d76a30ecc3ba2123f
+  metadata.gz: 109de0795c5ae684624a8f2fd86759fe23fdaa1d360e6616e5d565fe7b59fef76d103a06aaca45803acf2a1d3ff763cf9638c8dc9654dba90b5e05c5c08a8277
+  data.tar.gz: f7d40849705a4cd1095b5310d69d6cae33152edd502c1270d9d64ba0342a766c362fef499c40688e53913b0cafb5380c243a69452e4c05efd541e16655ffaacd

data/.gitignore

@@ -1,5 +1,6 @@
 *.gem
 *.rbc
+*.swp
 /.config
 /coverage/
 /InstalledFiles

data/CHANGELOG.md

@@ -1,3 +1,29 @@
+## 0.0.8, release 2020-09-22
+* Enhance code
+* Update the class MAC, more ruby like
+* Use securerandom (>= ruby2.5)
+
+## 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)
 

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

@@ -1,10 +1,21 @@
 # https://github.com/seattlerb/minitest#running-your-tests-
 require "rake/testtask"
+require File.dirname(__FILE__) + "/lib/amnesie/version"
 
 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
+
+# rake gem:build
+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-#{Amnesie::VERSION}.gem -P MediumSecurity")
+  end
 end
 
 task :default => :test

data/amnesie.gemspec

@@ -1,6 +1,8 @@
+require File.dirname(__FILE__) + "/lib/amnesie/version"
+
 Gem::Specification.new do |s|
   s.name = "amnesie"
-  s.version = "0.0.3"
+  s.version = Amnesie::VERSION
   s.summary = "A tool to make your computer amnesic"
   s.description = <<-EOF 
     A tool to make your computer amnesic"

data/bin/amnesie

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'amnesie/runner'
+require 'amnesie'
 
-runner = Amnesie::Runner.new(ARGV)
-runner.run
+Amnesie::Main.new(ARGV)

data/lib/amnesie.rb

@@ -0,0 +1,66 @@
+require_relative 'amnesie/options'
+require_relative 'amnesie/persist'
+require_relative 'amnesie/process'
+require_relative 'amnesie/network'
+require_relative 'amnesie/mac'
+require_relative 'amnesie/helpers'
+
+module Amnesie
+  def self.random_mac(network)
+    mac = Amnesie::MAC.new(network)
+    mac.set_addr
+    puts "New MAC for " + mac.to_s
+  end
+
+  def self.services(network)
+    persist = Amnesie::Persist.new(network)
+    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
+
+  def self.random_mac_and_kill(network)
+    process = Amnesie::Process.new(network)
+    mac = Amnesie::MAC.new(network)
+
+    process.kill
+    mac.down
+    mac.set_addr
+    puts "New MAC for " + mac.to_s
+    mac.up
+    process.restart
+
+  end
+
+  class Main
+    def initialize(argv)
+      @argv = argv
+      run
+    end
+
+    private
+
+    def run
+      options = Options.new(@argv)
+      network = options.net_dev ? Network.new(options.net_dev) : Network.new()
+
+      if options.init
+        Amnesie.random_mac(network.card)
+        exit
+      end
+
+      if options.persist
+        Amnesie.services(network.card)
+      end
+
+      if options.mac
+        Amnesie.random_mac_and_kill(network.card)
+      end
+    end
+  end
+end

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/mac.rb

@@ -1,47 +1,50 @@
-require_relative 'helpers'
+require 'securerandom'
 
 module Amnesie
   class MAC
     def initialize(card)
       @card = card
       @ip = Helpers::Exec.new("ip")
+      save_origin
+      new_mac
     end
 
-    # TODO yep...
-    def rand
-      first=`printf ""; dd bs=1 count=1 if=/dev/urandom 2>/dev/null | hexdump -v -e '/1 "%02X"'`
-      last=`printf ""; dd bs=1 count=5 if=/dev/urandom 2>/dev/null | hexdump -v -e '/1 ":%02X"'`
-      mac="#{first}#{last}"
-      lastfive=`echo #{mac} | cut -d: -f 2-6`.chomp
-      firstbyte=`echo #{mac} | cut -d: -f 1`.chomp
-      firstbyte=`printf '%02X' $(( 0x#{firstbyte} & 254 | 2))`
-      @mac="#{firstbyte}:#{lastfive}"
+    def set_addr
+      @ip.run("link set dev #{@card} address #{@mac}")
+    end
+
+    def down
+      @ip.run("link set dev #{@card} down")
+    end
+
+    def up
+      @ip.run("link set dev #{@card} up")
     end
 
     def to_s
-      rand
       @card + " " + @mac
     end
 
-    def search_curr_mac
-      @curr = `ip addr show dev #{@card} | grep -i ether | awk '{print $2}'`
+    private
+
+    def new_mac
+      first = SecureRandom.hex(1)
+      last = SecureRandom.hex(5)
+      lastfive = last.split(//).each_slice(2).to_a.map(&:join).join(':')
+      firstbyte = `printf '%02X' $(( 0x#{first} & 254 | 2))`
+      @mac = "#{firstbyte}:#{lastfive}".downcase
     end
 
+    def search_curr_mac
+      @curr = `ip addr show dev #{@card} | grep -i ether | awk '{print $2}'`.chomp
+    end
+    
     def save_origin
+      return if File.exist? "/tmp/mac_#{@card}"
       search_curr_mac
-      txt="/tmp/mac_#{@card}"
-      if not File.exist?(txt)
-        file = File.open(txt, 'a+')
-        file.puts(@curr)
-        file.close
-        puts "Origin saved"
-      end
-    end
-
-    def apply
-      @ip.run("link set dev #{@card} down")
-      @ip.run("link set dev #{@card} address #{@mac}")
-      @ip.run("link set dev #{@card} up")
+      filename="/tmp/mac_#{@card}"
+      File.write(filename, @curr)
+      puts "Origin saved"
     end
   end
 end

data/lib/amnesie/options.rb

@@ -2,21 +2,31 @@ require 'optparse'
 
 module Amnesie
   class Options
-    attr_reader :mac, :netcard
+    attr_reader :init, :mac, :net_dev, :persist
 
     def initialize(argv)
       parse(argv)
     end
 
+    private
+
     def parse(argv)
       OptionParser.new do |opts|
 
-        opts.on("-m", "--mac", "What is my MAC address?") do
+        opts.on("-i", "--init", "Used with init process (systemd, etc...)") do
+          @init = true
+        end
+
+        opts.on("-m", "--mac", "Forge a random MAC address.") do
           @mac = true
         end
 
         opts.on("-n", "--net-card NAME", "The name of the card to use") do |net|
-          @netcard = net
+          @net_dev = net
+        end
+
+        opts.on("-p", "--persist", "Enable systemd service") do |net|
+          @persist = true
         end
 
         opts.on("-h", "--help", "Show this message") do

data/lib/amnesie/persist.rb

@@ -0,0 +1,92 @@
+require 'fileutils'
+require 'tempfile'
+require 'tty-which'
+
+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

@@ -1,11 +1,10 @@
 require 'tty-which'
-require_relative 'helpers'
 
 module Amnesie
   class Process
     def initialize(card)
       @systemctl = Helpers::Exec.new("systemctl")
-      @pkill = Helpers::Exec.new("pkill")
+      @kill = Helpers::Exec.new("kill")
       @rm = Helpers::Exec.new("rm")
       @card = card
     end
@@ -25,15 +24,16 @@ module Amnesie
 
     def kill_dhcpcd
       return if not TTY::Which.exist?('dhcpcd')
-      `pgrep -x dhcpcd`
-      @pkill.run("dhcpcd") if $?.success?
+      pids=`pgrep -i dhcpcd`.chomp
+      kill_pids(pids) if $?.success?
       puts "Killed dhcpcd"
     end
 
     def kill_dhclient
-      return if not TTY::Which.exist?('dhclient')
-      `pgrep -x dhclient`
-      @pkill.run("dhclient") if $?.success?
+      return if not TTY::Which.exist?('dhclient', paths: ['/sbin'])
+      pids=`pgrep -i dhclient`.chomp
+      kill_pids(pids) 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"
@@ -51,10 +51,14 @@ module Amnesie
     end
 
     def restart_dhclient
-      return if not TTY::Which.exist?('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
 
@@ -66,5 +70,12 @@ module Amnesie
         puts "Restarted tor"
       end
     end
+
+    def kill_pids(pids)
+      pids.lines.each { |p|
+        ps = p.gsub(/\n/, '')
+        @kill.run("-9 #{ps}")
+      }
+    end
   end
 end

data/lib/amnesie/version.rb

@@ -0,0 +1,3 @@
+module Amnesie
+  VERSION = '0.0.8'.freeze
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amnesie
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.8
 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-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -132,12 +132,14 @@ files:
 - Rakefile
 - amnesie.gemspec
 - bin/amnesie
+- lib/amnesie.rb
 - lib/amnesie/helpers.rb
 - lib/amnesie/mac.rb
 - lib/amnesie/network.rb
 - lib/amnesie/options.rb
+- lib/amnesie/persist.rb
 - lib/amnesie/process.rb
-- lib/amnesie/runner.rb
+- lib/amnesie/version.rb
 - test/test_mac.rb
 homepage: https://github.com/szorfein/amnesie
 licenses:
@@ -161,7 +163,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

data/lib/amnesie/runner.rb

@@ -1,31 +0,0 @@
-require_relative 'options'
-require_relative 'mac'
-require_relative 'process'
-require_relative 'network'
-
-module Amnesie
-  class Runner
-    
-    def initialize(argv)
-      @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(@network.card)
-        card = Amnesie::MAC.new(@network.card)
-
-        process.kill
-        card.save_origin
-        card.rand
-        card.apply
-        puts card.to_s
-        process.restart
-      end
-    end
-  end
-end