From 3ce359bbf308354b86e94248fc13dfd4b23c792e Mon Sep 17 00:00:00 2001 From: Florian Frank Date: Mon, 4 Feb 2013 23:28:30 +0100 Subject: [PATCH] Security fix for create_additions problem 1.6.8 --- CHANGES | 5 +++ Gemfile | 10 ++---- VERSION | 2 +- ext/json/ext/parser/parser.c | 2 +- ext/json/ext/parser/parser.rl | 2 +- java/src/json/ext/Parser.java | 66 +++++++++++++++++++------------------- java/src/json/ext/Parser.rl | 2 +- json.gemspec | 8 ++--- json_pure.gemspec | 6 ++-- lib/json/common.rb | 21 ++++++++---- lib/json/pure/parser.rb | 8 ++--- lib/json/version.rb | 2 +- tests/test_json.rb | 10 ++++-- tests/test_json_addition.rb | 56 ++++++++++++++++++-------------- tests/test_json_string_matching.rb | 11 +++---- 15 files changed, 116 insertions(+), 95 deletions(-) diff --git a/CHANGES b/CHANGES index b347a7c..811e964 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,8 @@ +2013-02-04 (1.6.8) + * Security fix for JSON create_additions default value. It should not be + possible to create additions unless + explicitely requested by setting the create_additions argument to true or + using the JSON.load/dump interface. 2012-04-27 (1.6.7) * Fix possible crash when trying to parse nil value. 2012-02-11 (1.6.6) diff --git a/Gemfile b/Gemfile index 79bafcc..e405da2 100644 --- a/Gemfile +++ b/Gemfile @@ -6,10 +6,6 @@ gemspec :name => 'json' gemspec :name => 'json_pure' gemspec :name => 'json-java' -group :development, :test do - gem 'simplecov', :platform => :mri_19 -end - -group :test do - gem 'test-unit', '2.4.7', :platform => :mri_19 -end +gem 'utils' +gem 'test-unit' +gem 'debugger', :platform => :mri_19 diff --git a/VERSION b/VERSION index 400084b..d8c5e72 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.6.7 +1.6.8 diff --git a/ext/json/ext/parser/parser.c b/ext/json/ext/parser/parser.c index c140fdb..cbd8b93 100644 --- a/ext/json/ext/parser/parser.c +++ b/ext/json/ext/parser/parser.c @@ -1680,7 +1680,7 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self) if (option_given_p(opts, tmp)) { json->create_additions = RTEST(rb_hash_aref(opts, tmp)); } else { - json->create_additions = 1; + json->create_additions = 0; } tmp = ID2SYM(i_create_id); if (option_given_p(opts, tmp)) { diff --git a/ext/json/ext/parser/parser.rl b/ext/json/ext/parser/parser.rl index 20ecc48..f416b2d 100644 --- a/ext/json/ext/parser/parser.rl +++ b/ext/json/ext/parser/parser.rl @@ -664,7 +664,7 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self) if (option_given_p(opts, tmp)) { json->create_additions = RTEST(rb_hash_aref(opts, tmp)); } else { - json->create_additions = 1; + json->create_additions = 0; } tmp = ID2SYM(i_create_id); if (option_given_p(opts, tmp)) { diff --git a/java/src/json/ext/Parser.java b/java/src/json/ext/Parser.java index 0058f95..95fb9cf 100644 --- a/java/src/json/ext/Parser.java +++ b/java/src/json/ext/Parser.java @@ -166,7 +166,7 @@ public class Parser extends RubyObject { this.symbolizeNames = opts.getBool("symbolize_names", false); this.quirksMode = opts.getBool("quirks_mode", false); this.createId = opts.getString("create_id", getCreateId(context)); - this.createAdditions = opts.getBool("create_additions", true); + this.createAdditions = opts.getBool("create_additions", false); this.objectClass = opts.getClass("object_class", runtime.getHash()); this.arrayClass = opts.getClass("array_class", runtime.getArray()); this.match_string = opts.getHash("match_string"); @@ -1617,14 +1617,14 @@ static final int JSON_array_en_main = 1; } -// line 1623 "Parser.java" +// line 1621 "Parser.java" { cs = JSON_array_start; } -// line 714 "Parser.rl" +// line 712 "Parser.rl" -// line 1630 "Parser.java" +// line 1628 "Parser.java" { int _klen; int _trans = 0; @@ -1728,7 +1728,7 @@ case 1: { p += 1; _goto_targ = 5; if (true) continue _goto;} } break; -// line 1734 "Parser.java" +// line 1732 "Parser.java" } } } @@ -1748,7 +1748,7 @@ case 5: break; } } -// line 715 "Parser.rl" +// line 713 "Parser.rl" if (cs >= JSON_array_first_final) { res.update(result, p + 1); @@ -1758,7 +1758,7 @@ case 5: } -// line 1764 "Parser.java" +// line 1762 "Parser.java" private static byte[] init__JSON_object_actions_0() { return new byte [] { @@ -1881,7 +1881,7 @@ static final int JSON_object_error = 0; static final int JSON_object_en_main = 1; -// line 774 "Parser.rl" +// line 772 "Parser.rl" void parseObject(ParserResult res, int p, int pe) { @@ -1906,14 +1906,14 @@ static final int JSON_object_en_main = 1; } -// line 1912 "Parser.java" +// line 1910 "Parser.java" { cs = JSON_object_start; } -// line 798 "Parser.rl" +// line 796 "Parser.rl" -// line 1919 "Parser.java" +// line 1917 "Parser.java" { int _klen; int _trans = 0; @@ -1994,7 +1994,7 @@ case 1: switch ( _JSON_object_actions[_acts++] ) { case 0: -// line 729 "Parser.rl" +// line 727 "Parser.rl" { parseValue(res, p, pe); if (res.result == null) { @@ -2011,7 +2011,7 @@ case 1: } break; case 1: -// line 744 "Parser.rl" +// line 742 "Parser.rl" { parseString(res, p, pe); if (res.result == null) { @@ -2031,13 +2031,13 @@ case 1: } break; case 2: -// line 762 "Parser.rl" +// line 760 "Parser.rl" { p--; { p += 1; _goto_targ = 5; if (true) continue _goto;} } break; -// line 2043 "Parser.java" +// line 2041 "Parser.java" } } } @@ -2057,7 +2057,7 @@ case 5: break; } } -// line 799 "Parser.rl" +// line 797 "Parser.rl" if (cs < JSON_object_first_final) { res.update(null, p + 1); @@ -2090,7 +2090,7 @@ case 5: } -// line 2096 "Parser.java" +// line 2094 "Parser.java" private static byte[] init__JSON_actions_0() { return new byte [] { @@ -2194,7 +2194,7 @@ static final int JSON_error = 0; static final int JSON_en_main = 1; -// line 864 "Parser.rl" +// line 862 "Parser.rl" public IRubyObject parseStrict() { @@ -2204,16 +2204,16 @@ static final int JSON_en_main = 1; ParserResult res = new ParserResult(); -// line 2210 "Parser.java" +// line 2208 "Parser.java" { cs = JSON_start; } -// line 873 "Parser.rl" +// line 871 "Parser.rl" p = byteList.begin(); pe = p + byteList.length(); -// line 2219 "Parser.java" +// line 2217 "Parser.java" { int _klen; int _trans = 0; @@ -2294,7 +2294,7 @@ case 1: switch ( _JSON_actions[_acts++] ) { case 0: -// line 836 "Parser.rl" +// line 834 "Parser.rl" { currentNesting = 1; parseObject(res, p, pe); @@ -2308,7 +2308,7 @@ case 1: } break; case 1: -// line 848 "Parser.rl" +// line 846 "Parser.rl" { currentNesting = 1; parseArray(res, p, pe); @@ -2321,7 +2321,7 @@ case 1: } } break; -// line 2327 "Parser.java" +// line 2325 "Parser.java" } } } @@ -2341,7 +2341,7 @@ case 5: break; } } -// line 876 "Parser.rl" +// line 874 "Parser.rl" if (cs >= JSON_first_final && p == pe) { return result; @@ -2351,7 +2351,7 @@ case 5: } -// line 2357 "Parser.java" +// line 2355 "Parser.java" private static byte[] init__JSON_quirks_mode_actions_0() { return new byte [] { @@ -2454,7 +2454,7 @@ static final int JSON_quirks_mode_error = 0; static final int JSON_quirks_mode_en_main = 1; -// line 904 "Parser.rl" +// line 902 "Parser.rl" public IRubyObject parseQuirksMode() { @@ -2464,16 +2464,16 @@ static final int JSON_quirks_mode_en_main = 1; ParserResult res = new ParserResult(); -// line 2470 "Parser.java" +// line 2468 "Parser.java" { cs = JSON_quirks_mode_start; } -// line 913 "Parser.rl" +// line 911 "Parser.rl" p = byteList.begin(); pe = p + byteList.length(); -// line 2479 "Parser.java" +// line 2477 "Parser.java" { int _klen; int _trans = 0; @@ -2554,7 +2554,7 @@ case 1: switch ( _JSON_quirks_mode_actions[_acts++] ) { case 0: -// line 890 "Parser.rl" +// line 888 "Parser.rl" { parseValue(res, p, pe); if (res.result == null) { @@ -2566,7 +2566,7 @@ case 1: } } break; -// line 2572 "Parser.java" +// line 2570 "Parser.java" } } } @@ -2586,7 +2586,7 @@ case 5: break; } } -// line 916 "Parser.rl" +// line 914 "Parser.rl" if (cs >= JSON_quirks_mode_first_final && p == pe) { return result; diff --git a/java/src/json/ext/Parser.rl b/java/src/json/ext/Parser.rl index 6d9d4f9..4c54cf9 100644 --- a/java/src/json/ext/Parser.rl +++ b/java/src/json/ext/Parser.rl @@ -164,7 +164,7 @@ public class Parser extends RubyObject { this.symbolizeNames = opts.getBool("symbolize_names", false); this.quirksMode = opts.getBool("quirks_mode", false); this.createId = opts.getString("create_id", getCreateId(context)); - this.createAdditions = opts.getBool("create_additions", true); + this.createAdditions = opts.getBool("create_additions", false); this.objectClass = opts.getClass("object_class", runtime.getHash()); this.arrayClass = opts.getClass("array_class", runtime.getArray()); this.match_string = opts.getHash("match_string"); diff --git a/json.gemspec b/json.gemspec index 860f10e..7f7b641 100644 --- a/json.gemspec +++ b/json.gemspec @@ -2,21 +2,21 @@ Gem::Specification.new do |s| s.name = "json" - s.version = "1.6.7" + s.version = "1.6.8" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Florian Frank"] - s.date = "2012-04-28" + s.date = "2013-02-10" s.description = "This is a JSON implementation as a Ruby extension in C." s.email = "flori@ping.de" - s.extensions = ["ext/json/ext/parser/extconf.rb", "ext/json/ext/generator/extconf.rb"] + s.extensions = ["ext/json/ext/generator/extconf.rb", "ext/json/ext/parser/extconf.rb"] s.extra_rdoc_files = ["README.rdoc"] s.files = [".gitignore", ".travis.yml", "CHANGES", "COPYING", "COPYING-json-jruby", "GPL", "Gemfile", "README-json-jruby.markdown", "README.rdoc", "Rakefile", "TODO", "VERSION", "data/example.json", "data/index.html", "data/prototype.js", "diagrams/.keep", "ext/json/ext/fbuffer/fbuffer.h", "ext/json/ext/generator/extconf.rb", "ext/json/ext/generator/generator.c", "ext/json/ext/generator/generator.h", "ext/json/ext/parser/extconf.rb", "ext/json/ext/parser/parser.c", "ext/json/ext/parser/parser.h", "ext/json/ext/parser/parser.rl", "install.rb", "java/src/json/ext/ByteListTranscoder.java", "java/src/json/ext/Generator.java", "java/src/json/ext/GeneratorMethods.java", "java/src/json/ext/GeneratorService.java", "java/src/json/ext/GeneratorState.java", "java/src/json/ext/OptionsReader.java", "java/src/json/ext/Parser.java", "java/src/json/ext/Parser.rl", "java/src/json/ext/ParserService.java", "java/src/json/ext/RuntimeInfo.java", "java/src/json/ext/StringDecoder.java", "java/src/json/ext/StringEncoder.java", "java/src/json/ext/Utils.java", "json-java.gemspec", "json.gemspec", "json_pure.gemspec", "lib/json.rb", "lib/json/add/bigdecimal.rb", "lib/json/add/complex.rb", "lib/json/add/core.rb", "lib/json/add/date.rb", "lib/json/add/date_time.rb", "lib/json/add/exception.rb", "lib/json/add/ostruct.rb", "lib/json/add/range.rb", "lib/json/add/rational.rb", "lib/json/add/regexp.rb", "lib/json/add/struct.rb", "lib/json/add/symbol.rb", "lib/json/add/time.rb", "lib/json/common.rb", "lib/json/ext.rb", "lib/json/ext/.keep", "lib/json/light_object.rb", "lib/json/pure.rb", "lib/json/pure/generator.rb", "lib/json/pure/parser.rb", "lib/json/version.rb", "tests/fixtures/fail1.json", "tests/fixtures/fail10.json", "tests/fixtures/fail11.json", "tests/fixtures/fail12.json", "tests/fixtures/fail13.json", "tests/fixtures/fail14.json", "tests/fixtures/fail18.json", "tests/fixtures/fail19.json", "tests/fixtures/fail2.json", "tests/fixtures/fail20.json", "tests/fixtures/fail21.json", "tests/fixtures/fail22.json", "tests/fixtures/fail23.json", "tests/fixtures/fail24.json", "tests/fixtures/fail25.json", "tests/fixtures/fail27.json", "tests/fixtures/fail28.json", "tests/fixtures/fail3.json", "tests/fixtures/fail4.json", "tests/fixtures/fail5.json", "tests/fixtures/fail6.json", "tests/fixtures/fail7.json", "tests/fixtures/fail8.json", "tests/fixtures/fail9.json", "tests/fixtures/pass1.json", "tests/fixtures/pass15.json", "tests/fixtures/pass16.json", "tests/fixtures/pass17.json", "tests/fixtures/pass2.json", "tests/fixtures/pass26.json", "tests/fixtures/pass3.json", "tests/setup_variant.rb", "tests/test_json.rb", "tests/test_json_addition.rb", "tests/test_json_encoding.rb", "tests/test_json_fixtures.rb", "tests/test_json_generate.rb", "tests/test_json_string_matching.rb", "tests/test_json_unicode.rb", "tools/fuzz.rb", "tools/server.rb", "./tests/test_json_string_matching.rb", "./tests/test_json_fixtures.rb", "./tests/test_json_unicode.rb", "./tests/test_json_addition.rb", "./tests/test_json_generate.rb", "./tests/test_json_encoding.rb", "./tests/test_json.rb"] s.homepage = "http://flori.github.com/json" s.rdoc_options = ["--title", "JSON implemention for Ruby", "--main", "README.rdoc"] s.require_paths = ["ext/json/ext", "ext", "lib"] s.rubyforge_project = "json" - s.rubygems_version = "1.8.23" + s.rubygems_version = "1.8.25" s.summary = "JSON Implementation for Ruby" s.test_files = ["./tests/test_json_string_matching.rb", "./tests/test_json_fixtures.rb", "./tests/test_json_unicode.rb", "./tests/test_json_addition.rb", "./tests/test_json_generate.rb", "./tests/test_json_encoding.rb", "./tests/test_json.rb"] diff --git a/json_pure.gemspec b/json_pure.gemspec index 5383c3c..c0f4f23 100644 --- a/json_pure.gemspec +++ b/json_pure.gemspec @@ -2,11 +2,11 @@ Gem::Specification.new do |s| s.name = "json_pure" - s.version = "1.6.7" + s.version = "1.6.8" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Florian Frank"] - s.date = "2012-04-28" + s.date = "2013-02-10" s.description = "This is a JSON implementation in pure Ruby." s.email = "flori@ping.de" s.extra_rdoc_files = ["README.rdoc"] @@ -15,7 +15,7 @@ Gem::Specification.new do |s| s.rdoc_options = ["--title", "JSON implemention for ruby", "--main", "README.rdoc"] s.require_paths = ["lib"] s.rubyforge_project = "json" - s.rubygems_version = "1.8.23" + s.rubygems_version = "1.8.25" s.summary = "JSON Implementation for Ruby" s.test_files = ["./tests/test_json_string_matching.rb", "./tests/test_json_fixtures.rb", "./tests/test_json_unicode.rb", "./tests/test_json_addition.rb", "./tests/test_json_generate.rb", "./tests/test_json_encoding.rb", "./tests/test_json.rb"] diff --git a/lib/json/common.rb b/lib/json/common.rb index e8e76b6..7fd2db3 100644 --- a/lib/json/common.rb +++ b/lib/json/common.rb @@ -293,21 +293,28 @@ module JSON attr_accessor :load_default_options end self.load_default_options = { - :max_nesting => false, - :allow_nan => true, - :quirks_mode => true, + :max_nesting => false, + :allow_nan => true, + :quirks_mode => true, + :create_additions => true, } # Load a ruby data structure from a JSON _source_ and return it. A source can # either be a string-like object, an IO-like object, or an object responding # to the read method. If _proc_ was given, it will be called with any nested - # Ruby object as an argument recursively in depth first order. The default - # options for the parser can be changed via the load_default_options method. + # Ruby object as an argument recursively in depth first order. To modify the + # default options pass in the optional _options_ argument as well. + # + # BEWARE: This method is meant to serialise data from trusted user input, + # like from your own database server or clients under your control, it could + # be dangerous to allow untrusted users to pass JSON sources into it. The + # default options for the parser can be changed via the load_default_options + # method. # # This method is part of the implementation of the load/dump interface of # Marshal and YAML. - def load(source, proc = nil) - opts = load_default_options + def load(source, proc = nil, options = {}) + opts = load_default_options.merge options if source.respond_to? :to_str source = source.to_str elsif source.respond_to? :to_io diff --git a/lib/json/pure/parser.rb b/lib/json/pure/parser.rb index 84eb67f..70a8edc 100644 --- a/lib/json/pure/parser.rb +++ b/lib/json/pure/parser.rb @@ -63,9 +63,9 @@ module JSON # * *symbolize_names*: If set to true, returns symbols for the names # (keys) in a JSON object. Otherwise strings are returned, which is also # the default. - # * *create_additions*: If set to false, the Parser doesn't create - # additions even if a matchin class and create_id was found. This option - # defaults to true. + # * *create_additions*: If set to true, the Parser creates + # additions when if a matching class and create_id was found. This + # option defaults to false. # * *object_class*: Defaults to Hash # * *array_class*: Defaults to Array # * *quirks_mode*: Enables quirks_mode for parser, that is for example @@ -88,7 +88,7 @@ module JSON if opts.key?(:create_additions) @create_additions = !!opts[:create_additions] else - @create_additions = true + @create_additions = false end @create_id = @create_additions ? JSON.create_id : nil @object_class = opts[:object_class] || Hash diff --git a/lib/json/version.rb b/lib/json/version.rb index c74e914..d02b58c 100644 --- a/lib/json/version.rb +++ b/lib/json/version.rb @@ -1,6 +1,6 @@ module JSON # JSON version - VERSION = '1.6.7' + VERSION = '1.6.8' VERSION_ARRAY = VERSION.split(/\./).map { |x| x.to_i } # :nodoc: VERSION_MAJOR = VERSION_ARRAY[0] # :nodoc: VERSION_MINOR = VERSION_ARRAY[1] # :nodoc: diff --git a/tests/test_json.rb b/tests/test_json.rb index 4b4bc55..84c0539 100755 --- a/tests/test_json.rb +++ b/tests/test_json.rb @@ -329,12 +329,12 @@ class TestJSON < Test::Unit::TestCase def test_generate_core_subclasses_with_new_to_json obj = SubHash2["foo" => SubHash2["bar" => true]] obj_json = JSON(obj) - obj_again = JSON(obj_json) + obj_again = JSON.parse(obj_json, :create_additions => true) assert_kind_of SubHash2, obj_again assert_kind_of SubHash2, obj_again['foo'] assert obj_again['foo']['bar'] assert_equal obj, obj_again - assert_equal ["foo"], JSON(JSON(SubArray2["foo"])) + assert_equal ["foo"], JSON(JSON(SubArray2["foo"]), :create_additions => true) end def test_generate_core_subclasses_with_default_to_json @@ -493,6 +493,12 @@ EOT assert_equal nil, JSON.load('') end + def test_load_with_options + small_hash = JSON("foo" => 'bar') + symbol_hash = { :foo => 'bar' } + assert_equal symbol_hash, JSON.load(small_hash, nil, :symbolize_names => true) + end + def test_dump too_deep = '[[[[[[[[[[[[[[[[[[[[]]]]]]]]]]]]]]]]]]]]' assert_equal too_deep, JSON.dump(eval(too_deep)) diff --git a/tests/test_json_addition.rb b/tests/test_json_addition.rb index cf80866..824a1fa 100755 --- a/tests/test_json_addition.rb +++ b/tests/test_json_addition.rb @@ -73,11 +73,19 @@ class TestJSONAddition < Test::Unit::TestCase a = A.new(666) assert A.json_creatable? json = generate(a) - a_again = JSON.parse(json) + a_again = JSON.parse(json, :create_additions => true) assert_kind_of a.class, a_again assert_equal a, a_again end + def test_extended_json_default + a = A.new(666) + assert A.json_creatable? + json = generate(a) + a_hash = JSON.parse(json) + assert_kind_of Hash, a_hash + end + def test_extended_json_disabled a = A.new(666) assert A.json_creatable? @@ -104,7 +112,7 @@ class TestJSONAddition < Test::Unit::TestCase c = C.new assert !C.json_creatable? json = generate(c) - assert_raises(ArgumentError, NameError) { JSON.parse(json) } + assert_raises(ArgumentError, NameError) { JSON.parse(json, :create_additions => true) } end def test_raw_strings @@ -122,7 +130,7 @@ class TestJSONAddition < Test::Unit::TestCase assert_match(/\A\{.*\}\Z/, json) assert_match(/"json_class":"String"/, json) assert_match(/"raw":\[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255\]/, json) - raw_again = JSON.parse(json) + raw_again = JSON.parse(json, :create_additions => true) assert_equal raw, raw_again end @@ -130,17 +138,17 @@ class TestJSONAddition < Test::Unit::TestCase def test_core t = Time.now - assert_equal t, JSON(JSON(t)) + assert_equal t, JSON(JSON(t), :create_additions => true) d = Date.today - assert_equal d, JSON(JSON(d)) + assert_equal d, JSON(JSON(d), :create_additions => true) d = DateTime.civil(2007, 6, 14, 14, 57, 10, Rational(1, 12), 2299161) - assert_equal d, JSON(JSON(d)) - assert_equal 1..10, JSON(JSON(1..10)) - assert_equal 1...10, JSON(JSON(1...10)) - assert_equal "a".."c", JSON(JSON("a".."c")) - assert_equal "a"..."c", JSON(JSON("a"..."c")) + assert_equal d, JSON(JSON(d), :create_additions => true) + assert_equal 1..10, JSON(JSON(1..10), :create_additions => true) + assert_equal 1...10, JSON(JSON(1...10), :create_additions => true) + assert_equal "a".."c", JSON(JSON("a".."c"), :create_additions => true) + assert_equal "a"..."c", JSON(JSON("a"..."c"), :create_additions => true) s = MyJsonStruct.new 4711, 'foot' - assert_equal s, JSON(JSON(s)) + assert_equal s, JSON(JSON(s), :create_additions => true) struct = Struct.new :foo, :bar s = struct.new 4711, 'foot' assert_raises(JSONError) { JSON(s) } @@ -148,41 +156,41 @@ class TestJSONAddition < Test::Unit::TestCase raise TypeError, "test me" rescue TypeError => e e_json = JSON.generate e - e_again = JSON e_json + e_again = JSON e_json, :create_additions => true assert_kind_of TypeError, e_again assert_equal e.message, e_again.message assert_equal e.backtrace, e_again.backtrace end - assert_equal(/foo/, JSON(JSON(/foo/))) - assert_equal(/foo/i, JSON(JSON(/foo/i))) + assert_equal(/foo/, JSON(JSON(/foo/), :create_additions => true)) + assert_equal(/foo/i, JSON(JSON(/foo/i), :create_additions => true)) end def test_utc_datetime now = Time.now - d = DateTime.parse(now.to_s) # usual case - assert_equal d, JSON.parse(d.to_json) + d = DateTime.parse(now.to_s, :create_additions => true) # usual case + assert_equal d, JSON.parse(d.to_json, :create_additions => true) d = DateTime.parse(now.utc.to_s) # of = 0 - assert_equal d, JSON.parse(d.to_json) + assert_equal d, JSON.parse(d.to_json, :create_additions => true) d = DateTime.civil(2008, 6, 17, 11, 48, 32, Rational(1,24)) - assert_equal d, JSON.parse(d.to_json) + assert_equal d, JSON.parse(d.to_json, :create_additions => true) d = DateTime.civil(2008, 6, 17, 11, 48, 32, Rational(12,24)) - assert_equal d, JSON.parse(d.to_json) + assert_equal d, JSON.parse(d.to_json, :create_additions => true) end def test_rational_complex - assert_equal Rational(2, 9), JSON(JSON(Rational(2, 9))) - assert_equal Complex(2, 9), JSON(JSON(Complex(2, 9))) + assert_equal Rational(2, 9), JSON.parse(JSON(Rational(2, 9)), :create_additions => true) + assert_equal Complex(2, 9), JSON.parse(JSON(Complex(2, 9)), :create_additions => true) end def test_bigdecimal - assert_equal BigDecimal('3.141', 23), JSON(JSON(BigDecimal('3.141', 23))) - assert_equal BigDecimal('3.141', 666), JSON(JSON(BigDecimal('3.141', 666))) + assert_equal BigDecimal('3.141', 23), JSON(JSON(BigDecimal('3.141', 23)), :create_additions => true) + assert_equal BigDecimal('3.141', 666), JSON(JSON(BigDecimal('3.141', 666)), :create_additions => true) end def test_ostruct o = OpenStruct.new # XXX this won't work; o.foo = { :bar => true } o.foo = { 'bar' => true } - assert_equal o, JSON(JSON(o)) + assert_equal o, JSON.parse(JSON(o), :create_additions => true) end end diff --git a/tests/test_json_string_matching.rb b/tests/test_json_string_matching.rb index b8a7169..7f2148e 100644 --- a/tests/test_json_string_matching.rb +++ b/tests/test_json_string_matching.rb @@ -27,14 +27,13 @@ class TestJSONStringMatching < Test::Unit::TestCase t = TestTime.new t_json = [ t ].to_json assert_equal [ t ], - JSON.parse(t_json, - :match_string => { /\A\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}[+-]\d{4}\Z/ => TestTime }) + JSON.parse(t_json, :create_additions => true, + :match_string => { /\A\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}[+-]\d{4}\z/ => TestTime }) assert_equal [ t.strftime('%FT%T%z') ], - JSON.parse(t_json, - :match_string => { /\A\d{3}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}[+-]\d{4}\Z/ => TestTime }) + JSON.parse(t_json, :create_additions => true, + :match_string => { /\A\d{3}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}[+-]\d{4}\z/ => TestTime }) assert_equal [ t.strftime('%FT%T%z') ], JSON.parse(t_json, - :match_string => { /\A\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}[+-]\d{4}\Z/ => TestTime }, - :create_additions => false) + :match_string => { /\A\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}[+-]\d{4}\z/ => TestTime }) end end -- 1.8.1.2