mirror of
https://github.com/codeninjasllc/discourse.git
synced 2024-12-19 12:02:27 -05:00
dbf2f4efec
If a user has a current avatar, and sso_overrides_avatar is true, but no avatar_url is passed in the sso attributes, the current code errors, as it tries to parse a nil as a URL. It seems to me valid that a third party system may not pass an avatar_url in some cases (e.g. avatars may not be mandatory, so not all users may have them) This might warrant a discussion about what should happen in this case; maybe the current avatar in discourse should be removed? This branch merely stops the login process erroring.
127 lines
3.3 KiB
Ruby
127 lines
3.3 KiB
Ruby
require "spec_helper"
|
|
|
|
describe DiscourseSingleSignOn do
|
|
before do
|
|
@sso_url = "http://somesite.com/discourse_sso"
|
|
@sso_secret = "shjkfdhsfkjh"
|
|
|
|
SiteSetting.enable_sso = true
|
|
SiteSetting.sso_url = @sso_url
|
|
SiteSetting.sso_secret = @sso_secret
|
|
end
|
|
|
|
def make_sso
|
|
sso = SingleSignOn.new
|
|
sso.sso_url = "http://meta.discorse.org/topics/111"
|
|
sso.sso_secret = "supersecret"
|
|
sso.nonce = "testing"
|
|
sso.email = "some@email.com"
|
|
sso.username = "sam"
|
|
sso.name = "sam saffron"
|
|
sso.external_id = "100"
|
|
sso.custom_fields["a"] = "Aa"
|
|
sso.custom_fields["b.b"] = "B.b"
|
|
sso
|
|
end
|
|
|
|
def test_parsed(parsed, sso)
|
|
expect(parsed.nonce).to eq sso.nonce
|
|
expect(parsed.email).to eq sso.email
|
|
expect(parsed.username).to eq sso.username
|
|
expect(parsed.name).to eq sso.name
|
|
expect(parsed.external_id).to eq sso.external_id
|
|
expect(parsed.custom_fields["a"]).to eq "Aa"
|
|
expect(parsed.custom_fields["b.b"]).to eq "B.b"
|
|
end
|
|
|
|
it "can do round trip parsing correctly" do
|
|
sso = SingleSignOn.new
|
|
sso.sso_secret = "test"
|
|
sso.name = "sam saffron"
|
|
sso.username = "sam"
|
|
sso.email = "sam@sam.com"
|
|
|
|
sso = SingleSignOn.parse(sso.payload, "test")
|
|
|
|
expect(sso.name).to eq "sam saffron"
|
|
expect(sso.username).to eq "sam"
|
|
expect(sso.email).to eq "sam@sam.com"
|
|
end
|
|
|
|
it "can lookup or create user when name is blank" do
|
|
# so we can create system messages
|
|
Fabricate(:admin)
|
|
sso = DiscourseSingleSignOn.new
|
|
sso.username = "test"
|
|
sso.name = ""
|
|
sso.email = "test@test.com"
|
|
sso.external_id = "A"
|
|
user = sso.lookup_or_create_user
|
|
expect(user).to_not be_nil
|
|
end
|
|
|
|
it "can fill in data on way back" do
|
|
sso = make_sso
|
|
|
|
url, payload = sso.to_url.split("?")
|
|
expect(url).to eq sso.sso_url
|
|
parsed = SingleSignOn.parse(payload, "supersecret")
|
|
|
|
test_parsed(parsed, sso)
|
|
end
|
|
|
|
it "handles sso_url with query params" do
|
|
sso = make_sso
|
|
sso.sso_url = "http://tcdev7.wpengine.com/?action=showlogin"
|
|
|
|
expect(sso.to_url.split('?').size).to eq 2
|
|
|
|
url, payload = sso.to_url.split("?")
|
|
expect(url).to eq "http://tcdev7.wpengine.com/"
|
|
parsed = SingleSignOn.parse(payload, "supersecret")
|
|
|
|
test_parsed(parsed, sso)
|
|
end
|
|
|
|
it "validates nonce" do
|
|
_ , payload = DiscourseSingleSignOn.generate_url.split("?")
|
|
|
|
sso = DiscourseSingleSignOn.parse(payload)
|
|
expect(sso.nonce_valid?).to eq true
|
|
|
|
sso.expire_nonce!
|
|
|
|
expect(sso.nonce_valid?).to eq false
|
|
|
|
end
|
|
|
|
it "generates a correct sso url" do
|
|
|
|
url, payload = DiscourseSingleSignOn.generate_url.split("?")
|
|
expect(url).to eq @sso_url
|
|
|
|
sso = DiscourseSingleSignOn.parse(payload)
|
|
expect(sso.nonce).to_not be_nil
|
|
end
|
|
|
|
context 'when sso_overrides_avatar is enabled' do
|
|
|
|
before do
|
|
SiteSetting.sso_overrides_avatar = true
|
|
end
|
|
|
|
it "deal with no avatar url passed for an existing user with an avatar" do
|
|
sso_record = Fabricate(:single_sign_on_record, external_avatar_url: "http://example.com/an_image.png")
|
|
|
|
sso = DiscourseSingleSignOn.new
|
|
sso.username = "test"
|
|
sso.name = "test"
|
|
sso.email = sso_record.user.email
|
|
sso.external_id = sso_record.external_id
|
|
# Deliberately not setting avatar_url.
|
|
|
|
user = sso.lookup_or_create_user
|
|
expect(user).to_not be_nil
|
|
end
|
|
end
|
|
end
|