signature_dfe 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 187cda15b027142a73148dea40fbc77c0c50e29bf2ee52277ed8bef11bceda4e
-  data.tar.gz: 583dcd4b1b348b90df234d155898f5a66d3ae9fe60945c5fa3dd07ff3dd4683e
+  metadata.gz: 92c8fd17fe3a88f60eee23a9e825452bde448b4e5645596441046a38a9651d8e
+  data.tar.gz: fa6c437efbc6796d427135a9fb605d55091ea4b1499399a6f487c32a1fc31a8f
 SHA512:
-  metadata.gz: f1fce5b56885cb6b1b3bca3206307770a20cfa9152428128ccf446ddee6cacad35829e061bafbc701053bb44f067ccbfca45bdd795d5528e2b76e1ffeae059b8
-  data.tar.gz: 82b77da8b4a403c5774eba82d0ba207a307bab3c90585e58115e53361965568b4db97ac034dcd7380cad4365389460e98a7aa95dd5e3202b2859b6c902c9331c
+  metadata.gz: b2174847030246e40692a53ddf57e0574f98d3e2e869d09c150afec33f778f7e15ece32fe258e880bdb985f1968b7c04b41d70a043501ccfcc8bd22cc60d0084
+  data.tar.gz: c6dec2aac9da0de279ce8febef467aa151ce0cbcffb1424182ed02ac4dc41ce61c17d4cb5e72ebbaf8b3bc717362aebfb75808ff457a8f0d513e9ff1b4f1af67

data/.rubocop.yml

@@ -1,27 +1,10 @@
 AllCops:
-  Exclude:
-
-Layout/LineLength:
-  Exclude:
-
-Metrics/BlockLength:
-  Exclude:
-    - signature_dfe.gemspec
-    - spec/xml/signature_dfe_xml_spec.rb
-    - spec/signature_dfe_spec.rb
-    - spec/event/signature_dfe_event_pem_spec.rb
-    - spec/event/signature_dfe_event_pkcs_spec.rb
-    - spec/nfe/signature_dfe_nfe_pem_spec.rb
-    - spec/nfe/signature_dfe_nfe_pkcs_spec.rb
-    - spec/xml/event/signatire_dfe_event_spec.rb
-
-Style/Documentation:
-  Enabled: false
-
+  NewCops: enable
 Style/FrozenStringLiteralComment:
   Enabled: false
-
-Metrics/AbcSize:
-  Max: 20
+Style/Documentation:
+  Enabled: false
+Metrics/BlockLength:
   Exclude:
-    # - lib/signature_dfe/ssl.rb
+    - spec/**/*.rb
+    - signature_dfe.gemspec

data/CHANGELOG

@@ -1,5 +1,3 @@
-v 0.1.3
-	- add support to Inutilização
 v 0.1.2
 	- fix bug with pkcs12 signature
 	- add event for NF-e NFA-e NFC-e

data/README.md

@@ -68,7 +68,7 @@ A forma qual vc tem a xml da assinautra completo onde vc passa o seu xml contend
 ```ruby
 inf_nfe = %{
 <infNFe Id="NFe00000000000000000000000000000000000000000000" versao="3.10">
-	...
+  ...
 </infNFe>}
 SignatureDfe::NFe.sign inf_nfe
 ```
@@ -77,24 +77,24 @@ Onde a resposta será
 
 ```xml
 <Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
-	<SignedInfo>
-		<CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/>
-		<SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-		<Reference URI="#NFe...">
-			<Transforms>
-				<Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
-				<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/>
-			</Transforms>
-			<DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-			<DigestValue>...</DigestValue>
-		</Reference>
-	</SignedInfo>
-	<SignatureValue>...</SignatureValue>
-	<KeyInfo>
-		<X509Data>
-			<X509Certificate>...</X509Certificate>
-		</X509Data>
-	</KeyInfo>
+  <SignedInfo>
+    <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/>
+    <SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <Reference URI="#NFe...">
+      <Transforms>
+        <Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
+        <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/>
+      </Transforms>
+      <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+      <DigestValue>...</DigestValue>
+    </Reference>
+  </SignedInfo>
+  <SignatureValue>...</SignatureValue>
+  <KeyInfo>
+    <X509Data>
+      <X509Certificate>...</X509Certificate>
+    </X509Data>
+  </KeyInfo>
 </Signature>
 ```
 
