mirror of
https://github.com/rickbarrette/simple-aircraft-manager-rails.git
synced 2026-11-17 23:50:36 -05:00
Security hardening and OpenID Connect single sign-on
- SSO via OmniAuth OpenID Connect (Authentik, Keycloak, …): link by stable subject, by verified email, or from the profile; optional auto-create, admin-group sync, and turning password sign-in off - Current password required to change email or password; password changes and resets sign out other sessions; idle sessions expire after 30 days; "sign out everywhere else"; session reset on sign-in - Rate-limit password resets; scope squawk components to the aircraft - Strict Content Security Policy with nonces (inline handlers removed), Permissions-Policy and COOP headers; file links expire after an hour Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
2bfcb845ca
commit
ac4da93aaf
27 files changed
+708
-47
No files matched your search
@@ -30,6 +30,7 @@ class Admin::UsersController < ApplicationController
|
||||
end
|
||||
@user.admin = admin_flag
|
||||
if @user.update(attrs)
|
||||
@user.sessions.where.not(id: Current.session.id).destroy_all if attrs.key?(:password) # new password signs them out
|
||||
redirect_to admin_users_path, notice: "User updated."
|
||||
else
|
||||
render :edit, status: :unprocessable_entity
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
module Authentication
|
||||
extend ActiveSupport::Concern
|
||||
|
||||
# A session unused for this long is signed out.
|
||||
SESSION_IDLE_TIMEOUT = 30.days
|
||||
|
||||
included do
|
||||
before_action :require_authentication
|
||||
helper_method :authenticated?
|
||||
@@ -26,7 +29,15 @@ module Authentication
|
||||
end
|
||||
|
||||
def find_session_by_cookie
|
||||
Session.find_by(id: cookies.signed[:session_id]) if cookies.signed[:session_id]
|
||||
session = Session.find_by(id: cookies.signed[:session_id]) if cookies.signed[:session_id]
|
||||
return unless session
|
||||
if session.updated_at < SESSION_IDLE_TIMEOUT.ago
|
||||
session.destroy
|
||||
cookies.delete(:session_id)
|
||||
return
|
||||
end
|
||||
session.touch if session.updated_at < 1.hour.ago # last-active time, without a write per request
|
||||
session
|
||||
end
|
||||
|
||||
def request_authentication
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
class PasswordsController < ApplicationController
|
||||
allow_unauthenticated_access
|
||||
before_action :require_password_login
|
||||
before_action :set_user_by_token, only: %i[ edit update ]
|
||||
rate_limit to: 5, within: 15.minutes, only: :create, with: -> { redirect_to new_session_path, alert: "Try again later." }
|
||||
rate_limit to: 10, within: 15.minutes, only: :update, with: -> { redirect_to new_session_path, alert: "Try again later." }
|
||||
|
||||
def new
|
||||
end
|
||||
@@ -17,7 +20,8 @@ class PasswordsController < ApplicationController
|
||||
end
|
||||
|
||||
def update
|
||||
if @user.update(params.permit(:password, :password_confirmation))
|
||||
if params[:password].present? && @user.update(params.permit(:password, :password_confirmation))
|
||||
@user.sessions.destroy_all # a reset signs out every device
|
||||
redirect_to new_session_path, notice: "Password has been reset."
|
||||
else
|
||||
redirect_to edit_password_path(params[:token]), alert: "Passwords did not match."
|
||||
@@ -25,6 +29,10 @@ class PasswordsController < ApplicationController
|
||||
end
|
||||
|
||||
private
|
||||
def require_password_login
|
||||
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_password_reset_token!(params[:token])
|
||||
rescue ActiveSupport::MessageVerifier::InvalidSignature
|
||||
|
||||
@@ -3,14 +3,31 @@ class ProfilesController < ApplicationController
|
||||
@user = current_user
|
||||
end
|
||||
|
||||
# Changing the email or password needs the current password, so a session
|
||||
# left open somewhere can't be turned into a takeover of the account.
|
||||
def update
|
||||
@user = current_user
|
||||
attrs = params.require(:user).permit(:name, :email_address, :password, :password_confirmation)
|
||||
attrs = attrs.except(:password, :password_confirmation) if attrs[:password].blank?
|
||||
if @user.update(attrs)
|
||||
new_email = User.normalize_value_for(:email_address, attrs[:email_address].to_s) if attrs.key?(:email_address)
|
||||
sensitive = (new_email && new_email != @user.email_address) || attrs.key?(:password)
|
||||
# Checked before assigning: setting a new password replaces the digest at once.
|
||||
if sensitive && !@user.authenticate_password(params.dig(:user, :current_password).to_s)
|
||||
@user.assign_attributes(attrs.except(:password, :password_confirmation))
|
||||
@user.errors.add(:base, "Enter your current password to change your email or password")
|
||||
return render :edit, status: :unprocessable_entity
|
||||
end
|
||||
@user.assign_attributes(attrs)
|
||||
if @user.save
|
||||
@user.sessions.where.not(id: Current.session.id).destroy_all if attrs.key?(:password)
|
||||
redirect_to root_path, notice: "Profile updated."
|
||||
else
|
||||
render :edit, status: :unprocessable_entity
|
||||
end
|
||||
end
|
||||
|
||||
def sign_out_others
|
||||
count = current_user.sessions.where.not(id: Current.session.id).destroy_all.size
|
||||
redirect_to edit_profile_path, notice: "Signed out #{helpers.pluralize(count, 'other session')}."
|
||||
end
|
||||
end
|
||||
@@ -6,9 +6,13 @@ class SessionsController < ApplicationController
|
||||
end
|
||||
|
||||
def create
|
||||
return redirect_to new_session_path, alert: "Sign in with #{Sso.label}." unless Sso.password_login?
|
||||
|
||||
if user = User.authenticate_by(params.permit(:email_address, :password))
|
||||
return_to = after_authentication_url
|
||||
reset_session # fresh session id after signing in
|
||||
start_new_session_for user
|
||||
redirect_to after_authentication_url
|
||||
redirect_to return_to
|
||||
else
|
||||
redirect_to new_session_path, alert: "Try another email address or password."
|
||||
end
|
||||
|
||||
@@ -70,5 +70,6 @@ class SquawksController < ApplicationController
|
||||
|
||||
def squawk_params
|
||||
params.require(:squawk).permit(:priority, :issue_reported, :component_id, :notes, attachments: [])
|
||||
.tap { |p| p[:component_id] = scoped_id(@aircraft.components, p[:component_id]) if p.key?(:component_id) }
|
||||
end
|
||||
end
|
||||
@@ -0,0 +1,100 @@
|
||||
# Finishes an OpenID Connect sign-in (OmniAuth runs the redirect dance) and
|
||||
# links or unlinks a signed-in user's account. See Sso for the settings.
|
||||
#
|
||||
# Accounts are matched by the provider's stable subject id. The first time,
|
||||
# an existing account is linked by email only when the provider says the
|
||||
# email is verified (or OIDC_TRUST_EMAIL is on), since some providers let
|
||||
# users edit their email. Otherwise, sign in with a password once and link
|
||||
# from the profile page.
|
||||
class SsoController < ApplicationController
|
||||
allow_unauthenticated_access only: %i[callback failure]
|
||||
before_action :require_sso
|
||||
rate_limit to: 20, within: 3.minutes, only: :callback, with: -> { redirect_to new_session_path, alert: "Try again later." }
|
||||
|
||||
def callback
|
||||
auth = request.env["omniauth.auth"]
|
||||
return failure unless auth && auth.provider.to_s == Sso::PROVIDER.to_s && auth.uid.present?
|
||||
return link(auth) if authenticated?
|
||||
|
||||
user = User.find_by(sso_uid: auth.uid) || link_by_email(auth) || create_user(auth)
|
||||
unless user
|
||||
email = auth.info&.email.presence
|
||||
return redirect_to new_session_path, alert: "There's no account for #{email || 'that sign-in'} here yet. " \
|
||||
"Ask an administrator to add you, or sign in with your password and link #{Sso.label} from your profile."
|
||||
end
|
||||
|
||||
sync_admin(user, auth)
|
||||
return_to = session[:return_to_after_authenticating]
|
||||
reset_session # fresh session id after signing in
|
||||
start_new_session_for user
|
||||
redirect_to return_to || root_url
|
||||
end
|
||||
|
||||
# OmniAuth's error codes; anything else (network errors…) is logged, not shown.
|
||||
FAILURES = { "invalid_credentials" => "invalid credentials", "csrf_detected" => "the sign-in expired, try again",
|
||||
"access_denied" => "access denied", "timeout" => "timed out" }.freeze
|
||||
|
||||
def failure
|
||||
reason = FAILURES[params[:message].to_s]
|
||||
Rails.logger.warn("[sso] sign-in failed: #{params[:message].to_s.truncate(300)}") unless reason
|
||||
redirect_to(authenticated? ? edit_profile_path : new_session_path,
|
||||
alert: "#{Sso.label} sign-in failed (#{reason || "couldn't reach or verify #{Sso.label}; see the server log"}).")
|
||||
end
|
||||
|
||||
def destroy
|
||||
unless Sso.password_login?
|
||||
return redirect_to edit_profile_path, alert: "Password sign-in is off, so unlinking #{Sso.label} would lock you out."
|
||||
end
|
||||
current_user.update!(sso_uid: nil)
|
||||
redirect_to edit_profile_path, notice: "#{Sso.label} unlinked. Sign in with your email and password from now on."
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def require_sso
|
||||
raise ActiveRecord::RecordNotFound unless Sso.enabled?
|
||||
end
|
||||
|
||||
def link(auth)
|
||||
owner = User.find_by(sso_uid: auth.uid)
|
||||
if owner && owner != current_user
|
||||
redirect_to edit_profile_path, alert: "That #{Sso.label} account is already linked to another user."
|
||||
else
|
||||
current_user.update!(sso_uid: auth.uid)
|
||||
redirect_to edit_profile_path, notice: "#{Sso.label} linked. You can now sign in with it."
|
||||
end
|
||||
end
|
||||
|
||||
def link_by_email(auth)
|
||||
email = auth.info&.email.to_s.strip.downcase
|
||||
return if email.blank? || !(email_verified?(auth) || Sso.trust_email?)
|
||||
user = User.find_by(email_address: email, sso_uid: nil)
|
||||
user&.update!(sso_uid: auth.uid)
|
||||
user
|
||||
end
|
||||
|
||||
def create_user(auth)
|
||||
return unless Sso.auto_create_users?
|
||||
email = auth.info&.email.to_s.strip.downcase
|
||||
return if email.blank? || User.exists?(email_address: email)
|
||||
# The random password is never shown; a password reset can set a real one.
|
||||
User.create!(email_address: email, name: auth.info&.name.presence, sso_uid: auth.uid, password: SecureRandom.base58(40))
|
||||
rescue ActiveRecord::RecordInvalid
|
||||
nil
|
||||
end
|
||||
|
||||
def email_verified?(auth)
|
||||
[ true, "true" ].include?(raw_info(auth)["email_verified"])
|
||||
end
|
||||
|
||||
# With OIDC_ADMIN_GROUP set, the provider decides who's an admin. Skipped
|
||||
# when the token carries no groups claim, so a missing scope can't demote.
|
||||
def sync_admin(user, auth)
|
||||
return unless Sso.admin_group && raw_info(auth).key?("groups")
|
||||
user.update!(admin: Array(raw_info(auth)["groups"]).map(&:to_s).include?(Sso.admin_group))
|
||||
end
|
||||
|
||||
def raw_info(auth)
|
||||
(auth.extra&.raw_info || {}).to_h.stringify_keys
|
||||
end
|
||||
end
|
||||
Reference in new issue
Block a user