amnesie 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81455c8939114e8211b6c21844ad35e88d0422c29be33d36cafff2ea5210bfa6
-  data.tar.gz: 6dcc45de41fbfbf84b3e6f4a0af45fe139af8296ce5a444ecc3e4d5997baf243
+  metadata.gz: 233d7f8f3157dd7508337cdcf3400768b4d68e16abd1f186a30cc9cec94fe5d7
+  data.tar.gz: fa77a1ad923ced06d8a0eac3d5039690a87f73dfb5b8450702696f84380553ae
 SHA512:
-  metadata.gz: bc53a51bed717b6e931d35d0a1e19ba45c8b6ee250a811ed08e5956e6f64c419167112e1329f32019b0fa0204e0b98fc8ebb9d16f368923b959d45504769591c
-  data.tar.gz: 4a78f282cc125ce8dd2e7248ebfa9b3126dcff206a257a04157f7d01582728944fcdf0da62638dc16e079e700055b657bad0c043eef3d175e887d610552db288
+  metadata.gz: 21b9bda9e1aaaa409195ec6f271ae6547a5c2aab821858ab4be015b82480481ddc0934d76309c3e10d9dac3ac291e94b864e284881084b20dc661b67f71611b1
+  data.tar.gz: d534d1bb2a6550a88a591c92c2e602107fc0a5bd1dd3b7593ac5c919bd0cdd9b64da3ea3f4de935a6ca47310748f2c1f073261f3135c4b59d1ecca1e39bf3ba5

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 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)

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.5.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.4"
+  s.version = "0.0.5"
   s.summary = "A tool to make your computer amnesic"
   s.description = <<-EOF 
     A tool to make your computer amnesic"

data/lib/amnesie/options.rb

@@ -2,7 +2,7 @@ require 'optparse'
 
 module Amnesie
   class Options
-    attr_reader :mac, :netcard
+    attr_reader :mac, :netcard, :persist
 
     def initialize(argv)
       parse(argv)
@@ -19,6 +19,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,103 @@
+require 'fileutils'
+require 'tempfile'
+require_relative 'helpers'
+
+module Amnesie
+  class Persist
+
+    def initialize(card)
+      @card = card
+      @systemd_dir = search_systemd_dir
+      @mv = Helpers::Exec.new("mv")
+      @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
+      amnesie_path=Dir.pwd + "/" + $0
+      @string=<<EOF
+[Unit]
+Description=MAC Change %I
+Wants=network-pre.target
+Before=network-pre.target
+BindsTo=sys-subsystem-net-devices-%i.device
+After=sys-subsystem-net-devices-%i.device
+
+[Service]
+Type=oneshot
+ExecStart=#{amnesie_path} -m -n %I
+
+[Install]
+WantedBy=multi-user.target
+EOF
+    end
+
+    def services
+      tmp = Tempfile.new("amnesie-mac@.service")
+      mac_service
+      File.open(tmp.path, 'w') do |file|
+        file.puts @string
+      end
+      dest=@systemd_dir + "/amnesie-mac@.service"
+      @mv.run("#{tmp.path} #{dest}")
+      @systemctl.run("daemon-reload")
+    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 "amnesie-mac@.service for #{@card}? (enable,disable,start,stop) "
+      answer = gets.chomp
+      case answer
+      when /^enable/
+        mac_enable
+      when /^disable/
+        mac_disable
+      when /^stop/
+        mac_stop
+      when /^start/
+        mac_start
+      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 mac_stop
+      @systemctl.run("stop amnesie-mac@#{@card}.service")
+    end
+    def mac_start
+      @systemctl.run("start 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

@@ -31,7 +31,7 @@ module Amnesie
     end
 
     def kill_dhclient
-      return if not TTY::Which.exist?('dhclient', paths: ['/bin, /sbin'])
+      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"
@@ -51,7 +51,7 @@ module Amnesie
     end
 
     def restart_dhclient
-      return if not TTY::Which.exist?('dhclient', paths: ['/bin, /sbin'])
+      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}")

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,6 +11,7 @@ module Amnesie
       @options = Options.new(argv)
       @network = false
     end
+
     def run
       if @options.mac then
         if not @network
@@ -26,6 +28,21 @@ module Amnesie
         puts card.to_s
         process.restart
       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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amnesie
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 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-19 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