@@ -103,7 +103,7 @@ E a forma qual onde você pode obter os valores do <b>DigestValue</b>, <b>Signat
 ```ruby
 inf_nfe = %{
 <infNFe Id="NFe00000000000000000000000000000000000000000000" versao="3.10">
-	...
+  ...
 </infNFe>}
 ch_nfe = "0000000000000000000000000000000000000000000"
 digest_value = SignatureDfe::NFe.digest_value inf_nfe
@@ -122,7 +122,7 @@ A forma qual vc tem a xml da assinautra completo onde vc passa o seu xml contend
 ```ruby
 inf_evento = %{
 <infEvento Id="ID1101115515151515151515151515156546546546545646544701">
-	...
+  ...
 </infEvento>
 }
 SignatureDfe::NFe::Event.sign inf_evento
@@ -132,24 +132,24 @@ Onde a resposta será
 
 ```xml
 <Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
-	<SignedInfo>
-		<CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/>
-		<SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-		<Reference URI="#ID1...">
-			<Transforms>
-				<Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
-				<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/>
-			</Transforms>
-			<DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-			<DigestValue>...</DigestValue>
-		</Reference>
-	</SignedInfo>
-	<SignatureValue>...</SignatureValue>
-	<KeyInfo>
-		<X509Data>
-			<X509Certificate>...</X509Certificate>
-		</X509Data>
-	</KeyInfo>
+  <SignedInfo>
+    <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/>
+    <SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <Reference URI="#ID1...">
+      <Transforms>
+        <Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
+        <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/>
+      </Transforms>
+      <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+      <DigestValue>...</DigestValue>
+    </Reference>
+  </SignedInfo>
+  <SignatureValue>...</SignatureValue>
+  <KeyInfo>
+    <X509Data>
+      <X509Certificate>...</X509Certificate>
+    </X509Data>
+  </KeyInfo>
 </Signature>
 ```
 
