Skip to content

Commit

Permalink
Improve support for Unsecured JWT
Browse files Browse the repository at this point in the history
Allows for symmetric support of Unsecured JWT. It now works as any other algorithm for both encoding and decoding.

Fixes jwt#323.
  • Loading branch information
hesalx committed Apr 28, 2020
1 parent f4c7f15 commit 4fa1b3b
Show file tree
Hide file tree
Showing 5 changed files with 50 additions and 4 deletions.
21 changes: 21 additions & 0 deletions lib/jwt/algos/none.rb
@@ -0,0 +1,21 @@
module JWT
module Algos
module None
# Unsecured JWT
module_function

SUPPORTED = %w[none].freeze

def sign(to_sign)
raise EncodeError, 'Signing key not supported for Unsecured JWT' if to_sign.key
''
end

def verify(to_verify)
raise VerificationError, 'Signing key not supported for Unsecured JWT' if to_verify.public_key
raise VerificationError, 'Signature should be empty for Unsecured JWT' unless to_verify.signature == ''
true
end
end
end
end
3 changes: 1 addition & 2 deletions lib/jwt/decode.rb
Expand Up @@ -13,7 +13,7 @@ def initialize(jwt, key, verify, options, &keyfinder)
@jwt = jwt
@key = key
@options = options
@segments = jwt.split('.')
@segments = jwt.split('.', -1)
@verify = verify
@signature = ''
@keyfinder = keyfinder
Expand Down Expand Up @@ -66,7 +66,6 @@ def verify_claims

def validate_segment_count!
return if segment_length == 3
return if !@verify && segment_length == 2 # If no verifying required, the signature is not needed

raise(JWT::DecodeError, 'Not enough or too many segments')
end
Expand Down
2 changes: 0 additions & 2 deletions lib/jwt/encode.rb
Expand Up @@ -52,8 +52,6 @@ def encode_payload
end

def encode_signature
return '' if @algorithm == ALG_NONE

JWT::Base64.url_encode(JWT::Signature.sign(@algorithm, encoded_header_and_payload, @key))
end

Expand Down
2 changes: 2 additions & 0 deletions lib/jwt/signature.rb
Expand Up @@ -7,6 +7,7 @@
require 'jwt/algos/ecdsa'
require 'jwt/algos/rsa'
require 'jwt/algos/ps'
require 'jwt/algos/none'
require 'jwt/algos/unsupported'
begin
require 'rbnacl'
Expand All @@ -25,6 +26,7 @@ module Signature
Algos::Rsa,
Algos::Eddsa,
Algos::Ps,
Algos::None,
Algos::Unsupported
].freeze
ToSign = Struct.new(:algorithm, :msg, :key)
Expand Down
26 changes: 26 additions & 0 deletions spec/jwt_spec.rb
Expand Up @@ -44,19 +44,45 @@

context 'alg: NONE' do
let(:alg) { 'none' }
let(:sig) { 'kWOVtIOpWcG7JnyJG0qOkTDbOy636XrrQhMm_8JrRQ8' }

it 'should generate a valid token' do
token = JWT.encode payload, nil, alg

expect(token).to eq data['NONE']
end

it 'with key should raise JWT::EncodeError' do
expect do
JWT.encode payload, data[:secret], alg
end.to raise_error JWT::EncodeError, 'Signing key not supported for Unsecured JWT'
end

it 'should decode a valid token' do
jwt_payload, header = JWT.decode data['NONE'], nil, false

expect(header['alg']).to eq alg
expect(jwt_payload).to eq payload
end

it 'should decode and verify a valid token' do
jwt_payload, header = JWT.decode data['NONE'], nil, true, algorithm: alg

expect(header['alg']).to eq alg
expect(jwt_payload).to eq payload
end

it 'with signature should raise JWT::VerificationError' do
expect do
JWT.decode data['NONE'] + sig, nil, true, algorithm: alg
end.to raise_error JWT::VerificationError, 'Signature should be empty for Unsecured JWT'
end

it 'with key should raise JWT::VerificationError' do
expect do
JWT.decode data['NONE'], data[:secret], true, algorithm: alg
end.to raise_error JWT::VerificationError, 'Signing key not supported for Unsecured JWT'
end
end

context 'payload validation' do
Expand Down

0 comments on commit 4fa1b3b

Please sign in to comment.