Skip to content

Force the client_secret to be a string. #8

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
realdoug merged 1 commit into from
Apr 7, 2014
Merged

Force the client_secret to be a string. #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions lib/omniauth/strategies/salesforce.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def request_phase

def auth_hash
signed_value = access_token.params['id'] + access_token.params['issued_at']
raw_expected_signature = OpenSSL::HMAC.digest('sha256', options.client_secret, signed_value)
raw_expected_signature = OpenSSL::HMAC.digest('sha256', options.client_secret.to_s, signed_value)
expected_signature = Base64.strict_encode64 raw_expected_signature
signature = access_token.params['signature']
fail! "Salesforce user id did not match signature!" unless signature == expected_signature
Expand Down Expand Up @@ -79,7 +79,7 @@ def raw_info
'issued_at' => access_token.params['issued_at']
})
end

end

class SalesforceSandbox < OmniAuth::Strategies::Salesforce
Expand Down
12 changes: 6 additions & 6 deletions spec/omniauth/strategies/salesforce_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
'REQUEST_METHOD' => 'GET',
'rack.input' => '',
'rack.url_scheme' => 'http',
'SERVER_NAME' => 'server.example',
'QUERY_STRING' => 'code=xxxx',
'SCRIPT_NAME' => '',
'SERVER_NAME' => 'server.example',
'QUERY_STRING' => 'code=xxxx',
'SCRIPT_NAME' => '',
'SERVER_PORT' => 80
}
end
Expand Down Expand Up @@ -107,7 +107,7 @@
it "returns an info hash" do
subject.should_not be_nil
end
it "sets name" do
it "sets name" do
subject['name'].should == raw_info['display_name']
end
it "sets email" do
Expand Down Expand Up @@ -140,7 +140,7 @@
end
describe "credentials" do
subject { strategy.credentials }
it "sets token" do
it "sets token" do
subject['token'].should == strategy.access_token.token
end
it "sets instance_url" do
Expand Down Expand Up @@ -180,7 +180,7 @@
before do
client_id = "https://login.salesforce.com/id/00Dd0000000d45TEBQ/005d0000000fyGPCCY"
issued_at = "1331142541514"
signature = Base64.strict_encode64(OpenSSL::HMAC.digest('sha256', strategy.options.client_secret, client_id + issued_at))
signature = Base64.strict_encode64(OpenSSL::HMAC.digest('sha256', strategy.options.client_secret.to_s, client_id + issued_at))
end
context "when the signature does not match" do
before do
Expand Down