xrbp 0.1.10 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e441fc01ed75b0df28778339ba809a235438773082f62f25e1dcac9fb04c3308
-  data.tar.gz: e303c49a8ae8f71d19f532b24f0120f1dd1201747e4d0d274655c44cd5634ba4
+  metadata.gz: 6390bfb57eaa26b5285cb3f3c3fb10d85d0a3a81e09e3c3b1e52eff6d4a00514
+  data.tar.gz: b616a6a4324fbd34ec8e77529c2827fca77949f635a0785ab33d8ca867baccc2
 SHA512:
-  metadata.gz: 8dd5c9a48b69f732ebb11c72dba6b5345cedb6e89f52b0ca06f189bfd6592993425b4f2b2dfcd04b152a48c384b4e0b86248c30059adf7e5ae02018aaa9dc981
-  data.tar.gz: 261057099aeab635832d49bac987ad006fdb928a2b2507a8ec974cce1b4e2e59d9199aecc0f77412555b9fb5d33c4c77b47f6ff6ad489e40155ecc461f06f43d
+  metadata.gz: 6b96064684b5ef84f089808649e4b281e9f055610543deec66b8d09122c7a7b545da95f44b55e60a8e73e6402ec3d03f52cfc79ea9ee85bacc9e66003dbf0b01
+  data.tar.gz: 1f9f959987d864d4500ffc5ba2172c5341a9705a3eec9e3af09de88bfa9bf5f8feabbae0a7030db3437af75348a924b2535abb0b4661192aa44b3d5e300715df

data/lib/xrbp/nodestore/db.rb

@@ -413,7 +413,9 @@ module XRBP
         hash_prefix = Format::HASH_PREFIXES[obj["hash_prefix"].upcase]
         raise unless hash_prefix == :inner_node
 
-        Format::INNER_NODE.decode(node)
+        node = Format::INNER_NODE.decode(node)
+        node['node_type'] = Format::NODE_TYPE_CODES[node['node_type']]
+        node
       end
 
       protected

data/lib/xrbp/overlay/handshake.rb

@@ -12,8 +12,8 @@ module XRBP
     # XXX this module requires the openssl-ruby gem with the following patches:
     #     https://github.com/ruby/openssl/pull/250
     #
-    #     Otherwise the ssl_socket#finished and #peer_finished methods will
-    #     not be available
+    #     Otherwise the ssl_socket#finished_message and #peer_finished_message
+    #     methods will not be available
     #
     #     Currently the only way to apply this is to checkout openssl-ruby, apply
     #     the patches, and then rebuild/reinstall the gem locally!
@@ -39,8 +39,8 @@ module XRBP
       def shared
         @shared ||= begin
           sha512 = OpenSSL::Digest::SHA512.new
-          sf = socket.finished
-          pf = socket.peer_finished
+          sf = socket.finished_message
+          pf = socket.peer_finished_message
           sf = sha512.digest(sf)
           pf = sha512.digest(pf)
           shared = sf.to_bn ^ pf.to_bn
@@ -74,9 +74,12 @@ Session-Signature: #{shared}\r
           read_sockets, _, _ = IO.select([socket], nil, nil, 0.1)
 
           if read_sockets && read_sockets[0]
-            out = socket.read_nonblock(1024)
-            @response += out.strip
-            break if out[-4..-1] == "\r\n\r\n"
+            begin
+              out = socket.read_nonblock(1024)
+              @response += out.strip
+              break if out[-4..-1] == "\r\n\r\n"
+            rescue OpenSSL::SSL::SSLErrorWaitReadable
+            end
           end
         end
       end

data/lib/xrbp/version.rb

@@ -1,3 +1,3 @@
 module XRBP
-  VERSION = '0.1.10'
+  VERSION = '0.2.1'
 end # module XRBP

data/spec/xrbp/nodestore/backends/db_parser.rb

@@ -10,7 +10,7 @@ shared_examples "a database parser" do |opts={}|
 
   let(:inner_node_key) { ["001b46daaea7a40d9dcdc30f83918db8c8f9110c22e1207bcd8f9145dbe032dd"].pack("H*") }
   # XXX - see: https://github.com/ripple/rippled/issues/2960
-  let(:inner_node_type) { described_class == XRBP::NodeStore::Backends::NuDB ? 0 : 3 }
+  let(:inner_node_type) { described_class == XRBP::NodeStore::Backends::NuDB ? :unknown : :account_node }
   let(:inner_node) { {"node_type"=>inner_node_type, "hp_inner_node"=>"4d494e00", "child0"=>"0000000000000000000000000000000000000000000000000000000000000000", "child1"=>"0000000000000000000000000000000000000000000000000000000000000000", "child2"=>"0000000000000000000000000000000000000000000000000000000000000000", "child3"=>"0000000000000000000000000000000000000000000000000000000000000000", "child4"=>"0000000000000000000000000000000000000000000000000000000000000000", "child5"=>"0000000000000000000000000000000000000000000000000000000000000000", "child6"=>"0000000000000000000000000000000000000000000000000000000000000000", "child7"=>"0000000000000000000000000000000000000000000000000000000000000000", "child8"=>"0000000000000000000000000000000000000000000000000000000000000000", "child9"=>"0000000000000000000000000000000000000000000000000000000000000000", "child10"=>"0000000000000000000000000000000000000000000000000000000000000000", "child11"=>"0000000000000000000000000000000000000000000000000000000000000000", "child12"=>"0000000000000000000000000000000000000000000000000000000000000000", "child13"=>"0000000000000000000000000000000000000000000000000000000000000000", "child14"=>"0000000000000000000000000000000000000000000000000000000000000000", "child15"=>"666a34c47ed2890eab999536b6c0f728b3b2d616080bd38837f7c9f509b55204", "child16"=>"", "child17"=>"", "child18"=>"", "child19"=>"", "child20"=>"", "child21"=>"", "child22"=>"", "child23"=>"", "child24"=>"", "child25"=>"", "child26"=>"", "child27"=>"", "child28"=>"", "child29"=>"", "child30"=>"", "child31"=>""} }
 
   it "returns ledger" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xrbp
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.2.1
 platform: ruby
 authors:
 - Dev Null Productions
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-03 00:00:00.000000000 Z
+date: 2019-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json