@@ -158,7 +158,7 @@ E a forma qual onde você pode obter os valores do <b>DigestValue</b>, <b>Signat
 ```ruby
 inf_evento = %{
 <infEvento Id="ID1101115515151515151515151515156546546546545646544701">
-	...
+  ...
 </infEvento>}
 event_id = "ID1101115515151515151515151515156546546546545646544701"
 digest_value = SignatureDfe::NFe::Event.digest_value inf_evento
@@ -172,7 +172,7 @@ Segue-se exatamente como os documentos anteriores
 
 Para assinar passo a passo
 
-```
+```ruby
 inf_inut = %{
   <infInut Id="ID06546541654654654654654654654654654654879">
   ...
@@ -186,7 +186,7 @@ x509certificate = SignatureDfe::SSL.cert
 
 Ou, para gerar toda a assinatura em único passo
 
-```
+```ruby
 inf_inut = %{
   <infInut Id="ID06546541654654654654654654654654654654879">
   ...

data/lib/signature_dfe.rb

@@ -19,6 +19,7 @@ module SignatureDfe
   end
 end
 
+require 'signature_dfe/config'
 require 'signature_dfe/ssl'
 require 'signature_dfe/nfe'
 require 'signature_dfe/evento_nfe'

data/lib/signature_dfe/config.rb

@@ -0,0 +1,32 @@
+module SignatureDfe
+  class Config
+    include AbstractClass
+
+    attr_accessor :pkcs12, :pkey, :cert
+
+    attr_writer :password
+
+    def initialize
+      clear
+    end
+
+    def clear
+      @pkcs12 = nil
+      @pkey = nil
+      @cert = nil
+      @password = nil
+    end
+
+    def inspect
+      super.gsub(/, @pass[\s\S]*?>/, '>')
+    end
+
+    def cert?
+      !(cert.nil? || cert.empty?)
+    end
+
+    def instance_variables
+      super - [:@password]
+    end
+  end
+end

data/lib/signature_dfe/ssl.rb

@@ -1,31 +1,4 @@
 module SignatureDfe
-  class Config
-    include AbstractClass
-
-    attr_accessor :pkcs12, :pkey, :cert
-
-    attr_writer :password
-
-    def initialize
-      clear
-    end
-
-    def clear
-      @pkcs12 = nil
-      @pkey = nil
-      @cert = nil
-      @password = nil
-    end
-
-    def inspect
-      super.gsub(/\, \@pass[\s\S]*?\>/, '>')
-    end
-
-    def instance_variables
-      super - [:@password]
-    end
-  end
-
   class SSL
     include AbstractClass
 
@@ -35,17 +8,26 @@ module SignatureDfe
       attr_reader :config
     end
 
-    def self.sign(content, sign_method = OpenSSL::Digest::SHA1.new)
+    def self.sign(content, sign_method = OpenSSL::Digest.new('SHA1'))
       self.test unless defined?(@pk)
       @pk.sign sign_method, content
     end
 
     def self.cert
       self.test unless defined?(@pk)
-      @cert.to_s.gsub(/\-\-\-\-\-[A-Z]+ CERTIFICATE\-\-\-\-\-/, '').strip
+      @cert.to_s.gsub(/-----[A-Z]+ CERTIFICATE-----/, '').strip
     end
 
     class << self
+      def test
+        set_up
+        test_pkc12 if config.pkcs12
+        test_pem if config.pkey && !config.pkcs12
+        true
+      rescue OpenSSL::PKey::RSAError
+        error "Wrong password for '#{config.pkey}'"
+      end
+
       private
 
       def error(msg)
@@ -82,9 +64,7 @@ module SignatureDfe
       end
 
       def check_cert
-        if config.cert.nil? || config.cert.empty?
-          error 'You must be set up the cert if you chose use pkey'
-        end
+        error 'You must be set up the cert if you chose use pkey' unless config.cert?
         if File.exist? config.cert
           @cert = OpenSSL::X509::Certificate.new(File.read(config.cert))
         else
@@ -104,14 +84,5 @@ module SignatureDfe
         error "Your cert '#{config.cert}' is not a valid file"
       end
     end
-
-    def self.test
-      set_up
-      test_pkc12 if config.pkcs12
-      test_pem if config.pkey && !config.pkcs12
-      true
-    rescue OpenSSL::PKey::RSAError
-      error "Wrong password for '#{config.pkey}'"
-    end
   end
 end

data/lib/signature_dfe/version.rb

@@ -1,3 +1,3 @@
 module SignatureDfe
-  VERSION = '0.1.3'.freeze
+  VERSION = '0.1.4'.freeze
 end

data/lib/signature_dfe_check.rb

@@ -20,11 +20,9 @@ module SignatureDfe
       uri = Xml.namespace_value('URI', Xml.tag('Reference', xml)).gsub('#', '')
       xmlns = Xml.namespace_value('xmlns', xml)
       node_assigned = Xml.get_node_by_namespace_value(uri, xml)
-      node_assigned.gsub!(/>\s+\</, '><')
+      node_assigned.gsub!(/>\s+</, '><')
       node_name = Xml.node_name(node_assigned)
-      unless Xml.tag(node_name, xml).include?(xmlns)
-        node_assigned.gsub!(node_name, %(#{node_name} xmlns="#{xmlns}"))
-      end
+      node_assigned.gsub!(node_name, %(#{node_name} xmlns="#{xmlns}")) unless Xml.tag(node_name, xml).include?(xmlns)
       dv = OpenSSL::Digest::SHA1.digest(Xml.canonize(node_assigned))
       Base64.encode64(dv).strip == Xml.node_content('DigestValue', xml)
     end

data/lib/signature_dfe_xml.rb

@@ -7,19 +7,17 @@ module SignatureDfe
     end
 
     def self.build_signature(options = {})
-      path = "#{GEM_ROOT}/lib/signature_dfe/templates/signature.xml"
-      xml = File.read path
+      xml = File.read path('lib/signature_dfe/templates/signature.xml')
       xml.gsub!(':id', options[:id])
       xml.gsub!(':digest_value', options[:digest_value])
       xml.gsub!(':signature_value', options[:signature_value])
       cert = SignatureDfe::SSL.cert.to_s
-      cert.to_s.gsub(/\-\-\-\-\-[A-Z]+ CERTIFICATE\-\-\-\-\-/, '').strip!
-      xml.gsub!(':x509_certificate', cert.strip).gsub(/\>\s+\</, '><')
+      cert.to_s.gsub(/-----[A-Z]+ CERTIFICATE-----/, '').strip!
+      xml.gsub!(':x509_certificate', cert.strip).gsub(/>\s+</, '><')
     end
 
     def self.build_signed_info(id, digest_value_)
-      path = "#{GEM_ROOT}/lib/signature_dfe/templates/signed_info.xml"
-      signed_info = File.read path
+      signed_info = File.read path('lib/signature_dfe/templates/signed_info.xml')
       signed_info.gsub!(':id', id)
       signed_info.gsub!(':digest_value', digest_value_)
       signed_info_canonized = SignatureDfe::Xml.canonize signed_info
@@ -27,38 +25,38 @@ module SignatureDfe
     end
 
     def self.digest_method_algorithm(xml)
-      xml.scan(/(\<DigestMethod[\s\S]*?\#)([\s\S]*?)(\"|\')/)[0][1]
+      xml.scan(/(<DigestMethod[\s\S]*?\#)([\s\S]*?)("|')/)[0][1]
     end
 
     def self.node(name, xml)
-      r = %r{\<#{Regexp.escape(name)}[\s\S]*((/\>)|(#{Regexp.escape(name)}\>))}
+      r = %r{<#{Regexp.escape(name)}[\s\S]*((/>)|(#{Regexp.escape(name)}>))}
       xml.match(r)[0].gsub(/>\s+</, '><')
     end
 
     def self.node_content(name, xml)
-      full_node = xml.scan(%r{\<#{name}.*?\>([\s\S]*?)\</#{name}\>})
+      full_node = xml.scan(%r{<#{name}.*?>([\s\S]*?)</#{name}>})
       return nil unless full_node[0]
 
       full_node[0][0]
     end
 
     def self.node_name(xml)
-      xml.scan(%r{\<[^/\s\>]*})[0].gsub('<', '')
+      xml.scan(%r{<[^/\s>]*})[0].gsub('<', '')
     end
 
     def self.tag(name, xml)
-      xml.scan(%r{\<#{name}[\S\s]*?[/\>|\>]})[0]
+      xml.scan(%r{<#{name}[\S\s]*?[/>|>]})[0]
     end
 
     def self.namespace_value(namespace, xml)
-      matches = xml.match(/#{Regexp.escape(namespace)}\=\"([^"]*)/)
+      matches = xml.match(/#{Regexp.escape(namespace)}="([^"]*)/)
       return nil unless matches
 
       matches[1]
     end
 
     def self.get_node_by_namespace_value(value, xml)
-      a = xml.match(%r{\<[^<]*#{Regexp.escape(value)}[^>]*(\>|/>)})[0]
+      a = xml.match(%r{<[^<]*#{Regexp.escape(value)}[^>]*(>|/>)})[0]
       node(node_name(a), xml)
     end
 

data/signature_dfe.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.metadata['allowed_push_host'] = 'https://rubygems.org'
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = repo
-  spec.metadata['changelog_uri'] = repo + '/blob/master/CHANGELOG'
+  spec.metadata['changelog_uri'] = "#{repo}/blob/master/CHANGELOG"
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     rx = %r{^(test|spec|features)/}
     `git ls-files -z`.split("\x0").reject { |f| f.match(rx) }
@@ -30,6 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 2.1.2'
   spec.add_development_dependency 'nokogiri', '~> 1.10.7'
   spec.add_development_dependency 'openssl', '~> 2.1.2'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.required_ruby_version = '>= 2.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: signature_dfe
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Thiago Feitosa
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-01-29 00:00:00.000000000 Z
+date: 2020-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,16 +56,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -106,6 +106,7 @@ files:
 - certs/gen.sh
 - certs/key.pem
 - lib/signature_dfe.rb
+- lib/signature_dfe/config.rb
 - lib/signature_dfe/disabling.rb
 - lib/signature_dfe/evento_nfe.rb
 - lib/signature_dfe/nfe.rb
@@ -124,7 +125,7 @@ metadata:
   homepage_uri: https://github.com/thiaguerd/signature_dfe
   source_code_uri: https://github.com/thiaguerd/signature_dfe
   changelog_uri: https://github.com/thiaguerd/signature_dfe/blob/master/CHANGELOG
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -132,7 +133,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -140,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Assinatura digital de documentos fiscais eletrônicos
 test_files: []