xdr 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 841aa4d6061ac4e1989f6eb231c3b78fdc69b43f
-  data.tar.gz: d3342bce08c239465be256c53311d242d15fe658
+SHA256:
+  metadata.gz: 0d5bbd8152326ee17057091ea8a9ec722f07ad88c74bf9717b16cdab900401e5
+  data.tar.gz: 60dfea4235d890dc70553903b5130ed05e5c98e83bc3586ecf0bd7e447cb205e
 SHA512:
-  metadata.gz: faaa298dac8ceed46a0f9d7c654e5e4daad1bf8fad2dfdd1cee350c84ec54c653b193653289ef4fecbc92922f72e79c32a41285a59b392f98c14e596861afd6a
-  data.tar.gz: 1bc9c094fec32a7e39338122696fb58cb3058099f29929abf7b87da9972d3ddab2e1e58ca691ac3ab8956694ffb767eb354ec6f39b3c80b9245be3f74123757b
+  metadata.gz: d74217c94b1cbb5a7e0c6b1bcf14547c5b5d186b6bcabe6c078b5d941ac3953dd32ab652f151f8ed970c8c6fc92cbcee2e7608ab6c3b3d57e6d7de1080a780e6
+  data.tar.gz: cf5d7fd46ef66e83c70860d52ef50dab523af310ab2aba5f7cc06543791adac5d8afbefd8480734f1a34259ecdd2da2c5921f30e90fc84113f89bb006ae5d7de

data/CHANGELOG.md

@@ -6,6 +6,11 @@ file.  This project adheres to [Semantic Versioning](http://semver.org/).
 As this project is pre 1.0, breaking changes may happen for minor version
 bumps.  A breaking change will get clearly notified in this log.
 
+## [Unreleased](https://github.com/stellar/ruby-stellar-base/compare/v1.0.0...master)
+
+### Fixed
+- Padding bytes are now properly validated when reading xdr values.  According to the XDR spec, padding must be zeros.
+
 ## [1.0.0](https://github.com/stellar/ruby-stellar-base/compare/v0.1.0...v1.0.0)
 
 ### Added

data/lib/xdr/concerns/reads_bytes.rb

@@ -5,4 +5,12 @@ module XDR::Concerns::ReadsBytes
       raise EOFError if bytes.nil? || bytes.length != length
     end
   end
+
+  def read_zeros(io, length)
+    read_bytes(io, length).each_byte do |byte|
+      raise XDR::ReadError unless byte == 0
+    end
+
+    nil
+  end
 end

data/lib/xdr/opaque.rb

@@ -12,7 +12,7 @@ class XDR::Opaque
   def read(io)
     # read and return @length bytes
     # throw away @padding bytes
-    read_bytes(io, @length).tap{ read_bytes(io, @padding) }
+    read_bytes(io, @length).tap{ read_zeros(io, @padding) }
   end
 
   def write(val,io)

data/lib/xdr/string.rb

@@ -31,6 +31,6 @@ class XDR::String
 
     # read and return length bytes
     # throw away padding bytes
-    read_bytes(io, length).tap{ read_bytes(io, padding) }
+    read_bytes(io, length).tap{ read_zeros(io, padding) }
   end
 end

data/lib/xdr/var_opaque.rb

@@ -31,6 +31,6 @@ class XDR::VarOpaque
 
     # read and return length bytes
     # throw away padding bytes
-    read_bytes(io, length).tap{ read_bytes(io, padding) }
+    read_bytes(io, length).tap{ read_zeros(io, padding) }
   end
 end

data/lib/xdr/version.rb

@@ -1,3 +1,3 @@
 module XDR
-  VERSION = "2.0.0"
+  VERSION = "3.0.0"
 end

data/spec/lib/xdr/concerns/reads_bytes_spec.rb

@@ -3,6 +3,7 @@ require 'spec_helper'
 class TestReader
   include XDR::Concerns::ReadsBytes
   public :read_bytes
+  public :read_zeros
 end
 
 
@@ -28,4 +29,29 @@ describe XDR::Concerns::ReadsBytes, "#read_bytes"  do
     io = StringIO.new(str)
     subject.read_bytes(io, length)
   end
+end
+
+
+describe XDR::Concerns::ReadsBytes, "#read_zeros"  do
+  subject{ TestReader.new }
+
+  it "raises XDR::ReadError when the bytes read do not equal zero" do
+    expect{ read("\x01", 1) }.to raise_error(XDR::ReadError)
+  end
+
+  it "succeeds when all the bytes read are zero" do
+    expect{ read("\x00\x00\x00\x00", 1) }.to_not raise_error
+    expect{ read("\x00\x00\x00\x00", 2) }.to_not raise_error
+    expect{ read("\x00\x00\x00\x00", 3) }.to_not raise_error
+    expect{ read("\x00\x00\x00\x00", 4) }.to_not raise_error
+  end
+
+  it "raises EOFError when the requested length goes beyond the length of the stream" do
+    expect{ read("\x00\x00\x00\x00", 5) }.to raise_error(EOFError)
+  end
+
+  def read(str, length)
+    io = StringIO.new(str)
+    subject.read_zeros(io, length)
+  end
 end

data/spec/lib/xdr/opaque_spec.rb

@@ -9,6 +9,10 @@ describe XDR::Opaque, "#read" do
     expect(read("\x00\x01\x00\x00")).to eq("\x00\x01\x00")
   end
 
+  it "raises a ReadError when the padding isn't zeros" do
+    expect{ read "\x00\x00\x01\x01" }.to raise_error(XDR::ReadError)
+  end
+
   def read(str)
     io = StringIO.new(str)
     subject.read(io)

data/spec/lib/xdr/string_spec.rb

@@ -14,6 +14,12 @@ describe XDR::String, "#read" do
     expect{ read "\x00\x00\x00\x04hiya" }.to raise_error(XDR::ReadError)
   end
 
+  it "raises a ReadError when the padding isn't zeros" do
+    expect{ read "\x00\x00\x00\x01h\x00\x00\x01" }.to raise_error(XDR::ReadError)
+    expect{ read "\x00\x00\x00\x01h\x00\x01\x00" }.to raise_error(XDR::ReadError)
+    expect{ read "\x00\x00\x00\x01h\x01\x00\x00" }.to raise_error(XDR::ReadError)
+  end
+
   def read(str)
     io = StringIO.new(str)
     subject.read(io)

data/spec/lib/xdr/var_opaque_spec.rb

@@ -15,6 +15,13 @@ describe XDR::VarOpaque, "#read" do
     expect{ read "\x00\x00\x00\x03\x00\x00\x00\x00" }.to raise_error(XDR::ReadError)
   end
 
+
+  it "raises a ReadError when the padding isn't zeros" do
+    expect{ read "\x00\x00\x00\x01\x01\x00\x00\x01" }.to raise_error(XDR::ReadError)
+    expect{ read "\x00\x00\x00\x01\x01\x00\x01\x00" }.to raise_error(XDR::ReadError)
+    expect{ read "\x00\x00\x00\x01\x01\x01\x00\x00" }.to raise_error(XDR::ReadError)
+  end
+
   def read(str)
     io = StringIO.new(str)
     subject.read(io)

data/xdr.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
-  spec.add_dependency "activesupport", ">= 4.2.7"
-  spec.add_dependency "activemodel",  ">= 4.2.7"
+  spec.add_dependency "activesupport", ">= 5.2.0"
+  spec.add_dependency "activemodel",  ">= 5.2.0"
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xdr
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Scott Fleckenstein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2018-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.7
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.7
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.7
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.7
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -210,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: XDR Helper Library