Skip to content

Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.

Exclude Owner from default SSO roles and improve PEM certificate validation (#5540)

Adrian Gruntkowskifc24db4281f0
diff --git a/extra/lib/plausible/auth/sso/saml_config.ex b/extra/lib/plausible/auth/sso/saml_config.ex
index d5194efa72..7775e112a7 100644
--- a/extra/lib/plausible/auth/sso/saml_config.ex
+++ b/extra/lib/plausible/auth/sso/saml_config.ex
@@ -69,7 +69,7 @@ defmodule Plausible.Auth.SSO.SAMLConfig do
if pem = get_change(changeset, field) do
pem = clean_pem(pem)
- case X509.Certificate.from_pem(pem) do
+ case parse_pem(pem) do
{:ok, _cert} -> put_change(changeset, field, pem)
{:error, _} -> add_error(changeset, field, "invalid certificate", validation: :cert_pem)
end
@@ -78,6 +78,12 @@ defmodule Plausible.Auth.SSO.SAMLConfig do
end
end
+ defp parse_pem(pem) do
+ X509.Certificate.from_pem(pem)
+ catch
+ _, _ -> {:error, :failed_to_parse}
+ end
+
defp clean_pem(pem) do
pem
|> String.split("\n")
diff --git a/lib/plausible/teams/policy.ex b/lib/plausible/teams/policy.ex
index c077a744fb..aa60250fa6 100644
--- a/lib/plausible/teams/policy.ex
+++ b/lib/plausible/teams/policy.ex
@@ -7,7 +7,7 @@ defmodule Plausible.Teams.Policy do
import Ecto.Changeset
- @sso_member_roles Plausible.Teams.Membership.roles() -- [:guest]
+ @sso_member_roles Plausible.Teams.Membership.roles() -- [:guest, :owner]
@force_sso_modes [:none, :all_but_owners]
@update_fields [:sso_default_role, :sso_session_timeout_minutes]
diff --git a/test/plausible/auth/sso_test.exs b/test/plausible/auth/sso_test.exs
index 0253aeca9a..0671308dca 100644
--- a/test/plausible/auth/sso_test.exs
+++ b/test/plausible/auth/sso_test.exs
@@ -191,6 +191,31 @@ defmodule Plausible.Auth.SSOTest do
opts[:validation]
end)
end
+
+ test "returns error on invalid certificate (#2)" do
+ team = new_site().team
+ integration = SSO.initiate_saml_integration(team)
+
+ invalid_cert = """
+ -----BEGIN CERTIFICATE-----
+ MIIFdTCCA12gAwIBAgIUNcATm3CidmlEMMsZa9KBZpWYCVcwDQYJKoZIhvcNAQEL
+ BQAwYzELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
+ """
+
+ assert {:error, changeset} =
+ SSO.update_integration(integration, %{
+ idp_signin_url: "https://example.com",
+ idp_entity_id: "some-entity",
+ idp_cert_pem: invalid_cert
+ })
+
+ assert %{
+ idp_cert_pem: [:cert_pem]
+ } =
+ Ecto.Changeset.traverse_errors(changeset, fn {_msg, opts} ->
+ opts[:validation]
+ end)
+ end
end
describe "provision_user/1" do
diff --git a/test/plausible_web/live/sso_management_test.exs b/test/plausible_web/live/sso_management_test.exs
index 72b3d58166..f6a000797b 100644
--- a/test/plausible_web/live/sso_management_test.exs
+++ b/test/plausible_web/live/sso_management_test.exs
@@ -220,7 +220,7 @@ defmodule PlausibleWeb.Live.SSOMangementTest do
|> element("form#sso-policy")
|> render_submit(%{
policy: %{
- sso_default_role: "owner",
+ sso_default_role: "admin",
sso_session_timeout_minutes: "710"
}
})
@@ -231,7 +231,7 @@ defmodule PlausibleWeb.Live.SSOMangementTest do
html,
~s|#sso-policy_sso_default_role option[selected="selected"]|,
"value"
- ) == "owner"
+ ) == "admin"
assert text_of_attr(html, ~s|#sso-policy_sso_session_timeout_minutes|, "value") == "710"
end