minisign 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59267c0797e4539c136803dd3ac5333f14384019bb211abb50c078b14d9cb1c8
-  data.tar.gz: 7771c5a5b4227d1030d78b60fa584ed5158270a568617cc4ac7f4760230ef1d1
+  metadata.gz: 007c98083c5c2f0343244efee9295ca3b9464c8b8edb59ca809e779ae7d0f76e
+  data.tar.gz: bdf21e444448429ee135d59ae7403646afd84b4df0724391563858763bec9a43
 SHA512:
-  metadata.gz: 6a713e970fb762efaaabcd4572ea664d69cf5d558aa1219b3a27daf4c1fe4c111e98d0a4d90f4cc9892f0ec776b102bd0ab081d498a05a29639b0668a3decaa1
-  data.tar.gz: 603bb8180811b3923c1b5782e76d049fefe125ed5338f164dd0ed787d26ffae251932f6b67eea7ef6a15aaddd1076725a44fa397902eb8ea56c80f134dc77923
+  metadata.gz: b7db6eab732643303cb76aab37b8c31bd8efd349992c5dfedcd8a7c772936a6554f8382b05efc6c170bbfb970222024790096b5fa611884204cc94882a45338d
+  data.tar.gz: e635054fe989e5c76edadc0a16128b2c14b23e201949bda438b593c8671b2cc688df3729eff4733ef65e71a68caf137842ef9f060e6b0199746e92502f39026e

data/lib/minisign/cli.rb

@@ -41,6 +41,7 @@ module Minisign
       puts '-f                force. Combined with -G, overwrite a previous key pair'
       puts '-v                display version number'
       puts ''
+      exit 1
     end
 
     def self.prompt
@@ -90,44 +91,25 @@ module Minisign
     end
 
     def self.recreate(options)
-      secret_key = options[:s] || "#{Dir.home}/.minisign/minisign.key"
+      options[:s] ||= "#{Dir.home}/.minisign/minisign.key"
       public_key = options[:p] || './minisign.pub'
-      private_key_contents = File.read(secret_key)
-      begin
-        # try without a password first
-        private_key = Minisign::PrivateKey.new(private_key_contents)
-      rescue Minisign::PasswordMissingError
-        print 'Password: '
-        private_key = Minisign::PrivateKey.new(private_key_contents, prompt)
-      end
-      File.write(public_key, private_key.public_key)
+      File.write(public_key, private_key(options[:s]).public_key)
     end
 
     def self.change_password(options)
       options[:s] ||= "#{Dir.home}/.minisign/minisign.key"
-      private_key = begin
-        Minisign::PrivateKey.new(File.read(options[:s]))
-      rescue Minisign::PasswordMissingError
-        print 'Password: '
-        Minisign::PrivateKey.new(File.read(options[:s]), prompt)
-      end
+      new_private_key = private_key(options[:s])
       print 'New Password: '
       new_password = options[:W] ? nil : prompt
-      private_key.change_password! new_password
-      File.write(options[:s], private_key)
+      new_private_key.change_password! new_password
+      File.write(options[:s], new_private_key)
     end
 
     def self.sign(options)
       # TODO: multiple files
       options[:x] ||= "#{options[:m]}.minisig"
       options[:s] ||= "#{Dir.home}/.minisign/minisign.key"
-      private_key = begin
-        Minisign::PrivateKey.new(File.read(options[:s]))
-      rescue Minisign::PasswordMissingError
-        print 'Password: '
-        Minisign::PrivateKey.new(File.read(options[:s]), prompt)
-      end
-      signature = private_key.sign(options[:m], File.read(options[:m]), options[:t], options[:c])
+      signature = private_key(options[:s]).sign(options[:m], File.read(options[:m]), options[:t], options[:c])
       File.write(options[:x], signature)
     end
 
@@ -140,8 +122,8 @@ module Minisign
       signature = Minisign::Signature.new(File.read(options[:x]))
       begin
         verification = public_key.verify(signature, message)
-      rescue StandardError
-        puts 'Signature verification failed'
+      rescue Minisign::SignatureVerificationError => e
+        puts e.message
         exit 1
       end
       return if options[:q]
@@ -150,6 +132,16 @@ module Minisign
       puts options[:Q] ? signature.trusted_comment : verification
     end
 
