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
@@ -1,7 +1,20 @@
|
||||
class Admin::AboutController < ApplicationController
|
||||
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
|
||||
@info = SystemInfo.new
|
||||
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
|
||||
@@ -50,6 +50,7 @@ module Authentication
|
||||
end
|
||||
|
||||
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|
|
||||
Current.session = session
|
||||
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",
|
||||
"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",
|
||||
"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_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 }
|
||||
|
||||
validates :email_address, presence: true, uniqueness: true,
|
||||
|
||||
@@ -45,6 +45,15 @@
|
||||
] + info.databases.map { |label, bytes| [ "#{label} database", bytes && number_to_human_size(bytes) ] } %>
|
||||
</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">
|
||||
<div class="card-header"><h2 class="card-title">Background jobs</h2></div>
|
||||
<% if (j = info.jobs) %>
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
<% 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>
|
||||
<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>
|
||||
<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 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>
|
||||
</tr><% end %></tbody>
|
||||
</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" %>
|
||||
<%= 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" %>
|
||||
<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 %>
|
||||
</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>
|
||||
Reference in new issue
Block a user