akami 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20bb54b460119624acb0737c62c1c0b82825ace9886a239e2a3cefd8461635c7
-  data.tar.gz: c5fb01bbaf55b70be8627e2f9ee6a40cd2e6680ee2b0cee65d38eedd78961a48
+  metadata.gz: c1103cb0692c129241fbfd8360ab1dcfc96157c9ad7f2a28987ea3848ec06ab2
+  data.tar.gz: d2e9cfc6c384c697be541aceda1bb3a4dc5e9654db159eca3fbc795dfc5d2671
 SHA512:
-  metadata.gz: 787c578411ef161d8109708b1d498743b9bf7a24e840566209f946179b9ffe4ce0d20ce2236a615973108ffb578423bad481cc0d11301ee4617762d19cc24308
-  data.tar.gz: 6a421ce03eda89cf332b767e76d2c89dbd5577ecc36dc08d4d696f3ee8e1f84a6160bfd4fdba32f6bd30d3aaacc62cb3f7d07e7c0b7363bce389a198455a7a8e
+  metadata.gz: c3bd5f7aa12bc379c4434dc880a23f9897a722ae2dd09352fb50a0bf807e932abc26d2703dfd2bcea463216fb746d499ce2eb80cff978b1feeb23404749a0253
+  data.tar.gz: 84f9de77fef2521fa98df2c52f5e32b71f72b909da82f77a586e3aa746f8883610983b712c7ba11ff7833c409e72d243762358dfd6a46eead757ec9938b607e7

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.3.3 (2024-02-13)
+
+* Explicitly declare base64 dep in gemfile (useful for testing against ruby-head).
+
 ## 1.3.2 (2024-01-09)
 
 * Stop patching Hash [#35](https://github.com/savonrb/akami/pull/35)

data/lib/akami/version.rb

@@ -1,5 +1,5 @@
 module Akami
 
-  VERSION = '1.3.2'
+  VERSION = '1.3.3'
 
 end

data/lib/akami/wsse.rb

@@ -90,25 +90,24 @@ module Akami
 
     # Returns the XML for a WSSE header.
     def to_xml
-      if signature? and signature.have_document?
-        Gyoku.xml wsse_signature.merge!(hash)
-      elsif username_token? && timestamp?
-        Gyoku.xml wsse_username_token.merge!(wsu_timestamp) {
-          |key, v1, v2| v1.merge!(v2) {
-            |key, v1, v2| v1.merge!(v2)
-          }
-        }
-      elsif username_token?
-        Gyoku.xml wsse_username_token.merge!(hash)
-      elsif timestamp?
-        Gyoku.xml wsu_timestamp.merge!(hash)
-      else
-        ""
-      end
+      h = wsse_signature if signature? && signature.have_document?
+      h = merge_hashes_with_keys(h, wsu_timestamp) if timestamp?
+      h = merge_hashes_with_keys(h, wsse_username_token) if username_token?
+
+      return '' unless h
+      Gyoku.xml h
     end
 
   private
 
+    def merge_hashes_with_keys(hash_one, hash_two)
+      return hash_two unless hash_one
+      keys = hash_one["wsse:Security"][:order!] | hash_two["wsse:Security"][:order!]
+      Akami::HashHelper.deep_merge!(hash_one, hash_two)
+      hash_one["wsse:Security"][:order!] = keys
+      hash_one
+    end
+
     # Returns a Hash containing wsse:UsernameToken details.
     def wsse_username_token
       if digest?
@@ -135,7 +134,7 @@ module Akami
       # First key/value is tag/hash
       tag, hash = signature_hash.shift
 
-      security_hash nil, tag, hash, signature_hash
+      security_hash nil, tag, hash, signature_hash, true
     end
 
     # Returns a Hash containing wsu:Timestamp details.
@@ -147,21 +146,20 @@ module Akami
 
     # Returns a Hash containing wsse/wsu Security details for a given
     # +namespace+, +tag+ and +hash+.
-    def security_hash(namespace, tag, hash, extra_info = {})
+    def security_hash(namespace, tag, hash, extra_info = {}, signature_request=false)
       key = [namespace, tag].compact.join(":")
 
       sec_hash = {
         "wsse:Security" => {
-          key => hash
+          key => hash,
+          :order! => [key]
         },
         :attributes! => { "wsse:Security" => { "xmlns:wsse" => WSE_NAMESPACE } }
       }
 
-      unless extra_info.empty?
-        sec_hash["wsse:Security"].merge!(extra_info)
-      end
+      sec_hash["wsse:Security"].merge!(extra_info) unless extra_info.empty?
 
-      if signature?
+      if signature_request
         sec_hash[:attributes!].merge!("soapenv:mustUnderstand" => "1")
       else
         sec_hash["wsse:Security"].merge!(:attributes! => { key => { "wsu:Id" => "#{tag}-#{count}", "xmlns:wsu" => WSU_NAMESPACE } })
@@ -201,6 +199,5 @@ module Akami
     def hash
       @hash ||= Hash.new { |h, k| h[k] = Hash.new(&h.default_proc) }
     end
-
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: akami
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Daniel Harrington
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-10 00:00:00.000000000 Z
+date: 2024-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gyoku
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -112,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="