mirror of
https://github.com/rickbarrette/simple-aircraft-manager-rails.git
synced 2026-11-17 23:50:36 -05:00
Email test button and sign-in by emailed link
- Admin -> About: Email card (delivery, server, encryption, login name, From; never the password) and a "Send test email" button that sends immediately and shows the SMTP error if it fails - SMTP: implicit TLS on port 465 (or SMTP_TLS=true), auth only with a username, 10-15 s timeouts - "Email me a sign-in link": single-use (spent by any later sign-in via a monotonic users.last_signed_in_at), 15-minute expiry, confirm step so mail scanners can't use it up, same answer for unknown addresses, rate limited, off when PASSWORD_LOGIN=false - Admin -> Users shows last sign-in Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
2b0a2f1949
commit
4f548f3874
23 files changed
+275
-12
No files matched your search
@@ -54,7 +54,8 @@ The app is a standard Rails app. Run `bin/rails db:prepare && bin/thrust bin/rai
|
|||||||
| `SECRET_KEY_BASE` | Required in production (`bin/rails secret`). Alternatively provide `RAILS_MASTER_KEY`. |
|
| `SECRET_KEY_BASE` | Required in production (`bin/rails secret`). Alternatively provide `RAILS_MASTER_KEY`. |
|
||||||
| `FORCE_SSL` | `true` (default) redirects to HTTPS and sets secure cookies. Use `false` for plain HTTP. |
|
| `FORCE_SSL` | `true` (default) redirects to HTTPS and sets secure cookies. Use `false` for plain HTTP. |
|
||||||
| `APP_HOST` | Host used in password-reset email links. |
|
| `APP_HOST` | Host used in password-reset email links. |
|
||||||
| `SMTP_ADDRESS`, `SMTP_PORT`, `SMTP_USERNAME`, `SMTP_PASSWORD`, `MAIL_FROM` | Optional. They enable password-reset emails. Without them an admin resets passwords from **Users**. |
|
| `SMTP_ADDRESS`, `SMTP_PORT`, `SMTP_USERNAME`, `SMTP_PASSWORD`, `MAIL_FROM` | Optional. They enable email: password resets and **Email me a sign-in link**. Without them an admin resets passwords from **Users**. Check the setup with **Admin → About → Send test email**. |
|
||||||
|
| `SMTP_TLS` | `true` for servers that use TLS from the start. That's the default on port 465; other ports upgrade with STARTTLS. |
|
||||||
| `ANTHROPIC_API_KEY` | Optional. Lets Claude transcribe scanned logbook pages into entries (**Logbook → Import scans**). Without it, scans are only uploaded. |
|
| `ANTHROPIC_API_KEY` | Optional. Lets Claude transcribe scanned logbook pages into entries (**Logbook → Import scans**). Without it, scans are only uploaded. |
|
||||||
| `LOGBOOK_AI_MODEL`, `LOGBOOK_AI_EFFORT` | Optional. The Claude model and effort used for transcription (default `claude-opus-5-5`, `high`). |
|
| `LOGBOOK_AI_MODEL`, `LOGBOOK_AI_EFFORT` | Optional. The Claude model and effort used for transcription (default `claude-opus-5-5`, `high`). |
|
||||||
| `APP_URL` | Optional public base URL, e.g. `https://aircraft.example.com` (default `https://APP_HOST`). Used for the SSO callback. |
|
| `APP_URL` | Optional public base URL, e.g. `https://aircraft.example.com` (default `https://APP_HOST`). Used for the SSO callback. |
|
||||||
@@ -63,7 +64,7 @@ The app is a standard Rails app. Run `bin/rails db:prepare && bin/thrust bin/rai
|
|||||||
| `OIDC_AUTO_CREATE_USERS` | `true` creates an account for anyone the provider lets in. New accounts start with no aircraft. Default off: an admin adds users first. |
|
| `OIDC_AUTO_CREATE_USERS` | `true` creates an account for anyone the provider lets in. New accounts start with no aircraft. Default off: an admin adds users first. |
|
||||||
| `OIDC_TRUST_EMAIL` | `true` links existing accounts by email even if the provider doesn't mark it verified. Only use it if users can't edit their own email at the provider. |
|
| `OIDC_TRUST_EMAIL` | `true` links existing accounts by email even if the provider doesn't mark it verified. Only use it if users can't edit their own email at the provider. |
|
||||||
| `OIDC_ADMIN_GROUP` | Optional. Members of this provider group become admins and others lose admin, synced at each sign-in. |
|
| `OIDC_ADMIN_GROUP` | Optional. Members of this provider group become admins and others lose admin, synced at each sign-in. |
|
||||||
| `PASSWORD_LOGIN` | `false` hides email/password sign-in and password resets once SSO works. It's ignored while SSO isn't configured, so you can't lock yourself out. |
|
| `PASSWORD_LOGIN` | `false` hides email/password sign-in, emailed sign-in links and password resets once SSO works. It's ignored while SSO isn't configured, so you can't lock yourself out. |
|
||||||
|
|
||||||
### Single sign-on (Authentik example)
|
### Single sign-on (Authentik example)
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,20 @@
|
|||||||
class Admin::AboutController < ApplicationController
|
class Admin::AboutController < ApplicationController
|
||||||
before_action :require_admin!
|
before_action :require_admin!
|
||||||
|
rate_limit to: 5, within: 1.minute, only: :test_email, with: -> { redirect_to admin_about_path, alert: "Try again in a minute." }
|
||||||
|
|
||||||
def show
|
def show
|
||||||
@info = SystemInfo.new
|
@info = SystemInfo.new
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Sends right away (not via the job queue) so problems show up here.
|
||||||
|
def test_email
|
||||||
|
unless MailSettings.configured?
|
||||||
|
return redirect_to admin_about_path, alert: "Email isn't set up yet: set SMTP_ADDRESS (and SMTP_PORT, SMTP_USERNAME, SMTP_PASSWORD, MAIL_FROM)."
|
||||||
|
end
|
||||||
|
AdminMailer.test_email(current_user).deliver_now
|
||||||
|
redirect_to admin_about_path, notice: "Test email sent to #{current_user.email_address}. If it doesn't arrive, check the spam folder."
|
||||||
|
rescue StandardError => e # SMTP, DNS, TLS and timeout errors alike
|
||||||
|
Rails.logger.warn("[test email] #{e.class}: #{e.message}")
|
||||||
|
redirect_to admin_about_path, alert: "Sending failed: #{e.class.name.demodulize}: #{e.message.to_s.squish.truncate(240)}"
|
||||||
|
end
|
||||||
end
|
end
|
||||||
@@ -50,6 +50,7 @@ module Authentication
|
|||||||
end
|
end
|
||||||
|
|
||||||
def start_new_session_for(user)
|
def start_new_session_for(user)
|
||||||
|
user.update_column(:last_signed_in_at, Time.current)
|
||||||
user.sessions.create!(user_agent: request.user_agent, ip_address: request.remote_ip).tap do |session|
|
user.sessions.create!(user_agent: request.user_agent, ip_address: request.remote_ip).tap do |session|
|
||||||
Current.session = session
|
Current.session = session
|
||||||
cookies.signed.permanent[:session_id] = { value: session.id, httponly: true, same_site: :lax }
|
cookies.signed.permanent[:session_id] = { value: session.id, httponly: true, same_site: :lax }
|
||||||
|
|||||||
@@ -0,0 +1,43 @@
|
|||||||
|
# Sign in with a link sent by email instead of a password.
|
||||||
|
#
|
||||||
|
# Opening the link shows a confirm button rather than signing in straight
|
||||||
|
# away: mail scanners that pre-open links would otherwise use up the one-time
|
||||||
|
# link (and sign themselves in).
|
||||||
|
class SignInLinksController < ApplicationController
|
||||||
|
allow_unauthenticated_access
|
||||||
|
before_action :require_email_sign_in
|
||||||
|
before_action :set_user_by_token, only: %i[show consume]
|
||||||
|
rate_limit to: 5, within: 15.minutes, only: :create, with: -> { redirect_to new_sign_in_link_path, alert: "Try again later." }
|
||||||
|
rate_limit to: 20, within: 15.minutes, only: :consume, with: -> { redirect_to new_session_path, alert: "Try again later." }
|
||||||
|
|
||||||
|
def new
|
||||||
|
end
|
||||||
|
|
||||||
|
def create
|
||||||
|
if (user = User.find_by(email_address: params[:email_address].to_s))
|
||||||
|
SessionsMailer.sign_in_link(user).deliver_later
|
||||||
|
end
|
||||||
|
# Same answer either way, so this can't be used to find accounts.
|
||||||
|
redirect_to new_session_path, notice: "If there's an account for that address, a sign-in link is on its way. It works once, for 15 minutes."
|
||||||
|
end
|
||||||
|
|
||||||
|
def show
|
||||||
|
end
|
||||||
|
|
||||||
|
def consume
|
||||||
|
reset_session # fresh session id after signing in
|
||||||
|
start_new_session_for @user # also spends the link
|
||||||
|
redirect_to root_path, notice: "Signed in."
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def require_email_sign_in
|
||||||
|
redirect_to new_session_path, alert: "Sign in with #{Sso.label}." unless Sso.password_login?
|
||||||
|
end
|
||||||
|
|
||||||
|
def set_user_by_token
|
||||||
|
@user = User.find_by_token_for(:email_sign_in, params[:token].to_s)
|
||||||
|
redirect_to new_sign_in_link_path, alert: "That sign-in link has expired or was already used. Get a new one below." unless @user
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
class AdminMailer < ApplicationMailer
|
||||||
|
def test_email(user)
|
||||||
|
@user = user
|
||||||
|
mail subject: "Test email from Simple Aircraft Manager", to: user.email_address
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
class SessionsMailer < ApplicationMailer
|
||||||
|
def sign_in_link(user)
|
||||||
|
@user = user
|
||||||
|
@token = user.generate_token_for(:email_sign_in)
|
||||||
|
mail subject: "Your sign-in link", to: user.email_address
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
# Whether the app can send email, and a secret-free description of how.
|
||||||
|
module MailSettings
|
||||||
|
module_function
|
||||||
|
|
||||||
|
# Production only sends with SMTP_ADDRESS set; dev and test use their own
|
||||||
|
# delivery methods.
|
||||||
|
def configured?
|
||||||
|
ActionMailer::Base.delivery_method != :smtp || ENV["SMTP_ADDRESS"].present?
|
||||||
|
end
|
||||||
|
|
||||||
|
def summary
|
||||||
|
method = ActionMailer::Base.delivery_method
|
||||||
|
rows = { "Delivery" => configured? ? method.to_s.upcase : "not configured (set SMTP_ADDRESS)" }
|
||||||
|
if method == :smtp && configured?
|
||||||
|
s = ActionMailer::Base.smtp_settings
|
||||||
|
rows["Server"] = "#{s[:address]}:#{s[:port]}"
|
||||||
|
rows["Encryption"] = s[:tls] ? "TLS" : "STARTTLS when offered"
|
||||||
|
rows["Signs in as"] = s[:user_name].presence || "no login"
|
||||||
|
end
|
||||||
|
rows["From"] = ApplicationMailer.default[:from]
|
||||||
|
rows
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -47,7 +47,7 @@ class SystemInfo
|
|||||||
{
|
{
|
||||||
"Single sign-on" => Sso.enabled? ? "#{Sso.label}#{', password sign-in off' unless Sso.password_login?}" : "not configured",
|
"Single sign-on" => Sso.enabled? ? "#{Sso.label}#{', password sign-in off' unless Sso.password_login?}" : "not configured",
|
||||||
"AI logbook transcription" => ENV["ANTHROPIC_API_KEY"].present? ? "on (#{LogbookTranscriber::MODEL})" : "no API key",
|
"AI logbook transcription" => ENV["ANTHROPIC_API_KEY"].present? ? "on (#{LogbookTranscriber::MODEL})" : "no API key",
|
||||||
"Password-reset email" => ENV["SMTP_ADDRESS"].present? ? "SMTP" : "not configured",
|
"Email" => MailSettings.configured? ? ActionMailer::Base.delivery_method.to_s.upcase : "not configured",
|
||||||
"HTTPS enforced" => Rails.application.config.force_ssl ? "yes" : "no",
|
"HTTPS enforced" => Rails.application.config.force_ssl ? "yes" : "no",
|
||||||
"File storage" => ActiveStorage::Blob.service.class.name.demodulize.delete_suffix("Service")
|
"File storage" => ActiveStorage::Blob.service.class.name.demodulize.delete_suffix("Service")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,6 +5,13 @@ class User < ApplicationRecord
|
|||||||
has_many :aircraft, through: :aircraft_roles
|
has_many :aircraft, through: :aircraft_roles
|
||||||
has_one :air_trail_connection, dependent: :destroy
|
has_one :air_trail_connection, dependent: :destroy
|
||||||
|
|
||||||
|
# Emailed sign-in links: valid 15 minutes, and spent by the next sign-in of
|
||||||
|
# any kind (or an email change), so each link works once. last_signed_in_at
|
||||||
|
# only moves forward; signing out can't bring a used link back.
|
||||||
|
generates_token_for :email_sign_in, expires_in: 15.minutes do
|
||||||
|
[ email_address, last_signed_in_at&.to_f ]
|
||||||
|
end
|
||||||
|
|
||||||
normalizes :email_address, with: ->(e) { e.strip.downcase }
|
normalizes :email_address, with: ->(e) { e.strip.downcase }
|
||||||
|
|
||||||
validates :email_address, presence: true, uniqueness: true,
|
validates :email_address, presence: true, uniqueness: true,
|
||||||
|
|||||||
@@ -45,6 +45,15 @@
|
|||||||
] + info.databases.map { |label, bytes| [ "#{label} database", bytes && number_to_human_size(bytes) ] } %>
|
] + info.databases.map { |label, bytes| [ "#{label} database", bytes && number_to_human_size(bytes) ] } %>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
<section class="card">
|
||||||
|
<div class="card-header">
|
||||||
|
<h2 class="card-title">Email</h2>
|
||||||
|
<%= button_to "Send test email", admin_test_email_path, class: "btn-secondary btn-sm", disabled: !MailSettings.configured?,
|
||||||
|
data: { turbo_submits_with: "Sending…" }, title: "Sends to #{current_user.email_address}" %>
|
||||||
|
</div>
|
||||||
|
<%= render "pairs", pairs: MailSettings.summary %>
|
||||||
|
</section>
|
||||||
|
|
||||||
<section class="card">
|
<section class="card">
|
||||||
<div class="card-header"><h2 class="card-title">Background jobs</h2></div>
|
<div class="card-header"><h2 class="card-title">Background jobs</h2></div>
|
||||||
<% if (j = info.jobs) %>
|
<% if (j = info.jobs) %>
|
||||||
|
|||||||
@@ -1,11 +1,12 @@
|
|||||||
<% content_for :title, "Users" %>
|
<% content_for :title, "Users" %>
|
||||||
<div class="mb-4 flex items-center justify-between"><h1 class="text-2xl font-bold">Users</h1><%= link_to "+ New User", new_admin_user_path, class: "btn-primary" %></div>
|
<div class="mb-4 flex items-center justify-between"><h1 class="text-2xl font-bold">Users</h1><%= link_to "+ New User", new_admin_user_path, class: "btn-primary" %></div>
|
||||||
<section class="card"><table class="table">
|
<section class="card"><table class="table">
|
||||||
<thead><tr><th>Name</th><th>Email</th><th>Aircraft</th><th></th></tr></thead>
|
<thead><tr><th>Name</th><th>Email</th><th>Aircraft</th><th>Last sign-in</th><th></th></tr></thead>
|
||||||
<tbody><% @users.each do |u| %><tr>
|
<tbody><% @users.each do |u| %><tr>
|
||||||
<td><%= u.name %> <% if u.admin? %><span class="badge-blue">Admin</span><% end %><% if u.sso_uid? %> <span class="badge-gray" title="Signs in with <%= Sso.label %>"><%= Sso.label %></span><% end %></td>
|
<td><%= u.name %> <% if u.admin? %><span class="badge-blue">Admin</span><% end %><% if u.sso_uid? %> <span class="badge-gray" title="Signs in with <%= Sso.label %>"><%= Sso.label %></span><% end %></td>
|
||||||
<td><%= u.email_address %></td>
|
<td><%= u.email_address %></td>
|
||||||
<td class="text-xs"><%= u.aircraft_roles.map { "#{_1.aircraft.tail_number} (#{_1.role})" }.join(", ").presence || "—" %></td>
|
<td class="text-xs"><%= u.aircraft_roles.map { "#{_1.aircraft.tail_number} (#{_1.role})" }.join(", ").presence || "—" %></td>
|
||||||
|
<td class="text-xs text-slate-500"><%= u.last_signed_in_at ? "#{time_ago_in_words(u.last_signed_in_at)} ago" : "never" %></td>
|
||||||
<td class="text-right"><%= link_to "Edit", edit_admin_user_path(u), class: "btn-secondary btn-sm" %></td>
|
<td class="text-right"><%= link_to "Edit", edit_admin_user_path(u), class: "btn-secondary btn-sm" %></td>
|
||||||
</tr><% end %></tbody>
|
</tr><% end %></tbody>
|
||||||
</table></section>
|
</table></section>
|
||||||
|
|||||||
@@ -0,0 +1,2 @@
|
|||||||
|
<p>This is a test email from Simple Aircraft Manager, sent by <%= @user.email_address %> from Admin → About.</p>
|
||||||
|
<p>Email is working: password resets and sign-in links will arrive.</p>
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
This is a test email from Simple Aircraft Manager, sent by <%= @user.email_address %> from Admin → About.
|
||||||
|
|
||||||
|
Email is working: password resets and sign-in links will arrive.
|
||||||
@@ -15,7 +15,10 @@
|
|||||||
<div><%= form.label :password, class: "label" %>
|
<div><%= form.label :password, class: "label" %>
|
||||||
<%= form.password_field :password, required: true, autocomplete: "current-password", maxlength: 72, class: "input" %></div>
|
<%= form.password_field :password, required: true, autocomplete: "current-password", maxlength: 72, class: "input" %></div>
|
||||||
<%= form.submit "Sign in", class: (Sso.enabled? ? "btn-secondary" : "btn-primary") + " w-full justify-center" %>
|
<%= form.submit "Sign in", class: (Sso.enabled? ? "btn-secondary" : "btn-primary") + " w-full justify-center" %>
|
||||||
<p class="text-center text-sm"><%= link_to "Forgot password?", new_password_path, class: "link" %></p>
|
<p class="flex flex-wrap justify-center gap-x-4 gap-y-1 text-sm">
|
||||||
|
<% if MailSettings.configured? %><%= link_to "Email me a sign-in link", new_sign_in_link_path, class: "link" %><% end %>
|
||||||
|
<%= link_to "Forgot password?", new_password_path, class: "link" %>
|
||||||
|
</p>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -0,0 +1,3 @@
|
|||||||
|
<p>Here's your link to sign in to Simple Aircraft Manager:</p>
|
||||||
|
<p><%= link_to "Sign in as #{@user.email_address}", sign_in_link_url(@token) %></p>
|
||||||
|
<p>It works once, for the next 15 minutes. If you didn't ask for it, you can ignore this email.</p>
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
Here's your link to sign in to Simple Aircraft Manager as <%= @user.email_address %>:
|
||||||
|
|
||||||
|
<%= sign_in_link_url(@token) %>
|
||||||
|
|
||||||
|
It works once, for the next 15 minutes. If you didn't ask for it, you can ignore this email.
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
<% content_for :title, "Email me a sign-in link" %>
|
||||||
|
<div class="mx-auto max-w-sm">
|
||||||
|
<h1 class="mb-4 text-2xl font-bold">Sign in by email</h1>
|
||||||
|
<%= form_with url: sign_in_links_path, class: "card card-body space-y-4" do |form| %>
|
||||||
|
<p class="text-sm text-slate-600">We'll email you a link that signs you in. It works once, for 15 minutes.</p>
|
||||||
|
<div><%= form.label :email_address, "Email", class: "label" %>
|
||||||
|
<%= form.email_field :email_address, required: true, autofocus: true, autocomplete: "username", value: params[:email_address], class: "input" %></div>
|
||||||
|
<%= form.submit "Email me a link", class: "btn-primary w-full justify-center" %>
|
||||||
|
<p class="text-center text-sm"><%= link_to "Back to sign in", new_session_path, class: "link" %></p>
|
||||||
|
<% end %>
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
<% content_for :title, "Sign in" %>
|
||||||
|
<div class="mx-auto max-w-sm">
|
||||||
|
<h1 class="mb-4 text-2xl font-bold">Sign in</h1>
|
||||||
|
<div class="card card-body space-y-4">
|
||||||
|
<p class="text-sm text-slate-600">Continue as <strong><%= @user.email_address %></strong>?</p>
|
||||||
|
<%= button_to "Sign in", consume_sign_in_link_path(params[:token]), class: "btn-primary w-full justify-center" %>
|
||||||
|
<p class="text-center text-sm"><%= link_to "Not you? Back to sign in", new_session_path, class: "link" %></p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
@@ -63,16 +63,22 @@ Rails.application.configure do
|
|||||||
host: ENV.fetch("APP_HOST", "localhost"),
|
host: ENV.fetch("APP_HOST", "localhost"),
|
||||||
protocol: ENV.fetch("FORCE_SSL", "true") == "true" ? "https" : "http"
|
protocol: ENV.fetch("FORCE_SSL", "true") == "true" ? "https" : "http"
|
||||||
}
|
}
|
||||||
# Password-reset emails. Configure SMTP_ADDRESS (and friends) to enable.
|
# Email (password resets, sign-in links). Configure SMTP_ADDRESS (and friends)
|
||||||
|
# to enable; Admin → About has a test button.
|
||||||
if ENV["SMTP_ADDRESS"].present?
|
if ENV["SMTP_ADDRESS"].present?
|
||||||
|
smtp_port = ENV.fetch("SMTP_PORT", 587).to_i
|
||||||
config.action_mailer.delivery_method = :smtp
|
config.action_mailer.delivery_method = :smtp
|
||||||
config.action_mailer.smtp_settings = {
|
config.action_mailer.smtp_settings = {
|
||||||
address: ENV["SMTP_ADDRESS"],
|
address: ENV["SMTP_ADDRESS"],
|
||||||
port: ENV.fetch("SMTP_PORT", 587).to_i,
|
port: smtp_port,
|
||||||
user_name: ENV["SMTP_USERNAME"],
|
user_name: ENV["SMTP_USERNAME"].presence,
|
||||||
password: ENV["SMTP_PASSWORD"],
|
password: ENV["SMTP_PASSWORD"].presence,
|
||||||
authentication: :plain,
|
authentication: (:plain if ENV["SMTP_USERNAME"].present?),
|
||||||
enable_starttls_auto: true
|
# Port 465 is TLS from the start; others upgrade with STARTTLS.
|
||||||
|
tls: ENV.fetch("SMTP_TLS") { smtp_port == 465 ? "true" : "false" } == "true",
|
||||||
|
enable_starttls_auto: true,
|
||||||
|
open_timeout: 10,
|
||||||
|
read_timeout: 15
|
||||||
}.compact
|
}.compact
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,9 @@ Rails.application.routes.draw do
|
|||||||
post "rails/active_storage/direct_uploads", to: "direct_uploads#create"
|
post "rails/active_storage/direct_uploads", to: "direct_uploads#create"
|
||||||
|
|
||||||
resource :session
|
resource :session
|
||||||
|
resources :sign_in_links, path: "session/link", param: :token, only: %i[new create show] do
|
||||||
|
post :consume, on: :member
|
||||||
|
end
|
||||||
# Single sign-on: POST /auth/oidc (handled by OmniAuth) comes back here.
|
# Single sign-on: POST /auth/oidc (handled by OmniAuth) comes back here.
|
||||||
match "auth/:provider/callback", to: "sso#callback", via: %i[get post], as: :sso_callback
|
match "auth/:provider/callback", to: "sso#callback", via: %i[get post], as: :sso_callback
|
||||||
get "auth/failure", to: "sso#failure"
|
get "auth/failure", to: "sso#failure"
|
||||||
@@ -85,6 +88,7 @@ Rails.application.routes.draw do
|
|||||||
|
|
||||||
namespace :admin do
|
namespace :admin do
|
||||||
get "about", to: "about#show"
|
get "about", to: "about#show"
|
||||||
|
post "about/test_email", to: "about#test_email", as: :test_email
|
||||||
resources :users, except: :show
|
resources :users, except: :show
|
||||||
resources :component_types, except: :show
|
resources :component_types, except: :show
|
||||||
resources :airports, except: :show do
|
resources :airports, except: :show do
|
||||||
|
|||||||
@@ -0,0 +1,5 @@
|
|||||||
|
class AddLastSignedInAtToUsers < ActiveRecord::Migration[8.1]
|
||||||
|
def change
|
||||||
|
add_column :users, :last_signed_in_at, :datetime
|
||||||
|
end
|
||||||
|
end
|
||||||
Generated
+2
-1
@@ -10,7 +10,7 @@
|
|||||||
#
|
#
|
||||||
# It's strongly recommended that you check this file into your version control system.
|
# It's strongly recommended that you check this file into your version control system.
|
||||||
|
|
||||||
ActiveRecord::Schema[8.1].define(version: 2026_11_07_150000) do
|
ActiveRecord::Schema[8.1].define(version: 2026_11_07_170000) do
|
||||||
create_table "active_storage_attachments", force: :cascade do |t|
|
create_table "active_storage_attachments", force: :cascade do |t|
|
||||||
t.string "name", null: false
|
t.string "name", null: false
|
||||||
t.string "record_type", null: false
|
t.string "record_type", null: false
|
||||||
@@ -536,6 +536,7 @@ ActiveRecord::Schema[8.1].define(version: 2026_11_07_150000) do
|
|||||||
t.string "name"
|
t.string "name"
|
||||||
t.boolean "admin", default: false, null: false
|
t.boolean "admin", default: false, null: false
|
||||||
t.string "sso_uid"
|
t.string "sso_uid"
|
||||||
|
t.datetime "last_signed_in_at"
|
||||||
t.index ["email_address"], name: "index_users_on_email_address", unique: true
|
t.index ["email_address"], name: "index_users_on_email_address", unique: true
|
||||||
t.index ["sso_uid"], name: "index_users_on_sso_uid", unique: true
|
t.index ["sso_uid"], name: "index_users_on_sso_uid", unique: true
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -0,0 +1,100 @@
|
|||||||
|
require "test_helper"
|
||||||
|
|
||||||
|
class EmailSignInTest < ActionDispatch::IntegrationTest
|
||||||
|
include ActionMailer::TestHelper
|
||||||
|
|
||||||
|
setup { @user = create_user("jane@example.com") }
|
||||||
|
|
||||||
|
def link_from_email
|
||||||
|
perform_enqueued_jobs
|
||||||
|
mail = ActionMailer::Base.deliveries.last
|
||||||
|
assert_equal [ "jane@example.com" ], mail.to
|
||||||
|
mail.text_part.body.to_s[%r{http://example\.com(/session/link/[^\s]+)}, 1]
|
||||||
|
end
|
||||||
|
|
||||||
|
test "request a link, confirm, signed in; the link works once" do
|
||||||
|
get new_session_path
|
||||||
|
assert_select "a[href='#{new_sign_in_link_path}']", text: "Email me a sign-in link"
|
||||||
|
|
||||||
|
post sign_in_links_path, params: { email_address: "Jane@Example.com " }
|
||||||
|
assert_redirected_to new_session_path
|
||||||
|
assert_match "If there's an account for that address", flash[:notice]
|
||||||
|
path = link_from_email
|
||||||
|
|
||||||
|
get path # opening the link (or a mail scanner) doesn't sign in
|
||||||
|
assert_response :success
|
||||||
|
assert_select "button", text: "Sign in"
|
||||||
|
assert_equal 0, @user.sessions.count
|
||||||
|
|
||||||
|
post "#{path}/consume"
|
||||||
|
assert_redirected_to root_path
|
||||||
|
assert_equal 1, @user.sessions.count
|
||||||
|
follow_redirect!
|
||||||
|
assert_response :success
|
||||||
|
|
||||||
|
delete session_path
|
||||||
|
get path
|
||||||
|
assert_redirected_to new_sign_in_link_path
|
||||||
|
assert_match "expired or was already used", flash[:alert]
|
||||||
|
post "#{path}/consume"
|
||||||
|
assert_redirected_to new_sign_in_link_path
|
||||||
|
assert_equal 0, @user.reload.sessions.count
|
||||||
|
end
|
||||||
|
|
||||||
|
test "links expire, unknown addresses look the same, and it's off when password sign-in is" do
|
||||||
|
post sign_in_links_path, params: { email_address: "jane@example.com" }
|
||||||
|
path = link_from_email
|
||||||
|
travel 16.minutes do
|
||||||
|
post "#{path}/consume"
|
||||||
|
assert_redirected_to new_sign_in_link_path
|
||||||
|
end
|
||||||
|
|
||||||
|
ActionMailer::Base.deliveries.clear
|
||||||
|
post sign_in_links_path, params: { email_address: "nobody@example.com" }
|
||||||
|
assert_match "If there's an account for that address", flash[:notice]
|
||||||
|
perform_enqueued_jobs
|
||||||
|
assert_empty ActionMailer::Base.deliveries
|
||||||
|
|
||||||
|
get sign_in_link_path("forged-token")
|
||||||
|
assert_redirected_to new_sign_in_link_path
|
||||||
|
|
||||||
|
saved = %w[OIDC_ISSUER OIDC_CLIENT_ID PASSWORD_LOGIN].to_h { [ _1, ENV[_1] ] }
|
||||||
|
ENV.update("OIDC_ISSUER" => "https://auth.example.com/", "OIDC_CLIENT_ID" => "sam", "PASSWORD_LOGIN" => "false")
|
||||||
|
post sign_in_links_path, params: { email_address: "jane@example.com" }
|
||||||
|
assert_redirected_to new_session_path
|
||||||
|
assert_enqueued_emails 0
|
||||||
|
ensure
|
||||||
|
saved&.each { ENV[_1] = _2 }
|
||||||
|
end
|
||||||
|
|
||||||
|
test "admins can send a test email and see failures" do
|
||||||
|
admin = create_user("admin@example.com", admin: true)
|
||||||
|
sign_in admin
|
||||||
|
get admin_about_path
|
||||||
|
assert_select "form[action='#{admin_test_email_path}'] button", text: "Send test email"
|
||||||
|
|
||||||
|
assert_emails 1 do
|
||||||
|
post admin_test_email_path
|
||||||
|
end
|
||||||
|
assert_redirected_to admin_about_path
|
||||||
|
assert_equal "Test email sent to admin@example.com. If it doesn't arrive, check the spam folder.", flash[:notice]
|
||||||
|
assert_equal "Test email from Simple Aircraft Manager", ActionMailer::Base.deliveries.last.subject
|
||||||
|
|
||||||
|
failing = Class.new do
|
||||||
|
def initialize(*) = nil
|
||||||
|
def deliver!(*) = raise(Net::SMTPAuthenticationError.new(nil, message: "535 bad credentials"))
|
||||||
|
end
|
||||||
|
ActionMailer::Base.add_delivery_method :failing, failing
|
||||||
|
AdminMailer.delivery_method = :failing
|
||||||
|
begin
|
||||||
|
post admin_test_email_path
|
||||||
|
ensure
|
||||||
|
AdminMailer.delivery_method = :test
|
||||||
|
end
|
||||||
|
assert_match "Sending failed: SMTPAuthenticationError", flash[:alert]
|
||||||
|
|
||||||
|
sign_in @user
|
||||||
|
post admin_test_email_path
|
||||||
|
assert_redirected_to root_path
|
||||||
|
end
|
||||||
|
end
|
||||||
Reference in new issue
Block a user