freydis 0.1.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aca3e518674824172a35fc8e79f45d1ccb5d435376aa46ca53e1886096640c5d
-  data.tar.gz: ca393f18dabf26e8e8204014f1d04b1db74e467653c8c056ab7618410bfeb60d
+  metadata.gz: 8609f817dc7fdbd37760c0f0a2afe0652a2eba1841a062c595d00c16806def93
+  data.tar.gz: 97393b88c28dfc4ac136dbdb73c8cb624142cc9928b318bff3abff20d6df7354
 SHA512:
-  metadata.gz: d939115ae6697645af7f6e3adf044d25e6303a09c1791fa2d082924613f38791c072eb31252e3c85e42577984494669d29acd5714cde2084f28fe56f9a968ca5
-  data.tar.gz: d9c305c92139b2c47eb9f6ac3aa31b99de511df6d40fabac5dde40e8cc425331b302d1bca3d7fbf50d30fbec5878f8a1e31b4cfe2e5b6f8873c20a7dfbf279a5
+  metadata.gz: 3b9c9fc5a32b2cc4e4af1227705e93c3c4030bbacfce9d756d6d8f968a86fa72f498c28c57bfdae71ec2ece5ffb39c383b76afb1921a5874963bbf6aadbba12d
+  data.tar.gz: f20fd09c1cb93e12e5d493e160a3f4515e032aaeebb1393fec44c04fc9b70740e0c8c7a76f73572a00e86e67e99f1013c9fbc680208df42bddf4853a1737bbf8

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 0.8.0, release 2024/09/17
+* Drop support for gpg, use [sgpg](https://github.com/szorfein/sgpg) instead.
+* New workflow (github gem)
+* New option `--restore-at PATH` to change the default `/`.
+* Option `--disk PATH` now require the full path (e.g: `/dev/sdx`), you can add yourself by-id, by-uuid, etc...
+* User can customize what paths to include `--paths-add PATHS` or exclude `--paths-del PATHS`.
+* Encrypted disk is no more default, use `--disk-encrypt` if need.
+
+## 0.2.0, release 2023/10/23
+* Define constant OPTIONS and ACTIONS
+* Correct rsync options
+* Can save gpg recipient in freydis.yaml
+* Enhance output of freydis -L
+* Move engine in Freydis::Main
+
 ## 0.1.1, release 2022/10/8
 * Restore archive with sudo if permission are insufficient.
 

data/README.md

@@ -9,10 +9,10 @@
 
 </div>
 
-Backup and restore data on encrypted device.
+Backup and restore data (on encrypted) device.
 
 ## Requirements
-Freydis use `rsync` and `cryptsetup` and optionnal `bsdtar`, `shred`, `gnupg`.
+Freydis use `rsync` and `cryptsetup`.
 
 ## Install freydis locally
 
@@ -25,45 +25,38 @@ Freydis use `rsync` and `cryptsetup` and optionnal `bsdtar`, `shred`, `gnupg`.
 ## Examples
 
 #### 0x01 - Initialisation
-First, you need a config file and a disk encrypted.
+First, you need to configure freydis and optionnaly encrypt a device disk.
 
-    $ freydis --disk sdc --encrypt --save
+    $ freydis --disk /dev/sdc --encrypt --save
 
 The config file will be created at `~/.config/freydis/freydis.yaml`.
 
 ```yaml
 ---
-:disk: /dev/disk/by-id/usb-SABRENT_SABRENT_DB9876543214E-0:0
-:paths: []
+:disk: '/dev/sdc'
+:disk_is_encrypt: true
+:gpg_recipient: ''
+:backup_paths: []
+:exclude_paths: []
+:restore_at: '/'
 ```
 
-+ disk: save the full path `by-id` for `sdc` here.
-+ paths -> An Array which contain a list of absolute paths for backup.
-
 #### 0x02 - First backup
 Freydis will use `rsync`, all paths must be separated by a comma:
 
-    $ freydis --backup --paths-add "/home,/etc" --save
+    $ freydis --paths-add /home,/etc --save
 
-#### 0x03 - Restore
-With `--disk` and `--paths-add` saved in the config file, you only need to write:
-
-    $ freydis --restore
+You can also exclude some paths with `--paths-del`
 
-Freydis will restore all files in `/`.
+    $ freydis --paths-del ~/.cache,~/.npm --save
 
-#### 0x04 - Secrets
-Freydis can store secrets ([GPG Key](https://www.gnupg.org/) and [pass](https://www.passwordstore.org/) directory for now) and restore them if need:
+And backup
 
-    $ freydis --gpg-recipient szorfein@protonmail.com --secrets-backup
-    $ freydis --gpg-recipient szorfein@protonmail.com --secrets-restore
+    $ freydis --backup
 
-The option `--secrets-restore` use `gpg --import` if the key is no found on your system.
-
-### Tips
-If you lost the config file, `freydis` has made a copy on your device when you're done your first `--backup`:
+#### 0x03 - Restore
+With `--disk` and `--paths-add` saved in the config file, you only need to write:
 
-    $ freydis --open --disk sdc
-    $ cp -a /mnt/freydis/home/user/.config/freydis ~/.config/
+    $ freydis --restore
 
-And you can use `freydis` normally.
+Freydis will restore all files in `/` by default, use `--restore-at PATH` to change.

data/bin/freydis

@@ -1,10 +1,92 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'freydis'
+require 'optparse'
 
-freydis = Freydis::Main.new(
-  :argv => ARGV
-)
+# Load options from YAML
+config = Freydis::Config.new
+config.load
 
-freydis.start
-freydis.bye
+options = config.opts
+
+# puts "config file #{options}"
+
+OptionParser.new do |opts|
+  opts.banner = 'Usage: freydis.rb [options]'
+  opts.version = Freydis::VERSION
+
+  opts.on('--disk PATH', String,
+          'Use the disk e.g /dev/sdc.') do |disk|
+    puts "choosed disk #{disk}"
+    options[:disk] = Freydis::Guard.disk(disk)
+  end
+
+  opts.on('--disk-encrypt', 'If need to use cryptsetup to open disk.') do
+    options[:disk_is_encrypt] = true
+  end
+
+  opts.on('-p PATHS', '--paths-add PATHS', Array,
+          'Add absolute PATHS to backup, separate by \',\'.') do |paths|
+    paths.each do |p|
+      Freydis::Guard.path? p
+
+      puts p
+      options[:backup_paths] << p unless options[:backup_paths].include? p
+    end
+  end
+
+  opts.on('-d PATHS', '--paths-del PATHS', Array,
+          'Add absolute PATHS to exclude for the backup, separate by \',\'.') do |paths|
+    paths.each do |p|
+      Freydis::Guard.path? p
+
+      puts p
+      options[:exclude_paths] << p unless options[:exclude_paths].include? p
+    end
+  end
+
+  opts.on('-L', '--list-opts', 'List all options currently used.') do
+    puts options
+  end
+
+  opts.on('--restore-at PATH', 'Restore saved datas on your system, default is /.') do |path|
+    Freydis::Guard.path? path
+
+    options[:restore_at] = path
+  end
+
+  # Engines options
+
+  opts.on('-e', '--encrypt', 'Encrypt and format (ext4) your device.') do
+    Freydis::DiskLuks.encrypt(options)
+  end
+
+  opts.on('-o', '--open', 'Open and mount disk at /mnt/freydis.') do
+    Freydis::DiskLuks.open(options)
+  end
+
+  opts.on('-c', '--close', 'Umount (and close encrypted) disk.') do
+    Freydis::DiskLuks.close(options)
+  end
+
+  opts.on('-b', '--backup', 'Perform a backup.') do
+    Freydis::DiskLuks.open(options)
+    Freydis::Rsync.new(options).backup
+    Freydis::DiskLuks.close(options)
+  end
+
+  opts.on('-r', '--restore', 'Restore saved datas on your system.') do
+    Freydis::DiskLuks.open(options)
+    Freydis::Rsync.new(options).restore
+    Freydis::DiskLuks.close(options)
+  end
+
+  opts.on('-s', '--save', 'Save current arguments in the config file.') do
+    config.save(options)
+  end
+end.parse!
+
+puts
+puts 'Bye !'
+puts

data/freydis.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
     'bug_tracker_uri' => 'https://github.com/szorfein/freydis/issues',
     'changelog_uri' => 'https://github.com/szorfein/freydis/blob/main/CHANGELOG.md',
     'source_code_uri' => 'https://github.com/szorfein/freydis',
-    'funding_uri' => 'https://patreon.com/szorfein',
+    'funding_uri' => 'https://patreon.com/szorfein'
   }
 
   s.files = Dir.glob('{lib,bin}/**/*', File::FNM_DOTMATCH).reject { |f| File.directory?(f) }
@@ -35,11 +35,10 @@ Gem::Specification.new do |s|
   s.executables << 'freydis'
   s.require_paths = ['lib']
 
-  s.cert_chain = ['certs/szorfein.pem']
-  s.signing_key = File.expand_path('~/.ssh/gem-private_key.pem')
+  # s.cert_chain = ['certs/szorfein.pem']
+  # s.signing_key = File.expand_path('~/.ssh/gem-private_key.pem')
 
   s.required_ruby_version = '>= 2.6'
   s.requirements << 'cryptsetup'
   s.requirements << 'rsync'
 end
-

data/lib/freydis/config.rb

@@ -6,39 +6,49 @@ require 'pathname'
 require 'mods/msg'
 
 module Freydis
+  # Loads/Save config variable from a yaml file
   class Config
     include Msg
-
-    attr_accessor :gpg_recipient, :disk, :paths
+    attr_reader :opts
 
     def initialize
-      @cpath = "#{ENV['HOME']}/.config/freydis/freydis.yaml"
-      @disk = nil
-      @gpg_recipient = nil
-      @paths = []
+      @cpath = ENV['XDG_CONFIG_HOME'] ?
+                 "#{ENV['XDG_CONFIG_HOME']}/freydis/freydis.yaml" :
+                 "#{ENV['HOME']}/.config/freydis/freydis.yaml"
+      @opts = {
+        disk: '',
+        disk_is_encrypt: false,
+        backup_paths: [],
+        exclude_paths: [],
+        restore_at: '/'
+      }
+    end
+
+    def save(opts)
+      FileUtils.mkdir_p Pathname.new(@cpath).parent.to_s
+      load_opts(opts)
+      File.write @cpath, YAML.dump(@opts)
+      success "Saving options to #{@cpath}..."
     end
 
     def load
       if File.exist? @cpath
         info 'Loading config...'
-        data_load = YAML.load_file @cpath
-        @disk = data_load[:disk]
-        @gpg_recipient = data_load[:gpg_recipient]
-        @paths = data_load[:paths]
+        @opts = YAML.load_file @cpath
       else
         info "Creating config file #{@cpath}..."
         save
       end
     end
 
-    def save
-      FileUtils.mkdir_p Pathname.new(@cpath).parent.to_s
-      File.write @cpath, YAML::dump({
-        disk: @disk,
-        gpg_recipient: @gpg_recipient,
-        paths: @paths.uniq
-      })
-      success "Saving options to #{@cpath}..."
+    private
+
+    def load_opts(args)
+      @opts[:disk] = args[:disk] || ''
+      @opts[:disk_is_encrypt] = args[:disk_is_encrypt] || false
+      @opts[:backup_paths] = args[:backup_paths] || []
+      @opts[:exclude_paths] = args[:exclude_paths] || []
+      @opts[:restore_at] = args[:restore_at] || '/'
     end
   end
 end

data/lib/freydis/cryptsetup.rb

@@ -4,14 +4,13 @@ require 'mods/exec'
 require 'mods/msg'
 
 module Freydis
+  # Interact with cryptsetup from unix.
   class Cryptsetup
     include Exec
     include Msg
 
-    def initialize
-      Guard.disk_id(CONFIG.disk)
-
-      @disk = Disk.new(CONFIG.disk).search_sdx
+    def initialize(disk)
+      @disk = Guard.disk(disk)
       @mapper_name = 'freydis-encrypt'
       @mountpoint = '/mnt/freydis'
     end
@@ -27,7 +26,6 @@ module Freydis
     end
 
     def close
-      umount
       if File.exist? "/dev/mapper/#{@mapper_name}"
         x "cryptsetup -v close #{@mapper_name}"
       else
@@ -46,8 +44,6 @@ module Freydis
       x "mount -t ext4 /dev/mapper/#{@mapper_name} #{@mountpoint}"
     end
 
-    protected
-
     def umount
       if mounted?
         x "umount #{@mountpoint}"

data/lib/freydis/disk_luks.rb

@@ -3,31 +3,37 @@
 require 'mods/msg'
 
 module Freydis
+  # Open, close a device disk (located at /dev)
   module DiskLuks
     extend Msg
+
     module_function
 
-    def encrypt
-      cryptsetup = Freydis::Cryptsetup.new
+    def encrypt(opts)
+      cryptsetup = Cryptsetup.new(opts[:disk])
       cryptsetup.encrypt
+      opts[:disk_is_encrypt] = true
       cryptsetup.open
       cryptsetup.format
       cryptsetup.close
-      success "Disk #{CONFIG.disk} fully encrypted."
+      success "Disk #{opts[:disk]} fully encrypted."
     end
 
-    def open
-      cryptsetup = Freydis::Cryptsetup.new
-      cryptsetup.close
-      cryptsetup.open
+    def open(opts)
+      cryptsetup = Cryptsetup.new(opts[:disk])
+      if opts[:disk_is_encrypt]
+        cryptsetup.close
+        cryptsetup.open
+      end
       cryptsetup.mount
-      success "Disk #{CONFIG.disk} opened."
+      success "Disk #{opts[:disk]} opened."
     end
 
-    def close
-      cryptsetup = Freydis::Cryptsetup.new
-      cryptsetup.close
-      success "Disk #{CONFIG.disk} closed."
+    def close(opts)
+      cryptsetup = Cryptsetup.new(opts[:disk])
+      cryptsetup.umount
+      cryptsetup.close if opts[:disk_is_encrypt]
+      success "Disk #{opts[:disk]} closed."
     end
   end
 end

data/lib/freydis/error.rb

@@ -5,5 +5,4 @@ module Freydis
   class DiskId < StandardError; end
   class InvalidLuksDev < StandardError; end
   class InvalidPath < StandardError; end
-  class GPG < StandardError; end
 end

data/lib/freydis/guard.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
 module Freydis
+  # Guard control argument/path/input and quit if no valid
   module Guard
     module_function
 
     def disk(name)
-      full_path = "/dev/#{name}"
-      raise Freydis::InvalidDisk, 'No disk, use with -d DISK.' unless name
-      raise Freydis::InvalidDisk, 'No disk, use with -d DISK.' if name == ''
-      raise Freydis::InvalidDisk, 'Bad name #{name}, should match with sd[a-z]' unless name.match(/^sd[a-z]{1}$/)
-      raise Freydis::InvalidDisk, "No disk #{full_path} available." unless File.exist? full_path
-      Freydis::Disk.new(full_path).search_id # return disk(name) by-id
+      raise Freydis::InvalidDisk, 'No disk, use with --disk PATH.' unless name
+      raise Freydis::InvalidDisk, 'No disk, use with --disk PATH.' if name == ''
+      raise Freydis::InvalidDisk, "No disk #{name} available." unless File.exist? name
+
+      name
     rescue Freydis::InvalidDisk => e
       puts "#{e.class} => #{e}"
       exit 1
@@ -23,11 +23,12 @@ module Freydis
       exit 1
     end
 
-    def isLuks(disk)
-      raise Freydis::InvalidLuksDev, "No disk." unless disk
+    def luks?(disk)
+      raise Freydis::InvalidLuksDev, 'No disk, use with --disk PATH.' unless disk
       raise Freydis::InvalidLuksDev, "#{disk} does not exist." unless File.exist? disk
+
       sudo = Process.uid != 0 ? 'sudo' : ''
-      if !system(sudo, 'cryptsetup', 'isLuks', disk)
+      unless system(sudo, 'cryptsetup', 'isLuks', disk)
         raise Freydis::InvalidLuksDev, "#{disk} is not valid Luks device."
       end
     rescue Freydis::InvalidLuksDev => e
@@ -35,19 +36,11 @@ module Freydis
       exit 1
     end
 
-    def path?(p)
-      raise Freydis::InvalidPath, "#{p} does not exist." unless File.exist? p
+    def path?(path)
+      raise Freydis::InvalidPath, "#{path} does not exist." unless File.exist? path
     rescue Freydis::InvalidPath => e
       puts "#{e.class} => #{e}"
       exit 1
     end
-
-    def gpg(recipient)
-      raise Freydis::GPG, "No recipient, use --gpg-recipient NAME" unless recipient
-      recipient
-    rescue Freydis::GPG => e
-      puts "#{e.class} => #{e}"
-      exit 1
-    end
   end
 end

data/lib/freydis/rsync.rb

@@ -3,45 +3,43 @@
 require 'mods/exec'
 
 module Freydis
+  # Interact with rsync from unix
   class Rsync
     include Exec
 
-    def initialize
-      @workdir = '/mnt/freydis/backup/'
-      @exclude_paths = %w[
-        /dev/*
-        /proc/*
-        /sys/*
-        /tmp/*
-        /run/*
-        /mnt/*
-        /media/*
-        /var/lib/dhcpcd/*
-        /home/*/.gvfs
-        /home/*/.thumbnails/*
-        /home/*/.cache/*
-        /home/*/.local/share/*
-        /home/*/.Xauthority
-        /home/*/.xsession-errors
-        /lost+found
-      ]
-      @opts = '-aAXHvRx'
+    def initialize(opts)
+      @workdir = '/mnt/freydis/backup'
+      @exclude_paths = %w['/dev/*' '/proc/*'
+                          '/sys/*' '/tmp/*'
+                          '/run/*' '/mnt/*'
+                          '/media/*' '/home/*/.gvfs'
+                          '/var/lib/dhcpcd/*' '*lost+found']
+      @backup = opts[:backup_paths] || []
+      @user_excludes = opts[:exclude_paths] || []
+      @restore_at = opts[:restore_at] || '/'
+      @opts = '-aAXHv --relative -hh'
     end
 
     def backup
-      Freydis::DiskLuks.open
+      raise 'Nothing to backup, use --paths-add PATH' if @backup == []
+
       mkdir @workdir
-      exil = @exclude_paths * ','
-      save = CONFIG.paths * ' '
-      @opts += ' --delete'
+      exil = combine_exclude
+      save = @backup * ' '
+      @opts += ' --delete --recursive'
       x "rsync #{@opts} --exclude={#{exil}} #{save} #{@workdir}"
-      Freydis::DiskLuks.close
+      puts "Saved path #{save}"
     end
 
     def restore
-      Freydis::DiskLuks.open
-      x "rsync #{@opts} #{@workdir} /"
-      Freydis::DiskLuks.close
+      x "rsync #{@opts} #{@workdir} #{@restore_at}"
+    end
+
+    private
+
+    def combine_exclude
+      new_array = @exclude_paths << @user_excludes
+      new_array.flatten! * ','
     end
   end
 end

data/lib/freydis/version.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
 module Freydis
-  VERSION = '0.1.1'
+  VERSION = '0.8.0'
 end
-

data/lib/freydis.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_relative 'freydis/version'
-require_relative 'freydis/options'
 require_relative 'freydis/config'
 require_relative 'freydis/disk'
 require_relative 'freydis/disk_luks'
@@ -9,25 +8,7 @@ require_relative 'freydis/cryptsetup'
 require_relative 'freydis/rsync'
 require_relative 'freydis/error'
 require_relative 'freydis/guard'
-require_relative 'freydis/secrets'
 
+# Freydis - tool to backup data using rsync, cryptsetup.
 module Freydis
-  CONFIG = Config.new
-  CONFIG.load
-  
-  class Main
-    def initialize(args)
-      @argv = args[:argv]
-    end
-
-    def start
-      Options.new(@argv)
-    end
-
-    def bye
-      puts
-      puts "Bye !"
-      exit
-    end
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: freydis
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.8.0
 platform: ruby
 authors:
 - szorfein
@@ -12,31 +12,31 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   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
-  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
+  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
-  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
+  k/IsZAEZFgNjb20wggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCqe1yx
+  EG2oM25jeHp08A8zkaDNmbI3MujjrRM/WPEYZX2dVwOxkIS20hQVuxcAsBBA4W/W
+  kuPbqRkvLboaGaxLrllkSEJw9HA/GesTdXLyCFYmNzSFqGh5BafNSkxoiDhTavxp
+  xvYzAkYR/3CzSOWSxJk73wIg+F7w/nWJPTt2tgJE9hgR8uuFY+EzPOlFZhkFTdCV
+  88sBGuZPMjq7ASQVBE3UA+Y1xJeXE3/FhIhYvLnjevkkDLSLFmox0ZQf6nx6abuL
+  KTOGRA1bfLfkW5HMh5X5JwViliwG3RWhqAukJUgHTUk+oKtejlzSDqupwOenKZf0
+  xI2/BnS8zOsS6Te08iLxqZfI/lsG8wcPduekSetRI4VIOZ5QoRK54PiQjrOBhbnD
+  OQBB/XF1C80imZtRtdUqh6bK9WeWI4RYZ2/KwXL1AScEbXkBkkOECWoVrD18WgRm
+  siuX6RkNIelhtb0En7f3bizgPqlO0qPQV+wPi9TSBxdVG12C0OmjCQYMQD0CAwEA
+  AaOBgTB/MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBTlKnQ3qMUF
+  zydvZaKwdP+dnj2uajAiBgNVHREEGzAZgRdzem9yZmVpbkBwcm90b25tYWlsLmNv
   bTAiBgNVHRIEGzAZgRdzem9yZmVpbkBwcm90b25tYWlsLmNvbTANBgkqhkiG9w0B
-  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
-  LLknX69FN7/G
+  AQsFAAOCAYEAFjnBWWfaMeA8hP0Q76WmBCFckGN5I42X5RQkVYRRXIaeXIS1td/t
+  O1v1iQLo6ABfASMi6We7T16+ita68xwNOmSkMNHHXBr/fdGbHExxFSX7BXNRbwla
+  SS6Vy0bXKMDJbXcvkrmIolpYhEFm1218FCRCT6ogM1oWAJAfhfF9pMeRxrxjQYFn
+  ko8XgjIHxb83miOILgdq/lgJ4gfD7PsGfJtLCLiCKCcxIb4TtmKAzRwCDVpb6wqM
+  5xJZffAmHI7v8lVer53sPzm3INPu5xFZyfZ/SXYXPKKwln0efH63K5vuXYwEN7NI
+  SBSRTN03Hb65t86m6/r084SrNnLntQjCSqApzFBt1QwJ5cmiVilODN4V7y2hZpyK
+  hSk3b2VOotDPiWIm1p/IPXQDfm5x67Z5fJQPAlBTsse4jKyVyW1lZLmERSBuRZ2O
+  urXgRIzALxd/xazPCnoLSXPzfJSI6Y77S1EBvhPd9RaSO8IyH9RhPDP9mnTvW2Kl
+  NAUnoL+txK5a
   -----END CERTIFICATE-----
-date: 2022-11-09 00:00:00.000000000 Z
+date: 2024-09-17 00:00:00.000000000 Z
 dependencies: []
 description: 'Freydis is a CLI tool to encrypt a disk device, backup and restore easyly.
   Freydis use `cryptsetup` and `rsync` mainly.
@@ -60,11 +60,7 @@ files:
 - lib/freydis/disk_luks.rb
 - lib/freydis/error.rb
 - lib/freydis/guard.rb
-- lib/freydis/options.rb
 - lib/freydis/rsync.rb
-- lib/freydis/secrets.rb
-- lib/freydis/secrets/archive.rb
-- lib/freydis/secrets/gpg.rb
 - lib/freydis/version.rb
 - lib/mods/exec.rb
 - lib/mods/msg.rb
@@ -93,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - cryptsetup
 - rsync
-rubygems_version: 3.3.23
+rubygems_version: 3.3.25
 signing_key:
 specification_version: 4
 summary: Backup and Restore data from encrypted device.

data/lib/freydis/options.rb

@@ -1,90 +0,0 @@
-# frozen_string_literal: true
-
-require 'optparse'
-
-module Freydis
-  class Options
-    def initialize(argv)
-      parse(argv)
-    end
-
-    private
-
-    def parse(argv)
-      OptionParser.new do |opts|
-        opts.banner = 'Usage: freydis.rb [options]'
-        opts.version = VERSION
-
-        opts.on('--disk NAME', /^sd[a-z]$/, 'Use the disk NAME (e.g: sda, sdb).') do |disk|
-          Freydis::CONFIG.disk = Guard.disk(disk)
-        end
-
-        opts.on('--gpg-recipient NAME', String, 'Use gpg key NAME.') do |key|
-          Freydis::CONFIG.gpg_recipient = Guard.gpg(key)
-        end
-
-        opts.on('-p PATHS', '--paths-add PATHS', Array, 'Add absolute PATHS to the backup list.') do |paths|
-          paths.each do |p|
-            Freydis::Guard.path? p
-            Freydis::CONFIG.paths << p
-          end
-
-        end
-
-        opts.on('-d PATH', '--path-del PATH', String, 'Remove absolute PATH from the backup list.') do |p|
-          Freydis::Guard.path? p
-          Freydis::CONFIG.paths.delete p if CONFIG.paths.include? p
-        end
-
-        opts.on('-L', '--paths-list', 'List all paths from your list.') do
-          if Freydis::CONFIG.paths.nil?
-            puts 'Nothing in paths yet...'
-          else
-            puts Freydis::CONFIG.paths
-          end
-        end
-
-        # Engines options
-
-        opts.on('-e', '--encrypt', 'Encrypt and format (ext4) your device.') do
-          Freydis::DiskLuks.encrypt
-        end
-
-        opts.on('-o', '--open', 'Open and mount encrypted disk at /mnt/freydis.') do
-          Freydis::DiskLuks.open
-        end
-
-        opts.on('-c', '--close', 'Umount and close encrypted disk.') do
-          Freydis::DiskLuks.close
-        end
-
-        opts.on('-b', '--backup', 'Perform a backup.') do
-          Freydis::Rsync.new.backup
-        end
-
-        opts.on('-r', '--restore', 'Restore saved datas on your system.') do
-          Freydis::Rsync.new.restore
-        end
-
-        opts.on('--secrets-backup', 'Backup only secrets, including GPG keys.') do |s|
-          Freydis::Secrets.backup
-        end
-
-        opts.on('--secrets-restore', 'Restore secrets.') do |s|
-          Freydis::Secrets.restore
-        end
-
-        opts.on('-s', '--save', 'Save current arguments in the config file.') do
-          Freydis::CONFIG.save
-        end
-
-        begin
-          opts.parse!(argv)
-        rescue OptionParser::ParseError => e
-          warn e.message, "\n", opts
-          exit 1
-        end
-      end
-    end
-  end
-end

data/lib/freydis/secrets/archive.rb

@@ -1,73 +0,0 @@
-# frozen_string_literal: true
-
-require 'date'
-require 'fileutils'
-
-module Freydis
-  module Secrets
-    # Create or Restore an archive of secrets with bsdtar
-    class Archive
-      include Exec
-      include Msg
-
-      def initialize(gpg)
-        @workdir = '/mnt/freydis/secrets'
-        @filename = "#{@workdir}/#{CONFIG.gpg_recipient}_#{Date.today}.tar.gz"
-        @restore_dir = '/tmp'
-        @include_paths = %w[]
-        @gpg = gpg
-      end
-
-      def create
-        populate_include
-        inc_paths = @include_paths * ' '
-
-        mkdir @workdir
-        info "Creating archive #{@filename}..."
-        bsdtar "--acls --xattrs -cpvf #{@filename} #{inc_paths}"
-        @gpg.clean_keys
-      end
-
-      # Restore the most recent archive in your $HOME
-      def restore
-        last_archive = find_last_archive
-        error 'No archive found.' unless last_archive
-
-        mkdir @restore_dir
-        info "Restoring #{last_archive}..."
-        bsdtar "-xvf #{last_archive} -C #{@restore_dir}"
-        @gpg.import_keys @restore_dir
-        @gpg.clean_keys @restore_dir
-      end
-
-      protected
-
-      def populate_include
-        @gpg.export_keys unless File.exist? @gpg.seckey_path
-        search_paths(%W[#{ENV['HOME']}/.password-store 
-                     #{@gpg.seckey_path}
-                     #{@gpg.pubkey_path}])
-      end
-
-      def find_last_archive
-        if Process.uid == 0
-          Dir.glob("#{@workdir}/#{CONFIG.gpg_recipient}*").sort[0]
-        else
-          archive = `sudo ls #{@workdir}/ | grep #{CONFIG.gpg_recipient} | sort | head -1`.chomp
-          "#{@workdir}/#{archive}" if archive
-        end
-      end
-
-      private
-
-      def search_paths(paths)
-        paths.each do |p|
-          if Dir.exist?(p) || File.exist?(p)
-            info "Found #{p}, add to archive..."
-            @include_paths << p
-          end
-        end
-      end
-    end
-  end
-end

data/lib/freydis/secrets/gpg.rb

@@ -1,63 +0,0 @@
-# frozen_string_literal: true
-
-module Freydis
-  module Secrets
-    class GPG
-      include Exec
-      include Msg
-
-      attr_reader :seckey_path, :pubkey_path
-
-      def initialize
-        @recipient = Guard.gpg(CONFIG.gpg_recipient)
-        @seckey_path = "/tmp/#{@recipient}-secret.key"
-        @pubkey_path = "/tmp/#{@recipient}-public.key"
-      end
-
-      def export_keys
-        info "Exporting keys for #{@recipient}..."
-        gpg "-a --export-secret-keys --armor #{@recipient} >#{@seckey_path}"
-        gpg "-a --export --armor #{@recipient} >#{@pubkey_path}"
-      end
-
-      def import_keys(prefix = nil)
-        is_key = `gpg -K | grep #{@recipient}`.chomp
-        if is_key.empty?
-          info "Importing key #{@recipient}..."
-          gpg_import(prefix)
-        else
-          info "Key #{@recipient} is alrealy present, skip import."
-        end
-      end
-
-      def clean_keys(prefix = nil)
-        if prefix
-          shred "#{prefix}#{@seckey_path}", "#{prefix}#{@pubkey_path}"
-        else
-          shred @seckey_path, @pubkey_path
-        end
-        success "Clean keys."
-      end
-
-      protected
-
-      def gpg_import(prefix)
-        if prefix
-          gpg "--armor --import #{prefix}#{@seckey_path}"
-          gpg "--armor --import #{prefix}#{@pubkey_path}"
-        else
-          gpg "--armor --import #{@seckey_path}"
-          gpg "--armor --import #{@pubkey_path}"
-        end
-      end
-
-      private
-
-      def gpg(command)
-        unless system("gpg #{command}")
-          error "Exe: gpg #{command}"
-        end
-      end
-    end
-  end
-end

data/lib/freydis/secrets.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-require 'mods/msg'
-require_relative 'secrets/gpg'
-require_relative 'secrets/archive'
-
-module Freydis
-  module Secrets
-    extend Msg
-
-    def self.backup
-      DiskLuks.open
-      info 'Backup secrets...'
-      gpg = GPG.new
-      archive = Archive.new(gpg)
-      archive.create
-      DiskLuks.close
-    end
-
-    def self.restore
-      DiskLuks.open
-      info 'Restoring secrets...'
-      gpg = GPG.new
-      archive = Archive.new(gpg)
-      archive.restore
-      DiskLuks.close
-    end
-  end
-end