epics 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 980932f78c7674473397501f8e2605ea228440f7f6eb0f8e83b64191c390fb59
-  data.tar.gz: 646f6c19ced2dfc713a632dee70a4bbd88bf18334593ce743b4175fcb73ee063
+  metadata.gz: 196537be2328e1c2445eafddb04840616446d599e8f2c887b8d6e5884acd1107
+  data.tar.gz: 7d0fc17a578fcae3e3827d56375c20449961b40f581fdd2a192f7addf1ac3c6e
 SHA512:
-  metadata.gz: f3ed6cc291a2ff0a6049f3cb25312364a8165a32aaf87127cb75f655f6338dfe6f9e3ab640f81a13fe177d3e6e3229d2712df8eb9f7c1885b6ebe777597f4061
-  data.tar.gz: ddd2ec2d76ff97053856883471725ae1f0a9f8c97aab9f094ab9598966d3d4494f8cb76184e0a454721b9cb304d403de4e10677ea2a21bea13bad288595d759c
+  metadata.gz: d8b5b8538c6c6100f1e6f9cf225999ec1d9bed0fa152bfb0aa5ff8f02cdfd545254eb9a348f03e868fa7544e67424b1fbd4277ba1185bc820fa68792ed23bb9b
+  data.tar.gz: e490b632b8f018aff18c8461780875190af6a287807c7baaaa579060eca89961b83bd3404291b31f98a54859a6a8eca9df2b7053c9de080a9043a7b1ae0a84f6

data/.semaphore/semaphore.yml

@@ -3,7 +3,7 @@ name: Test
 agent:
   machine:
     type: e1-standard-2
-    os_image: ubuntu1804
+    os_image: ubuntu2004
 blocks:
   - name: Setup
     task:
@@ -16,30 +16,39 @@ blocks:
   - name: Spec versions
     task:
       jobs:
-        - name: "2.7"
+        - name: "3.0"
           commands:
             - checkout
-            - sem-version ruby 2.7
+            - sem-version ruby 3.0
             - cache restore
-            - gem install bundler:2.4.3
+            - gem install bundler:2.4.22
             - bundle install
             - cache store
             - bundle exec rspec
-        - name: "3.0"
+        - name: "3.1"
           commands:
             - checkout
-            - sem-version ruby 3.0
+            - sem-version ruby 3.1
             - cache restore
-            - gem install bundler:2.4.3
+            - gem install bundler:2.4.22
             - bundle install
             - cache store
             - bundle exec rspec
-        - name: "3.1"
+        - name: "3.2"
           commands:
             - checkout
-            - sem-version ruby 3.1
+            - sem-version ruby 3.2
+            - cache restore
+            - gem install bundler:2.4.22
+            - bundle install
+            - cache store
+            - bundle exec rspec
+        - name: "3.3"
+          commands:
+            - checkout
+            - sem-version ruby 3.3
             - cache restore
-            - gem install bundler:2.4.3
+            - gem install bundler:2.4.22
             - bundle install
             - cache store
             - bundle exec rspec

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+### Unreleased
+
+### 2.2.0
+
+- [ENHANCEMENT]  Adds C2S order tyoe
+- [HOUSEKEEPING] updates nokogiri dependency
+- [HOUSEKEEPING] updates rexml dependency
+- [HOUSEKEEPING] adds Ruby 3.3 to CI
+
+### 2.1.2
+
+- [BUGFIX] Fix order data encryption for OpenSSL 3
+
 ### 2.1.1
 
 - [HOUSEKEEPING] update Bank public key initialization for OpenSSL 3

data/epics.gemspec

@@ -41,10 +41,11 @@ Gem::Specification.new do |spec|
   spec.post_install_message += "\e[32m" + ('*' * 60) + "\n\e[0m"
 
   spec.add_dependency 'faraday',  '>= 1.10.0'
-  spec.add_dependency 'nokogiri', '>= 1.14.0'
+  spec.add_dependency 'nokogiri', '>= 1.16.5'
   spec.add_dependency 'rubyzip',  '>= 2.3.2'
+  spec.add_dependency 'rexml',    '>= 3.2.8'
 
-  spec.add_development_dependency 'bundler', '>= 2.4.3'
+  spec.add_development_dependency 'bundler', '>= 2.4.12'
   spec.add_development_dependency 'equivalent-xml'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rake', '~> 13.0'

data/lib/epics/c2s.rb

@@ -0,0 +1,9 @@
+class Epics::C2S < Epics::CDB
+  def order_attribute
+    "DZHNN"
+  end
+
+  def order_type
+    'C2S'
+  end
+end

data/lib/epics/cdb.rb

@@ -1,4 +1,12 @@
 class Epics::CDB < Epics::GenericUploadRequest
