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.
Files changed (221) hide show
  1. checksums.yaml +4 -4
  2. data/.node-version +1 -1
  3. data/.yarn/releases/yarn-4.18.1.cjs +1000 -0
  4. data/.yarnrc.yml +3 -5
  5. data/AGENTS.md +12 -8
  6. data/CHANGELOG.md +73 -0
  7. data/Gemfile.lock +226 -171
  8. data/Makefile +38 -1
  9. data/README.md +2 -2
  10. data/app/assets/icons/trek/passkey.svg +5 -0
  11. data/app/assets/stylesheets/trek/base.css +6 -0
  12. data/app/components/trek/entries/item_component/item_component.css +6 -0
  13. data/app/components/trek/form/image_field_component/image_field_component.html.slim +9 -0
  14. data/app/components/trek/form/image_field_component.rb +1 -5
  15. data/app/components/trek/form/password_strength_component/password_strength_component.css +56 -0
  16. data/app/components/trek/form/password_strength_component/password_strength_component.html.slim +8 -0
  17. data/app/components/trek/form/password_strength_component/password_strength_component.js +74 -0
  18. data/app/components/trek/form/password_strength_component.rb +29 -0
  19. data/app/components/trek/gate_component/gate_component.css +7 -0
  20. data/app/components/trek/icon/sprite_component.rb +3 -2
  21. data/app/components/trek/list/item_component.rb +1 -1
  22. data/app/components/trek/list/tree/item_component.rb +2 -2
  23. data/app/components/trek/search_component/search_component.html.slim +2 -1
  24. data/app/components/trek/search_component.rb +9 -1
  25. data/app/components/trek/section_component/section_component.css +22 -0
  26. data/app/components/trek/section_component/section_component.html.slim +5 -0
  27. data/app/components/trek/section_component/section_component.js +1 -0
  28. data/app/components/trek/section_component.rb +14 -0
  29. data/app/content/trek/content/bullet_list.rb +10 -0
  30. data/app/content/trek/content/document.rb +33 -0
  31. data/app/content/trek/content/image_block.rb +52 -0
  32. data/app/content/trek/content/link_resolver.rb +33 -0
  33. data/app/content/trek/content/list_item.rb +19 -0
  34. data/app/content/trek/content/ordered_list.rb +10 -0
  35. data/app/content/trek/content/paragraph.rb +10 -0
  36. data/app/content/trek/content/prompts_block.rb +22 -0
  37. data/app/content/trek/content.rb +32 -0
  38. data/app/controllers/concerns/trek/auditable.rb +103 -0
  39. data/app/controllers/concerns/trek/filters.rb +2 -0
  40. data/app/controllers/concerns/trek/passkeys.rb +37 -0
  41. data/app/controllers/concerns/trek/reorderable.rb +14 -3
  42. data/app/controllers/trek/csp_reports_controller.rb +59 -0
  43. data/app/controllers/trek/panels/base_controller.rb +3 -0
  44. data/app/controllers/trek/panels/links_controller.rb +1 -1
  45. data/app/controllers/trek/panels/prompts_controller.rb +1 -1
  46. data/app/controllers/trek/resource_controller.rb +7 -1
  47. data/app/helpers/trek/audit_logs_helper.rb +21 -0
  48. data/app/helpers/trek/thumbnail_helper.rb +11 -0
  49. data/app/helpers/trek/user_agents_helper.rb +36 -0
  50. data/app/javascript/controllers/index.js +3 -0
  51. data/app/javascript/controllers/passkey_controller.js +118 -0
  52. data/app/javascript/trek.js +4 -0
  53. data/app/jobs/trek/audit_log/purge_job.rb +18 -0
  54. data/app/jobs/trek/purge_expired_sessions_job.rb +14 -0
  55. data/app/jobs/trek/resolve_session_hostname_job.rb +17 -0
  56. data/app/models/concerns/trek/audit_log.rb +30 -0
  57. data/app/models/concerns/trek/contentable.rb +9 -14
  58. data/app/models/concerns/trek/pageable.rb +10 -1
  59. data/app/models/concerns/trek/users/passkeys.rb +75 -0
  60. data/app/models/concerns/trek/users/password_history.rb +51 -0
  61. data/app/models/concerns/trek/users/password_policy.rb +85 -0
  62. data/app/models/concerns/trek/users/password_renewal.rb +51 -0
  63. data/app/models/concerns/trek/users/session_lifetime.rb +39 -0
  64. data/app/models/concerns/trek/users/sign_in_lockout.rb +67 -0
  65. data/app/models/concerns/trek/users/sign_ins.rb +31 -0
  66. data/app/models/concerns/trek/users/validations.rb +3 -2
  67. data/app/models/trek/feature.rb +6 -0
  68. data/app/models/trek/pwned_passwords.rb +40 -0
  69. data/app/models/trek/user_session.rb +10 -0
  70. data/app/policies/trek/audit_log_policy.rb +34 -0
  71. data/app/policies/trek/user_policy.rb +5 -0
  72. data/app/validators/not_disposable_validator.rb +18 -0
  73. data/app/views/trek/panels/images/_form.html.slim +1 -1
  74. data/app/views/trek/panels/images/create.turbo_stream.slim +1 -1
  75. data/app/views/trek/panels/links/_form.html.slim +1 -1
  76. data/app/views/trek/panels/prompts/_form.html.slim +1 -1
  77. data/config/brakeman.ignore +22 -0
  78. data/config/i18n-tasks.yml +7 -0
  79. data/config/locales/trek.en.yml +167 -39
  80. data/config/locales/trek.fr.yml +168 -40
  81. data/docs/.vitepress/config.mjs +8 -3
  82. data/docs/deploy.md +2 -0
  83. data/docs/getting-started.md +3 -3
  84. data/docs/proxies.md +53 -0
  85. data/docs/reference/components.md +1 -0
  86. data/docs/reference/concerns/contentable.md +2 -1
  87. data/docs/reference/controllers.md +1 -1
  88. data/docs/reference/environment-variables.md +2 -0
  89. data/docs/reference/formatters.md +31 -8
  90. data/docs/reference/generators/admin-user.md +1 -1
  91. data/docs/reference/generators/audit-log.md +113 -0
  92. data/docs/reference/generators/install.md +12 -3
  93. data/docs/reference/generators/security-headers.md +109 -0
  94. data/docs/reference/index.md +3 -0
  95. data/docs/reference/models/fragment.md +1 -0
  96. data/docs/reference/models/tag.md +4 -2
  97. data/docs/reference/models/user.md +123 -3
  98. data/docs/reference/validators.md +94 -0
  99. data/docs/security.md +90 -0
  100. data/docs/what-is-trek.md +4 -4
  101. data/lefthook.yml +8 -0
  102. data/lib/generators/trek/helpers.rb +13 -5
  103. data/lib/generators/trek/install/admin/user_password_resets_generator.rb +5 -0
  104. data/lib/generators/trek/install/admin/user_sessions_generator.rb +5 -0
  105. data/lib/generators/trek/install/admin/users_generator.rb +23 -0
  106. data/lib/generators/trek/install/admin_generator.rb +8 -0
  107. data/lib/generators/trek/install/appsignal_generator.rb +1 -1
  108. data/lib/generators/trek/install/audit_log_generator.rb +56 -0
  109. data/lib/generators/trek/install/authentication_generator.rb +78 -4
  110. data/lib/generators/trek/install/authorization_generator.rb +1 -1
  111. data/lib/generators/trek/install/esbuild_generator.rb +1 -2
  112. data/lib/generators/trek/install/mailer_generator.rb +18 -0
  113. data/lib/generators/trek/install/model_specs_generator.rb +6 -4
  114. data/lib/generators/trek/install/postcss_generator.rb +1 -4
  115. data/lib/generators/trek/install/postmark_generator.rb +2 -2
  116. data/lib/generators/trek/install/security_headers_generator.rb +49 -0
  117. data/lib/generators/trek/install/specs_generator.rb +11 -0
  118. data/lib/generators/trek/install/user_generator.rb +1 -1
  119. data/lib/generators/trek/install/yarn_generator.rb +1 -1
  120. data/lib/generators/trek/install_generator.rb +62 -54
  121. data/lib/generators/trek/scaffold_generator.rb +13 -5
  122. data/lib/generators/trek/taxonomies_generator.rb +5 -0
  123. data/lib/generators/trek/templates/.gitlab-ci.yml +18 -2
  124. data/lib/generators/trek/templates/Makefile +1 -1
  125. data/lib/generators/trek/templates/controllers/admin/active_sessions_controller.rb +21 -0
  126. data/lib/generators/trek/templates/controllers/admin/audit_logs_controller.rb +30 -0
  127. data/lib/generators/trek/templates/controllers/admin/fragments_controller.rb +7 -0
  128. data/lib/generators/trek/templates/controllers/admin/panels/images_controller.rb +8 -0
  129. data/lib/generators/trek/templates/controllers/admin/panels/links_controller.rb +8 -0
  130. data/lib/generators/trek/templates/controllers/admin/panels/prompts_controller.rb +8 -0
  131. data/lib/generators/trek/templates/controllers/admin/passkey_sessions_controller.rb +41 -0
  132. data/lib/generators/trek/templates/controllers/admin/passkeys_controller.rb +37 -0
  133. data/lib/generators/trek/templates/controllers/admin/user_password_resets_controller.rb +4 -4
  134. data/lib/generators/trek/templates/controllers/admin/user_sessions_controller.rb +53 -4
  135. data/lib/generators/trek/templates/controllers/admin/users_controller.rb +20 -0
  136. data/lib/generators/trek/templates/controllers/concerns/trek/authentication.rb +58 -7
  137. data/lib/generators/trek/templates/helpers/application_helper.rb +0 -4
  138. data/lib/generators/trek/templates/initializers/audit_log.rb +11 -0
  139. data/lib/generators/trek/templates/initializers/content_security_policy.rb +49 -0
  140. data/lib/generators/trek/templates/initializers/permissions_policy.rb +19 -0
  141. data/lib/generators/trek/templates/jobs/admin/password_reset_job.rb +9 -0
  142. data/lib/generators/trek/templates/layouts/admin/auth.html.slim +0 -5
  143. data/lib/generators/trek/templates/layouts/admin.html.slim +0 -3
  144. data/lib/generators/trek/templates/mailers/admin/passwords_mailer.rb +1 -1
  145. data/lib/generators/trek/templates/mailers/admin_mailer.rb +28 -1
  146. data/lib/generators/trek/templates/migrations/audit_logs.rb.erb +27 -0
  147. data/lib/generators/trek/templates/migrations/tags.rb.erb +6 -1
  148. data/lib/generators/trek/templates/migrations/user_passkeys.rb.erb +24 -0
  149. data/lib/generators/trek/templates/migrations/user_password_renewal.rb.erb +8 -0
  150. data/lib/generators/trek/templates/migrations/user_previous_passwords.rb.erb +10 -0
  151. data/lib/generators/trek/templates/migrations/user_session_tracking.rb.erb +11 -0
  152. data/lib/generators/trek/templates/migrations/user_sign_in_lockout.rb.erb +7 -0
  153. data/lib/generators/trek/templates/migrations/user_sign_ins.rb.erb +13 -0
  154. data/lib/generators/trek/templates/models/audit_log.rb +3 -0
  155. data/lib/generators/trek/templates/models/fragment.rb +14 -0
  156. data/lib/generators/trek/templates/models/tag_category.rb +2 -1
  157. data/lib/generators/trek/templates/models/user/passkey.rb +17 -0
  158. data/lib/generators/trek/templates/models/user/previous_password.rb +4 -0
  159. data/lib/generators/trek/templates/models/user/session.rb +8 -0
  160. data/lib/generators/trek/templates/policies/audit_log.rb +4 -0
  161. data/lib/generators/trek/templates/spec/mailers/admin/passwords_mailer_spec.rb +16 -0
  162. data/lib/generators/trek/templates/spec/mailers/admin_mailer_spec.rb +51 -0
  163. data/lib/generators/trek/templates/spec/models/audit_log_spec.rb +43 -0
  164. data/lib/generators/trek/templates/spec/models/tag_spec.rb +52 -0
  165. data/lib/generators/trek/templates/spec/models/user/session_spec.rb +68 -0
  166. data/lib/generators/trek/templates/spec/models/user_spec.rb +142 -4
  167. data/lib/generators/trek/templates/spec/requests/admin/active_sessions_spec.rb +120 -0
  168. data/lib/generators/trek/templates/spec/requests/admin/audit_logs_spec.rb +149 -0
  169. data/lib/generators/trek/templates/spec/requests/admin/fragments_spec.rb +26 -2
  170. data/lib/generators/trek/templates/spec/requests/admin/pages_spec.rb +8 -0
  171. data/lib/generators/trek/templates/spec/requests/admin/panels_spec.rb +54 -0
  172. data/lib/generators/trek/templates/spec/requests/admin/passkey_sessions_spec.rb +103 -0
  173. data/lib/generators/trek/templates/spec/requests/admin/passkeys_spec.rb +104 -0
  174. data/lib/generators/trek/templates/spec/requests/admin/password_renewal_spec.rb +83 -0
  175. data/lib/generators/trek/templates/spec/requests/admin/sign_in_lockout_spec.rb +95 -0
  176. data/lib/generators/trek/templates/spec/requests/admin/sign_in_notices_spec.rb +95 -0
  177. data/lib/generators/trek/templates/spec/requests/admin/user_password_resets_spec.rb +43 -6
  178. data/lib/generators/trek/templates/spec/requests/admin/user_sessions_spec.rb +25 -2
  179. data/lib/generators/trek/templates/views/admin/audit_logs/index.html.slim +35 -0
  180. data/lib/generators/trek/templates/views/admin/audit_logs/show.html.slim +50 -0
  181. data/lib/generators/trek/templates/views/admin/fragments/index.html.slim +14 -3
  182. data/lib/generators/trek/templates/views/admin/user_password_resets/edit.html.slim +16 -6
  183. data/lib/generators/trek/templates/views/admin/user_password_resets/new.html.slim +2 -1
  184. data/lib/generators/trek/templates/views/admin/user_sessions/new.html.slim +27 -1
  185. data/lib/generators/trek/templates/views/admin/users/_passkeys.html.slim +67 -0
  186. data/lib/generators/trek/templates/views/admin/users/_properties.html.slim +21 -0
  187. data/lib/generators/trek/templates/views/admin/users/_sessions.html.slim +70 -0
  188. data/lib/generators/trek/templates/views/admin/users/index.html.slim +13 -0
  189. data/lib/generators/trek/templates/views/admin/users/show.html.slim +10 -21
  190. data/lib/generators/trek/templates/views/admin_mailer/new_sign_in.en.html.slim +22 -0
  191. data/lib/generators/trek/templates/views/admin_mailer/new_sign_in.en.text.erb +16 -0
  192. data/lib/generators/trek/templates/views/admin_mailer/new_sign_in.fr.html.slim +22 -0
  193. data/lib/generators/trek/templates/views/admin_mailer/new_sign_in.fr.text.erb +16 -0
  194. data/lib/generators/trek/templates/views/admin_mailer/sign_in_locked.en.html.slim +17 -0
  195. data/lib/generators/trek/templates/views/admin_mailer/sign_in_locked.en.text.erb +10 -0
  196. data/lib/generators/trek/templates/views/admin_mailer/sign_in_locked.fr.html.slim +18 -0
  197. data/lib/generators/trek/templates/views/admin_mailer/sign_in_locked.fr.text.erb +10 -0
  198. data/lib/trek/admin_ip_allowlist.rb +52 -0
  199. data/lib/trek/csp_reports.rb +99 -0
  200. data/lib/trek/data/common_passwords.txt +857 -0
  201. data/lib/trek/data/passkey_providers.json +404 -0
  202. data/lib/trek/disposable_email_domains.rb +53 -0
  203. data/lib/trek/engine.rb +18 -1
  204. data/lib/trek/passkey_providers.rb +19 -0
  205. data/lib/trek/reverse_dns.rb +27 -0
  206. data/lib/trek/saved_attachments_reload.rb +2 -1
  207. data/lib/trek/version.rb +1 -1
  208. data/lib/trek.rb +14 -1
  209. data/package.json +3 -5
  210. data/renovate.json +12 -1
  211. data/trek.gemspec +6 -3
  212. data/yarn.lock +2273 -2573
  213. metadata +160 -17
  214. data/.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs +0 -541
  215. data/.yarn/releases/yarn-3.8.0.cjs +0 -875
  216. data/app/formatters/prosemirror_to_html/global_id_to_links_formatter.rb +0 -19
  217. data/app/formatters/prosemirror_to_html/nodes/image_block.rb +0 -44
  218. data/app/formatters/prosemirror_to_html/nodes/prompts_block.rb +0 -28
  219. data/app/formatters/prosemirror_to_html/remove_empty_paragraphs_formatter.rb +0 -11
  220. data/app/models/prosemirror.rb +0 -23
  221. data/lib/generators/trek/templates/models/user_session.rb +0 -3
