leeloo 0.4.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45be4ecf01ce08cd7317d3c6f9d8a612d999b972efdcbfe322a964a06f77a303
-  data.tar.gz: bd3a8767c2c1d70cdc21856b180cb7f3651c9777471f70a35af810130650d4ef
+  metadata.gz: dd35144ab160594e6b4c3d05ea7eeaf175cc99fb79fc3b93cea31000df120ab3
+  data.tar.gz: 32537a5e8670c43d6463e1d713a61f49a7601d435957ecd98eeaf48c2a8658bd
 SHA512:
-  metadata.gz: 1ec00409e8ac173872aac71537aad50d40f93a24634b1b101b6f46b59d658696c2480d6e5157fd7cd1d864acc4cc6ec5e421eed6ff74f560c4e25f57ecd7bd27
-  data.tar.gz: 1d259f7fc29192bcf6d1cd3a7f7f92d8e9244d79e11741f2fce8f82f8aab0d7cfd5c96ad120c16aa018b8c69540e937e6986a8f18a297a7d137d748e5e19511d
+  metadata.gz: 8469474876e92a015bce39b25cfc418c1f9d55b763b8de44763121eb4e379c64716c43b2fd2789c536cf0a8891e828e0c1782519ae3d549054f8527a2bd2c50a
+  data.tar.gz: d98949b84ac056b71302f038748da0ad6986a81af3a63fad52b73c7db204c91d87e8cd4b4b6db02c4049e379a9817278b77d453bf04b53f6f46089317e12c907

data/lib/leeloo/command.rb

@@ -23,11 +23,34 @@ module Leeloo
       program :help, 'GitHub', 'https://github.com/sylvek'
       program :help_formatter, :compact
 
-      default_command :"list"
+      default_command :wrapper
+
+      command :wrapper do |c|
+        c.syntax      = 'leeloo [options]'
+        c.description = "Display secrets"
+        c.option '--ascii', nil, 'display secrets without unicode tree'
+        c.option '--keystore STRING', String, 'a selected keystore'
+        c.option '--clipboard', nil, 'copy to clipboard'
+        c.action do |args, options|
+          unless args == []
+            name = args.first
+            ctl = SecretController.new(options)
+            ctl.read(name)
+            ctl.display
+          else
+            SecretsController.new(options).display
+          end
+        end
+      end
+
+      command :init do |c|
+        c.syntax      = 'leeloo init'
+        c.description = "Just to be compatible with passwordstore.org"
+      end
 
       command :list do |c|
         c.syntax      = 'leeloo list [options]'
-        c.description = "Display secrets list of keystore"
+        c.description = "Display secrets list of stored on a keystore"
         c.option '--ascii', nil, 'display secrets without unicode tree'
         c.option '--keystore STRING', String, 'a selected keystore'
 
@@ -61,7 +84,7 @@ module Leeloo
         end
       end
 
-      command "keystore remove" do |c|
+      command :"keystore remove" do |c|
         c.syntax      = 'leeloo keystore remove <name>'
         c.description = "remove a keystore (path/to/keystore is not destroyed)"
 
@@ -74,7 +97,7 @@ module Leeloo
         end
       end
 
-      command "keystore add" do |c|
+      command :"keystore add" do |c|
         c.syntax      = 'leeloo keystore add <name> <path/to/keystore>'
         c.description = "add a keystore"
 
@@ -88,7 +111,7 @@ module Leeloo
         end
       end
 
-      command "keystore default" do |c|
+      command :"keystore default" do |c|
         c.syntax      = 'leeloo keystore default name'
         c.description = "set the default keystore"
 
@@ -101,12 +124,63 @@ module Leeloo
         end
       end
 
+      command :key do |c|
+        c.syntax      = 'leeloo keys'
+        c.description = "list keys from this keystore"
+        c.option '--ascii', nil, 'display secrets without unicode tree'
+        c.option '--keystore STRING', String, 'a selected keystore'
+
+        c.action do |args, options|
+          ctl = KeysController.new(options)
+          ctl.display
+        end
+      end
+
+      command :"key sync" do |c|
+        c.syntax      = 'leeloo keys sync'
+        c.description = "synchronize secrets with keys"
+        c.option '--keystore STRING', String, 'a selected keystore'
+
+        c.action do |args, options|
+          ctl = KeysController.new(options)
+          ctl.sync
+          ctl.display
+        end
+      end
+
+      command :"key add" do |c|
+        c.syntax      = 'leeloo key add <email>'
+        c.description = "add a dedicated key"
+        c.option '--keystore STRING', String, 'a selected keystore'
+
+        c.action do |args, options|
+          abort "email is missing" unless args.length == 1
+          email = args.first
+          ctl = KeysController.new(options)
+          ctl.add_key(email)
+          ctl.display
+        end
+      end
+
+      command :"key remove" do |c|
+        c.syntax      = 'leeloo key remove <email>'
+        c.description = "remove a dedicated key"
+        c.option '--keystore STRING', String, 'a selected keystore'
+
+        c.action do |args, options|
+          abort "email is missing" unless args.length == 1
+          email = args.first
+          ctl = KeysController.new(options)
+          ctl.remove_key(email)
+          ctl.display
+        end
+      end
+
       command :read do |c|
         c.syntax      = 'leeloo read <name>'
         c.description = "Display a secret from a keystore"
         c.option '--keystore STRING', String, 'a selected keystore'
         c.option '--clipboard', nil, 'copy to clipboard'