+    def self.private_key(seckey_file)
+      seckey_file_contents = File.read(seckey_file)
+      begin
+        Minisign::PrivateKey.new(seckey_file_contents)
+      rescue Minisign::PasswordMissingError
+        print 'Password: '
+        Minisign::PrivateKey.new(seckey_file_contents, prompt)
+      end
+    end
+
     # rubocop:enable Metrics/CyclomaticComplexity
     # rubocop:enable Metrics/AbcSize
     # rubocop:enable Metrics/MethodLength

data/lib/minisign/public_key.rb

@@ -21,7 +21,7 @@ module Minisign
     #   public_key.key_id
     #   #=> "E86FECED695E8E0"
     def key_id
-      key_id_binary_string.bytes.map { |c| c.to_s(16) }.reverse.join.upcase
+      hex key_id_binary_string.bytes
     end
 
     # Verify a message's signature
@@ -29,9 +29,9 @@ module Minisign
     # @param signature [Minisign::Signature]
     # @param message [String] the content that was signed
     # @return [String] the trusted comment
-    # @raise Ed25519::VerifyError on invalid signatures
-    # @raise RuntimeError on tampered trusted comments
-    # @raise RuntimeError on mismatching key ids
+    # @raise Minisign::SignatureVerificationError on invalid signatures
+    # @raise Minisign::SignatureVerificationError on tampered trusted comments
+    # @raise Minisign::SignatureVerificationError on mismatching key ids
     def verify(signature, message)
       assert_matching_key_ids!(signature.key_id, key_id)
       verify_message_signature(signature.signature, message)
@@ -54,8 +54,8 @@ module Minisign
 
     def verify_message_signature(signature, message)
       ed25519_verify_key.verify(signature, blake2b512(message))
-    rescue Ed25519::VerifyError => e
-      raise Minisign::SignatureVerificationError, e
+    rescue Ed25519::VerifyError
+      raise Minisign::SignatureVerificationError, 'Signature verification failed'
     end
 
     def untrusted_comment

data/lib/minisign/signature.rb

@@ -3,11 +3,13 @@
 module Minisign
   # Parse a .minisig file's contents
   class Signature
+    include Utils
     # @param str [String] The contents of the .minisig file
     # @example
     #   Minisign::Signature.new(File.read('test/example.txt.minisig'))
     def initialize(str)
       @lines = str.split("\n")
+      @decoded = Base64.strict_decode64(@lines[1])
     end
 
     # @return [String] the key id
@@ -15,7 +17,7 @@ module Minisign
     #   Minisign::Signature.new(File.read('test/example.txt.minisig')).key_id
     #   #=> "E86FECED695E8E0"
     def key_id
-      encoded_signature[2..9].bytes.map { |c| c.to_s(16) }.reverse.join.upcase
+      hex @decoded[2..9].bytes
     end
 
     # @return [String] the trusted comment
@@ -33,18 +35,12 @@ module Minisign
 
     # @return [String] the global signature
     def signature
-      encoded_signature[10..]
+      @decoded[10..]
     end
 
     # @return [String] The signature that can be written to a file
     def to_s
       "#{@lines.join("\n")}\n"
     end
-
-    private
-
-    def encoded_signature
-      Base64.decode64(@lines[1])
-    end
   end
 end

data/lib/minisign/utils.rb

@@ -18,6 +18,11 @@ module Minisign
       end
     end
 
+    # @return [String] bytes as little endian hexadecimal
+    def hex(bytes)
+      bytes.map { |c| c.to_s(16) }.reverse.join.upcase
+    end
+
     # @return [String] the <kdf_output> used to xor the ed25519 keys
     def derive_key(password, kdf_salt, kdf_opslimit, kdf_memlimit)
       RbNaCl::PasswordHash.scrypt(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minisign
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Jesse Shawl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-17 00:00:00.000000000 Z
+date: 2024-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ed25519
@@ -38,7 +38,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '7.1'
-description: Verify minisign signatures
+description: Create and verify minisign signatures
 email: jesse@jesse.sh
 executables:
 - minisign
@@ -58,6 +58,10 @@ homepage: https://github.com/jshawl/minisign
 licenses:
 - MIT
 metadata:
+  bug_tracker_uri: https://github.com/jshawl/minisign/issues
+  changelog_uri: https://github.com/jshawl/minisign/blob/main/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/minisign/0.2.1
+  source_code_uri: https://github.com/jshawl/minisign/tree/v0.2.1
   rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []