Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
Improve SSO naming and setup (#5558)
Adrian Gruntkowski832c767d91b7
diff --git a/extra/lib/plausible/auth/sso.ex b/extra/lib/plausible/auth/sso.exindex e5c2d2b52d..b48bbbfc56 100644--- a/extra/lib/plausible/auth/sso.ex+++ b/extra/lib/plausible/auth/sso.ex@@ -134,7 +134,7 @@ defmodule Plausible.Auth.SSO do:no_integration| :no_domain| :no_verified_domain- | :owner_mfa_disabled+ | :owner_2fa_disabled| :no_sso_user}def set_force_sso(team, mode) dowith :ok <- check_force_sso(team, mode) do@@ -153,14 +153,14 @@ defmodule Plausible.Auth.SSO do:no_integration| :no_domain| :no_verified_domain- | :owner_mfa_disabled+ | :owner_2fa_disabled| :no_sso_user}def check_force_sso(_team, :none), do: :okdef check_force_sso(team, :all_but_owners) dowith :ok <- check_integration_configured(team),:ok <- check_sso_user_present(team) do- check_owners_mfa_enabled(team)+ check_owners_2fa_enabled(team)endend@@ -300,8 +300,8 @@ defmodule Plausible.Auth.SSO doendend- defp check_owners_mfa_enabled(team) do- disabled_mfa_count =+ defp check_owners_2fa_enabled(team) do+ disabled_2fa_count =Repo.aggregate(from(tm in Teams.Membership,@@ -313,10 +313,10 @@ defmodule Plausible.Auth.SSO do:count)- if disabled_mfa_count == 0 do+ if disabled_2fa_count == 0 do:okelse- {:error, :owner_mfa_disabled}+ {:error, :owner_2fa_disabled}endenddiff --git a/extra/lib/plausible/auth/sso/saml_config.ex b/extra/lib/plausible/auth/sso/saml_config.exindex 7775e112a7..af9c33ed22 100644--- a/extra/lib/plausible/auth/sso/saml_config.ex+++ b/extra/lib/plausible/auth/sso/saml_config.ex@@ -85,11 +85,19 @@ defmodule Plausible.Auth.SSO.SAMLConfig doenddefp clean_pem(pem) do- pem- |> String.split("\n")- |> Enum.map(&String.trim/1)- |> Enum.reject(&(&1 == ""))- |> Enum.join("\n")- |> String.trim()+ cleaned =+ pem+ |> String.split("\n")+ |> Enum.map(&String.trim/1)+ |> Enum.reject(&(&1 == ""))+ |> Enum.join("\n")+ |> String.trim()++ # Trying to account for PEM certificates without markers+ if String.starts_with?(cleaned, "-----BEGIN CERTIFICATE-----") do+ cleaned+ else+ "-----BEGIN CERTIFICATE-----\n" <> cleaned <> "\n-----END CERTIFICATE-----"+ endendenddiff --git a/extra/lib/plausible_web/controllers/sso_controller.ex b/extra/lib/plausible_web/controllers/sso_controller.exindex 49772f92a8..63c231fcf7 100644--- a/extra/lib/plausible_web/controllers/sso_controller.ex+++ b/extra/lib/plausible_web/controllers/sso_controller.ex@@ -29,23 +29,32 @@ defmodule PlausibleWeb.SSOController doenddef login(conn, %{"email" => email} = params) do- case SSO.Domains.lookup(email) do- {:ok, %{sso_integration: integration}} ->- redirect(conn,- to:- Routes.sso_path(- conn,- :saml_signin,- integration.identifier,- email: email,- return_to: params["return_to"]- )- )-+ with :ok <- Auth.rate_limit(:login_ip, conn),+ {:ok, %{sso_integration: integration}} <- SSO.Domains.lookup(email) do+ redirect(conn,+ to:+ Routes.sso_path(+ conn,+ :saml_signin,+ integration.identifier,+ email: email,+ return_to: params["return_to"]+ )+ )+ else{:error, :not_found} ->conn|> put_flash(:login_error, "Wrong email.")|> redirect(to: Routes.sso_path(conn, :login_form))++ {:error, {:rate_limit, _}} ->+ Auth.log_failed_login_attempt("too many login attempts for #{email}")++ render_error(+ conn,+ 429,+ "Too many login attempts. Wait a minute before trying again."+ )endenddiff --git a/extra/lib/plausible_web/live/sso_management.ex b/extra/lib/plausible_web/live/sso_management.exindex 79cb679b2e..83302f9aae 100644--- a/extra/lib/plausible_web/live/sso_management.ex+++ b/extra/lib/plausible_web/live/sso_management.ex@@ -26,7 +26,10 @@ defmodule PlausibleWeb.Live.SSOManagement do~H"""<.flash_messages flash={@flash} />- <.tile :if={@mode != :manage} docs="sso">+ <.tile+ :if={@mode != :manage}+ docs={if @mode in [:domain_setup, :domain_verify], do: "sso#sso-domains", else: "sso"}+ ><:title><a id="sso-config">Single Sign-On</a></:title>@@ -73,7 +76,10 @@ defmodule PlausibleWeb.Live.SSOManagement dodef init_view(assigns) do~H"""<form id="sso-init" for={} phx-submit="init-sso">- <p class="text-sm">Click below to start setting up Single Sign-On for your team.</p>+ <p class="text-sm">+ Single Sign-On (SSO) enables team members to sign in without having to register an account. For more details,+ <.styled_link href="https://plausible.io/docs/sso">see our documentation</.styled_link>.+ </p><.button type="submit">Start Configuring SSO</.button></form>@@ -87,24 +93,24 @@ defmodule PlausibleWeb.Live.SSOManagement doUse the following parameters when configuring your Identity Provider of choice:</p>+ <.input_with_clipboard+ id="sp-acs-url"+ name="sp-acs-url"+ label="ACS URL / Single Sign-On URL / Reply URL"+ value={saml_acs_url(@integration)}+ />+<.form id="sso-sp-config" for={} class="flex-col space-y-4"><.input_with_clipboardid="sp-entity-id"name="sp-entity-id"- label="Entity ID"+ label="Entity ID / Audience URI / Identifier"value={SSO.SAMLConfig.entity_id(@integration)}/>-- <.input_with_clipboard- id="sp-acs-url"- name="sp-acs-url"- label="ACS URL"- value={saml_acs_url(@integration)}- /></.form><div class="flex-col space-y-3">- <p class="text-sm">Following attribute mappings must be setup at Identity Provider:</p>+ <p class="text-sm">Following attribute mappings must be set up at Identity Provider:</p><ul role="list" class="list-disc leading-6 text-sm ml-8"><li :for={param <- ["email", "first_name", "last_name"]}>@@ -136,11 +142,19 @@ defmodule PlausibleWeb.Live.SSOManagement doclass="flex-col space-y-4"phx-submit="update-integration">- <.input field={f[:idp_signin_url]} label="Sign-in URL" placeholder="<URL>" />+ <.input+ field={f[:idp_signin_url]}+ label="SSO URL / Sign-on URL / Login URL"+ placeholder="<URL>"+ />- <.input field={f[:idp_entity_id]} label="Entity ID" placeholder="<Entity ID>" />+ <.input+ field={f[:idp_entity_id]}+ label="Entity ID / Issuer / Identifier"+ placeholder="<Entity ID>"+ />- <.input field={f[:idp_cert_pem]} type="textarea" label="Certificate in PEM format" />+ <.input field={f[:idp_cert_pem]} type="textarea" label="Signing Certificate in PEM format" /><.button type="submit">Save</.button></.form>@@ -214,7 +228,7 @@ defmodule PlausibleWeb.Live.SSOManagement do:if={@domain.status in [Status.in_progress(), Status.unverified(), Status.verified()]}type="submit">- Run verification now+ Run Verification Now</.button><.button :if={@domain.status == Status.pending()} type="submit">Continue</.button>@@ -239,19 +253,19 @@ defmodule PlausibleWeb.Live.SSOManagement do</p><form id="sso-sp-config" for={} class="flex-col space-y-4">- <.input_with_clipboard- id="sp-entity-id"- name="sp-entity-id"- label="Entity ID"- value={SSO.SAMLConfig.entity_id(@integration)}- />-<.input_with_clipboardid="sp-acs-url"name="sp-acs-url"- label="ACS URL"+ label="ACS URL / Single Sign-On URL / Reply URL"value={saml_acs_url(@integration)}/>++ <.input_with_clipboard+ id="sp-entity-id"+ name="sp-entity-id"+ label="Entity ID / Audience URI / Identifier"+ value={SSO.SAMLConfig.entity_id(@integration)}+ /></form><div class="flex-col space-y-3">@@ -273,21 +287,21 @@ defmodule PlausibleWeb.Live.SSOManagement do<.inputfield={f[:idp_signin_url]}value={@integration.config.idp_signin_url}- label="Sign-in URL"+ label="SSO URL / Sign-on URL / Login URL"readonly={true}/><.inputfield={f[:idp_entity_id]}value={@integration.config.idp_entity_id}- label="Entity ID"+ label="Entity ID / Issuer / Identifier"readonly={true}/><.inputfield={f[:idp_cert_pem]}type="textarea"- label="Certificate in PEM format"+ label="Signing Certificate in PEM format"value={@integration.config.idp_cert_pem}readonly={true}/>@@ -300,7 +314,7 @@ defmodule PlausibleWeb.Live.SSOManagement do</div></.tile>- <.tile docs="sso">+ <.tile docs="sso#sso-domains"><:title><a id="sso-domains-config">SSO Domains</a></:title>@@ -368,7 +382,7 @@ defmodule PlausibleWeb.Live.SSOManagement do</div></.tile>- <.tile docs="sso">+ <.tile docs="sso#sso-policy"><:title><a id="sso-policy-config">SSO Policy</a></:title>@@ -670,7 +684,7 @@ defmodule PlausibleWeb.Live.SSOManagement do{false, "you must be logged in via SSO"}{{:error, :no_integration}, _} ->- {false, "you must first setup Single Sign-on"}+ {false, "you must first setup Single Sign-On"}{{:error, :no_domain}, _} ->{false, "you must add a domain"}@@ -678,8 +692,8 @@ defmodule PlausibleWeb.Live.SSOManagement do{{:error, :no_verified_domain}, _} ->{false, "you must verify a domain"}- {{:error, :owner_mfa_disabled}, _} ->- {false, "all Owners must have MFA enabled"}+ {{:error, :owner_2fa_disabled}, _} ->+ {false, "all Owners must have 2FA enabled"}{{:error, :no_sso_user}, _} ->{false, "at least one SSO user must log in successfully"}diff --git a/extra/lib/plausible_web/templates/sso/login_form.html.heex b/extra/lib/plausible_web/templates/sso/login_form.html.heexindex 14c4a08bdf..505d5ef94e 100644--- a/extra/lib/plausible_web/templates/sso/login_form.html.heex+++ b/extra/lib/plausible_web/templates/sso/login_form.html.heex@@ -1,6 +1,6 @@<.focus_box><:title>- {Phoenix.Flash.get(@flash, :login_title) || "Enter your Single Sign-on email"}+ {Phoenix.Flash.get(@flash, :login_title) || "Enter your Single Sign-On email"}</:title><:subtitle><%= if Phoenix.Flash.get(@flash, :login_instructions) do %>diff --git a/extra/lib/plausible_web/templates/sso/saml_signin.html.heex b/extra/lib/plausible_web/templates/sso/saml_signin.html.heexindex e30be282b4..e70be63538 100644--- a/extra/lib/plausible_web/templates/sso/saml_signin.html.heex+++ b/extra/lib/plausible_web/templates/sso/saml_signin.html.heex@@ -12,7 +12,7 @@</script><div><h1>- Processing Single Sign-on request...+ Processing Single Sign-On request...</h1><noscript><p>diff --git a/extra/lib/plausible_web/templates/sso/team_sessions.html.heex b/extra/lib/plausible_web/templates/sso/team_sessions.html.heexindex c9a20bd73f..0b9ac3a194 100644--- a/extra/lib/plausible_web/templates/sso/team_sessions.html.heex+++ b/extra/lib/plausible_web/templates/sso/team_sessions.html.heex@@ -1,5 +1,5 @@<.settings_tiles>- <.tile docs="sso-login-management">+ <.tile docs="sso#team-management"><:title><a id="user-sessions">SSO Login Management</a></:title>diff --git a/lib/plausible/auth/auth.ex b/lib/plausible/auth/auth.exindex 4ea2b84cf9..a8b0fb0690 100644--- a/lib/plausible/auth/auth.ex+++ b/lib/plausible/auth/auth.ex@@ -13,6 +13,8 @@ defmodule Plausible.Auth doalias Plausible.RateLimitalias Plausible.Teams+ require Logger+@rate_limits %{login_ip: %{prefix: "login:ip",@@ -52,6 +54,15 @@ defmodule Plausible.Auth doendend+ @spec log_failed_login_attempt(String.t()) :: :ok+ def log_failed_login_attempt(message) do+ if Application.get_env(:plausible, :log_failed_login_attempts) do+ Logger.warning("[login] #{message}")+ end++ :ok+ end+@spec find_user_by(Keyword.t()) :: Auth.User.t() | nildef find_user_by(opts) doRepo.get_by(Auth.User, opts)diff --git a/lib/plausible/teams/memberships/update_role.ex b/lib/plausible/teams/memberships/update_role.exindex b505ef776d..e1aa9bcacd 100644--- a/lib/plausible/teams/memberships/update_role.ex+++ b/lib/plausible/teams/memberships/update_role.ex@@ -51,7 +51,7 @@ defmodule Plausible.Teams.Memberships.UpdateRole doon_ee dodefp check_can_promote_to_owner(team, user, :owner) doif team.policy.force_sso == :all_but_owners and not Plausible.Auth.TOTP.enabled?(user) do- {:error, :mfa_disabled}+ {:error, :disabled_2fa}else:okend@@ -66,7 +66,7 @@ defmodule Plausible.Teams.Memberships.UpdateRole doif :erlang.phash2(1, 1) == 0 do:okelse- {:error, :mfa_disabled}+ {:error, :disabled_2fa}endendenddiff --git a/lib/plausible_web/controllers/auth_controller.ex b/lib/plausible_web/controllers/auth_controller.exindex c271c94663..c4fd3e5994 100644--- a/lib/plausible_web/controllers/auth_controller.ex+++ b/lib/plausible_web/controllers/auth_controller.ex@@ -303,14 +303,14 @@ defmodule PlausibleWeb.AuthController do|> UserAuth.log_in_user(user, redirect_path)else{:error, :wrong_password} ->- maybe_log_failed_login_attempts("wrong password for #{email}")+ Auth.log_failed_login_attempt("wrong password for #{email}")conn|> put_flash(:login_error, "Wrong email or password. Please try again.")|> render("login_form.html"){:error, :user_not_found} ->- maybe_log_failed_login_attempts("user not found for #{email}")+ Auth.log_failed_login_attempt("user not found for #{email}")Plausible.Auth.Password.dummy_calculation()conn@@ -318,7 +318,7 @@ defmodule PlausibleWeb.AuthController do|> render("login_form.html"){:error, {:rate_limit, _}} ->- maybe_log_failed_login_attempts("too many login attempts for #{email}")+ Auth.log_failed_login_attempt("too many login attempts for #{email}")render_error(conn,@@ -463,9 +463,7 @@ defmodule PlausibleWeb.AuthController do|> UserAuth.log_in_user(user, params["return_to"]){:error, :invalid_code} ->- maybe_log_failed_login_attempts(- "wrong 2FA verification code provided for #{user.email}"- )+ Auth.log_failed_login_attempt("wrong 2FA verification code provided for #{user.email}")conn|> put_flash(:error, "The provided code is invalid. Please try again")@@ -500,7 +498,7 @@ defmodule PlausibleWeb.AuthController doUserAuth.log_in_user(conn, user){:error, :invalid_code} ->- maybe_log_failed_login_attempts("wrong 2FA recovery code provided for #{user.email}")+ Auth.log_failed_login_attempt("wrong 2FA recovery code provided for #{user.email}")conn|> put_flash(:error, "The provided recovery code is invalid. Please try another one")@@ -520,7 +518,7 @@ defmodule PlausibleWeb.AuthController do{:ok, user}else{:error, {:rate_limit, _}} ->- maybe_log_failed_login_attempts("too many login attempts for #{user.email}")+ Auth.log_failed_login_attempt("too many login attempts for #{user.email}")conn|> TwoFactor.Session.clear_2fa_user()@@ -657,10 +655,4 @@ defmodule PlausibleWeb.AuthController dodefp redirect_to_login(conn) doredirect(conn, to: Routes.auth_path(conn, :login_form))end-- defp maybe_log_failed_login_attempts(message) do- if Application.get_env(:plausible, :log_failed_login_attempts) do- Logger.warning("[login] #{message}")- end- endenddiff --git a/lib/plausible_web/live/team_management.ex b/lib/plausible_web/live/team_management.exindex 0fc7c44b5a..2cf03f980e 100644--- a/lib/plausible_web/live/team_management.ex+++ b/lib/plausible_web/live/team_management.ex@@ -315,7 +315,7 @@ defmodule PlausibleWeb.Live.TeamManagement do"The team has to have at least one owner")- {{:error, :mfa_disabled}, _} ->+ {{:error, :disabled_2fa}, _} ->socket|> put_live_flash(:error,diff --git a/test/plausible/auth/sso_test.exs b/test/plausible/auth/sso_test.exsindex ba3db6b678..7dfaa79ec1 100644--- a/test/plausible/auth/sso_test.exs+++ b/test/plausible/auth/sso_test.exs@@ -111,6 +111,49 @@ defmodule Plausible.Auth.SSOTest doX509.Certificate.from_pem(@cert_pem)end+ test "updates integration with PEM missing boundaries" do+ boundless_pem =+ "MIIDqjCCApKgAwIBAgIGAZfpTJclMA0GCSqGSIb3DQEBCwUAMIGVMQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwET2t0YTEUMBIGA1UECwwLU1NPUHJvdmlkZXIxFjAUBgNVBAMMDXRyaWFsLTU1OTk4NzkxHDAaBgkqhkiG9w0BCQEWDWluZm9Ab2t0YS5jb20wHhcNMjUwNzA4MDkwOTAwWhcNMzUwNzA4MDkxMDAwWjCBlTELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBE9rdGExFDASBgNVBAsMC1NTT1Byb3ZpZGVyMRYwFAYDVQQDDA10cmlhbC01NTk5ODc5MRwwGgYJKoZIhvcNAQkBFg1pbmZvQG9rdGEuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzmF1LGsjEQkdLfCR6epCX5uKaJnowd3ZE8/t+kPiW0TIIvp4a3bH7r+pBbbili7Wz8LRs6C99RmtG4KjfBd6IAS1vYVba1RJ3XkoiIfVeDCP5sXKPyRquNj1/gyZkYxTYZVnh3ibXXUmlIkCDrF0TeO+4VfrWXQlc5/vNz7fbhH3bYCFj8jy3tKqXsE18X5USALRH22K4N2ZcGujNMwxzXIqGkPyPfRpnSY+AS8tGnW36Xn4WnKs9ciAnmTtTMXNrGrc6OLkbAEKLxSegpV9oSugChZ21siJXFf2Xz3jp71C12kbEDCXQ8Xi86iS3PnBYvp2ThT0Qiby1vscdNGaUwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCEbceBacHt0sx6Q0sU68E6CyyEfYVHPUOxLwBq4lrqeh9b0fctNuyFAceJbejIto9sqQ+RQzqob5PGfNpFanPbrcOx5F4NLgS9keR/bJGetSfiQe0nw/2ikNd7O0mWeWo1LvRtTGOAS2o3NTkLv3W1mxCkgjbi24hQs6eR5ARY6//AqYQWwWIDMIZotuIuRh285A8Gn1Vxj6ApWski3jttCLzU7NDJU7I6CXfzbDdEpr9I18CEZ7oOei/61q4wNq/x3CT4TsbDnVLVcYs0qqe/EKwQ6alqkHqlp2zxThOVvMW6tz0X8hNnxrXmmZdp7WF6s/8/Pw9Dq691L0AIKnIL"++ pem = """+ -----BEGIN CERTIFICATE-----+ MIIDqjCCApKgAwIBAgIGAZfpTJclMA0GCSqGSIb3DQEBCwUAMIGVMQswCQYDVQQGEwJVUzETMBEG+ A1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwET2t0YTEU+ MBIGA1UECwwLU1NPUHJvdmlkZXIxFjAUBgNVBAMMDXRyaWFsLTU1OTk4NzkxHDAaBgkqhkiG9w0B+ CQEWDWluZm9Ab2t0YS5jb20wHhcNMjUwNzA4MDkwOTAwWhcNMzUwNzA4MDkxMDAwWjCBlTELMAkG+ A1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xDTAL+ BgNVBAoMBE9rdGExFDASBgNVBAsMC1NTT1Byb3ZpZGVyMRYwFAYDVQQDDA10cmlhbC01NTk5ODc5+ MRwwGgYJKoZIhvcNAQkBFg1pbmZvQG9rdGEuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB+ CgKCAQEAzmF1LGsjEQkdLfCR6epCX5uKaJnowd3ZE8/t+kPiW0TIIvp4a3bH7r+pBbbili7Wz8LR+ s6C99RmtG4KjfBd6IAS1vYVba1RJ3XkoiIfVeDCP5sXKPyRquNj1/gyZkYxTYZVnh3ibXXUmlIkC+ DrF0TeO+4VfrWXQlc5/vNz7fbhH3bYCFj8jy3tKqXsE18X5USALRH22K4N2ZcGujNMwxzXIqGkPy+ PfRpnSY+AS8tGnW36Xn4WnKs9ciAnmTtTMXNrGrc6OLkbAEKLxSegpV9oSugChZ21siJXFf2Xz3j+ p71C12kbEDCXQ8Xi86iS3PnBYvp2ThT0Qiby1vscdNGaUwIDAQABMA0GCSqGSIb3DQEBCwUAA4IB+ AQCEbceBacHt0sx6Q0sU68E6CyyEfYVHPUOxLwBq4lrqeh9b0fctNuyFAceJbejIto9sqQ+RQzqo+ b5PGfNpFanPbrcOx5F4NLgS9keR/bJGetSfiQe0nw/2ikNd7O0mWeWo1LvRtTGOAS2o3NTkLv3W1+ mxCkgjbi24hQs6eR5ARY6//AqYQWwWIDMIZotuIuRh285A8Gn1Vxj6ApWski3jttCLzU7NDJU7I6+ CXfzbDdEpr9I18CEZ7oOei/61q4wNq/x3CT4TsbDnVLVcYs0qqe/EKwQ6alqkHqlp2zxThOVvMW6+ tz0X8hNnxrXmmZdp7WF6s/8/Pw9Dq691L0AIKnIL+ -----END CERTIFICATE-----+ """++ team = new_site().team+ integration = SSO.initiate_saml_integration(team)++ assert {:ok, integration} =+ SSO.update_integration(integration, %{+ idp_signin_url: "https://example.com",+ idp_entity_id: "some-entity",+ idp_cert_pem: boundless_pem+ })++ assert integration.config.idp_signin_url == "https://example.com"+ assert integration.config.idp_entity_id == "some-entity"++ assert X509.Certificate.from_pem(integration.config.idp_cert_pem) ==+ X509.Certificate.from_pem(pem)+ end+test "optionally accepts metadata" doteam = new_site().teamintegration = SSO.initiate_saml_integration(team)@@ -540,7 +583,7 @@ defmodule Plausible.Auth.SSOTest dodescribe "check_force_sso/2" dotest "returns ok when conditions are met for setting all_but_owners" do- # Owner with MFA enabled+ # Owner with 2FA enabledowner = new_user(){:ok, owner, _} = Auth.TOTP.initiate(owner){:ok, owner, _} = Auth.TOTP.enable(owner, :skip_verify)@@ -561,13 +604,13 @@ defmodule Plausible.Auth.SSOTest doassert :ok = SSO.check_force_sso(team, :all_but_owners)end- test "returns error when one owner does not have MFA configured" do+ test "returns error when one owner does not have 2FA configured" doowner = new_user(){:ok, owner, _} = Auth.TOTP.initiate(owner){:ok, owner, _} = Auth.TOTP.enable(owner, :skip_verify)team = new_site(owner: owner).team- # Owner without MFA+ # Owner without 2FAanother_owner = new_user()add_member(team, user: another_owner, role: :owner)@@ -583,11 +626,11 @@ defmodule Plausible.Auth.SSOTest doidentity = new_identity("Carrie Mower", "lance@" <> domain){:ok, _, _, _sso_user} = SSO.provision_user(identity)- assert {:error, :owner_mfa_disabled} = SSO.check_force_sso(team, :all_but_owners)+ assert {:error, :owner_2fa_disabled} = SSO.check_force_sso(team, :all_but_owners)endtest "returns error when there's no provisioned SSO user present" do- # Owner with MFA enabled+ # Owner with 2FA enabledowner = new_user(){:ok, owner, _} = Auth.TOTP.initiate(owner){:ok, owner, _} = Auth.TOTP.enable(owner, :skip_verify)@@ -604,7 +647,7 @@ defmodule Plausible.Auth.SSOTest doendtest "returns error when there's no verified SSO domain present" do- # Owner with MFA enabled+ # Owner with 2FA enabledowner = new_user(){:ok, owner, _} = Auth.TOTP.initiate(owner){:ok, owner, _} = Auth.TOTP.enable(owner, :skip_verify)@@ -621,7 +664,7 @@ defmodule Plausible.Auth.SSOTest doendtest "returns error when there's no SSO domain present" do- # Owner with MFA enabled+ # Owner with 2FA enabledowner = new_user(){:ok, owner, _} = Auth.TOTP.initiate(owner){:ok, owner, _} = Auth.TOTP.enable(owner, :skip_verify)@@ -634,7 +677,7 @@ defmodule Plausible.Auth.SSOTest doendtest "returns error when there's no SSO integration present" do- # Owner with MFA enabled+ # Owner with 2FA enabledowner = new_user(){:ok, owner, _} = Auth.TOTP.initiate(owner){:ok, owner, _} = Auth.TOTP.enable(owner, :skip_verify)diff --git a/test/plausible/teams/memberships/update_role_test.exs b/test/plausible/teams/memberships/update_role_test.exsindex 01ccc88848..2288c80b03 100644--- a/test/plausible/teams/memberships/update_role_test.exs+++ b/test/plausible/teams/memberships/update_role_test.exs@@ -183,7 +183,7 @@ defmodule Plausible.Teams.Memberships.UpdateRoleTest donew_identity(collaborator.name, collaborator.email)|> Plausible.Auth.SSO.provision_user()- assert {:error, :mfa_disabled} = UpdateRole.update(team, collaborator.id, "owner", user)+ assert {:error, :disabled_2fa} = UpdateRole.update(team, collaborator.id, "owner", user)endendenddiff --git a/test/plausible_web/controllers/sso_controller_test.exs b/test/plausible_web/controllers/sso_controller_test.exsindex 1668c2a3d2..8d2651deb1 100644--- a/test/plausible_web/controllers/sso_controller_test.exs+++ b/test/plausible_web/controllers/sso_controller_test.exs@@ -61,7 +61,7 @@ defmodule PlausibleWeb.SSOControllerTest doassert html = html_response(conn, 200)- assert html =~ "Enter your Single Sign-on email"+ assert html =~ "Enter your Single Sign-On email"assert element_exists?(html, "input[name=email]")assert text_of_attr(html, "input[name=return_to]", "value") == ""end@@ -79,7 +79,7 @@ defmodule PlausibleWeb.SSOControllerTest doassert html = html_response(conn, 200)- assert html =~ "Enter your Single Sign-on email"+ assert html =~ "Enter your Single Sign-On email"assert text_of_attr(html, "input[name=email]", "value") == "[email protected]"assert html =~ ~s|document.getElementById("sso-login-form").submit()|end@@ -132,7 +132,7 @@ defmodule PlausibleWeb.SSOControllerTest dodomain: domain,integration: integration} do- email = "paul@" <> domain+ email = "claire@" <> domainconn =post(conn, Routes.sso_path(conn, :login), %{"email" => email, "return_to" => "/sites"})@@ -155,11 +155,32 @@ defmodule PlausibleWeb.SSOControllerTest doassert Phoenix.Flash.get(conn.assigns.flash, :login_error) == "Wrong email."end++ test "limits login attempts to 5 per minute", %{conn: conn} do+ conn = put_req_header(conn, "x-forwarded-for", "1.2.3.9")+ email = "[email protected]"++ response =+ eventually(+ fn ->+ Enum.each(1..5, fn _ ->+ post(conn, Routes.sso_path(conn, :login), %{"email" => email})+ end)++ conn = post(conn, Routes.sso_path(conn, :login), %{"email" => email})++ {conn.status == 429, conn}+ end,+ 500+ )++ assert html_response(response, 429) =~ "Too many login attempts"+ endenddescribe "saml_signin/2 (fake SAML)" dotest "renders autosubmitted form", %{conn: conn, domain: domain, integration: integration} do- email = "paul@" <> domain+ email = "jesper@" <> domainconn =get(@@ -172,7 +193,7 @@ defmodule PlausibleWeb.SSOControllerTest doassert html = html_response(conn, 200)- assert html =~ "Processing Single Sign-on request..."+ assert html =~ "Processing Single Sign-On request..."assert text_of_attr(html, "form#sso-req-form", "action") ==Routes.sso_path(conn, :saml_consume, integration.identifier)diff --git a/test/plausible_web/live/sso_management_test.exs b/test/plausible_web/live/sso_management_test.exsindex f6a000797b..6cc47e8546 100644--- a/test/plausible_web/live/sso_management_test.exs+++ b/test/plausible_web/live/sso_management_test.exs@@ -78,8 +78,8 @@ defmodule PlausibleWeb.Live.SSOMangementTest dotext = text(render(lv))- assert text =~ "Sign-in URL can't be blank"- assert text =~ "Entity ID can't be blank"+ assert text =~ "SSO URL / Sign-on URL / Login URL can't be blank"+ assert text =~ "Entity ID / Issuer / Identifier can't be blank"assert text =~ "Certificate in PEM format can't be blank"lvdiff --git a/test/plausible_web/live/team_management_test.exs b/test/plausible_web/live/team_management_test.exsindex 7f549e3048..127267888a 100644--- a/test/plausible_web/live/team_management_test.exs+++ b/test/plausible_web/live/team_management_test.exs@@ -61,7 +61,7 @@ defmodule PlausibleWeb.Live.TeamMangementTest do:setup_team]- test "fails to save layout with SSO user updated to owner with Force SSO but without MFA",+ test "fails to save layout with SSO user updated to owner with Force SSO but without 2FA",%{conn: conn,team: team,