@@ -0,0 +1,35 @@
1
+ = render Trek::HeadingComponent.new( \
2
+ title: model_name.human(count: 2),
3
+ intro: t(".intro"),
4
+ ) do |c|
5
+ ruby:
6
+ if scope_params&.dig(:failures).present?
7
+ c.with_button(
8
+ href: [:admin, :audit_logs, filters: filter_params],
9
+ text: t("admin.actions.all"),
10
+ )
11
+ else
12
+ c.with_button(
13
+ href: [
14
+ :admin, :audit_logs,
15
+ filters: filter_params, scopes: { failures: 1 }
16
+ ],
17
+ text: t(".failures", count: scope_counts[:failures]),
18
+ )
19
+ end
20
+
21
+ = render Trek::EntriesComponent.new do |entries|
22
+ ruby:
23
+ @objects.each do |log|
24
+ entries.with_item(item: log, action: :show) do |entry|
25
+ entry.with_title(href: [:admin, log]) { log.action }
26
+ entry.with_detail { l(log.created_at, format: :long) }
27
+ entry.with_detail { log.actor.to_s } if log.actor
28
+ entry.with_detail { "#{log.http_method} #{log.http_status}".strip }
29
+ entry.with_detail { log.auditable.to_s } if log.auditable
30
+ entry.with_detail { log.error_class } if log.error_class
31
+ end
32
+ end
33
+
34
+ = render Trek::PaginationComponent.new do
35
+ = paginate @objects
@@ -0,0 +1,50 @@
1
+ = render Trek::HeadingComponent.new( \
2
+ title: @object.to_s,
3
+ intro: t(".intro"),
4
+ ) do |c|
5
+ - c.with_button(href: [:admin, :audit_logs], text: t("admin.actions.cancel"))
6
+
7
+ = render Trek::PropertiesComponent.new(model:) do |p|
8
+ = p.with_item :created_at
9
+ = l(@object.created_at, format: :long)
10
+
11
+ - if @object.actor
12
+ = p.with_item :actor
13
+ = audit_log_record_link(@object.actor)
14
+
15
+ = p.with_item :action
16
+ = @object.action
17
+
18
+ = p.with_item :http_method
19
+ code = @object.http_method
20
+
21
+ = p.with_item :path
22
+ code = @object.path
23
+
24
+ - if @object.http_status
25
+ = p.with_item :http_status
26
+ = @object.http_status
27
+
28
+ - if @object.error_class
29
+ = p.with_item :error_class
30
+ code = @object.error_class
31
+
32
+ - if @object.auditable
33
+ = p.with_item :auditable
34
+ = audit_log_record_link(@object.auditable)
35
+
36
+ - if @object.ip_address
37
+ = p.with_item :ip_address
38
+ code = @object.ip_address
39
+
40
+ - if @object.user_agent
41
+ = p.with_item :user_agent
42
+ = @object.user_agent
43
+
44
+ - if @object.request_id
45
+ = p.with_item :request_id
46
+ code = @object.request_id
47
+
48
+ - if @object.params.present?
49
+ = p.with_item :params
50
+ pre = JSON.pretty_generate(@object.params)
@@ -12,8 +12,19 @@
12
12
  end