+  def order_attribute
+    'OZHNN'
+  end
+
+  def order_type
+    'CDB'
+  end
+
   def header
     Nokogiri::XML::Builder.new do |xml|
       xml.header(authenticate: true) {
@@ -10,8 +18,8 @@ class Epics::CDB < Epics::GenericUploadRequest
           xml.UserID user_id
           xml.Product("EPICS - a ruby ebics kernel", 'Language' => 'de')
           xml.OrderDetails {
-            xml.OrderType 'CDB'
-            xml.OrderAttribute 'OZHNN'
+            xml.OrderType order_type
+            xml.OrderAttribute order_attribute
             xml.StandardOrderParams
           }
           xml.BankPubKeyDigests {

data/lib/epics/client.rb

@@ -129,6 +129,10 @@ class Epics::Client
     upload(Epics::CDB, document)
   end
 
+  def C2S(document)
+    upload(Epics::C2S, document)
+  end
+
   def CDD(document)
     upload(Epics::CDD, document)
   end

data/lib/epics/generic_upload_request.rb

@@ -1,15 +1,17 @@
 class Epics::GenericUploadRequest < Epics::GenericRequest
   attr_accessor :key
+  attr_accessor :iv
   attr_accessor :document
 
   def initialize(client, document)
     super(client)
     self.document = document
-    self.key ||= cipher.random_key
+    self.key = cipher.random_key
+    self.iv = 0.chr * cipher.iv_len
   end
 
   def cipher
-    @cipher ||= OpenSSL::Cipher.new("aes-128-cbc")
+    @cipher ||= OpenSSL::Cipher.new("aes-128-cbc").tap { |cipher| cipher.encrypt }
   end
 
   def digester
@@ -49,9 +51,9 @@ class Epics::GenericUploadRequest < Epics::GenericRequest
 
   def encrypt(d)
     cipher.reset
-    cipher.encrypt
     cipher.padding = 0
     cipher.key = self.key
+    cipher.iv = self.iv
     (cipher.update(pad(d)) + cipher.final)
   end
 

data/lib/epics/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Epics
-  VERSION = '2.1.1'
+  VERSION = '2.2.0'
 end

data/lib/epics.rb

@@ -37,6 +37,7 @@ require "epics/cdd"
 require "epics/b2b"
 require "epics/xds"
 require "epics/cds"
+require "epics/c2s"
 require "epics/cdz"
 require "epics/crz"
 require "epics/xct"

data/spec/generic_upload_spec.rb

@@ -46,4 +46,13 @@ RSpec.describe Epics::GenericUploadRequest do
     end
 
   end
+
+  describe '#encrypted_order_data' do
+    it 'returns the same data every time' do
+      data_1 = subject.encrypted_order_data
+      data_2 = subject.encrypted_order_data
+
+      expect(data_1).to eq(data_2)
+    end
+  end
 end

data/spec/orders/c2s_spec.rb

@@ -0,0 +1,21 @@
+RSpec.describe Epics::C2S 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') }
+  let(:document) { File.read( File.join( File.dirname(__FILE__), '..', 'fixtures', 'xml', 'cdb.xml') ) }
+  subject { described_class.new(client, document) }
+
+  describe 'order attributes' do
+    it { expect(subject.header.to_s).to include('<OrderAttribute>DZHNN</OrderAttribute>') }
+    it { expect(subject.header.to_s).to include('<OrderType>C2S</OrderType>') }
+  end
+
+  describe '#to_xml' do
+    specify { expect(subject.to_xml).to be_a_valid_ebics_doc }
+  end
+
+  describe '#to_transfer_xml' do
+    before { subject.transaction_id = SecureRandom.hex(16) }
+
+    specify { expect(subject.to_transfer_xml).to be_a_valid_ebics_doc }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epics
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Lars Brillert
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-25 00:00:00.000000000 Z
+date: 2024-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 1.16.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 1.16.5
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -52,20 +52,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.2
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.8
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.3
+        version: 2.4.12
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.3
+        version: 2.4.12
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
@@ -166,6 +180,7 @@ files:
 - lib/epics.rb
 - lib/epics/azv.rb
 - lib/epics/b2b.rb
+- lib/epics/c2s.rb
 - lib/epics/c52.rb
 - lib/epics/c53.rb
 - lib/epics/c54.rb
@@ -244,6 +259,7 @@ files:
 - spec/middleware/parse_ebics_spec.rb
 - spec/orders/azv_spec.rb
 - spec/orders/b2b_spec.rb
+- spec/orders/c2s_spec.rb
 - spec/orders/c52_spec.rb
 - spec/orders/c53_spec.rb
 - spec/orders/c54_spec.rb
@@ -305,7 +321,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.13
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: a ruby implementation of the EBICS protocol
@@ -353,6 +369,7 @@ test_files:
 - spec/middleware/parse_ebics_spec.rb
 - spec/orders/azv_spec.rb
 - spec/orders/b2b_spec.rb
+- spec/orders/c2s_spec.rb
 - spec/orders/c52_spec.rb
 - spec/orders/c53_spec.rb
 - spec/orders/c54_spec.rb