Skip to content

Commit

Permalink
Merge pull request splitrb#697 from knarewski/stop-crashing-on-non-ha…
Browse files Browse the repository at this point in the history
…sh-json

Stop crashing on non-hash json
andrehjr authored Sep 17, 2022
2 parents 95795b4 + 2314122 commit 5b86061
Showing 2 changed files with 20 additions and 5 deletions.
3 changes: 2 additions & 1 deletion lib/split/persistence/cookie_adapter.rb
Original file line number Diff line number Diff line change
@@ -70,7 +70,8 @@ def delete_cookie_header!(header, key, value)
def hash
@hash ||= if cookies = @cookies[:split.to_s]
begin
JSON.parse(cookies)
parsed = JSON.parse(cookies)
parsed.is_a?(Hash) ? parsed : {}
rescue JSON::ParserError
{}
end
22 changes: 18 additions & 4 deletions spec/persistence/cookie_adapter_spec.rb
Original file line number Diff line number Diff line change
@@ -14,10 +14,24 @@
end

it "handles invalid JSON" do
context.request.cookies[:split] = {
value: '{"foo":2,',
expires: Time.now
}
context.request.cookies["split"] = "{\"foo\":2,"

expect(subject["my_key"]).to be_nil
subject["my_key"] = "my_value"
expect(subject["my_key"]).to eq("my_value")
end

it "ignores valid JSON of invalid type (integer)" do
context.request.cookies["split"] = "2"

expect(subject["my_key"]).to be_nil
subject["my_key"] = "my_value"
expect(subject["my_key"]).to eq("my_value")
end

it "ignores valid JSON of invalid type (array)" do
context.request.cookies["split"] = "[\"foo\", \"bar\"]"

expect(subject["my_key"]).to be_nil
subject["my_key"] = "my_value"
expect(subject["my_key"]).to eq("my_value")

0 comments on commit 5b86061

Please sign in to comment.