13
13
  end
14
14
 
15
- = render Trek::ListComponent.new do |c|
15
+ = render Trek::SearchComponent.new( \
16
+ action: admin_fragments_path,
17
+ value: params[:search],
18
+ )
19
+
20
+ = render Trek::EntriesComponent.new do |entries|
16
21
  ruby:
17
- @objects.each do |object|
18
- c.with_item(object:)
22
+ @objects.each do |fragment|
23
+ entries.with_item(item: fragment) do |entry|
24
+ entry.with_title(href: [:edit, :admin, fragment]) do
25
+ fragment.title.presence || fragment.to_s
26
+ end
27
+ entry.with_detail { tag.code(fragment.to_s) } if fragment.title.present?
28
+ entry.with_detail { truncate(fragment.content_text, length: 80) }
29
+ end
19
30
  end
@@ -1,11 +1,21 @@
1
1
  = render Trek::GateComponent.new
2
2
  = form_with url: admin_user_password_reset_path(@token), method: :put do |f|
3
- = f.group :password, model_name: User.model_name
4
- = f.password_field :password,
5
- required: true,
6
- autocomplete: "new-password",
7
- maxlength: 72,
8
- minlength: 8
3
+ ruby:
4
+ rules = t(
5
+ ".rules",
6
+ min: User.password_min_length,
7
+ passphrase: User.passphrase_length,
8
+ )
9
+ = f.group :password, model_name: User.model_name, hint: rules
10
+ = render Trek::Form::PasswordStrengthComponent.new( \
11
+ min_length: User.password_min_length,
12
+ passphrase_length: User.passphrase_length,
13
+ )
14
+ = f.password_field :password,
15
+ required: true,
16
+ autocomplete: "new-password",
17
+ maxlength: 72,
18
+ minlength: User.password_min_length
9
19
 
