amnesie 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32a693e395e10dae6902936ee92ccee0f5c88f26dd2c3f35b4af0aaf84d6336d
-  data.tar.gz: f9f3cc186a25d643add3f3856bbbe41d18bc876cfbad76f0451d6715a9d99359
+  metadata.gz: 11732d798fc4f5b255df8da77dce5585e801790ce0c0b4b50f6323495b6055b7
+  data.tar.gz: dd548f98938363b93bdcdc77e3e8772dec636832f39668e64aefbbc430c9414e
 SHA512:
-  metadata.gz: 87c5a5990c9a64110f2db7ae5346b76be2f1190e85984cc52bb6c28b8cf62051113e8a327ef9d701c221dafc448cdbf0d89c7b77a71ce249117c9bbe4caacb0e
-  data.tar.gz: 6c095d7d1be44fff68d0527cff8509db7d8a171d74ae5e1fcba75d5610396f4b16215e3c71251cc7b0517a36ea572594fae46170249b4f2527e6008e28d07a19
+  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,8 @@
+## 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

data/Rakefile

@@ -1,5 +1,6 @@
 # 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"
@@ -7,12 +8,13 @@ Rake::TestTask.new(:test) do |t|
   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-0.0.7.gem -P MediumSecurity")
+    system("gem install amnesie-#{Amnesie::VERSION}.gem -P MediumSecurity")
   end
 end
 

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.7"
+  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/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,12 +2,14 @@ require 'optparse'
 
 module Amnesie
   class Options
-    attr_reader :init, :mac, :netcard, :persist
+    attr_reader :init, :mac, :net_dev, :persist
 
     def initialize(argv)
       parse(argv)
     end
 
+    private
+
     def parse(argv)
       OptionParser.new do |opts|
 
@@ -15,12 +17,12 @@ module Amnesie
           @init = true
         end
 
-        opts.on("-m", "--mac", "What is my MAC address?") do
+        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|

data/lib/amnesie/persist.rb

@@ -1,11 +1,9 @@
 require 'fileutils'
 require 'tempfile'
 require 'tty-which'
-require_relative 'helpers'
 
 module Amnesie
   class Persist
-
     def initialize(card)
       @card = card
       @systemd_dir = search_systemd_dir

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', paths: ['/sbin'])
-      `pgrep -x dhclient`
-      @pkill.run("dhclient") if $?.success?
+      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"
@@ -70,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.7
+  version: 0.0.8
 platform: ruby
 authors:
 - szorfein
@@ -35,7 +35,7 @@ cert_chain:
   J/zT/q2Ac7BWpSLbv6p9lChBiEnD9j24x463LR5QQjDNS5SsjzRQfFuprsa9Nqf2
   Tw==
   -----END CERTIFICATE-----
-date: 2020-05-29 00:00:00.000000000 Z
+date: 2020-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -132,13 +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:

data/lib/amnesie/runner.rb

@@ -1,48 +0,0 @@
-require_relative 'options'
-require_relative 'mac'
-require_relative 'process'
-require_relative 'network'
-require_relative 'persist'
-
-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 unless @options.init
-        card.save_origin
-        card.rand
-        card.apply
-        puts card.to_s
-        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
-end