Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pass payload to keyfinder #172

Merged
merged 3 commits into from
Oct 20, 2016
Merged

Pass payload to keyfinder #172

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c2304eb
Pass payload to keyfinder.
CodeMonkeySteve Oct 17, 2016
775c031
Raise exception if keyfinder didn't return a key.
CodeMonkeySteve Oct 19, 2016
2f837b2
Style changes from code review.
CodeMonkeySteve Oct 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions lib/jwt.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,24 +122,31 @@ def decode(jwt, key = nil, verify = true, custom_options = {}, &keyfinder)
merged_options = DEFAULT_OPTIONS.merge(custom_options)
decoder = Decode.new jwt, key, verify, merged_options, &keyfinder
header, payload, signature, signing_input = decoder.decode_segments
decode_verify_signature(key, header, signature, signing_input, merged_options, &keyfinder) if verify
decode_verify_signature(key, header, payload, signature, signing_input, merged_options, &keyfinder) if verify
decoder.verify

raise(JWT::DecodeError, 'Not enough or too many segments') unless header && payload

[payload, header]
end

def decode_verify_signature(key, header, signature, signing_input, options, &keyfinder)
algo, key = signature_algorithm_and_key(header, key, &keyfinder)
def decode_verify_signature(key, header, payload, signature, signing_input, options, &keyfinder)
algo, key = signature_algorithm_and_key(header, payload, key, &keyfinder)
if options[:algorithm] && algo != options[:algorithm]
raise JWT::IncorrectAlgorithm, 'Expected a different algorithm'
end
verify_signature(algo, key, signing_input, signature)
end

def signature_algorithm_and_key(header, key, &keyfinder)
key = yield(header) if keyfinder
def signature_algorithm_and_key(header, payload, key, &keyfinder)
if keyfinder
key = if keyfinder.arity == 2
yield(header, payload)
else
yield(header)
end
raise JWT::DecodeError, 'No verification key available' unless key
end
[header['alg'], key]
end

Expand Down