10
20
  = render Trek::Form::ActionsComponent.new(aspect: :seamless) do |c|
11
21
  ruby:
@@ -4,7 +4,8 @@
4
4
  = f.email_field :email,
5
5
  required: true,
6
6
  autofocus: true,
7
- autocomplete: "username"
7
+ autocomplete: "username",
8
+ value: params[:email]
8
9
 
9
10
  = render Trek::Form::ActionsComponent.new(aspect: :seamless) do |c|
10
11
  ruby:
@@ -1,10 +1,11 @@
1
1
  = render Trek::GateComponent.new
2
2
  = form_with url: admin_user_session_path do |f|
3
3
  = f.group :email, model_name: User.model_name
4
+ / "webauthn" offers the site's passkeys in the field's autofill
4
5
  = f.email_field :email,
5
6
  required: true,
6
7
  autofocus: @email.nil?,
7
- autocomplete: "username",
8
+ autocomplete: "username webauthn",
8
9
  value: @email
9
10
 
10
11
  = f.group :password, model_name: User.model_name
@@ -27,3 +28,28 @@
27
28
  href: %i[new admin user_password_reset],
28
29
  text: t(".forgot_password"),
29
30
  )
31
+
32
+ / Shown by the passkey controller, in browsers that support passkeys
33
+ ruby:
34
+ passkey_form = {
35
+ url: admin_passkey_session_path,
36
+ hidden: true,
37
+ data: {
38
+ controller: "passkey",
39
+ passkey_options_url_value: options_admin_passkey_session_path,
40
+ passkey_conditional_value: true
41
+ }
42
+ }
43
+ = form_with(**passkey_form) do
44
+ = hidden_field_tag :credential, nil, data: { passkey_target: "credential" }
45
+ div(data-passkey-target="error" hidden)
46
+ = render Trek::Form::ErrorsComponent.new(errors: [t(".passkey_failure")])
47
+
48
+ = render Trek::Form::ActionsComponent.new(aspect: :seamless) do |c|
49
+ ruby:
50
+ c.with_button(
51
+ text: t(".passkey"),
52
+ data: { action: "passkey#get" },
53
+ ) do |b|
54
+ b.with_icon("trek/passkey")
55
+ end
@@ -0,0 +1,67 @@
1
+ / Shown by the passkey controller, in browsers that support passkeys: in the
2
+ / section while it's empty, below the list, in an actions bar, once it isn't.
3
+ / Submitting it creates the passkey on the device, then posts it.
4
+ ruby:
5
+ passkey_form = {
6
+ url: admin_passkeys_path,
7
+ hidden: true,
8
+ data: {
9
+ controller: "passkey",
10
+ passkey_options_url_value: options_admin_passkeys_path,
11
+ action: "submit->passkey#submit"
12
+ }
13
+ }
14
+ aspect = passkeys.any? ? :default : :seamless
15
+ - add_passkey = capture do
16
+ = form_with(**passkey_form) do
17
+ = hidden_field_tag :credential, nil, data: { passkey_target: "credential" }
18
+ div(data-passkey-target="error" hidden)
19
+ = render Trek::Form::ErrorsComponent.new(errors: [t(".failure")])
20
+ div(data-passkey-target="alreadyAdded" hidden)
21
+ = render Trek::Form::ErrorsComponent.new(errors: [t(".already_added")])
22
+
23
+ = render Trek::Form::ActionsComponent.new(aspect:) do |c|
24
+ ruby:
25
+ c.with_button(type: "submit", text: t(".add")) do |b|
26
+ b.with_icon("trek/passkey")
27
+ end
28
+
29
+ = render Trek::SectionComponent.new(title: t(".title"), hint: t(".intro"))
30
+ - if passkeys.any?
31
+ = render Trek::EntriesComponent.new do |entries|
32
+ ruby:
33
+ passkeys.each do |passkey|
34
+ entries.with_item(item: passkey) do |entry|
35
+ entry.with_title(href: nil) { passkey.to_s }
36
+ entry.with_detail do
37
+ t(".added", date: l(passkey.created_at, format: :long))
38
+ end
39
+ entry.with_detail do
40
+ if passkey.last_used_at
41
+ time = time_ago_in_words(passkey.last_used_at)
42
+ t(".last_used", time:)
43
+ else
44
+ t(".never_used")
45
+ end
46
+ end
47
+ entry.with_status do
48
+ render Trek::ButtonComponent.new(
49
+ href: admin_passkey_path(passkey),
50
+ text: t(".delete"),
51
+ size: :narrow,
52
+ color: :tomato,
53
+ data: {
54
+ turbo_method: :delete,
55
+ turbo_confirm: t(".delete_confirm"),
56
+ turbo_confirm_button: t(".delete"),
57
+ turbo_confirm_color: "tomato"
58
+ },
59
+ )
60
+ end
61
+ end
62
+ end
63
+ - else
64
+ = add_passkey
65
+
66
+ - if passkeys.any?
67
+ = add_passkey
@@ -0,0 +1,21 @@
1
+ = render Trek::PropertiesComponent.new(model:) do |p|
2
+ - if @object.name?
3
+ = p.with_item :name
4
+ = @object.name
5
+
6
+ = p.with_item :role
7
+ = t("user.roles.#{@object.role}")
8
+
9
+ = p.with_item :email
10
+ = mail_to @object.email
11
+
12
+ = p.with_item :created_at
13
+ = l(@object.created_at, default: "")
14
+
15
+ - if policy_permitted_attribute?(:locale) && @object.locale?
16
+ = p.with_item :locale
17
+ = t("user.locale.#{@object.locale}")
18
+
19
+ - if policy_permitted_attribute?(:theme) && @object.theme?
20
+ = p.with_item :theme
21
+ = t("user.theme.#{@object.theme}")
@@ -0,0 +1,70 @@
1
+ - if @object.last_sign_in_at?
2
+ ruby:
3
+ change_password = link_to(
4
+ t(".change_password"),
5
+ new_admin_user_password_reset_path(email: @object.email),
6
+ )
7
+ not_you = t(".not_you_html", change_password:)
8
+ previous_sign_in = Trek::SectionComponent.new(
9
+ title: t(".previous_sign_in"),
10
+ hint: not_you,
11
+ )
12
+ = render previous_sign_in
13
+ = render Trek::EntriesComponent.new do |entries|
14
+ ruby:
15
+ entries.with_item(item: @object) do |entry|
16
+ browser = user_agent_summary(@object.last_sign_in_user_agent)
17
+ entry.with_title(href: nil) { browser }
18
+ entry.with_detail { @object.last_sign_in_ip }
19
+ entry.with_detail do
20
+ t(".signed_in", date: l(@object.last_sign_in_at, format: :long))
21
+ end
22
+ end
23
+
24
+ = render Trek::SectionComponent.new(title: t(".title"), hint: t(".intro"))
25
+ = render Trek::EntriesComponent.new do |entries|
26
+ ruby:
27
+ sessions.each do |user_session|
28
+ entries.with_item(item: user_session) do |entry|
29
+ browser = user_agent_summary(user_session.user_agent)
30
+ entry.with_title(href: nil) { browser }
31
+ entry.with_detail do
32
+ ip = user_session.ip_address
33
+ hostname = user_session.ip_hostname
34
+ hostname ? tag.abbr(ip, title: hostname) : ip
35
+ end
36
+ entry.with_detail do
37
+ t(".signed_in", date: l(user_session.created_at, format: :long))
38
+ end
39
+ last_activity = time_ago_in_words(user_session.last_activity_at)
40
+ entry.with_detail { t(".last_activity", time: last_activity) }
41
+ entry.with_status do
42
+ if user_session == Current.session
43
+ t(".current")
44
+ else
45
+ render Trek::ButtonComponent.new(
46
+ href: admin_active_session_path(user_session),
47
+ text: t(".sign_out"),
48
+ size: :narrow,
49
+ data: { turbo_method: :delete },
50
+ )
51
+ end
52
+ end
53
+ end
54
+ end
55
+
56
+ - if sessions.size > 1
57
+ = render Trek::Form::ActionsComponent.new do |c|
58
+ ruby:
59
+ c.with_button(
60
+ href: %i[others admin active_sessions],
61
+ text: t(".sign_out_others"),
62
+ data: {
63
+ turbo_method: :delete,
64
+ turbo_confirm: t(".sign_out_others_confirm"),
65
+ turbo_confirm_button: t(".sign_out_others"),
66
+ turbo_confirm_color: "amber"
67
+ },
68
+ ) do |b|
69
+ b.with_icon("trek/logout")
70
+ end
@@ -12,6 +12,19 @@
12
12
  end
