trek 2.3.2 → 2.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.node-version +1 -1
- data/.yarn/releases/yarn-4.18.1.cjs +1000 -0
- data/.yarnrc.yml +3 -5
- data/AGENTS.md +12 -8
- data/CHANGELOG.md +73 -0
- data/Gemfile.lock +226 -171
- data/Makefile +38 -1
- data/README.md +2 -2
- data/app/assets/icons/trek/passkey.svg +5 -0
- data/app/assets/stylesheets/trek/base.css +6 -0
- data/app/components/trek/entries/item_component/item_component.css +6 -0
- data/app/components/trek/form/image_field_component/image_field_component.html.slim +9 -0
- data/app/components/trek/form/image_field_component.rb +1 -5
- data/app/components/trek/form/password_strength_component/password_strength_component.css +56 -0
- data/app/components/trek/form/password_strength_component/password_strength_component.html.slim +8 -0
- data/app/components/trek/form/password_strength_component/password_strength_component.js +74 -0
- data/app/components/trek/form/password_strength_component.rb +29 -0
- data/app/components/trek/gate_component/gate_component.css +7 -0
- data/app/components/trek/icon/sprite_component.rb +3 -2
- data/app/components/trek/list/item_component.rb +1 -1
- data/app/components/trek/list/tree/item_component.rb +2 -2
- data/app/components/trek/search_component/search_component.html.slim +2 -1
- data/app/components/trek/search_component.rb +9 -1
- data/app/components/trek/section_component/section_component.css +22 -0
- data/app/components/trek/section_component/section_component.html.slim +5 -0
- data/app/components/trek/section_component/section_component.js +1 -0
- data/app/components/trek/section_component.rb +14 -0
- data/app/content/trek/content/bullet_list.rb +10 -0
- data/app/content/trek/content/document.rb +33 -0
- data/app/content/trek/content/image_block.rb +52 -0
- data/app/content/trek/content/link_resolver.rb +33 -0
- data/app/content/trek/content/list_item.rb +19 -0
- data/app/content/trek/content/ordered_list.rb +10 -0
- data/app/content/trek/content/paragraph.rb +10 -0
- data/app/content/trek/content/prompts_block.rb +22 -0
- data/app/content/trek/content.rb +32 -0
- data/app/controllers/concerns/trek/auditable.rb +103 -0
- data/app/controllers/concerns/trek/filters.rb +2 -0
- data/app/controllers/concerns/trek/passkeys.rb +37 -0
- data/app/controllers/concerns/trek/reorderable.rb +14 -3
- data/app/controllers/trek/csp_reports_controller.rb +59 -0
- data/app/controllers/trek/panels/base_controller.rb +3 -0
- data/app/controllers/trek/panels/links_controller.rb +1 -1
- data/app/controllers/trek/panels/prompts_controller.rb +1 -1
- data/app/controllers/trek/resource_controller.rb +7 -1
- data/app/helpers/trek/audit_logs_helper.rb +21 -0
- data/app/helpers/trek/thumbnail_helper.rb +11 -0
- data/app/helpers/trek/user_agents_helper.rb +36 -0
- data/app/javascript/controllers/index.js +3 -0
- data/app/javascript/controllers/passkey_controller.js +118 -0
- data/app/javascript/trek.js +4 -0
- data/app/jobs/trek/audit_log/purge_job.rb +18 -0
- data/app/jobs/trek/purge_expired_sessions_job.rb +14 -0
- data/app/jobs/trek/resolve_session_hostname_job.rb +17 -0
- data/app/models/concerns/trek/audit_log.rb +30 -0
- data/app/models/concerns/trek/contentable.rb +9 -14
- data/app/models/concerns/trek/pageable.rb +10 -1
- data/app/models/concerns/trek/users/passkeys.rb +75 -0
- data/app/models/concerns/trek/users/password_history.rb +51 -0
- data/app/models/concerns/trek/users/password_policy.rb +85 -0
- data/app/models/concerns/trek/users/password_renewal.rb +51 -0
- data/app/models/concerns/trek/users/session_lifetime.rb +39 -0
- data/app/models/concerns/trek/users/sign_in_lockout.rb +67 -0
- data/app/models/concerns/trek/users/sign_ins.rb +31 -0
- data/app/models/concerns/trek/users/validations.rb +3 -2
- data/app/models/trek/feature.rb +6 -0
- data/app/models/trek/pwned_passwords.rb +40 -0
- data/app/models/trek/user_session.rb +10 -0
- data/app/policies/trek/audit_log_policy.rb +34 -0
- data/app/policies/trek/user_policy.rb +5 -0
- data/app/validators/not_disposable_validator.rb +18 -0
- data/app/views/trek/panels/images/_form.html.slim +1 -1
- data/app/views/trek/panels/images/create.turbo_stream.slim +1 -1
- data/app/views/trek/panels/links/_form.html.slim +1 -1
- data/app/views/trek/panels/prompts/_form.html.slim +1 -1
- data/config/brakeman.ignore +22 -0
- data/config/i18n-tasks.yml +7 -0
- data/config/locales/trek.en.yml +167 -39
- data/config/locales/trek.fr.yml +168 -40
- data/docs/.vitepress/config.mjs +8 -3
- data/docs/deploy.md +2 -0
- data/docs/getting-started.md +3 -3
- data/docs/proxies.md +53 -0
- data/docs/reference/components.md +1 -0
- data/docs/reference/concerns/contentable.md +2 -1
- data/docs/reference/controllers.md +1 -1
- data/docs/reference/environment-variables.md +2 -0
- data/docs/reference/formatters.md +31 -8
- data/docs/reference/generators/admin-user.md +1 -1
- data/docs/reference/generators/audit-log.md +113 -0
- data/docs/reference/generators/install.md +12 -3
- data/docs/reference/generators/security-headers.md +109 -0
- data/docs/reference/index.md +3 -0
- data/docs/reference/models/fragment.md +1 -0
- data/docs/reference/models/tag.md +4 -2
- data/docs/reference/models/user.md +123 -3
- data/docs/reference/validators.md +94 -0
- data/docs/security.md +90 -0
- data/docs/what-is-trek.md +4 -4
- data/lefthook.yml +8 -0
- data/lib/generators/trek/helpers.rb +13 -5
- data/lib/generators/trek/install/admin/user_password_resets_generator.rb +5 -0
- data/lib/generators/trek/install/admin/user_sessions_generator.rb +5 -0
- data/lib/generators/trek/install/admin/users_generator.rb +23 -0
- data/lib/generators/trek/install/admin_generator.rb +8 -0
- data/lib/generators/trek/install/appsignal_generator.rb +1 -1
- data/lib/generators/trek/install/audit_log_generator.rb +56 -0
- data/lib/generators/trek/install/authentication_generator.rb +78 -4
- data/lib/generators/trek/install/authorization_generator.rb +1 -1
- data/lib/generators/trek/install/esbuild_generator.rb +1 -2
- data/lib/generators/trek/install/mailer_generator.rb +18 -0
- data/lib/generators/trek/install/model_specs_generator.rb +6 -4
- data/lib/generators/trek/install/postcss_generator.rb +1 -4
- data/lib/generators/trek/install/postmark_generator.rb +2 -2
- data/lib/generators/trek/install/security_headers_generator.rb +49 -0
- data/lib/generators/trek/install/specs_generator.rb +11 -0
- data/lib/generators/trek/install/user_generator.rb +1 -1
- data/lib/generators/trek/install/yarn_generator.rb +1 -1
- data/lib/generators/trek/install_generator.rb +62 -54
- data/lib/generators/trek/scaffold_generator.rb +13 -5
- data/lib/generators/trek/taxonomies_generator.rb +5 -0
- data/lib/generators/trek/templates/.gitlab-ci.yml +18 -2
- data/lib/generators/trek/templates/Makefile +1 -1
- data/lib/generators/trek/templates/controllers/admin/active_sessions_controller.rb +21 -0
- data/lib/generators/trek/templates/controllers/admin/audit_logs_controller.rb +30 -0
- data/lib/generators/trek/templates/controllers/admin/fragments_controller.rb +7 -0
- data/lib/generators/trek/templates/controllers/admin/panels/images_controller.rb +8 -0
- data/lib/generators/trek/templates/controllers/admin/panels/links_controller.rb +8 -0
- data/lib/generators/trek/templates/controllers/admin/panels/prompts_controller.rb +8 -0
- data/lib/generators/trek/templates/controllers/admin/passkey_sessions_controller.rb +41 -0
- data/lib/generators/trek/templates/controllers/admin/passkeys_controller.rb +37 -0
- data/lib/generators/trek/templates/controllers/admin/user_password_resets_controller.rb +4 -4
- data/lib/generators/trek/templates/controllers/admin/user_sessions_controller.rb +53 -4
- data/lib/generators/trek/templates/controllers/admin/users_controller.rb +20 -0
- data/lib/generators/trek/templates/controllers/concerns/trek/authentication.rb +58 -7
- data/lib/generators/trek/templates/helpers/application_helper.rb +0 -4
- data/lib/generators/trek/templates/initializers/audit_log.rb +11 -0
- data/lib/generators/trek/templates/initializers/content_security_policy.rb +49 -0
- data/lib/generators/trek/templates/initializers/permissions_policy.rb +19 -0
- data/lib/generators/trek/templates/jobs/admin/password_reset_job.rb +9 -0
- data/lib/generators/trek/templates/layouts/admin/auth.html.slim +0 -5
- data/lib/generators/trek/templates/layouts/admin.html.slim +0 -3
- data/lib/generators/trek/templates/mailers/admin/passwords_mailer.rb +1 -1
- data/lib/generators/trek/templates/mailers/admin_mailer.rb +28 -1
- data/lib/generators/trek/templates/migrations/audit_logs.rb.erb +27 -0
- data/lib/generators/trek/templates/migrations/tags.rb.erb +6 -1
- data/lib/generators/trek/templates/migrations/user_passkeys.rb.erb +24 -0
- data/lib/generators/trek/templates/migrations/user_password_renewal.rb.erb +8 -0
- data/lib/generators/trek/templates/migrations/user_previous_passwords.rb.erb +10 -0
- data/lib/generators/trek/templates/migrations/user_session_tracking.rb.erb +11 -0
- data/lib/generators/trek/templates/migrations/user_sign_in_lockout.rb.erb +7 -0
- data/lib/generators/trek/templates/migrations/user_sign_ins.rb.erb +13 -0
- data/lib/generators/trek/templates/models/audit_log.rb +3 -0
- data/lib/generators/trek/templates/models/fragment.rb +14 -0
- data/lib/generators/trek/templates/models/tag_category.rb +2 -1
- data/lib/generators/trek/templates/models/user/passkey.rb +17 -0
- data/lib/generators/trek/templates/models/user/previous_password.rb +4 -0
- data/lib/generators/trek/templates/models/user/session.rb +8 -0
- data/lib/generators/trek/templates/policies/audit_log.rb +4 -0
- data/lib/generators/trek/templates/spec/mailers/admin/passwords_mailer_spec.rb +16 -0
- data/lib/generators/trek/templates/spec/mailers/admin_mailer_spec.rb +51 -0
- data/lib/generators/trek/templates/spec/models/audit_log_spec.rb +43 -0
- data/lib/generators/trek/templates/spec/models/tag_spec.rb +52 -0
- data/lib/generators/trek/templates/spec/models/user/session_spec.rb +68 -0
- data/lib/generators/trek/templates/spec/models/user_spec.rb +142 -4
- data/lib/generators/trek/templates/spec/requests/admin/active_sessions_spec.rb +120 -0
- data/lib/generators/trek/templates/spec/requests/admin/audit_logs_spec.rb +149 -0
- data/lib/generators/trek/templates/spec/requests/admin/fragments_spec.rb +26 -2
- data/lib/generators/trek/templates/spec/requests/admin/pages_spec.rb +8 -0
- data/lib/generators/trek/templates/spec/requests/admin/panels_spec.rb +54 -0
- data/lib/generators/trek/templates/spec/requests/admin/passkey_sessions_spec.rb +103 -0
- data/lib/generators/trek/templates/spec/requests/admin/passkeys_spec.rb +104 -0
- data/lib/generators/trek/templates/spec/requests/admin/password_renewal_spec.rb +83 -0
- data/lib/generators/trek/templates/spec/requests/admin/sign_in_lockout_spec.rb +95 -0
- data/lib/generators/trek/templates/spec/requests/admin/sign_in_notices_spec.rb +95 -0
- data/lib/generators/trek/templates/spec/requests/admin/user_password_resets_spec.rb +43 -6
- data/lib/generators/trek/templates/spec/requests/admin/user_sessions_spec.rb +25 -2
- data/lib/generators/trek/templates/views/admin/audit_logs/index.html.slim +35 -0
- data/lib/generators/trek/templates/views/admin/audit_logs/show.html.slim +50 -0
- data/lib/generators/trek/templates/views/admin/fragments/index.html.slim +14 -3
- data/lib/generators/trek/templates/views/admin/user_password_resets/edit.html.slim +16 -6
- data/lib/generators/trek/templates/views/admin/user_password_resets/new.html.slim +2 -1
- data/lib/generators/trek/templates/views/admin/user_sessions/new.html.slim +27 -1
- data/lib/generators/trek/templates/views/admin/users/_passkeys.html.slim +67 -0
- data/lib/generators/trek/templates/views/admin/users/_properties.html.slim +21 -0
- data/lib/generators/trek/templates/views/admin/users/_sessions.html.slim +70 -0
- data/lib/generators/trek/templates/views/admin/users/index.html.slim +13 -0
- data/lib/generators/trek/templates/views/admin/users/show.html.slim +10 -21
- data/lib/generators/trek/templates/views/admin_mailer/new_sign_in.en.html.slim +22 -0
- data/lib/generators/trek/templates/views/admin_mailer/new_sign_in.en.text.erb +16 -0
- data/lib/generators/trek/templates/views/admin_mailer/new_sign_in.fr.html.slim +22 -0
- data/lib/generators/trek/templates/views/admin_mailer/new_sign_in.fr.text.erb +16 -0
- data/lib/generators/trek/templates/views/admin_mailer/sign_in_locked.en.html.slim +17 -0
- data/lib/generators/trek/templates/views/admin_mailer/sign_in_locked.en.text.erb +10 -0
- data/lib/generators/trek/templates/views/admin_mailer/sign_in_locked.fr.html.slim +18 -0
- data/lib/generators/trek/templates/views/admin_mailer/sign_in_locked.fr.text.erb +10 -0
- data/lib/trek/admin_ip_allowlist.rb +52 -0
- data/lib/trek/csp_reports.rb +99 -0
- data/lib/trek/data/common_passwords.txt +857 -0
- data/lib/trek/data/passkey_providers.json +404 -0
- data/lib/trek/disposable_email_domains.rb +53 -0
- data/lib/trek/engine.rb +18 -1
- data/lib/trek/passkey_providers.rb +19 -0
- data/lib/trek/reverse_dns.rb +27 -0
- data/lib/trek/saved_attachments_reload.rb +2 -1
- data/lib/trek/version.rb +1 -1
- data/lib/trek.rb +14 -1
- data/package.json +3 -5
- data/renovate.json +12 -1
- data/trek.gemspec +6 -3
- data/yarn.lock +2273 -2573
- metadata +160 -17
- data/.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs +0 -541
- data/.yarn/releases/yarn-3.8.0.cjs +0 -875
- data/app/formatters/prosemirror_to_html/global_id_to_links_formatter.rb +0 -19
- data/app/formatters/prosemirror_to_html/nodes/image_block.rb +0 -44
- data/app/formatters/prosemirror_to_html/nodes/prompts_block.rb +0 -28
- data/app/formatters/prosemirror_to_html/remove_empty_paragraphs_formatter.rb +0 -11
- data/app/models/prosemirror.rb +0 -23
- data/lib/generators/trek/templates/models/user_session.rb +0 -3
|
@@ -2,8 +2,13 @@ module Admin
|
|
|
2
2
|
class UserSessionsController < ApplicationController
|
|
3
3
|
include Trek::Authentication
|
|
4
4
|
|
|
5
|
+
# Failed sign-ins from one IP address, whatever the account, over a longer window than
|
|
6
|
+
# rate_limit's. Counted in Rails.cache, as rate_limit is.
|
|
7
|
+
FAILED_SIGN_INS_PER_IP = 20
|
|
8
|
+
FAILED_SIGN_INS_WINDOW = 1.hour
|
|
9
|
+
|
|
5
10
|
allow_unauthenticated_access only: %i[new create]
|
|
6
|
-
rate_limit to: 5, within: 3.minutes, only: :create, with: -> {
|
|
11
|
+
rate_limit to: 5, within: 3.minutes, only: :create, with: -> { render_rate_limited }
|
|
7
12
|
|
|
8
13
|
helper Trek::I18nHelper
|
|
9
14
|
helper Trek::ThemeHelper
|
|
@@ -19,11 +24,22 @@ module Admin
|
|
|
19
24
|
end
|
|
20
25
|
|
|
21
26
|
def create
|
|
22
|
-
|
|
27
|
+
return render_rate_limited if too_many_failed_sign_ins_from_ip?
|
|
28
|
+
|
|
29
|
+
# Hashes the password typed even when no user matches, so the response takes as long
|
|
30
|
+
user = User.privileged.authenticate_by(session_params)
|
|
31
|
+
@user = user || User.privileged.find_by(email: params[:email].to_s)
|
|
32
|
+
|
|
33
|
+
# A locked user is refused even with the right password, with the same answer as a wrong one
|
|
34
|
+
if user && !user.sign_in_locked?
|
|
35
|
+
user.record_successful_sign_in!
|
|
23
36
|
start_new_session_for user
|
|
24
|
-
|
|
37
|
+
record_sign_in_of user
|
|
38
|
+
redirect_to after_authentication_url, notice: sign_in_notice(user)
|
|
25
39
|
else
|
|
26
|
-
|
|
40
|
+
@user&.record_failed_sign_in!
|
|
41
|
+
count_failed_sign_in_from_ip
|
|
42
|
+
render_sign_in_form t(".failure"), status: :unprocessable_entity
|
|
27
43
|
end
|
|
28
44
|
end
|
|
29
45
|
|
|
@@ -34,8 +50,41 @@ module Admin
|
|
|
34
50
|
|
|
35
51
|
private
|
|
36
52
|
|
|
53
|
+
# In the user's language: this request isn't signed in yet, so it's still in the app's default one.
|
|
54
|
+
def sign_in_notice(user)
|
|
55
|
+
I18n.with_locale(user.locale || I18n.default_locale) { t(".success") }
|
|
56
|
+
end
|
|
57
|
+
|
|
37
58
|
def session_params
|
|
38
59
|
params.permit(:email, :password)
|
|
39
60
|
end
|
|
61
|
+
|
|
62
|
+
# Rendered rather than redirected to, so the audit log records the failure's status
|
|
63
|
+
def render_sign_in_form(alert, status:)
|
|
64
|
+
@email = params[:email].presence
|
|
65
|
+
flash.now[:alert] = alert
|
|
66
|
+
render :new, status:
|
|
67
|
+
end
|
|
68
|
+
|
|
69
|
+
def render_rate_limited
|
|
70
|
+
render_sign_in_form t("notices.rate_limited"), status: :too_many_requests
|
|
71
|
+
end
|
|
72
|
+
|
|
73
|
+
def too_many_failed_sign_ins_from_ip?
|
|
74
|
+
Rails.cache.read(failed_sign_ins_from_ip_key).to_i >= FAILED_SIGN_INS_PER_IP
|
|
75
|
+
end
|
|
76
|
+
|
|
77
|
+
def count_failed_sign_in_from_ip
|
|
78
|
+
Rails.cache.increment(failed_sign_ins_from_ip_key, 1, expires_in: FAILED_SIGN_INS_WINDOW)
|
|
79
|
+
end
|
|
80
|
+
|
|
81
|
+
def failed_sign_ins_from_ip_key
|
|
82
|
+
"admin/failed_sign_ins/#{request.remote_ip}"
|
|
83
|
+
end
|
|
84
|
+
|
|
85
|
+
# For the audit log (Trek::Auditable): the account signed in to, or tried
|
|
86
|
+
def audit_target
|
|
87
|
+
@user
|
|
88
|
+
end
|
|
40
89
|
end
|
|
41
90
|
end
|
|
@@ -1,5 +1,17 @@
|
|
|
1
1
|
module Admin
|
|
2
2
|
class UsersController < Trek::ResourceController
|
|
3
|
+
helper Trek::UserAgentsHelper
|
|
4
|
+
|
|
5
|
+
# On their own profile, users also see the browsers signed in as them (the sessions tab), and
|
|
6
|
+
# their passkeys.
|
|
7
|
+
def show
|
|
8
|
+
super
|
|
9
|
+
return unless @object == Current.user
|
|
10
|
+
|
|
11
|
+
@sessions = Current.user.sessions.active.recent_first
|
|
12
|
+
@passkeys = Current.user.passkeys.order(:created_at)
|
|
13
|
+
end
|
|
14
|
+
|
|
3
15
|
def new
|
|
4
16
|
super
|
|
5
17
|
@object.role = "editor"
|
|
@@ -12,6 +24,14 @@ module Admin
|
|
|
12
24
|
@object.password = SecureRandom.alphanumeric(24) if @object.password.blank?
|
|
13
25
|
end
|
|
14
26
|
|
|
27
|
+
# After a suspected compromise: every user, this admin included, must choose a new password at
|
|
28
|
+
# their next request.
|
|
29
|
+
def require_password_renewal
|
|
30
|
+
authorize! User, to: :require_password_renewal?
|
|
31
|
+
User.require_password_renewal!
|
|
32
|
+
redirect_to admin_users_path, notice: t(".success")
|
|
33
|
+
end
|
|
34
|
+
|
|
15
35
|
def theme
|
|
16
36
|
value = params[:theme].to_s
|
|
17
37
|
Current.user.update!(theme: value) if User.themes.key?(value)
|
|
@@ -22,15 +22,32 @@ module Trek::Authentication
|
|
|
22
22
|
end
|
|
23
23
|
|
|
24
24
|
def require_authentication
|
|
25
|
-
|
|
25
|
+
return request_authentication unless resume_session
|
|
26
|
+
|
|
27
|
+
renew_password if Current.user.try(:password_renewal_needed?)
|
|
28
|
+
end
|
|
29
|
+
|
|
30
|
+
# An expired password, or one an admin asked everyone to renew, must be changed before going on:
|
|
31
|
+
# signs out and opens the new password form.
|
|
32
|
+
def renew_password
|
|
33
|
+
token = Current.user.password_reset_token
|
|
34
|
+
terminate_session
|
|
35
|
+
redirect_to edit_admin_user_password_reset_path(token), alert: t("notices.password_renewal_needed")
|
|
26
36
|
end
|
|
27
37
|
|
|
28
38
|
def resume_session
|
|
29
39
|
Current.session ||= find_session_by_cookie
|
|
30
40
|
end
|
|
31
41
|
|
|
42
|
+
# A session past its idle timeout or lifetime is dropped: the user signs in again.
|
|
32
43
|
def find_session_by_cookie
|
|
33
|
-
|
|
44
|
+
return unless cookies.signed[:session_id]
|
|
45
|
+
|
|
46
|
+
user_session = User::Session.find_by(id: cookies.signed[:session_id])
|
|
47
|
+
return user_session unless user_session&.expired?
|
|
48
|
+
|
|
49
|
+
user_session.destroy
|
|
50
|
+
nil
|
|
34
51
|
end
|
|
35
52
|
|
|
36
53
|
def request_authentication
|
|
@@ -43,20 +60,54 @@ module Trek::Authentication
|
|
|
43
60
|
end
|
|
44
61
|
|
|
45
62
|
def start_new_session_for(user)
|
|
46
|
-
user.
|
|
63
|
+
user.sessions.create!(user_agent: request.user_agent, ip_address: request.remote_ip).tap do |session|
|
|
47
64
|
Current.session = session
|
|
48
|
-
|
|
65
|
+
# Its IP address's host name, for the active sessions list, without slowing the sign-in down
|
|
66
|
+
Trek::ResolveSessionHostnameJob.perform_later(session)
|
|
67
|
+
cookies.signed[:session_id] = {
|
|
68
|
+
value: session.id, expires: User::Session.lifetime.from_now, httponly: true, same_site: :lax
|
|
69
|
+
}
|
|
49
70
|
end
|
|
50
71
|
end
|
|
51
72
|
|
|
73
|
+
# Records the sign-in as the user's current one, and emails them when this browser never signed
|
|
74
|
+
# in as them before (unless it's their first sign-in, or the app turned it off).
|
|
75
|
+
def record_sign_in_of(user)
|
|
76
|
+
new_browser = !signed_in_from_this_browser?(user)
|
|
77
|
+
remember_sign_in_from_this_browser(user)
|
|
78
|
+
user.record_sign_in(ip: request.remote_ip, user_agent: request.user_agent)
|
|
79
|
+
return unless new_browser && user.last_sign_in_at && user.new_sign_in_email
|
|
80
|
+
|
|
81
|
+
AdminMailer.new_sign_in(
|
|
82
|
+
user, at: user.current_sign_in_at, ip: request.remote_ip, user_agent: request.user_agent
|
|
83
|
+
).deliver_later
|
|
84
|
+
end
|
|
85
|
+
|
|
86
|
+
# The users who signed in from this browser, in a signed cookie kept for years
|
|
87
|
+
def signed_in_from_this_browser?(user)
|
|
88
|
+
Array(cookies.signed[:trek_known_users]).include?(user.id)
|
|
89
|
+
end
|
|
90
|
+
|
|
91
|
+
def remember_sign_in_from_this_browser(user)
|
|
92
|
+
user_ids = (Array(cookies.signed[:trek_known_users]) | [user.id]).last(20)
|
|
93
|
+
cookies.signed.permanent[:trek_known_users] = { value: user_ids, httponly: true, same_site: :lax }
|
|
94
|
+
end
|
|
95
|
+
|
|
52
96
|
def terminate_session
|
|
53
97
|
Current.session.destroy
|
|
54
98
|
cookies.delete(:session_id)
|
|
55
99
|
end
|
|
56
100
|
|
|
101
|
+
# At most once every User::Session.activity_interval (5 minutes), so browsing doesn't write on
|
|
102
|
+
# every page.
|
|
57
103
|
def track_last_activity
|
|
58
|
-
#
|
|
59
|
-
Current.
|
|
60
|
-
|
|
104
|
+
# Not after signing out, which destroys the session
|
|
105
|
+
return unless Current.session&.persisted?
|
|
106
|
+
|
|
107
|
+
Current.session.record_activity
|
|
108
|
+
last_activity_at = Current.user.last_activity_at
|
|
109
|
+
return if last_activity_at && last_activity_at > User::Session.activity_interval.ago
|
|
110
|
+
|
|
111
|
+
Current.user.update_columns(last_activity_at: Time.current) # rubocop:disable Rails/SkipsModelValidations
|
|
61
112
|
end
|
|
62
113
|
end
|
|
@@ -3,10 +3,6 @@ module ApplicationHelper
|
|
|
3
3
|
# stylesheet_link_tag("https://fonts.googleapis.com/css2?family=Poppins:wght@400;500;600;700&display=swap")
|
|
4
4
|
# end
|
|
5
5
|
|
|
6
|
-
def admin_webfonts_link_tag
|
|
7
|
-
stylesheet_link_tag("https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600&display=swap")
|
|
8
|
-
end
|
|
9
|
-
|
|
10
6
|
def admin_full_brand
|
|
11
7
|
[
|
|
12
8
|
t("admin.brand.title"),
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
# Records an AuditLog row for each mutation in the admin (see Trek::Auditable), including sign-ins
|
|
2
|
+
# and password resets. Include Trek::Auditable in another controller to audit it too.
|
|
3
|
+
Rails.application.config.to_prepare do
|
|
4
|
+
[
|
|
5
|
+
Trek::BaseController,
|
|
6
|
+
Admin::BaseController,
|
|
7
|
+
Admin::UserSessionsController,
|
|
8
|
+
Admin::PasskeySessionsController,
|
|
9
|
+
Admin::UserPasswordResetsController
|
|
10
|
+
].each { |controller| controller.include(Trek::Auditable) }
|
|
11
|
+
end
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
# The Content Security Policy: what pages may load and run, so a script injected into a page (an XSS)
|
|
2
|
+
# can't run, nor send data elsewhere. See
|
|
3
|
+
# https://guides.rubyonrails.org/security.html#content-security-policy-header
|
|
4
|
+
#
|
|
5
|
+
# It only reports violations for now (`content_security_policy_report_only`): check the browser's
|
|
6
|
+
# console, and the violations reported to AppSignal (the "csp" namespace) or the log, on every page,
|
|
7
|
+
# then set it to false to enforce it.
|
|
8
|
+
#
|
|
9
|
+
# Add the hosts the front office uses, e.g. for analytics `policy.script_src :self, "https://plausible.io"`
|
|
10
|
+
# and `policy.connect_src :self, "https://plausible.io"`, or for videos `policy.frame_src "https://www.youtube-nocookie.com"`.
|
|
11
|
+
Rails.application.configure do
|
|
12
|
+
# Where uploaded files are served from: the store's public URL, and the bucket's endpoint for files
|
|
13
|
+
# just uploaded (config/initializers/shrine.rb). Origins only, as CSP sources.
|
|
14
|
+
upload_hosts = ENV.values_at("S3_BASE_URL", "S3_ENDPOINT").compact_blank.map do |url|
|
|
15
|
+
URI(url).tap { |uri| uri.path = "" }.to_s
|
|
16
|
+
end
|
|
17
|
+
|
|
18
|
+
config.content_security_policy do |policy|
|
|
19
|
+
policy.default_src :self
|
|
20
|
+
policy.base_uri :self
|
|
21
|
+
policy.form_action :self
|
|
22
|
+
# Framed by its own pages only (Lookbook's previews), against clickjacking
|
|
23
|
+
policy.frame_ancestors :self
|
|
24
|
+
policy.object_src :none
|
|
25
|
+
# No inline script: the app's own files, and the scripts given the request's nonce
|
|
26
|
+
policy.script_src :self
|
|
27
|
+
# Inline `style` attributes stay allowed: Trek's components and Backpack's set some (colors,
|
|
28
|
+
# custom properties)
|
|
29
|
+
policy.style_src :self, :unsafe_inline
|
|
30
|
+
policy.font_src :self, :data
|
|
31
|
+
# For fonts from Google Fonts (the admin's Inter is served by the app):
|
|
32
|
+
# policy.style_src :self, :unsafe_inline, "https://fonts.googleapis.com"
|
|
33
|
+
# policy.font_src :self, :data, "https://fonts.gstatic.com"
|
|
34
|
+
policy.img_src :self, :data, :blob, *upload_hosts
|
|
35
|
+
policy.media_src :self, :blob, *upload_hosts
|
|
36
|
+
policy.connect_src :self
|
|
37
|
+
# Trek's endpoint logs the violations, and reports them to AppSignal when the app uses it
|
|
38
|
+
policy.report_uri ENV.fetch("CSP_REPORT_URI", "/csp-reports")
|
|
39
|
+
end
|
|
40
|
+
|
|
41
|
+
# A nonce for the scripts written in a page (`javascript_tag nonce: true`), per session rather than
|
|
42
|
+
# per request: Turbo renders the next pages under the first one's policy, but with their nonce. A
|
|
43
|
+
# visitor without a session yet gets a random one, as an empty nonce is invalid: prefer script files
|
|
44
|
+
# to inline scripts on pages Turbo visits without a session.
|
|
45
|
+
config.content_security_policy_nonce_generator = ->(request) { request.session.id.to_s.presence || SecureRandom.base64(16) }
|
|
46
|
+
config.content_security_policy_nonce_directives = %w[script-src]
|
|
47
|
+
|
|
48
|
+
config.content_security_policy_report_only = true
|
|
49
|
+
end
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
# Turns off the browser features the app doesn't use (the Permissions-Policy header), so a script
|
|
2
|
+
# injected into a page can't use them either. Allow one the front office needs, e.g. `geolocation=(self)`
|
|
3
|
+
# for a map.
|
|
4
|
+
#
|
|
5
|
+
# Not Rails' `config.permissions_policy`, which still sends the former Feature-Policy header.
|
|
6
|
+
Rails.application.config.action_dispatch.default_headers["Permissions-Policy"] = %w[
|
|
7
|
+
accelerometer=()
|
|
8
|
+
camera=()
|
|
9
|
+
display-capture=()
|
|
10
|
+
geolocation=()
|
|
11
|
+
gyroscope=()
|
|
12
|
+
hid=()
|
|
13
|
+
magnetometer=()
|
|
14
|
+
microphone=()
|
|
15
|
+
midi=()
|
|
16
|
+
payment=()
|
|
17
|
+
serial=()
|
|
18
|
+
usb=()
|
|
19
|
+
].join(", ")
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
# Emails a password reset link to a privileged user, and nothing for any other email. The reset
|
|
2
|
+
# request form queues it whatever the email, so the response takes as long whether an account
|
|
3
|
+
# exists or not.
|
|
4
|
+
class Admin::PasswordResetJob < ApplicationJob
|
|
5
|
+
def perform(email)
|
|
6
|
+
user = User.privileged.find_by(email:)
|
|
7
|
+
Admin::PasswordsMailer.reset(user).deliver_now if user
|
|
8
|
+
end
|
|
9
|
+
end
|
|
@@ -12,11 +12,6 @@ html(lang=I18n.locale class=class_for_theme)
|
|
|
12
12
|
link(rel="manifest" href="/site.webmanifest")
|
|
13
13
|
= csrf_meta_tags
|
|
14
14
|
= csp_meta_tag
|
|
15
|
-
link(rel="preconnect" href="https://fonts.googleapis.com")
|
|
16
|
-
link(rel="preconnect" href="https://fonts.gstatic.com" crossorigin)
|
|
17
|
-
/ slim-lint:disable LineLength
|
|
18
|
-
link(href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600&display=swap" rel="stylesheet")
|
|
19
|
-
/ slim-lint:enable LineLength
|
|
20
15
|
= stylesheet_link_tag "admin",
|
|
21
16
|
media: "all",
|
|
22
17
|
'data-turbo-track': "reload"
|
|
@@ -12,9 +12,6 @@ html(lang=I18n.locale class=class_for_theme)
|
|
|
12
12
|
link(rel="manifest" href="/site.webmanifest")
|
|
13
13
|
= csrf_meta_tags
|
|
14
14
|
= csp_meta_tag
|
|
15
|
-
link(rel="preconnect" href="https://fonts.googleapis.com")
|
|
16
|
-
link(rel="preconnect" href="https://fonts.gstatic.com" crossorigin)
|
|
17
|
-
= admin_webfonts_link_tag
|
|
18
15
|
= stylesheet_link_tag "admin",
|
|
19
16
|
media: "all",
|
|
20
17
|
"data-turbo-track": "reload"
|
|
@@ -4,9 +4,9 @@ class Admin::PasswordsMailer < ApplicationMailer
|
|
|
4
4
|
def reset(user)
|
|
5
5
|
@user = user
|
|
6
6
|
@url = edit_admin_user_password_reset_url(@user.generate_token_for(:password_reset))
|
|
7
|
-
@expiration_delay = distance_of_time_in_words(0, User.token_definitions[:password_reset].expires_in)
|
|
8
7
|
|
|
9
8
|
I18n.with_locale(@user.locale || I18n.default_locale) do
|
|
9
|
+
@expiration_delay = distance_of_time_in_words(0, User.token_definitions[:password_reset].expires_in)
|
|
10
10
|
mail to: @user.email
|
|
11
11
|
end
|
|
12
12
|
end
|
|
@@ -1,10 +1,37 @@
|
|
|
1
1
|
class AdminMailer < ApplicationMailer
|
|
2
2
|
include ActionView::Helpers::DateHelper
|
|
3
3
|
|
|
4
|
+
helper Trek::UserAgentsHelper
|
|
5
|
+
|
|
4
6
|
def invite(user)
|
|
5
7
|
@user = user
|
|
6
8
|
@url = edit_admin_user_password_reset_url(@user.generate_token_for(:invite))
|
|
7
|
-
|
|
9
|
+
|
|
10
|
+
I18n.with_locale(@user.locale || I18n.default_locale) do
|
|
11
|
+
@expiration_delay = distance_of_time_in_words(0, User.token_definitions[:invite].expires_in)
|
|
12
|
+
mail to: @user.email
|
|
13
|
+
end
|
|
14
|
+
end
|
|
15
|
+
|
|
16
|
+
# A sign-in from a browser that never signed in as the user, so they can react if it wasn't them
|
|
17
|
+
def new_sign_in(user, at:, ip:, user_agent:)
|
|
18
|
+
@user = user
|
|
19
|
+
@at = at
|
|
20
|
+
@ip = ip
|
|
21
|
+
@user_agent = user_agent
|
|
22
|
+
@sessions_url = admin_user_url(user, anchor: "sessions")
|
|
23
|
+
@reset_url = new_admin_user_password_reset_url
|
|
24
|
+
|
|
25
|
+
I18n.with_locale(@user.locale || I18n.default_locale) do
|
|
26
|
+
mail to: @user.email
|
|
27
|
+
end
|
|
28
|
+
end
|
|
29
|
+
|
|
30
|
+
# Signing in is locked after failed sign-ins in a row (Trek::Users::SignInLockout): the user waits,
|
|
31
|
+
# or resets their password if they forgot it, or learns someone is guessing it.
|
|
32
|
+
def sign_in_locked(user)
|
|
33
|
+
@user = user
|
|
34
|
+
@reset_url = new_admin_user_password_reset_url
|
|
8
35
|
|
|
9
36
|
I18n.with_locale(@user.locale || I18n.default_locale) do
|
|
10
37
|
mail to: @user.email
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
class TrekAuditLogs < <%= migration_class_name %>
|
|
2
|
+
def change
|
|
3
|
+
create_table :audit_logs do |t|
|
|
4
|
+
# Who made the request: nil when nobody is signed in. index: false, see the index below.
|
|
5
|
+
t.references :actor, polymorphic: true, index: false
|
|
6
|
+
# The record the request worked on, when there is one.
|
|
7
|
+
t.references :auditable, polymorphic: true
|
|
8
|
+
|
|
9
|
+
t.string :action, null: false
|
|
10
|
+
t.string :http_method, null: false
|
|
11
|
+
t.string :path, null: false
|
|
12
|
+
t.integer :http_status
|
|
13
|
+
t.jsonb :params, null: false, default: {}
|
|
14
|
+
t.string :ip_address
|
|
15
|
+
t.string :user_agent
|
|
16
|
+
t.string :request_id
|
|
17
|
+
t.string :error_class
|
|
18
|
+
|
|
19
|
+
# Rows are never updated: no updated_at.
|
|
20
|
+
t.datetime :created_at, null: false
|
|
21
|
+
end
|
|
22
|
+
|
|
23
|
+
add_index :audit_logs, [:actor_type, :actor_id, :created_at]
|
|
24
|
+
add_index :audit_logs, :created_at
|
|
25
|
+
add_index :audit_logs, :request_id
|
|
26
|
+
end
|
|
27
|
+
end
|
|
@@ -1,13 +1,18 @@
|
|
|
1
1
|
class TrekTags < <%= migration_class_name %>
|
|
2
2
|
def change
|
|
3
3
|
create_table :tags do |t|
|
|
4
|
-
t.string :key
|
|
4
|
+
t.string :key
|
|
5
5
|
t.string :name
|
|
6
6
|
t.integer :position, null: false
|
|
7
7
|
t.references :category, foreign_key: { to_table: :tag_categories }
|
|
8
8
|
t.integer :taggings_count, null: false, default: 0
|
|
9
9
|
|
|
10
10
|
t.timestamps
|
|
11
|
+
|
|
12
|
+
# A key is unique within its category, as Tag validates it
|
|
13
|
+
t.index %i[category_id key], unique: true
|
|
14
|
+
# and among the tags without one, which the index above lets through: NULLs never collide
|
|
15
|
+
t.index :key, unique: true, where: "category_id IS NULL", name: "index_tags_on_key_without_category"
|
|
11
16
|
end
|
|
12
17
|
end
|
|
13
18
|
end
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
class TrekUserPasskeys < <%= migration_class_name %>
|
|
2
|
+
def change
|
|
3
|
+
# The random id a user's passkeys are created for (Trek::Users::Passkeys), set on the first one
|
|
4
|
+
add_column :users, :webauthn_id, :string
|
|
5
|
+
add_index :users, :webauthn_id, unique: true
|
|
6
|
+
|
|
7
|
+
create_table :user_passkeys do |t|
|
|
8
|
+
t.belongs_to :user, null: false, foreign_key: true
|
|
9
|
+
# The browser it was added from, shown when Trek doesn't know its provider (aaguid)
|
|
10
|
+
t.string :name, null: false
|
|
11
|
+
# The credential's id and public key, as the browser sent them
|
|
12
|
+
t.string :external_id, null: false, index: { unique: true }
|
|
13
|
+
t.text :public_key, null: false
|
|
14
|
+
t.bigint :sign_count, null: false, default: 0
|
|
15
|
+
# How the browser reaches the authenticator ("internal", "hybrid", "usb"…)
|
|
16
|
+
t.string :transports, array: true, null: false, default: []
|
|
17
|
+
# The authenticator's model, e.g. a password manager (Trek::PasskeyProviders), when it says
|
|
18
|
+
t.string :aaguid
|
|
19
|
+
t.datetime :last_used_at
|
|
20
|
+
|
|
21
|
+
t.timestamps
|
|
22
|
+
end
|
|
23
|
+
end
|
|
24
|
+
end
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
class TrekUserPasswordRenewal < <%= migration_class_name %>
|
|
2
|
+
def change
|
|
3
|
+
# When the password was last set, for its expiry (Trek::Users::PasswordRenewal)
|
|
4
|
+
add_column :users, :password_changed_at, :datetime
|
|
5
|
+
# When an admin asked everyone for a new password, after a suspected compromise
|
|
6
|
+
add_column :users, :password_renewal_required_at, :datetime
|
|
7
|
+
end
|
|
8
|
+
end
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
class TrekUserPreviousPasswords < <%= migration_class_name %>
|
|
2
|
+
def change
|
|
3
|
+
create_table :user_previous_passwords do |t|
|
|
4
|
+
t.belongs_to :user, null: false, foreign_key: true
|
|
5
|
+
t.string :password_digest, null: false
|
|
6
|
+
|
|
7
|
+
t.datetime :created_at, null: false
|
|
8
|
+
end
|
|
9
|
+
end
|
|
10
|
+
end
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
class TrekUserSessionTracking < <%= migration_class_name %>
|
|
2
|
+
def change
|
|
3
|
+
# The session's last request, for its idle timeout (Trek::Users::SessionLifetime)
|
|
4
|
+
add_column :user_sessions, :last_activity_at, :datetime
|
|
5
|
+
up_only { execute "UPDATE user_sessions SET last_activity_at = updated_at" }
|
|
6
|
+
change_column_null :user_sessions, :last_activity_at, false
|
|
7
|
+
|
|
8
|
+
# The host name of the IP address it signed in from (Trek::ReverseDns)
|
|
9
|
+
add_column :user_sessions, :ip_hostname, :string
|
|
10
|
+
end
|
|
11
|
+
end
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
class TrekUserSignInLockout < <%= migration_class_name %>
|
|
2
|
+
def change
|
|
3
|
+
# Failed sign-ins in a row, and until when they lock signing in (Trek::Users::SignInLockout)
|
|
4
|
+
add_column :users, :failed_sign_in_count, :integer, default: 0, null: false
|
|
5
|
+
add_column :users, :sign_in_locked_until, :datetime
|
|
6
|
+
end
|
|
7
|
+
end
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
class TrekUserSignIns < <%= migration_class_name %>
|
|
2
|
+
def change
|
|
3
|
+
# The current and the previous sign-ins (Trek::Users::SignIns), kept when their sessions end
|
|
4
|
+
change_table :users, bulk: true do |t|
|
|
5
|
+
t.datetime :current_sign_in_at
|
|
6
|
+
t.string :current_sign_in_ip
|
|
7
|
+
t.string :current_sign_in_user_agent
|
|
8
|
+
t.datetime :last_sign_in_at
|
|
9
|
+
t.string :last_sign_in_ip
|
|
10
|
+
t.string :last_sign_in_user_agent
|
|
11
|
+
end
|
|
12
|
+
end
|
|
13
|
+
end
|
|
@@ -18,6 +18,20 @@ class Fragment < ApplicationRecord
|
|
|
18
18
|
|
|
19
19
|
scope :ordered, -> { order(:position) }
|
|
20
20
|
|
|
21
|
+
# Matches the key (namespace.key), the title, or the text of the content, in the current locale.
|
|
22
|
+
scope :search, ->(query) do
|
|
23
|
+
next all if query.blank?
|
|
24
|
+
|
|
25
|
+
where(<<~SQL, pattern: "%#{sanitize_sql_like(query)}%", locale: Mobility.locale.to_s)
|
|
26
|
+
concat_ws('.', namespace, key) ILIKE :pattern
|
|
27
|
+
OR title ->> :locale ILIKE :pattern
|
|
28
|
+
OR EXISTS (
|
|
29
|
+
SELECT 1 FROM jsonb_path_query(content -> :locale, '$.**.text') AS text
|
|
30
|
+
WHERE text #>> '{}' ILIKE :pattern
|
|
31
|
+
)
|
|
32
|
+
SQL
|
|
33
|
+
end
|
|
34
|
+
|
|
21
35
|
def to_s
|
|
22
36
|
[namespace, key].join(".")
|
|
23
37
|
end
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
class TagCategory < ApplicationRecord
|
|
2
|
+
# Not deleted while it has tags: left without a category, their keys could collide with others'
|
|
2
3
|
has_many :tags,
|
|
3
4
|
-> { ordered },
|
|
4
|
-
dependent: :
|
|
5
|
+
dependent: :restrict_with_error,
|
|
5
6
|
foreign_key: :category_id,
|
|
6
7
|
inverse_of: :category
|
|
7
8
|
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
# A passkey the user signs in with instead of their password (Trek::Users::Passkeys): its private
|
|
2
|
+
# key stays on their device or in their password manager, Trek keeps the public one.
|
|
3
|
+
class User::Passkey < ApplicationRecord
|
|
4
|
+
belongs_to :user
|
|
5
|
+
|
|
6
|
+
validates :name, presence: true, length: { maximum: 100 }
|
|
7
|
+
|
|
8
|
+
# Its provider, or else the browser it was added from (`name`)
|
|
9
|
+
def to_s
|
|
10
|
+
provider || name
|
|
11
|
+
end
|
|
12
|
+
|
|
13
|
+
# The password manager, platform or security key keeping it, when Trek knows it
|
|
14
|
+
def provider
|
|
15
|
+
Trek::PasskeyProviders[aaguid]
|
|
16
|
+
end
|
|
17
|
+
end
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
# A browser signed in as the user, found through a signed session_id cookie.
|
|
2
|
+
class User::Session < ApplicationRecord
|
|
3
|
+
# Expires after 48 hours without a request, and 30 days after signing in; set idle_timeout and
|
|
4
|
+
# lifetime to change it.
|
|
5
|
+
include Trek::Users::SessionLifetime
|
|
6
|
+
|
|
7
|
+
belongs_to :user
|
|
8
|
+
end
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
require "rails_helper"
|
|
2
|
+
|
|
3
|
+
RSpec.describe Admin::PasswordsMailer do
|
|
4
|
+
include ActionView::Helpers::DateHelper
|
|
5
|
+
|
|
6
|
+
# Not the app's default locale, so the email can't be right by chance
|
|
7
|
+
let(:locale) { (I18n.available_locales - [I18n.default_locale]).first }
|
|
8
|
+
|
|
9
|
+
it "formats the reset link's expiry in the recipient's locale" do
|
|
10
|
+
skip "the app has a single locale" unless locale
|
|
11
|
+
user = users.create(role: :editor, locale: locale)
|
|
12
|
+
expiry = I18n.with_locale(locale) { distance_of_time_in_words(0, User.token_definitions[:password_reset].expires_in) }
|
|
13
|
+
|
|
14
|
+
expect(described_class.reset(user).text_part.body.to_s).to include(expiry)
|
|
15
|
+
end
|
|
16
|
+
end
|