pki_express 1.3.1 → 1.3.2

data/lib/pki_express/signature_finisher.rb

@@ -1,315 +1,315 @@
-module PkiExpress
-  class SignatureFinisher < PkiExpressOperator
-    attr_reader :transfer_file_id, :output_file_path
-
-    def initialize(config=PkiExpressConfig.new)
-      super(config)
-      @file_to_sign_path = nil
-      @transfer_file_id = nil
-      @data_file_path = nil
-      @output_file_path = nil
-      @signature = nil
-    end
-
-    # region The "file_to_sign" accessors
-
-    def file_to_sign
-      _get_file_to_sign
-    end
-
-    def _get_file_to_sign
-      unless @file_to_sign_path
-        return nil
-      end
-
-      File.read(@file_to_sign_path)
-    end
-    private :_get_file_to_sign
-
-    def file_to_sign=(content_raw)
-      _set_file_to_sign(content_raw)
-    end
-
-    def _set_file_to_sign(content_raw)
-      unless content_raw
-        raise 'The provided "file_to_sign" is not valid'
-      end
-
-      temp_file_path = self.create_temp_file
-      File.open(temp_file_path, 'wb') do |f|
-        f.write(content_raw)
-      end
-      @file_to_sign_path = temp_file_path
-    end
-    private :_set_file_to_sign
-
-    def file_to_sign_base64
-      _get_file_to_sign_base64
-    end
-
-    def _get_file_to_sign_base64
-      unless @file_to_sign_path
-        return nil
-      end
-
-      content = File.read(@file_to_sign_path)
-      Base64.encode64(content)
-    end
-    private :_get_file_to_sign_base64
-
-    def file_to_sign_base64=(content_base64)
-      _set_file_to_sign_base64(content_base64)
-    end
-
-    def _set_file_to_sign_base64(content_base64)
-      unless content_base64
-        raise 'The provided "file_to_sign_base64" is not valid'
-      end
-
-      begin
-        content_raw = Base64.decode64(content_base64)
-      rescue Error
-        raise 'The provided "file_to_sign_base64" is not Base64-encoded'
-      end
-
-      _set_file_to_sign(content_raw)
-    end
-    private :_set_file_to_sign_base64
-
-    def file_to_sign_path
-      _get_file_to_sign_path
-    end
-
-    def _get_file_to_sign_path
-      @file_to_sign_path
-    end
-    private :_get_file_to_sign_path
-
-    def file_to_sign_path=(path)
-      _set_file_to_sign_path(path)
-    end
-
-    def _set_file_to_sign_path(path)
-      unless path
-        raise 'The provided "file_to_sign_path" is not valid'
-      end
-      unless File.exists?(path)
-        raise 'The provided "file_to_sign_path" does not exist'
-      end
-
-      @file_to_sign_path = path
-    end
-    private :_set_file_to_sign_path
-
-    # endregion
-
-    # region The "data_file" accessors
-
-    def data_file
-      _get_data_file
-    end
-
-    def _get_data_file
-      unless @data_file_path
-        return nil
-      end
-
-      File.read(@data_file_path)
-    end
-    private :_get_data_file
-
-    def data_file=(content_raw)
-      _set_data_file(content_raw)
-    end
-
-    def _set_data_file(content_raw)
-      unless content_raw
-        raise 'The provided "data_file" is not valid'
-      end
-
-      temp_file_path = self.create_temp_file
-      File.open(temp_file_path, 'wb') do |f|
-        f.write(content_raw)
-      end
-      @data_file_path = temp_file_path
-    end
-    private :_set_data_file
-
-    def data_file_base64
-      _get_data_file_base64
-    end
-
-    def _get_data_file_base64
-      unless @data_file_path
-        return nil
-      end
-
-      content = File.read(@data_file_path)
-      Base64.encode64(content)
-    end
-    private :_get_data_file_base64
-
-    def data_file_base64=(content_base64)
-      _set_data_file_base64(content_base64)
-    end
-
-    def _set_data_file_base64(content_base64)
-      unless content_base64
-        raise 'The provided "data_file_base64" is not valid'
-      end
-
-      begin
-        content_raw = Base64.decode64(content_base64)
-      rescue Error
-        raise 'The provided "data_file_base64" is not Base64-encoded'
-      end
-
-      _set_data_file(content_raw)
-    end
-    private :_set_data_file_base64
-
-    def data_file_path
-      _get_data_file_path
-    end
-
-    def _get_data_file_path
-      @data_file_path
-    end
-    private :_get_data_file_path
-
-    def data_file_path=(path)
-      _set_data_file_path(path)
-    end
-
-    def _set_data_file_path(path)
-      unless path
-        raise 'The provided "data_file_path" is not valid'
-      end
-      unless File.exists?(path)
-        raise 'The provided "data_file_path" does not exist'
-      end
-
-      @data_file_path = path
-    end
-    private :_set_data_file_path
-
-    # endregion
-
-    # region The "signature" accessors
-
-    def signature
-      _get_signature
-    end
-
-    def _get_signature
-      @signature
-    end
-    private :_get_signature
-
-    def signature=(content_raw)
-      _set_signature(content_raw)
-    end
-
-    def _set_signature(content_raw)
-      unless content_raw
-        raise 'The provided "signature" is not valid'
-      end
-      @signature = content_raw
-    end
-    private :_set_signature
-
-    def signature_base64
-      _get_signature_base64
-    end
-
-    def _get_signature_base64
-      unless @signature
-        return nil
-      end
-      Base64.encode64(@signature)
-    end
-    private :_get_signature_base64
-
-    def signature_base64=(content_base64)
-      _set_signature_base64(content_base64)
-    end
-
-    def _set_signature_base64(content_base64)
-      unless content_base64
-        raise 'The provided "signature_base64" is not valid'
-      end
-
-      begin
-        content_raw = Base64.decode64(content_base64)
-      rescue Error
-        raise 'The provided "signature_base64" is not Base64-encoded'
-      end
-
-      _set_signature(content_raw)
-    end
-    private :_set_signature_base64
-
-    # endregion
-
-    def transfer_file_id=(value)
-      unless value
-        raise 'The provided "transfer_file_id" is not valid'
-      end
-      unless File.exist?(File.expand_path(value, @config.transfer_data_folder))
-        raise 'The provided "transfer_file_id" does not exist'
-      end
-      @transfer_file_id = value
-    end
-
-    def output_file_path=(value)
-      unless value
-        raise 'The provided "output_file_path" is not valid'
-      end
-      @output_file_path = value
-    end
-
-    def complete(get_cert=true)
-      unless @file_to_sign_path
-        raise 'The file to be signed was not set'
-      end
-      unless @transfer_file_id
-        raise 'The transfer data file was not set'
-      end
-      unless @signature
-        raise 'The signature was not set'
-      end
-      unless @output_file_path
-        raise 'The output destination was not set'
-      end
-
-      args = [
-          @file_to_sign_path,
-          File.expand_path(@transfer_file_id, @config.transfer_data_folder),
-          @signature,
-          @output_file_path,
-      ]
-
-      if @data_file_path
-        args.append('--data-file')
-        args.append(@data_file_path)
-      end
-
-      if get_cert
-        # This operation can only be used on version greater than 1.8 of the
-        # PKI Express.
-        @version_manager.require_version('1.8')
-
-        # Invoke command.
-        result = invoke(Commands::COMPLETE_SIG, args)
-
-        # Parse output and return model.
-        model = parse_output(result)
-        return PKCertificate.new(model.fetch(:signer))
-      end
-
-      # Invoke command.
-      invoke(Commands::COMPLETE_SIG, args)
-    end
-
-  end
+module PkiExpress
+  class SignatureFinisher < PkiExpressOperator
+    attr_reader :transfer_file_id, :output_file_path
+
+    def initialize(config=PkiExpressConfig.new)
+      super(config)
+      @file_to_sign_path = nil
+      @transfer_file_id = nil
+      @data_file_path = nil
+      @output_file_path = nil
+      @signature = nil
+    end
+
+    # region The "file_to_sign" accessors
+
+    def file_to_sign
+      _get_file_to_sign
+    end
+
+    def _get_file_to_sign
+      unless @file_to_sign_path
+        return nil
+      end
+
+      File.read(@file_to_sign_path)
+    end
+    private :_get_file_to_sign
+
+    def file_to_sign=(content_raw)
+      _set_file_to_sign(content_raw)
+    end
+
+    def _set_file_to_sign(content_raw)
+      unless content_raw
+        raise 'The provided "file_to_sign" is not valid'
+      end
+
+      temp_file_path = self.create_temp_file
+      File.open(temp_file_path, 'wb') do |f|
+        f.write(content_raw)
+      end
+      @file_to_sign_path = temp_file_path
+    end
+    private :_set_file_to_sign
+
+    def file_to_sign_base64
+      _get_file_to_sign_base64
+    end
+
+    def _get_file_to_sign_base64
+      unless @file_to_sign_path
+        return nil
+      end
+
+      content = File.read(@file_to_sign_path)
+      Base64.encode64(content)
+    end
+    private :_get_file_to_sign_base64
+
+    def file_to_sign_base64=(content_base64)
+      _set_file_to_sign_base64(content_base64)
+    end
+
+    def _set_file_to_sign_base64(content_base64)
+      unless content_base64
+        raise 'The provided "file_to_sign_base64" is not valid'
+      end
+
+      begin
+        content_raw = Base64.decode64(content_base64)
+      rescue Error
+        raise 'The provided "file_to_sign_base64" is not Base64-encoded'
+      end
+
+      _set_file_to_sign(content_raw)
+    end
+    private :_set_file_to_sign_base64
+
+    def file_to_sign_path
+      _get_file_to_sign_path
+    end
+
+    def _get_file_to_sign_path
+      @file_to_sign_path
+    end
+    private :_get_file_to_sign_path
+
+    def file_to_sign_path=(path)
+      _set_file_to_sign_path(path)
+    end
+
+    def _set_file_to_sign_path(path)
+      unless path
+        raise 'The provided "file_to_sign_path" is not valid'
+      end
+      unless File.exists?(path)
+        raise 'The provided "file_to_sign_path" does not exist'
+      end
+
+      @file_to_sign_path = path
+    end
+    private :_set_file_to_sign_path
+
+    # endregion
+
+    # region The "data_file" accessors
+
+    def data_file
+      _get_data_file
+    end
+
+    def _get_data_file
+      unless @data_file_path
+        return nil
+      end
+
+      File.read(@data_file_path)
+    end
+    private :_get_data_file
+
+    def data_file=(content_raw)
+      _set_data_file(content_raw)
+    end
+
+    def _set_data_file(content_raw)
+      unless content_raw
+        raise 'The provided "data_file" is not valid'
+      end
+
+      temp_file_path = self.create_temp_file
+      File.open(temp_file_path, 'wb') do |f|
+        f.write(content_raw)
+      end
+      @data_file_path = temp_file_path
+    end
+    private :_set_data_file
+
+    def data_file_base64
+      _get_data_file_base64
+    end
+
+    def _get_data_file_base64
+      unless @data_file_path
+        return nil
+      end
+
+      content = File.read(@data_file_path)
+      Base64.encode64(content)
+    end
+    private :_get_data_file_base64
+
+    def data_file_base64=(content_base64)
+      _set_data_file_base64(content_base64)
+    end
+
+    def _set_data_file_base64(content_base64)
+      unless content_base64
+        raise 'The provided "data_file_base64" is not valid'
+      end
+
+      begin
+        content_raw = Base64.decode64(content_base64)
+      rescue Error
+        raise 'The provided "data_file_base64" is not Base64-encoded'
+      end
+
+      _set_data_file(content_raw)
+    end
+    private :_set_data_file_base64
+
+    def data_file_path
+      _get_data_file_path
+    end
+
+    def _get_data_file_path
+      @data_file_path
+    end
+    private :_get_data_file_path
+
+    def data_file_path=(path)
+      _set_data_file_path(path)
+    end
+
+    def _set_data_file_path(path)
+      unless path
+        raise 'The provided "data_file_path" is not valid'
+      end
+      unless File.exists?(path)
+        raise 'The provided "data_file_path" does not exist'
+      end
+
+      @data_file_path = path
+    end
+    private :_set_data_file_path
+
+    # endregion
+
+    # region The "signature" accessors
+
+    def signature
+      _get_signature
+    end
+
+    def _get_signature
+      @signature
+    end
+    private :_get_signature
+
+    def signature=(content_raw)
+      _set_signature(content_raw)
+    end
+
+    def _set_signature(content_raw)
+      unless content_raw
+        raise 'The provided "signature" is not valid'
+      end
+      @signature = content_raw
+    end
+    private :_set_signature
+
+    def signature_base64
+      _get_signature_base64
+    end
+
+    def _get_signature_base64
+      unless @signature
+        return nil
+      end
+      Base64.encode64(@signature)
+    end
+    private :_get_signature_base64
+
+    def signature_base64=(content_base64)
+      _set_signature_base64(content_base64)
+    end
+
+    def _set_signature_base64(content_base64)
+      unless content_base64
+        raise 'The provided "signature_base64" is not valid'
+      end
+
+      begin
+        content_raw = Base64.decode64(content_base64)
+      rescue Error
+        raise 'The provided "signature_base64" is not Base64-encoded'
+      end
+
+      _set_signature(content_raw)
+    end
+    private :_set_signature_base64
+
+    # endregion
+
+    def transfer_file_id=(value)
+      unless value
+        raise 'The provided "transfer_file_id" is not valid'
+      end
+      unless File.exist?(File.expand_path(value, @config.transfer_data_folder))
+        raise 'The provided "transfer_file_id" does not exist'
+      end
+      @transfer_file_id = value
+    end
+
+    def output_file_path=(value)
+      unless value
+        raise 'The provided "output_file_path" is not valid'
+      end
+      @output_file_path = value
+    end
+
+    def complete(get_cert=true)
+      unless @file_to_sign_path
+        raise 'The file to be signed was not set'
+      end
+      unless @transfer_file_id
+        raise 'The transfer data file was not set'
+      end
+      unless @signature
+        raise 'The signature was not set'
+      end
+      unless @output_file_path
+        raise 'The output destination was not set'
+      end
+
+      args = [
+          @file_to_sign_path,
+          File.expand_path(@transfer_file_id, @config.transfer_data_folder),
+          @signature,
+          @output_file_path,
+      ]
+
+      if @data_file_path
+        args.append('--data-file')
+        args.append(@data_file_path)
+      end
+
+      if get_cert
+        # This operation can only be used on version greater than 1.8 of the
+        # PKI Express.
+        @version_manager.require_version('1.8')
+
+        # Invoke command.
+        result = invoke(Commands::COMPLETE_SIG, args)
+
+        # Parse output and return model.
+        model = parse_output(result)
+        return PKCertificate.new(model.fetch(:signer))
+      end
+
+      # Invoke command.
+      invoke(Commands::COMPLETE_SIG, args)
+    end
+
+  end
 end

data/lib/pki_express/signature_policy_identifier.rb

@@ -1,21 +1,21 @@
-module PkiExpress
-  class SignaturePolicyIdentifier
-    attr_accessor :digest, :oid, :uri
-
-    def initialize(model)
-      @digest = nil
-      @oid = nil
-      @uri = nil
-
-      unless model.nil?
-        digest = model.fetch(:digest)
-        unless digest.nil?
-          DigestAlgorithmAndValue.new(digest)
-        end
-        oid = model.fetch(:oid)
-        uri = model.fetch(:uri)
-      end
-    end
-
-  end
+module PkiExpress
+  class SignaturePolicyIdentifier
+    attr_accessor :digest, :oid, :uri
+
+    def initialize(model)
+      @digest = nil
+      @oid = nil
+      @uri = nil
+
+      unless model.nil?
+        digest = model.fetch(:digest)
+        unless digest.nil?
+          DigestAlgorithmAndValue.new(digest)
+        end
+        oid = model.fetch(:oid)
+        uri = model.fetch(:uri)
+      end
+    end
+
+  end
 end