-        c.option '--keystore STRING', String, 'a selected keystore'
 
         c.action do |args, options|
           abort "name is missing" unless args.length == 1
@@ -133,6 +207,23 @@ module Leeloo
           ctl.display
         end
       end
+      alias_command :insert, :write
+
+      command :generate do |c|
+        c.syntax      = 'leeloo generate <name> <number of randomized characters>'
+        c.description = "Generate a secret from a keystore"
+        c.option '--keystore STRING', String, 'a selected keystore'
+        c.option '--clipboard', nil, 'copy to clipboard'
+
+        c.action do |args, options|
+          abort "name or number are missing" unless args.length == 2
+          name = args.first
+          options.__hash__[:generate] = args.last.to_i
+          ctl = SecretController.new(options)
+          ctl.write(name)
+          ctl.display
+        end
+      end
 
       command :translate do |c|
         c.syntax      = 'leeloo translate'
@@ -156,11 +247,13 @@ module Leeloo
           name = args.first
           ctl = SecretController.new(options)
           ctl.remove(name)
-          ctl.display
+          #ctl.display
+          puts "done."
         end
       end
+      alias_command :rm, :remove
 
-      command :sync do |c|
+      command :"keystore sync" do |c|
         c.syntax      = 'leeloo sync'
         c.description = "Synchronize a keystore"
         c.option '--keystore STRING', String, 'a selected keystore'
@@ -172,7 +265,18 @@ module Leeloo
         end
       end
 
-      command :init do |c|
+      command :"keystore export" do |c|
+        c.syntax      = 'leeloo export'
+        c.description = "Export all secrets from a keystore"
+        c.option '--keystore STRING', String, 'a selected keystore'
+
+        c.action do |args, options|
+          ctl = ExportController.new(options)
+          ctl.display
+        end
+      end
+
+      command :"keystore init" do |c|
         c.syntax      = 'leeloo init'
         c.description = "Initialize a keystore"
         c.option '--keystore STRING', String, 'a selected keystore'

data/lib/leeloo/controller.rb

@@ -32,16 +32,46 @@ module Leeloo
 	class SecretsController < PrivateLocalFileSystemController
 		def initialize options
 			super options
-			@secrets = @preferences.keystore(@options.keystore).secrets
+			@secrets = @keystore.secrets
 		end
 		def search name
 			@secrets = @secrets.select { |secret| secret.name.downcase.include? name.downcase } || []
 		end
+		def list
+			@secrets
+		end
 		def display
 			@output.render_secrets @secrets
 		end
 	end
 
+	class ExportController < PrivateLocalFileSystemController
+		def display
+			@keystore.secrets.each do |secret|
+				@output.render_name_and_secret(secret.name, @keystore.secret_from_name(secret.name))
+			end
+		end
+	end
+
+	class KeysController < PrivateLocalFileSystemController
+		def add_key email
+			@keystore.add_key(email)
+		end
+		def remove_key email
+			@keystore.remove_key(email)
+		end
+		def sync
+			@keystore.secrets.each do |secret|
+				phrase = @keystore.secret_from_name(secret.name).read
+				@keystore.secret_from_name(secret.name).write(phrase)
+			end
+		end
+		def display
+			@keys = @keystore.keys
+			@output.render_keys @keys
+		end
+	end
+
 	class SecretController < PrivateLocalFileSystemController
 		def read name
 			@secret = @keystore.secret_from_name(name)
@@ -53,8 +83,8 @@ module Leeloo
 			phrase = SecureRandom.base64(32).truncate(@options.generate.to_i) if @options.generate
 
 			unless phrase
-				phrase  = password "secret"
-				confirm = password "confirm it"
+				phrase  = password "Enter password for #{name}"
+				confirm = password "Confirm it"
 				abort "not the same secret" unless phrase == confirm
 			end
 

data/lib/leeloo/keystore.rb

@@ -72,6 +72,7 @@ module Leeloo
     def initialize name, path
       super name
       @path = path
