crack 0.4.1 → 0.4.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: dd9edd7d26ac3281a9fd55016709019b9f3d8f50
+  data.tar.gz: b6a141ff1f15d25fb0b1217d0a265b050a260590
+SHA512:
+  metadata.gz: 66ba343bb6aee32b946a472f504d570d4eb178984cf1ae65582f18f00ffe1f648e07835b20f7ade971ce9ee253c5e8ef829b34320fe71af77e8141b22f956fdd
+  data.tar.gz: 3be356c152ff9074973c3dbd4eefce2cc04ab20fe97127cf7d4d1ae2865531928c7e9ccae5529d4e05beb6b78b0e58a4bd03bada157fcaa6a931eac2086a3c3b

data/crack.gemspec

@@ -16,5 +16,5 @@ Gem::Specification.new do |gem|
   gem.version       = Crack::VERSION
   gem.license       = "MIT"
 
-  gem.add_dependency "safe_yaml", "~> 0.9.0"
+  gem.add_dependency "safe_yaml", "~> 1.0.0"
 end

data/lib/crack/json.rb

@@ -3,7 +3,7 @@
 # The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-require 'yaml'
+require 'safe_yaml/load'
 require 'strscan'
 
 module Crack
@@ -23,7 +23,12 @@ module Crack
     end
 
     def self.parse(json)
-      YAML.load(unescape(convert_json_to_yaml(json)))
+      args = [unescape(convert_json_to_yaml(json))]
+      args << nil if SafeYAML::MULTI_ARGUMENT_YAML_LOAD
+      args << { :whitelisted_tags => ['!ruby/regexp'] }
+
+      SafeYAML.load(*args)
+
     rescue *parser_exceptions
       raise ParseError, "Invalid JSON string"
     end

data/lib/crack/version.rb

@@ -1,3 +1,3 @@
 module Crack
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/test/json_test.rb

@@ -49,6 +49,11 @@ describe "JSON Parsing" do
     end
   end
 
+  it "is not vulnerable to YAML deserialization exploits" do
+    class Foo; end
+    refute_instance_of(Foo, Crack::JSON.parse("# '---/\n--- !ruby/object:Foo\n  foo: bar"))
+  end
+
   it "raise error for failed decoding" do
     assert_raises(Crack::ParseError) {
       Crack::JSON.parse(%({: 1}))

metadata

@@ -1,32 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: crack
 version: !ruby/object:Gem::Version
-  version: 0.4.1
-  prerelease: 
+  version: 0.4.2
 platform: ruby
 authors:
 - John Nunemaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-16 00:00:00.000000000 Z
+date: 2014-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safe_yaml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 1.0.0
 description: Really simple JSON and XML parsing, ripped from Merb and Rails.
 email:
 - nunemaker@gmail.com
@@ -59,27 +56,26 @@ files:
 homepage: http://github.com/jnunemaker/crack
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Really simple JSON and XML parsing, ripped from Merb and Rails.
 test_files:
 - test/data/twittersearch-firefox.json