epics 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af6bf6d6425c258c08814fc2c1c3b9a3b3073123
-  data.tar.gz: 1ee5bef16a6bf11f34f8aa60a79f3b11d8875122
+  metadata.gz: 063dc49eee1a69c5da9492fe57bfebad265b6b8c
+  data.tar.gz: 2a4ee56062ace723a77db89e8d6d0f740e746a13
 SHA512:
-  metadata.gz: 1afc8a8f34f6cde89869f5a5c4a24b09ae3bcb111da63ef81f97823fc187fa67120f86b0343c54a8841f4c43654e7be27b44804ca87ed479f3c27f6666d5ca6b
-  data.tar.gz: f57a864a565b4bd70731cde527052f5d17c6e304542f26a7937321e7045136ca53424287c082e132d870df0158c73cee4696873fd8fb815bfc90ac30549d9f32
+  metadata.gz: d95094a67c27c63c46cbbc406bdb9951ed03a187b933a3feddb5378feaaeebeddac1c727344247af71cb8fe7495c18938ec0d7d288765d9a2e7a7cd7a7603f31
+  data.tar.gz: 12d39c6a553e7e21ccae83680f93abd8fb4c5aed789f25c15c20acbbf1806c3d58407a97ef55392b8fe7e21f3703cbe64031de0a9ab1faa4ef79852c5e942dc8

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 1.1.1
+
+  * [BUGFIX] CCT order was submited as CD1
+  * [BUGFIX] padding was calculated against the wrong block size
+  * [BUGFIX] double encoding of the signature
+
 ### 1.1.0
 
   * [BUGFIX] Sending `Receipts` after downloading data, to circumvent download locks

data/lib/epics/cct.rb

@@ -14,7 +14,7 @@ class Epics::CCT < Epics::GenericUploadRequest
           :content! => "EPICS - a ruby ebics kernel"
         },
         "OrderDetails" => {
-          "OrderType" => "CD1",
+          "OrderType" => "CCT",
           "OrderAttribute" => "OZHNN",
           "StandardOrderParams/" => ""
         },

data/lib/epics/generic_upload_request.rb

@@ -52,10 +52,11 @@ class Epics::GenericUploadRequest < Epics::GenericRequest
   end
 
   def signature_value
-    Base64.encode64(client.a.sign( digester.digest(document.gsub(/\n|\r/, "")) )).gsub(/\n/, "")
+    client.a.sign( digester.digest(document.gsub(/\n|\r/, "")) )
   end
 
   def encrypt(d)
+    cipher.reset
     cipher.encrypt
     cipher.padding = 0
     cipher.key = self.key
@@ -75,14 +76,11 @@ class Epics::GenericUploadRequest < Epics::GenericRequest
   end
 
   def pad(d)
-    if d.size % 32 == 0
-      return d
-    else
-      len = 32*((d.size / 32)+1)
-      padded = d.ljust(len, "\x01")
-      padded[-1] = ["#{len - d.size}".rjust(2, "0")].pack("*H")
-      padded
-    end
+    len = cipher.block_size*((d.size / cipher.block_size)+1)
+    padded = d.ljust(len, [0].pack("C*"))
+    padded[-1] = [len - d.size].pack("C*")
+
+    padded
   end
 
 end

data/lib/epics/version.rb

@@ -1,3 +1,3 @@
 module Epics
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/spec/generic_upload_spec.rb

@@ -0,0 +1,37 @@
+RSpec.describe Epics::GenericUploadRequest do
+  let(:client) { Epics::Client.new( File.open(File.join( File.dirname(__FILE__), 'fixtures', 'SIZBN001.key')), 'secret' , 'https://194.180.18.30/ebicsweb/ebicsweb', 'SIZBN001', 'EBIX', 'EBICS') }
+  subject { described_class.new(client, "\x01" * 12) }
+
+  describe '#pad' do
+
+    it 'will complete the block to the next 16byte' do
+      expect(subject.pad("\x01" * 13).size).to eq(16)
+    end
+
+    it 'will pad a complete block if the size is a multiple of 16' do
+      expect(subject.pad("\x01" * 16).size).to eq(32)
+    end
+
+    it 'will set the last byte to the padding length' do
+      expect(subject.pad("\x01" * 13)[-1]).to eq([3].pack("C*"))
+    end
+  end
+
+  describe '#signature_value' do
+    before { allow(OpenSSL::Random).to receive(:random_bytes).and_return(Base64.strict_decode64("7wtROfiX4tyN60cygJUSsHkhzxX1RVJa8vGNYnflvKc=")) }
+
+    it 'will be the signed document' do
+      expect(subject.signature_value).to eq("BQBMyxGHYoAbbmbMJRFbGrvUNinY15+qeeRLF708VL+tuENnbJMO6xHLWxU1rksOnu4xDzxfua9b3IxIaxLyTTFDuVi6bbu3sBslhIt2frdigo0xBL14KUJQ/pYiMj+2pfNYhtVxzamrnvgPSLNAEn36JykK2d347chT87HlZ7CAGNBS7lJHAzRP1v7Hkc+kKttkkWCpOGk06R6FUCxxVKXmQketMEl/scsMyJ3JtBe/EcjEZdDe5WcqZYUu5ARrfEiAeyutVRZnu17c3nKwkmWl7UqFAwp16cS8IPNL4i5FGCytgKl/kyaoxaE/P1lrGOkHcCTsSR0bAbARhndfdQ==")
+    end
+  end
+
+  describe '#order_signature' do
+    before { allow(subject).to receive(:signature_value).and_return("FOOBAR") }
+    let(:signature) { Nokogiri::XML(subject.order_signature) }
+
+    it 'contains the untouched signature_value ' do
+      expect(signature.at_xpath('//xmlns:SignatureValue').text).to eq("FOOBAR")
+    end
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epics
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Lars Brillert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-29 00:00:00.000000000 Z
+date: 2014-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -214,6 +214,7 @@ files:
 - spec/fixtures/xml/sta_response.xml
 - spec/fixtures/xml/sta_response_continued.xml
 - spec/fixtures/xml/upload_init_response.xml
+- spec/generic_upload_spec.rb
 - spec/hpb_spec.rb
 - spec/key_spec.rb
 - spec/mgf_spec.rb
@@ -301,6 +302,7 @@ test_files:
 - spec/fixtures/xml/sta_response.xml
 - spec/fixtures/xml/sta_response_continued.xml
 - spec/fixtures/xml/upload_init_response.xml
+- spec/generic_upload_spec.rb
 - spec/hpb_spec.rb
 - spec/key_spec.rb
 - spec/mgf_spec.rb