+      FileUtils.touch "#{@path}/.gpg-id"
       FileUtils.mkdir_p "#{@path}/secrets"
     end
 
@@ -79,6 +80,10 @@ module Leeloo
       find_secrets "#{@path}/secrets"
     end
 
+    def keys
+      []
+    end
+
     def find_secrets path
       elements = []
       Dir.glob("#{path}/**") do |element|
@@ -121,7 +126,10 @@ module Leeloo
     def initialize name, path
       super name, path
       FileUtils.mkdir_p "#{@path}/keys"
+      populate_recipients
+    end
 
+    def populate_recipients
       @recipients = []
       Dir.glob("#{path}/keys/*") { |key| @recipients << File.basename(key) }
       @recipients.each { |key| GPGME::Key.import(File.open("#{path}/keys/#{key}")) }
@@ -129,7 +137,30 @@ module Leeloo
 
     def init
       super
-      GPGME::Key.find(:public, nil, ).each { |key| key.export(:output => File.open("#{path}/keys/#{key.uids.first.email}", "w+")) }
+      File.write("#{@path}/keys/do_not_remove_me", "do not remove me")
+    end
+
+    def keys
+      available = GPGME::Key.find(:public, nil, ).map { |key| key.email }
+      actual = Dir.glob("#{@path}/keys/**").map { |path| path.split('/').last }
+      available.map { |email| actual.include?(email) ? "#{email}::true" : "#{email}::false" }
+    end
+
+    def add_key email
+      paths = []
+      GPGME::Key.find(:public, email).each do |key| 
+        key.export(:output => File.open("#{path}/keys/#{key.uids.first.email}", "w+"))
+        paths << "#{path}/keys/#{key.uids.first.email}"
+      end
+      return paths
+    end
+
+    def remove_key email
+      if File.exist?("#{path}/keys/#{email}")
+        File.delete("#{path}/keys/#{email}")
+        return "#{path}/keys/#{email}"
+      end
+      return nil
     end
 
     def secret_of path
@@ -172,6 +203,25 @@ module Leeloo
       secret_of @keystore.secret_from_name(element)
     end
 
+    def keys
+      @keystore.keys
+    end
+
+    def add_key email
+      @keystore.add_key(email).each do |path|
+        @git.add path
+        @git.commit "#{email} added"
+      end
+    end
+
+    def remove_key email
+      deleted = @keystore.remove_key email
+      if deleted
+        @git.add deleted
+        @git.commit "#{email} removed"
+      end
+    end
+
     def secrets
       @keystore.secrets
     end

data/lib/leeloo/output.rb

@@ -21,6 +21,12 @@ module Leeloo
         def render_text text
         end
 
+        def render_name_and_secret name, secret
+        end
+
+        def render_keys keys
+        end
+
         def render_footprint footprint
         end
 
@@ -46,10 +52,20 @@ module Leeloo
             end
         end
 
+        def render_name_and_secret name, secret
+            self.render_text name
+            self.render_secret secret
+            self.render_text '------'
+        end
+
         def render_text text
             puts text
         end
 
+        def render_keys keys
+            self.render_text keys
+        end
+
         def render_footprint footprint
             puts "token:"
             puts Base64.strict_encode64 footprint.to_json
@@ -69,11 +85,21 @@ module Leeloo
         end
 
         def render_secrets secrets
-            hash = {:secrets => []}
-            secrets.sort_by(&:name).each { |secret| sort(hash[:secrets], secret.name) }
+            hash = {'Password Store' => []}
+            secrets.sort_by(&:name).each { |secret| sort(hash['Password Store'], secret.name) }
             puts TTY::Tree.new(hash).render
         end
 
+        def render_keys keys
+            rows = []
+            keys.each do |key|
+                splitted = key.split('::')
+                is_present = '*' if splitted[1] == 'true'
+                rows << [splitted[0], is_present]
+            end
+            puts TTY::Table.new(header: ['Email', 'Selected'], rows: rows).render(:ascii)
+        end
+
         def sort array, element
             if element
                 e = element.split("/", 2)

data/lib/leeloo/version.rb

@@ -1,4 +1,4 @@
 module Leeloo
-  VERSION     = '0.4.0'.freeze
+  VERSION     = '0.5.2'.freeze
   DESCRIPTION = "The easiest way to share securely your secrets".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: leeloo
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.2
 platform: ruby
 authors:
 - sylvek
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-12-07 00:00:00.000000000 Z
+date: 2022-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -94,20 +94,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
 description: The easiest way to share securely your secrets
 email:
 - smaucourt@gmail.com
@@ -158,7 +186,7 @@ homepage: https://github.com/sylvek/leeloo
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -173,8 +201,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: The easiest way to share securely your secrets
 test_files: []