rjr 0.16.3 → 0.16.4

data/lib/rjr/common.rb

@@ -5,6 +5,7 @@
 # Copyright (C) 2011-2013 Mohammed Morsi <mo@morsi.org>
 # Licensed under the Apache License, Version 2.0
 require 'logger'
+require 'json'
 
 # Return a random uuid
 def gen_uuid
@@ -164,3 +165,63 @@ class Object
   end
 end
 end
+
+# Two stage json parsing required, for more details
+# see json issue https://github.com/flori/json/issues/179
+
+# FIXME this will only work for json >= 1.7.6 where
+# create_additions is defined
+
+class Class
+  class << self
+    attr_accessor :whitelist_json_classes
+    attr_accessor :permitted_json_classes
+  end
+
+  def permit_json_create
+    Class.whitelist_json_classes = true
+    Class.permitted_json_classes ||= []
+    unless Class.permitted_json_classes.include?(self.name)
+      Class.permitted_json_classes << self.name
+    end
+  end
+end
+
+module RJR
+  def self.validate_json_class(jc)
+    Class.whitelist_json_classes ||= false
+
+    Class.whitelist_json_classes ?
+      # only permit classes user explicitly authorizes
+      !Class.permitted_json_classes.include?(jc) :
+
+      # allow any class
+      jc.to_s.split(/::/).inject(Object) do |p,c|
+        case
+        when c.empty?  then p
+        when p.constants.collect { |c| c.to_s }.include?(c)
+          then p.const_get(c)
+        else
+          nil
+        end
+      end.nil?
+  end
+
+  def self.validate_json_hash(jh)
+    jh.each { |k,v|
+      if k == ::JSON.create_id &&
+         validate_json_class(v)
+        raise ArgumentError, "can't create json class #{v}"
+      elsif v.is_a?(Hash)
+        validate_json_hash(v)
+      end
+    }
+  end
+  
+  def self.parse_json(js)
+    jp = ::JSON.parse js, :create_additions => false
+    return jp unless jp.is_a?(Hash)
+    validate_json_hash(jp)
+    ::JSON.parse js, :create_additions => true
+  end
+end

data/lib/rjr/message.rb

@@ -5,10 +5,6 @@
 # Copyright (C) 2012-2013 Mohammed Morsi <mo@morsi.org>
 # Licensed under the Apache License, Version 2.0
 
-# FIXME https://github.com/flori/json/issues/179
-#   if pull request doesn't get accepted implement
-#   one of the workarounds in rjr
-
 require 'json'
 require 'rjr/common'
 
@@ -48,7 +44,7 @@ class RequestMessage
     if args.has_key?(:message)
       begin
         @json_message = args[:message]
-        request = JSON.parse(@json_message)
+        request = RJR.parse_json(@json_message)
         @jr_method = request['method']
         @jr_args   = request['params']
         @msg_id    = request['id']
@@ -79,7 +75,7 @@ class RequestMessage
   def self.is_request_message?(message)
     begin
        # FIXME log error
-       parsed = JSON.parse(message)
+       parsed = RJR.parse_json(message)
        parsed.has_key?('method') && parsed.has_key?('id')
     rescue Exception => e
       false
@@ -129,7 +125,7 @@ class ResponseMessage
   def initialize(args = {})
     if args.has_key?(:message)
       @json_message  = args[:message]
-      response = JSON.parse(@json_message)
+      response = RJR.parse_json(@json_message)
       @msg_id  = response['id']
       @result   = Result.new
       @result.success   = response.has_key?('result')
@@ -168,7 +164,7 @@ class ResponseMessage
   # @return [true,false] indicating if message is response message
   def self.is_response_message?(message)
     begin
-      json = JSON.parse(message)
+      json = RJR.parse_json(message)
       json.has_key?('result') || json.has_key?('error')
     rescue Exception => e
       # FIXME log error
@@ -232,7 +228,7 @@ class NotificationMessage
     if args.has_key?(:message)
       begin
         @json_message = args[:message]
-        notification = JSON.parse(@json_message)
+        notification = RJR.parse_json(@json_message)
         @jr_method = notification['method']
         @jr_args   = notification['params']
         @headers   = args.has_key?(:headers) ? {}.merge!(args[:headers]) : {}
@@ -262,7 +258,7 @@ class NotificationMessage
   def self.is_notification_message?(message)
     begin
        # FIXME log error
-       parsed = JSON.parse(message)
+       parsed = RJR.parse_json(message)
        parsed.has_key?('method') && !parsed.has_key?('id')
     rescue Exception => e
       false

data/specs/dispatcher_spec.rb

@@ -80,7 +80,7 @@ module RJR
 
     it "should be convertable from json" do
       j = '{"json_class":"RJR::Request","data":{"request":{"rjr_method":"foobar","rjr_method_args":["a","b"],"rjr_headers":{"foo":"bar"},"rjr_node_type":"local","rjr_node_id":"loc1"},"result":{"result":42,"error_code":null,"error_msg":null,"error_class":null}}}'
-      r = JSON.parse(j)
+      r = JSON.parse(j, :create_additions => true)
 
       r.class.should == RJR::Request
       r.rjr_method.should == 'foobar'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rjr
 version: !ruby/object:Gem::Version
-  version: 0.16.3
+  version: 0.16.4
   prerelease: 
 platform: ruby
 authors:
@@ -48,17 +48,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - <=
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.7.5
+        version: 1.7.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - <=
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.7.5
+        version: 1.7.6
 description: Ruby Json Rpc library
 email: mo@morsi.org
 executables: