Skip to content

Use Base64.strict_encode64 #414

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

Merged
merged 2 commits into from
Oct 5, 2018
Merged

Use Base64.strict_encode64 #414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1516401
Use `strict_encode64` for basic authentication
escoberik Oct 23, 2017
83e121c
Replace strict_encode64 with Base64 built-in's
meganemura Oct 4, 2018
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
2 changes: 1 addition & 1 deletion lib/oauth2/authenticator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def apply(params)
end

def self.encode_basic_auth(user, password)
'Basic ' + Base64.encode64(user + ':' + password).delete("\n")
'Basic ' + Base64.strict_encode64(user + ':' + password)
end

private
Expand Down
7 changes: 1 addition & 6 deletions lib/oauth2/mac_token.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ def signature(timestamp, nonce, verb, uri)
'', nil
].join("\n")

strict_encode64(OpenSSL::HMAC.digest(@algorithm, secret, signature))
Base64.strict_encode64(OpenSSL::HMAC.digest(@algorithm, secret, signature))
end

# Set the HMAC algorithm
Expand All @@ -113,10 +113,5 @@ def algorithm=(alg)
# and the MAC always goes in a header
def token=(_noop)
end

# Base64.strict_encode64 is not available on Ruby 1.8.7
def strict_encode64(str)
Base64.encode64(str).delete("\n")
end
end
end
2 changes: 1 addition & 1 deletion spec/oauth2/authenticator_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

context 'with Basic authentication' do
let(:mode) { :basic_auth }
let(:header) { 'Basic ' + Base64.encode64("#{client_id}:#{client_secret}").delete("\n") }
let(:header) { 'Basic ' + Base64.strict_encode64("#{client_id}:#{client_secret}") }

it 'encodes credentials in headers' do
output = subject.apply({})
Expand Down