- <%= label f, :persistent_keepalive, "Persistent Keepalive", class: "label" %>
+ <%= label(f, :persistent_keepalive, "Persistent Keepalive", class: "label") %>
- <%= label f, :mtu, "MTU", class: "label" %>
+ <%= label(f, :mtu, "MTU", class: "label") %>
- <%= text_input f,
- :mtu,
- placeholder: Sites.default(:mtu),
- class: "input #{input_error_class(f, :mtu)}" %>
+ <%= text_input(
+ f,
+ :mtu,
+ placeholder: Sites.default(:mtu),
+ class: "input #{input_error_class(f, :mtu)}"
+ ) %>
- <%= error_tag f, :mtu %>
+ <%= error_tag(f, :mtu) %>
WireGuard interface MTU for devices. Defaults to what's set in the configuration file.
diff --git a/apps/fz_http/lib/fz_http_web/live/setting_live/unprivileged/account.html.heex b/apps/fz_http/lib/fz_http_web/live/setting_live/unprivileged/account.html.heex
index 982765485..668810e94 100644
--- a/apps/fz_http/lib/fz_http_web/live/setting_live/unprivileged/account.html.heex
+++ b/apps/fz_http/lib/fz_http_web/live/setting_live/unprivileged/account.html.heex
@@ -1,28 +1,31 @@
<%= if @live_action == :change_password do %>
<%= live_modal(
- FzHttpWeb.SettingLive.Unprivileged.AccountFormComponent,
- return_to: Routes.setting_unprivileged_account_path(@socket, :show),
- title: "Change password",
- id: "account-form-component",
- current_user: @current_user,
- form: "account-edit") %>
+ FzHttpWeb.SettingLive.Unprivileged.AccountFormComponent,
+ return_to: Routes.setting_unprivileged_account_path(@socket, :show),
+ title: "Change password",
+ id: "account-form-component",
+ current_user: @current_user,
+ form: "account-edit"
+ ) %>
<% end %>
<%= if @live_action == :register_mfa do %>
- <.live_component module={FzHttpWeb.MFA.RegisterComponent}
- id="register-mfa"
- user={@current_user}
- return_to={Routes.setting_unprivileged_account_path(@socket, :show)} />
+ <.live_component
+ module={FzHttpWeb.MFA.RegisterComponent}
+ id="register-mfa"
+ user={@current_user}
+ return_to={Routes.setting_unprivileged_account_path(@socket, :show)}
+ />
<% end %>
<.link navigate={Routes.device_unprivileged_index_path(@socket, :index)}>
<- Back to devices
-<%= render FzHttpWeb.SharedView, "heading.html", page_title: @page_title %>
+<%= render(FzHttpWeb.SharedView, "heading.html", page_title: @page_title) %>
- <%= render FzHttpWeb.SharedView, "flash.html", assigns %>
+ <%= render(FzHttpWeb.SharedView, "flash.html", assigns) %>
<%= @page_subtitle %>
@@ -35,7 +38,11 @@
<%= if @local_auth_enabled do %>
- <.link navigate={Routes.setting_unprivileged_account_path(@socket, :change_password)} class="button">
+ <.link
+ replace={true}
+ patch={Routes.setting_unprivileged_account_path(@socket, :change_password)}
+ class="button"
+ >
@@ -45,7 +52,7 @@
@@ -73,10 +80,20 @@
<%= for {meta, index} <- Enum.with_index(@metas) do %>
- …
- …
+
+ …
+
+
+ …
+
<%= meta.remote_ip || "-" %>
<%= meta.user_agent %>
@@ -99,13 +116,17 @@
<%= if length(@methods) > 0 do %>
- <%= render FzHttpWeb.SharedView, "mfa_methods_table.html", methods: @methods %>
+ <%= render(FzHttpWeb.SharedView, "mfa_methods_table.html", methods: @methods) %>
<% else %>
No MFA methods added.
<% end %>
diff --git a/apps/fz_http/lib/fz_http_web/live/setting_live/unprivileged/account_form_component.html.heex b/apps/fz_http/lib/fz_http_web/live/setting_live/unprivileged/account_form_component.html.heex
index 9ed567f5e..f276970e3 100644
--- a/apps/fz_http/lib/fz_http_web/live/setting_live/unprivileged/account_form_component.html.heex
+++ b/apps/fz_http/lib/fz_http_web/live/setting_live/unprivileged/account_form_component.html.heex
@@ -1,22 +1,32 @@
- <.form let={f} for={@changeset} x-autocomplete="off" id="account-edit" phx-target={@myself} phx-submit="save">
+ <.form
+ :let={f}
+ for={@changeset}
+ x-autocomplete="off"
+ id="account-edit"
+ phx-target={@myself}
+ phx-submit="save"
+ >
Enter new password below.
- <%= render FzHttpWeb.SharedView,
- "password_field.html",
- context: f,
- field: :password,
- autocomplete: "new-password",
- label: "Password" %>
-
- <%= render FzHttpWeb.SharedView,
- "password_field.html",
- context: f,
- field: :password_confirmation,
- autocomplete: "new-password",
- label: "Password Confirmation" %>
+ <%= render(
+ FzHttpWeb.SharedView,
+ "password_field.html",
+ context: f,
+ field: :password,
+ autocomplete: "new-password",
+ label: "Password"
+ ) %>
+ <%= render(
+ FzHttpWeb.SharedView,
+ "password_field.html",
+ context: f,
+ field: :password_confirmation,
+ autocomplete: "new-password",
+ label: "Password Confirmation"
+ ) %>
- <.form let={f} for={@changeset} x-autocomplete="off" id="user-form" phx-target={@myself} phx-submit="save">
+ <.form
+ :let={f}
+ for={@changeset}
+ x-autocomplete="off"
+ id="user-form"
+ phx-target={@myself}
+ phx-submit="save"
+ >
<%= if @action == :edit do %>
Change user email or enter new password below.
@@ -7,30 +14,35 @@
<% end %>
- <%= label f, :email, class: "label" %>
+ <%= label(f, :email, class: "label") %>
- <%= text_input f, :email,
- class: "input #{input_error_class(f, :email)}",
- disabled: @user && @user.id == @current_user.id %>
+ <%= text_input(f, :email,
+ class: "input #{input_error_class(f, :email)}",
+ disabled: @user && @user.id == @current_user.id
+ ) %>
- <%= error_tag f, :email %>
+ <%= error_tag(f, :email) %>
- <%= render FzHttpWeb.SharedView,
- "password_field.html",
- context: f,
- field: :password,
- autocomplete: "new-password",
- label: "New Password" %>
+ <%= render(
+ FzHttpWeb.SharedView,
+ "password_field.html",
+ context: f,
+ field: :password,
+ autocomplete: "new-password",
+ label: "New Password"
+ ) %>
- <%= render FzHttpWeb.SharedView,
- "password_field.html",
- context: f,
- field: :password_confirmation,
- autocomplete: "new-password",
- label: "New Password Confirmation" %>
+ <%= render(
+ FzHttpWeb.SharedView,
+ "password_field.html",
+ context: f,
+ field: :password_confirmation,
+ autocomplete: "new-password",
+ label: "New Password Confirmation"
+ ) %>
diff --git a/apps/fz_http/lib/fz_http_web/live/user_live/index.html.heex b/apps/fz_http/lib/fz_http_web/live/user_live/index.html.heex
index b94be0cd1..5a4094991 100644
--- a/apps/fz_http/lib/fz_http_web/live/user_live/index.html.heex
+++ b/apps/fz_http/lib/fz_http_web/live/user_live/index.html.heex
@@ -7,13 +7,14 @@
user: nil,
current_user: @current_user,
action: @live_action,
- form: "user-form") %>
+ form: "user-form"
+ ) %>
<% end %>
-<%= render FzHttpWeb.SharedView, "heading.html", page_title: @page_title %>
+<%= render(FzHttpWeb.SharedView, "heading.html", page_title: @page_title) %>
- <%= render FzHttpWeb.SharedView, "flash.html", assigns %>
+ <%= render(FzHttpWeb.SharedView, "flash.html", assigns) %>
@@ -29,43 +30,49 @@
- <%= for user <- @users do %>
-
-
- <.link navigate={Routes.user_show_path(@socket, :show, user)}>
- <%= user.email %>
-
-
- <%= user.device_count %>
-
-
-
+
+
+ <.link navigate={Routes.user_show_path(@socket, :show, user)}>
+ <%= user.email %>
+
+
+ <%= user.device_count %>
+
+
+
- …
-
- <%= user.last_signed_in_method %>
-
+ …
+
+ <%= user.last_signed_in_method %>
+
- …
-
-
+ …
+
+
- …
-
-
- <% end %>
+ phx-hook="FormatTimestamp"
+ >
+ …
+
+
+ <% end %>
- <.link navigate={Routes.user_index_path(@socket, :new)} class="button">
+ <.link replace={true} patch={Routes.user_index_path(@socket, :new)} class="button">
Add User
diff --git a/apps/fz_http/lib/fz_http_web/live/user_live/show.html.heex b/apps/fz_http/lib/fz_http_web/live/user_live/show.html.heex
index 1399a10ca..5b722d622 100644
--- a/apps/fz_http/lib/fz_http_web/live/user_live/show.html.heex
+++ b/apps/fz_http/lib/fz_http_web/live/user_live/show.html.heex
@@ -1,37 +1,39 @@
<%= if @live_action == :edit do %>
<%= live_modal(
- FzHttpWeb.UserLive.FormComponent,
- return_to: Routes.user_show_path(@socket, :show, @user),
- title: "Edit #{@user.email}",
- id: "user-form-component",
- user: @user,
- current_user: @current_user,
- action: @live_action,
- form: "user-form") %>
+ FzHttpWeb.UserLive.FormComponent,
+ return_to: Routes.user_show_path(@socket, :show, @user),
+ title: "Edit #{@user.email}",
+ id: "user-form-component",
+ user: @user,
+ current_user: @current_user,
+ action: @live_action,
+ form: "user-form"
+ ) %>
<% end %>
<%= if @live_action == :new_device do %>
<%= live_modal(
- FzHttpWeb.DeviceLive.NewFormComponent,
- return_to: Routes.user_show_path(@socket, :show, @user.id),
- title: "Add Device",
- current_user: @current_user,
- target_user_id: @user.id,
- id: "create-device-component",
- form: "create-device",
- button_text: "Generate Configuration") %>
+ FzHttpWeb.DeviceLive.NewFormComponent,
+ return_to: Routes.user_show_path(@socket, :show, @user.id),
+ title: "Add Device",
+ current_user: @current_user,
+ target_user_id: @user.id,
+ id: "create-device-component",
+ form: "create-device",
+ button_text: "Generate Configuration"
+ ) %>
<% end %>
-<%= render FzHttpWeb.SharedView, "heading.html", page_title: "Users |> #{@user.email}" %>
+<%= render(FzHttpWeb.SharedView, "heading.html", page_title: "Users |> #{@user.email}") %>
- <%= render FzHttpWeb.SharedView, "flash.html", assigns %>
+ <%= render(FzHttpWeb.SharedView, "flash.html", assigns) %>
Details
- <.link navigate={Routes.user_show_path(@socket, :edit, @user)} class="button">
+ <.link patch={Routes.user_show_path(@socket, :edit, @user)} replace={true} class="button">
@@ -40,14 +42,16 @@
- <%= render FzHttpWeb.SharedView, "user_details.html", user: @user, rules_path: @rules_path %>
+ <%= render(FzHttpWeb.SharedView, "user_details.html", user: @user, rules_path: @rules_path) %>
<%= if length(@connections) > 0 do %>
- <.live_component id="connections-table"
- module={FzHttpWeb.OIDCLive.ConnectionsTableComponent}
- connections={@connections}
- user={@user} />
+ <.live_component
+ id="connections-table"
+ module={FzHttpWeb.OIDCLive.ConnectionsTableComponent}
+ connections={@connections}
+ user={@user}
+ />
<% end %>
@@ -55,17 +59,22 @@
<%= if length(@devices) > 0 do %>
- <%= render FzHttpWeb.SharedView, "devices_table.html",
- devices: @devices, show_user: false, socket: @socket %>
+ <%= render(FzHttpWeb.SharedView, "devices_table.html",
+ devices: @devices,
+ show_user: false,
+ socket: @socket
+ ) %>
<% else %>
- No devices.
+ No devices.
<% end %>
<.link
- navigate={Routes.user_show_path(@socket, :new_device, @user)}
- id="add-device-button"
- class="button">
+ patch={Routes.user_show_path(@socket, :new_device, @user)}
+ replace={true}
+ id="add-device-button"
+ class="button"
+ >
Add Device
@@ -78,12 +87,14 @@
Enable or disable this user's VPN connection. Applies to all their devices.
- <.live_component id="allowed-to-connect"
- module={FzHttpWeb.UserLive.VPNConnectionComponent}
- user={@user} />
+ <.live_component
+ id="allowed-to-connect"
+ module={FzHttpWeb.UserLive.VPNConnectionComponent}
+ user={@user}
+ />
- Promote or Demote User
@@ -94,7 +105,8 @@
class="button is-warning"
data-confirm={"Are you sure? #{mote_message(@user)}"}
phx-click={mote(@user)}
- phx-value-user_id={@user.id}>
+ phx-value-user_id={@user.id}
+ >
@@ -102,7 +114,7 @@
- Delete User
@@ -113,7 +125,8 @@
class="button is-danger"
data-confirm="Are you sure? This will permanently delete this user, all associated devices and instantly drop any active VPN sessions associated to this user."
phx-click="delete_user"
- phx-value-user_id={@user.id}>
+ phx-value-user_id={@user.id}
+ >
diff --git a/apps/fz_http/lib/fz_http_web/plug/samly_target_url.ex b/apps/fz_http/lib/fz_http_web/plug/samly_target_url.ex
new file mode 100644
index 000000000..8c61ed7d7
--- /dev/null
+++ b/apps/fz_http/lib/fz_http_web/plug/samly_target_url.ex
@@ -0,0 +1,13 @@
+defmodule FzHttpWeb.Plug.SamlyTargetUrl do
+ @moduledoc """
+ Plug to set target url for samly to later on redirect to after auth success
+ """
+
+ import Plug.Conn
+
+ def init(opts), do: opts
+
+ def call(conn, _opt) do
+ put_session(conn, "target_url", "/auth/saml/callback")
+ end
+end
diff --git a/apps/fz_http/lib/fz_http_web/router.ex b/apps/fz_http/lib/fz_http_web/router.ex
index 5271e290f..e4a247c07 100644
--- a/apps/fz_http/lib/fz_http_web/router.ex
+++ b/apps/fz_http/lib/fz_http_web/router.ex
@@ -45,6 +45,11 @@ defmodule FzHttpWeb.Router do
plug FzHttpWeb.Authentication.Pipeline
end
+ pipeline :samly do
+ plug :fetch_session
+ plug FzHttpWeb.Plug.SamlyTargetUrl
+ end
+
# Ueberauth routes
scope "/auth", FzHttpWeb do
pipe_through [
@@ -64,6 +69,12 @@ defmodule FzHttpWeb.Router do
get "/oidc/:provider", AuthController, :redirect_oidc_auth_uri, as: :auth_oidc
end
+ scope "/auth/saml" do
+ pipe_through :samly
+
+ forward "/", Samly.Router
+ end
+
# Unauthenticated routes
scope "/", FzHttpWeb do
pipe_through [
@@ -155,7 +166,11 @@ defmodule FzHttpWeb.Router do
live "/devices", DeviceLive.Admin.Index, :index
live "/devices/:id", DeviceLive.Admin.Show, :show
live "/settings/site", SettingLive.Site, :show
+
live "/settings/security", SettingLive.Security, :show
+ live "/settings/security/oidc/:id/edit", SettingLive.Security, :edit_oidc
+ live "/settings/security/saml/:id/edit", SettingLive.Security, :edit_saml
+
live "/settings/account", SettingLive.Account, :show
live "/settings/account/edit", SettingLive.Account, :edit
live "/settings/account/register_mfa", SettingLive.Account, :register_mfa
@@ -173,6 +188,9 @@ defmodule FzHttpWeb.Router do
forward "/mailbox", Plug.Swoosh.MailboxPreview
live_dashboard "/dashboard"
+
+ get "/samly", FzHttpWeb.DebugController, :samly
+ get "/session", FzHttpWeb.DebugController, :session
end
end
end
diff --git a/apps/fz_http/lib/fz_http_web/templates/auth/request.html.heex b/apps/fz_http/lib/fz_http_web/templates/auth/request.html.heex
index 707a49912..c50ced4ad 100644
--- a/apps/fz_http/lib/fz_http_web/templates/auth/request.html.heex
+++ b/apps/fz_http/lib/fz_http_web/templates/auth/request.html.heex
@@ -1,9 +1,9 @@
Sign In
-
+
- <%= link "<- Back to sign in methods", to: Routes.root_path(@conn, :index) %>
+ <%= link("<- Back to sign in methods", to: Routes.root_path(@conn, :index)) %>
@@ -11,7 +11,14 @@
@@ -26,10 +33,13 @@
- <%= submit "Sign In", class: "button" %>
+ <%= submit("Sign In", class: "button") %>
- <%= link "Forgot password", to: Routes.auth_path(@conn, :reset_password), class: "forgot-password" %>
+ <%= link("Forgot password",
+ to: Routes.auth_path(@conn, :reset_password),
+ class: "forgot-password"
+ ) %>
diff --git a/apps/fz_http/lib/fz_http_web/templates/auth/reset_password.html.heex b/apps/fz_http/lib/fz_http_web/templates/auth/reset_password.html.heex
index d0197c3d2..f82e7dbcf 100644
--- a/apps/fz_http/lib/fz_http_web/templates/auth/reset_password.html.heex
+++ b/apps/fz_http/lib/fz_http_web/templates/auth/reset_password.html.heex
@@ -1,6 +1,6 @@
Reset Password
-
+
<%= link("<- Back to sign in methods", to: Routes.root_path(@conn, :index)) %>
@@ -18,7 +18,7 @@
- <%= submit "Send", class: "button" %>
+ <%= submit("Send", class: "button") %>
<% end %>
diff --git a/apps/fz_http/lib/fz_http_web/templates/layout/admin.html.heex b/apps/fz_http/lib/fz_http_web/templates/layout/admin.html.heex
index 55e3ecddb..4e940de16 100644
--- a/apps/fz_http/lib/fz_http_web/templates/layout/admin.html.heex
+++ b/apps/fz_http/lib/fz_http_web/templates/layout/admin.html.heex
@@ -1,102 +1,132 @@
-
+
-
-
-
+
+
+
<.live_title prefix="Firezone • ">
<%= assigns[:page_title] %>
-
-
+
-
-
-
+
+
+
-
-
- <%= render(FzHttpWeb.SharedView, "socket_token_headers.html", conn: @conn, current_user: @current_user) %>
+
+
+ <%= render(FzHttpWeb.SharedView, "socket_token_headers.html",
+ conn: @conn,
+ current_user: @current_user
+ ) %>
-