13
13
  end
14
14
 
15
+ if allowed_to?(:require_password_renewal?, model)
16
+ c.with_button(
17
+ href: [:require_password_renewal, :admin, :users],
18
+ text: t(".require_password_renewal"),
19
+ data: {
20
+ turbo_method: :post,
21
+ turbo_confirm: t(".require_password_renewal_confirm"),
22
+ turbo_confirm_button: t(".require_password_renewal"),
23
+ turbo_confirm_color: "amber"
24
+ },
25
+ )
26
+ end
27
+
15
28
  = render Trek::ListComponent.new(action: :show) do |c|
16
29
  ruby:
17
30
  @objects.each do |object|
@@ -18,24 +18,13 @@
18
18
  end
19
19
  end
20
20
 
21
- = render Trek::PropertiesComponent.new(model:) do |p|
22
- - if @object.name?
23
- = p.with_item :name
24
- = @object.name
25
-
26
- = p.with_item :role
27
- = t("user.roles.#{@object.role}")
28
-
29
- = p.with_item :email
30
- = mail_to @object.email
31
-
32
- = p.with_item :created_at
33
- = l(@object.created_at, default: "")
34
-
35
- - if policy_permitted_attribute?(:locale) && @object.locale?
36
- = p.with_item :locale
37
- = t("user.locale.#{@object.locale}")
38
-
39
- - if policy_permitted_attribute?(:theme) && @object.theme?
40
- = p.with_item :theme
41
- = t("user.theme.#{@object.theme}")
21
+ - if @object == Current.user
22
+ = render Trek::TabsComponent.new do |c|
23
+ - c.with_item(id: :profile, label: t(".profile"))
24
+ = render "properties"
25
+ - c.with_item(id: :sessions, label: t(".active_sessions"))
26
+ = render "sessions", sessions: @sessions
27
+ - c.with_item(id: :passkeys, label: t(".passkeys"))
28
+ = render "passkeys", passkeys: @passkeys
29
+ - else
30
+ = render "properties"
@@ -0,0 +1,22 @@
1
+ p Hello #{@user},
2
+ p
3
+ | Your #{t("application_name")} account was just signed in to
4
+ | from a browser it had never seen:
5
+ ul
6
+ li = l(@at, format: :long)
7
+ li = user_agent_summary(@user_agent)
8
+ li = @ip
9
+ p If it was you, there's nothing to do.
10
+ p
11
+ | If it wasn't, change your password right away,
12
+ | then sign out the browsers you don't recognize:
13
+ ul
14
+ li = link_to "Change your password",
15
+ @reset_url,
16
+ target: "_blank",
17
+ rel: "noopener"
18
+ li = link_to "See your active sessions",
19
+ @sessions_url,
20
+ target: "_blank",
21
+ rel: "noopener"
22
+ p The #{t("application_name")} team
@@ -0,0 +1,16 @@
1
+ Hello <%%= @user %>,
2
+
3
+ Your <%%= t("application_name") %> account was just signed in to from a browser it had never seen:
4
+
5
+ - <%%= l(@at, format: :long) %>
6
+ - <%%= user_agent_summary(@user_agent) %>
7
+ - <%%= @ip %>
8
+
9
+ If it was you, there's nothing to do.
10
+
11
+ If it wasn't, change your password right away, then sign out the browsers you don't recognize:
12
+
13
+ - Change your password: <%%= @reset_url %>
14
+ - See your active sessions: <%%= @sessions_url %>
15
+
16
+ The <%%= t("application_name") %> team
@@ -0,0 +1,22 @@
1
+ p Bonjour #{@user},
2
+ p
3
+ | Votre compte #{t("application_name")} vient d'être connecté
4
+ | depuis un navigateur jamais vu :
5
+ ul
6
+ li = l(@at, format: :long)
7
+ li = user_agent_summary(@user_agent)
8
+ li = @ip
9
+ p Si c'était vous, il n'y a rien à faire.
10
+ p
11
+ | Sinon, changez votre mot de passe tout de suite,
12
+ | puis déconnectez les navigateurs que vous ne reconnaissez pas :
13
+ ul
14
+ li = link_to "Changer votre mot de passe",
15
+ @reset_url,
16
+ target: "_blank",
17
+ rel: "noopener"
18
+ li = link_to "Voir vos sessions actives",
19
+ @sessions_url,
20
+ target: "_blank",
21
+ rel: "noopener"
22
+ p L'équipe #{t("application_name")}
@@ -0,0 +1,16 @@
1
+ Bonjour <%%= @user %>,
2
+
3
+ Votre compte <%%= t("application_name") %> vient d'être connecté depuis un navigateur jamais vu :
4
+
5
+ - <%%= l(@at, format: :long) %>
6
+ - <%%= user_agent_summary(@user_agent) %>
7
+ - <%%= @ip %>
8
+
9
+ Si c'était vous, il n'y a rien à faire.
10
+
11
+ Sinon, changez votre mot de passe tout de suite, puis déconnectez les navigateurs que vous ne reconnaissez pas :
12
+
13
+ - Changer votre mot de passe : <%%= @reset_url %>
14
+ - Voir vos sessions actives : <%%= @sessions_url %>
15
+
16
+ L'équipe <%%= t("application_name") %>
@@ -0,0 +1,17 @@
1
+ p Hello #{@user},
2
+ p
3
+ | Several attempts in a row to sign in to #{t("application_name")}
4
+ with your email failed, with a wrong password. To keep your account
5
+ safe, signing in is paused for a few minutes, a little longer after
6
+ each new failure.
7
+ p
8
+ | If it was you, wait a few minutes before trying again, or
9
+ =< link_to "choose a new password",
10
+ @reset_url,
11
+ target: "_blank",
12
+ rel: "noopener"
13
+ | .
14
+ p
15
+ | If it wasn't you, someone may be trying to guess your password: if
16
+ it's short or you use it elsewhere, choose a new one.
17
+ p The #{t("application_name")} team
@@ -0,0 +1,10 @@
1
+ Hello <%%= @user %>,
2
+
3
+ Several attempts in a row to sign in to <%%= t("application_name") %> with your email failed, with a wrong password. To keep your account safe, signing in is paused for a few minutes, a little longer after each new failure.
4
+
5
+ If it was you, wait a few minutes before trying again, or choose a new password:
6
+ <%%= @reset_url %>
7
+
8
+ If it wasn't you, someone may be trying to guess your password: if it's short or you use it elsewhere, choose a new one.
9
+
10
+ The <%%= t("application_name") %> team
@@ -0,0 +1,18 @@
1
+ p Bonjour #{@user},
2
+ p
3
+ | Plusieurs tentatives de connexion à #{t("application_name")}
4
+ avec votre adresse e-mail ont échoué d'affilée, avec un mauvais mot de
5
+ passe. Pour protéger votre compte, la connexion est suspendue quelques
6
+ minutes, un peu plus longtemps après chaque nouvel échec.
7
+ p
8
+ | Si c'était vous, patientez quelques minutes avant de réessayer, ou
9
+ =< link_to "choisissez un nouveau mot de passe",
10
+ @reset_url,
11
+ target: "_blank",
12
+ rel: "noopener"
13
+ | .
14
+ p
15
+ | Si ce n'était pas vous, quelqu'un essaie peut-être de deviner votre mot
16
+ de passe : s'il est court ou que vous l'utilisez ailleurs,
17
+ choisissez-en un nouveau.
18
+ p L'équipe #{t("application_name")}
@@ -0,0 +1,10 @@
1
+ Bonjour <%%= @user %>,
2
+
3
+ Plusieurs tentatives de connexion à <%%= t("application_name") %> avec votre adresse e-mail ont échoué d'affilée, avec un mauvais mot de passe. Pour protéger votre compte, la connexion est suspendue quelques minutes, un peu plus longtemps après chaque nouvel échec.
4
+
5
+ Si c'était vous, patientez quelques minutes avant de réessayer, ou choisissez un nouveau mot de passe :
6
+ <%%= @reset_url %>
7
+
8
+ Si ce n'était pas vous, quelqu'un essaie peut-être de deviner votre mot de passe : s'il est court ou que vous l'utilisez ailleurs, choisissez-en un nouveau.
9
+
10
+ L'équipe <%%= t("application_name") %>
@@ -0,0 +1,52 @@
1
+ # frozen_string_literal: true
2
+
3
+ require "ipaddr"
4
+
5
+ module Trek
6
+ # Restricts the admin (/admin and below, the sign-in page included) to the IP addresses and ranges in
7
+ # ADMIN_ALLOWED_IPS, separated by commas or spaces: "203.0.113.0/24, 2001:db8::/32, 198.51.100.7".
8
+ # From anywhere else, the admin doesn't exist: a 404, as for an unknown URL, rather than a redirect
9
+ # to the sign-in page. Off when ADMIN_ALLOWED_IPS is unset or empty; read when the app starts.
10
+ #
11
+ # The address is `request.remote_ip`: behind a proxy or a CDN, list its ranges in
12
+ # `config.action_dispatch.trusted_proxies`, or every request seems to come from it (docs: proxies).
13
+ #
14
+ # Inserted after ActionDispatch::DebugExceptions (Trek::Engine): after RemoteIp, which works out the
15
+ # address, and inside ShowExceptions, which turns the routing error into the app's 404 page.
16
+ class AdminIpAllowlist
17
+ PATH = %r{\A/admin(/|\z)}
18
+
19
+ def initialize(app, allowed = ENV.fetch("ADMIN_ALLOWED_IPS", nil))
20
+ @app = app
21
+ @ranges = parse(allowed)
22
+ end
23
+
24
+ def call(env)
25
+ if @ranges.any? && env["PATH_INFO"].to_s.match?(PATH) && !allowed?(ActionDispatch::Request.new(env).remote_ip)
26
+ # The same error, and log line, as for a URL no route matches
27
+ raise ActionController::RoutingError, "No route matches [#{env["REQUEST_METHOD"]}] #{env["PATH_INFO"].inspect}"
28
+ end
29
+
30
+ @app.call(env)
31
+ end
32
+
33
+ private
34
+
35
+ def parse(allowed)
36
+ allowed.to_s.split(/[\s,]+/).reject(&:empty?).map do |range|
37
+ IPAddr.new(range)
38
+ rescue IPAddr::Error
39
+ raise ArgumentError, "ADMIN_ALLOWED_IPS: #{range.inspect} is neither an IP address nor a range"
40
+ end
41
+ end
42
+
43
+ def allowed?(remote_ip)
44
+ ip = IPAddr.new(remote_ip.to_s)
45
+ # An IPv4 address may come as IPv6 ("::ffff:203.0.113.5")
46
+ ip = ip.native if ip.ipv4_mapped?
47
+ @ranges.any? { |range| range.family == ip.family && range.include?(ip) }
48
+ rescue IPAddr::Error
49
+ false
50
+ end
51
+ end
52
+ end