From 6ed5fea57f9a448644dc486e0dfd9edbb81bc849 Mon Sep 17 00:00:00 2001 From: TheodoorP Date: Fri, 22 Jan 2021 21:38:21 +0100 Subject: [PATCH] fix(register): disallow registration when registration is disabled --- .../controllers/auth_controller.ex | 61 ++++++++++--------- 1 file changed, 33 insertions(+), 28 deletions(-) diff --git a/lib/plausible_web/controllers/auth_controller.ex b/lib/plausible_web/controllers/auth_controller.ex index eb8f96811..fdce9aeaa 100644 --- a/lib/plausible_web/controllers/auth_controller.ex +++ b/lib/plausible_web/controllers/auth_controller.ex @@ -32,36 +32,41 @@ defmodule PlausibleWeb.AuthController do end def register(conn, params) do - user = Plausible.Auth.User.new(%Plausible.Auth.User{}, params["user"]) + if Keyword.fetch!(Application.get_env(:plausible, :selfhost), :disable_registration) do + conn + |> redirect(to: "/login") + else + user = Plausible.Auth.User.new(%Plausible.Auth.User{}, params["user"]) - if PlausibleWeb.Captcha.verify(params["h-captcha-response"]) do - case Repo.insert(user) do - {:ok, user} -> - code = Auth.issue_email_verification(user) - Logger.info("VERIFICATION CODE: #{code}") - email_template = PlausibleWeb.Email.activation_email(user, code) - Plausible.Mailer.send_email(email_template) - - conn - |> put_session(:current_user_id, user.id) - |> put_resp_cookie("logged_in", "true", - http_only: false, - max_age: 60 * 60 * 24 * 365 * 5000 - ) - |> redirect(to: "/activate") - - {:error, changeset} -> - render(conn, "register_form.html", - changeset: changeset, - layout: {PlausibleWeb.LayoutView, "focus.html"} - ) + if PlausibleWeb.Captcha.verify(params["h-captcha-response"]) do + case Repo.insert(user) do + {:ok, user} -> + code = Auth.issue_email_verification(user) + Logger.info("VERIFICATION CODE: #{code}") + email_template = PlausibleWeb.Email.activation_email(user, code) + Plausible.Mailer.send_email(email_template) + + conn + |> put_session(:current_user_id, user.id) + |> put_resp_cookie("logged_in", "true", + http_only: false, + max_age: 60 * 60 * 24 * 365 * 5000 + ) + |> redirect(to: "/activate") + + {:error, changeset} -> + render(conn, "register_form.html", + changeset: changeset, + layout: {PlausibleWeb.LayoutView, "focus.html"} + ) + end + else + render(conn, "register_form.html", + changeset: user, + captcha_error: "Please complete the captcha to register", + layout: {PlausibleWeb.LayoutView, "focus.html"} + ) end - else - render(conn, "register_form.html", - changeset: user, - captcha_error: "Please complete the captcha to register", - layout: {PlausibleWeb.LayoutView, "focus.html"} - ) end end