From 4d1062e584cd210d3fbd19312001288df6ed9275 Mon Sep 17 00:00:00 2001 From: Peter Hankiewicz Date: Wed, 15 Dec 2021 16:37:40 +0100 Subject: [PATCH] Add captcha to search view --- Gemfile.lock | 4 +- app/assets/images/captcha_loading.gif | Bin 0 -> 20719 bytes .../lumen/captcha_gateway.js.coffee | 7 + app/assets/stylesheets/application.css.scss | 1 + app/assets/stylesheets/bitters/_forms.scss | 4 + .../stylesheets/captcha_gateway/index.scss | 9 + .../api_submitter_requests_controller.rb | 7 +- app/controllers/captcha_gateway_controller.rb | 21 + app/controllers/search_controller.rb | 13 + .../submitter_widget_notices_controller.rb | 5 +- app/controllers/token_urls_controller.rb | 6 +- .../elasticsearch/elasticsearch_query.rb | 2 +- app/views/api_submitter_requests/new.html.erb | 2 +- app/views/captcha_gateway/index.html.erb | 18 + .../_counterfeit_form.html.erb | 2 +- .../_counternotice_form.html.erb | 2 +- .../_court_order_form.html.erb | 2 +- .../_defamation_form.html.erb | 2 +- .../submitter_widget/_dmca_form.html.erb | 2 +- .../_government_request_form.html.erb | 2 +- .../_law_enforcement_request_form.html.erb | 2 +- .../submitter_widget/_other_form.html.erb | 2 +- .../_private_information_form.html.erb | 2 +- .../submitter_widget/_trademark_form.html.erb | 2 +- app/views/search/index.html.erb | 1 + app/views/shared/_header_search.html.erb | 2 +- app/views/shared/_search.html.erb | 2 +- app/views/token_urls/new.html.erb | 2 +- .../new_framework_defaults_5_2.rb | 38 - .../new_framework_defaults_6_0.rb | 45 - .../new_framework_defaults_6_1.rb | 67 -- config/initializers/rack-attack.rb | 11 + config/initializers/rails_admin.rb | 890 +++++++++--------- config/routes.rb | 2 + public/robots.txt | 3 + 35 files changed, 559 insertions(+), 623 deletions(-) create mode 100644 app/assets/images/captcha_loading.gif create mode 100644 app/assets/javascripts/lumen/captcha_gateway.js.coffee create mode 100644 app/assets/stylesheets/captcha_gateway/index.scss create mode 100644 app/controllers/captcha_gateway_controller.rb create mode 100644 app/views/captcha_gateway/index.html.erb delete mode 100644 config/initializers/new_framework_defaults_5_2.rb delete mode 100644 config/initializers/new_framework_defaults_6_0.rb delete mode 100644 config/initializers/new_framework_defaults_6_1.rb diff --git a/Gemfile.lock b/Gemfile.lock index 6dbc59a9c..8aeda5b11 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -250,7 +250,7 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (6.0.1) railties (>= 3.2.16) - json (2.3.1) + json (2.6.1) kaminari (1.2.1) activesupport (>= 4.1.0) kaminari-actionview (= 1.2.1) @@ -392,7 +392,7 @@ GEM rb-fsevent (0.10.3) rb-inotify (0.10.1) ffi (~> 1.0) - recaptcha (4.14.0) + recaptcha (5.8.1) json recipient_interceptor (0.2.0) mail diff --git a/app/assets/images/captcha_loading.gif b/app/assets/images/captcha_loading.gif new file mode 100644 index 0000000000000000000000000000000000000000..d7db28fab7103609fa6ad079e11ea87d48941831 GIT binary patch literal 20719 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%0A{jv21 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 + if $('.captcha-gateway') + checkFormCaptchaReady = setInterval -> + if $('#g-recaptcha-response-data-gateway').val() + $('#captcha-gateway-form').submit() + clearInterval(checkFormCaptchaReady) + , 100 diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index c26104bbb..580a5d648 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -49,6 +49,7 @@ @import 'token_urls/index'; @import 'media_mentions/index'; @import 'api_submitter_requests/index'; +@import 'captcha_gateway/index'; @import 'pages/pages'; diff --git a/app/assets/stylesheets/bitters/_forms.scss b/app/assets/stylesheets/bitters/_forms.scss index e3e554993..b35f788a9 100644 --- a/app/assets/stylesheets/bitters/_forms.scss +++ b/app/assets/stylesheets/bitters/_forms.scss @@ -112,6 +112,10 @@ input[type="submit"]:not(.reset) { } } +button[disabled] { + cursor: not-allowed; +} + input { @include placeholder { color: #AEB6C2; diff --git a/app/assets/stylesheets/captcha_gateway/index.scss b/app/assets/stylesheets/captcha_gateway/index.scss new file mode 100644 index 000000000..13ee1096f --- /dev/null +++ b/app/assets/stylesheets/captcha_gateway/index.scss @@ -0,0 +1,9 @@ +.captcha-gateway { + .main { + padding: 35px; + + img { + padding: 15px; + } + } +} diff --git a/app/controllers/api_submitter_requests_controller.rb b/app/controllers/api_submitter_requests_controller.rb index f991f2408..ee7ca1151 100644 --- a/app/controllers/api_submitter_requests_controller.rb +++ b/app/controllers/api_submitter_requests_controller.rb @@ -1,6 +1,4 @@ class ApiSubmitterRequestsController < ApplicationController - include Recaptcha::ClientHelper - def new @api_submitter_request = ApiSubmitterRequest.new end @@ -56,13 +54,14 @@ def api_submitter_request_params end def validate - unless verify_recaptcha(model: @api_submitter_request) + unless verify_recaptcha(action: 'new_submitter_request', minimum_score: 0.5) + flash.delete(:recaptcha_error) + return { status: false, why: 'Captcha verification failed, please try again.' } end - { status: true } diff --git a/app/controllers/captcha_gateway_controller.rb b/app/controllers/captcha_gateway_controller.rb new file mode 100644 index 000000000..1b87689ce --- /dev/null +++ b/app/controllers/captcha_gateway_controller.rb @@ -0,0 +1,21 @@ +class CaptchaGatewayController < ApplicationController + def index + redirect_to root_path and return if params[:destination].nil? + + if params.dig('g-recaptcha-response-data', 'gateway') + success_captcha = verify_recaptcha(action: 'gateway', minimum_score: 0.5) + + captcha_gateway_logger = Logger.new("#{Rails.root}/log/captcha_gateway_logger.log") + captcha_gateway_logger.info(recaptcha_reply.inspect) + + if success_captcha + session[:captcha_permission] = Time.now + ENV['CAPTCHA_GATEWAY_PERMISSION_TIME'].to_i.seconds + redirect_to CGI.unescape(params[:destination]) and return + else + flash.delete(:recaptcha_error) + flash.alert = 'Sorry, we don\'t this that you are a human, if you think this is an error please contact our team at team@lumendatabase.org.' + redirect_to root_path and return + end + end + end +end diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb index 0aad64961..8d2f1c257 100644 --- a/app/controllers/search_controller.rb +++ b/app/controllers/search_controller.rb @@ -18,6 +18,19 @@ class SearchController < ApplicationController URL_ROOT = nil def index + if request.format.html? && current_user.nil? && !Rails.env.test? + permitted = false + + if session[:captcha_permission] + time_permission = session[:captcha_permission] + permitted = true if time_permission > Time.now + end + + unless permitted + redirect_to(captcha_gateway_index_path(destination: CGI.escape(request.original_url))) and return + end + end + @searcher = item_searcher @searchdata = @searcher.search @wrapped_instances = wrap_instances diff --git a/app/controllers/submitter_widget_notices_controller.rb b/app/controllers/submitter_widget_notices_controller.rb index a104cac0f..f0d4f721e 100644 --- a/app/controllers/submitter_widget_notices_controller.rb +++ b/app/controllers/submitter_widget_notices_controller.rb @@ -1,6 +1,4 @@ class SubmitterWidgetNoticesController < NoticesController - include Recaptcha::ClientHelper - layout 'submitter_widget' before_action :before_actions @@ -36,7 +34,8 @@ def create get_notice_type(params), notice_params, submitter_widget_user ).build - unless verify_recaptcha(model: @notice) + unless verify_recaptcha(action: 'submitter_widget_new_notice', minimum_score: 0.5) + flash.delete(:recaptcha_error) flash.alert = 'Captcha verification failed, please try again.' strip_fixed_roles and render 'notices/submitter_widget/new' and return end diff --git a/app/controllers/token_urls_controller.rb b/app/controllers/token_urls_controller.rb index 15af1bc58..a7b0b9fd1 100644 --- a/app/controllers/token_urls_controller.rb +++ b/app/controllers/token_urls_controller.rb @@ -3,8 +3,6 @@ require 'hasher' class TokenUrlsController < ApplicationController - include Recaptcha::ClientHelper - IP_BETWEEN_REQUESTS_WAITING_TIME = 2.hours def new @@ -133,7 +131,9 @@ def validate } end - unless verify_recaptcha(model: @token_url) + unless verify_recaptcha(action: 'new_token_url', minimum_score: 0.5) + flash.delete(:recaptcha_error) + return { status: false, why: 'Captcha verification failed, please try again.' diff --git a/app/models/elasticsearch/elasticsearch_query.rb b/app/models/elasticsearch/elasticsearch_query.rb index ef1d490b5..73058ee08 100644 --- a/app/models/elasticsearch/elasticsearch_query.rb +++ b/app/models/elasticsearch/elasticsearch_query.rb @@ -71,7 +71,7 @@ def search # Adding a datestamp guarantees that the cache_key eventually expires. def cache_key is_super_admin = Current.user&.role?(Role.super_admin) - @cache_key ||= "search-result-#{Digest::MD5.hexdigest(params.values.to_s)}-#{Date.today}-#{is_super_admin}" + @cache_key ||= "search-result-#{Digest::MD5.hexdigest(params.except('g-recaptcha-response-data', 'g-recaptcha-response').values.to_s)}-#{Date.today}-#{is_super_admin}" end private diff --git a/app/views/api_submitter_requests/new.html.erb b/app/views/api_submitter_requests/new.html.erb index d83f08485..1c69809a3 100644 --- a/app/views/api_submitter_requests/new.html.erb +++ b/app/views/api_submitter_requests/new.html.erb @@ -35,7 +35,7 @@ <%= f.input :entity_url, label: 'URL' %> - <%= recaptcha_tags %> + <%= recaptcha_v3(action: 'new_submitter_request') %>
diff --git a/app/views/captcha_gateway/index.html.erb b/app/views/captcha_gateway/index.html.erb new file mode 100644 index 000000000..5b4994987 --- /dev/null +++ b/app/views/captcha_gateway/index.html.erb @@ -0,0 +1,18 @@ +<% title 'Are you a human?' %> + +
+
+
+

We need to check if you are a human, wait a few seconds please.

+

You will be automatically redirected to your destination page.

+
+ <%= image_tag '/assets/captcha_loading.gif' %> +
+ +
+ <%= recaptcha_v3(action: 'gateway') %> + +
+
+
+
diff --git a/app/views/notices/submitter_widget/_counterfeit_form.html.erb b/app/views/notices/submitter_widget/_counterfeit_form.html.erb index 6f322df70..64ae44c8a 100644 --- a/app/views/notices/submitter_widget/_counterfeit_form.html.erb +++ b/app/views/notices/submitter_widget/_counterfeit_form.html.erb @@ -30,7 +30,7 @@ label: 'Counterfeit notice', form: form %> - <%= recaptcha_tags %> + <%= recaptcha_v3(action: 'submitter_widget_new_notice') %> <%= render 'notices/form_components/submit', form: form %> <% end %> diff --git a/app/views/notices/submitter_widget/_counternotice_form.html.erb b/app/views/notices/submitter_widget/_counternotice_form.html.erb index a017dcde3..9d1799871 100644 --- a/app/views/notices/submitter_widget/_counternotice_form.html.erb +++ b/app/views/notices/submitter_widget/_counternotice_form.html.erb @@ -42,7 +42,7 @@ <%= render 'notices/submitter_widget/form_components/roles', form: form %> - <%= recaptcha_tags %> + <%= recaptcha_v3(action: 'submitter_widget_new_notice') %> <%= render 'notices/form_components/submit', form: form %> <% end %> diff --git a/app/views/notices/submitter_widget/_court_order_form.html.erb b/app/views/notices/submitter_widget/_court_order_form.html.erb index b2bba873f..10ba10708 100644 --- a/app/views/notices/submitter_widget/_court_order_form.html.erb +++ b/app/views/notices/submitter_widget/_court_order_form.html.erb @@ -28,7 +28,7 @@ <%= render 'notices/submitter_widget/form_components/roles', form: form %> - <%= recaptcha_tags %> + <%= recaptcha_v3(action: 'submitter_widget_new_notice') %> <%= render 'notices/form_components/submit', form: form %> <% end %> diff --git a/app/views/notices/submitter_widget/_defamation_form.html.erb b/app/views/notices/submitter_widget/_defamation_form.html.erb index 0d1a359d0..be8318509 100644 --- a/app/views/notices/submitter_widget/_defamation_form.html.erb +++ b/app/views/notices/submitter_widget/_defamation_form.html.erb @@ -28,7 +28,7 @@ label: 'Defamation takedown notice', form: form %> - <%= recaptcha_tags %> + <%= recaptcha_v3(action: 'submitter_widget_new_notice') %> <%= render 'notices/form_components/submit', form: form %> <% end %> diff --git a/app/views/notices/submitter_widget/_dmca_form.html.erb b/app/views/notices/submitter_widget/_dmca_form.html.erb index e06539db7..b291bd73a 100644 --- a/app/views/notices/submitter_widget/_dmca_form.html.erb +++ b/app/views/notices/submitter_widget/_dmca_form.html.erb @@ -32,7 +32,7 @@ label: 'DMCA takedown notice', form: form %> - <%= recaptcha_tags %> + <%= recaptcha_v3(action: 'submitter_widget_new_notice') %> <%= render 'notices/form_components/submit', form: form %> <% end %> diff --git a/app/views/notices/submitter_widget/_government_request_form.html.erb b/app/views/notices/submitter_widget/_government_request_form.html.erb index beafe69c8..8188ef228 100644 --- a/app/views/notices/submitter_widget/_government_request_form.html.erb +++ b/app/views/notices/submitter_widget/_government_request_form.html.erb @@ -27,7 +27,7 @@ <%= render 'notices/submitter_widget/form_components/roles', form: form %> - <%= recaptcha_tags %> + <%= recaptcha_v3(action: 'submitter_widget_new_notice') %> <%= render 'notices/form_components/submit', form: form %> <% end %> diff --git a/app/views/notices/submitter_widget/_law_enforcement_request_form.html.erb b/app/views/notices/submitter_widget/_law_enforcement_request_form.html.erb index 426c19524..97c4c2562 100644 --- a/app/views/notices/submitter_widget/_law_enforcement_request_form.html.erb +++ b/app/views/notices/submitter_widget/_law_enforcement_request_form.html.erb @@ -29,7 +29,7 @@ <%= render 'notices/submitter_widget/form_components/roles', form: form %> - <%= recaptcha_tags %> + <%= recaptcha_v3(action: 'submitter_widget_new_notice') %> <%= render 'notices/form_components/submit', form: form %> <% end %> diff --git a/app/views/notices/submitter_widget/_other_form.html.erb b/app/views/notices/submitter_widget/_other_form.html.erb index 80b2c7cb0..1b4ac3e2c 100644 --- a/app/views/notices/submitter_widget/_other_form.html.erb +++ b/app/views/notices/submitter_widget/_other_form.html.erb @@ -30,7 +30,7 @@ label: 'Notice', form: form %> - <%= recaptcha_tags %> + <%= recaptcha_v3(action: 'submitter_widget_new_notice') %> <%= render 'notices/form_components/submit', form: form %> <% end %> diff --git a/app/views/notices/submitter_widget/_private_information_form.html.erb b/app/views/notices/submitter_widget/_private_information_form.html.erb index 3579d170b..91506fd07 100644 --- a/app/views/notices/submitter_widget/_private_information_form.html.erb +++ b/app/views/notices/submitter_widget/_private_information_form.html.erb @@ -28,7 +28,7 @@ label: 'Private Information notice', form: form %> - <%= recaptcha_tags %> + <%= recaptcha_v3(action: 'submitter_widget_new_notice') %> <%= render 'notices/form_components/submit', form: form %> <% end %> diff --git a/app/views/notices/submitter_widget/_trademark_form.html.erb b/app/views/notices/submitter_widget/_trademark_form.html.erb index c51b73ddd..90ec28420 100644 --- a/app/views/notices/submitter_widget/_trademark_form.html.erb +++ b/app/views/notices/submitter_widget/_trademark_form.html.erb @@ -34,7 +34,7 @@ label: 'Trademark takedown notice', form: form %> - <%= recaptcha_tags %> + <%= recaptcha_v3(action: 'submitter_widget_new_notice') %> <%= render 'notices/form_components/submit', form: form %> <% end %> diff --git a/app/views/search/index.html.erb b/app/views/search/index.html.erb index 32166b6e9..5999c2e3d 100644 --- a/app/views/search/index.html.erb +++ b/app/views/search/index.html.erb @@ -1,4 +1,5 @@ <%= title 'Search' %> + <%= cache(@searcher.cache_key) do %>
diff --git a/app/views/shared/_header_search.html.erb b/app/views/shared/_header_search.html.erb index 09408d0aa..5c09e922d 100644 --- a/app/views/shared/_header_search.html.erb +++ b/app/views/shared/_header_search.html.erb @@ -12,7 +12,7 @@ <% end %> Add more
- +
diff --git a/app/views/shared/_search.html.erb b/app/views/shared/_search.html.erb index e1369fa7c..f3761b8ff 100644 --- a/app/views/shared/_search.html.erb +++ b/app/views/shared/_search.html.erb @@ -4,7 +4,7 @@ <%= text_field_tag :term, params[:term], id: "search", type: 'search', placeholder: @search_all_placeholder %>
- +
Open
diff --git a/app/views/token_urls/new.html.erb b/app/views/token_urls/new.html.erb index 1e495278f..c49ad45cc 100644 --- a/app/views/token_urls/new.html.erb +++ b/app/views/token_urls/new.html.erb @@ -12,7 +12,7 @@ <%= f.input :email, label: 'Email address', required: true %> <%= f.input :documents_notification, as: :boolean, inline_label: 'Select to get a notification when new notice documents are added (or when existing notice documents are updated).', label: false %> - <%= recaptcha_tags %> + <%= recaptcha_v3(action: 'new_token_url') %>
diff --git a/config/initializers/new_framework_defaults_5_2.rb b/config/initializers/new_framework_defaults_5_2.rb deleted file mode 100644 index c383d072b..000000000 --- a/config/initializers/new_framework_defaults_5_2.rb +++ /dev/null @@ -1,38 +0,0 @@ -# Be sure to restart your server when you modify this file. -# -# This file contains migration options to ease your Rails 5.2 upgrade. -# -# Once upgraded flip defaults one by one to migrate to the new default. -# -# Read the Guide for Upgrading Ruby on Rails for more info on each option. - -# Make Active Record use stable #cache_key alongside new #cache_version method. -# This is needed for recyclable cache keys. -# Rails.application.config.active_record.cache_versioning = true - -# Use AES-256-GCM authenticated encryption for encrypted cookies. -# Also, embed cookie expiry in signed or encrypted cookies for increased security. -# -# This option is not backwards compatible with earlier Rails versions. -# It's best enabled when your entire app is migrated and stable on 5.2. -# -# Existing cookies will be converted on read then written with the new scheme. -# Rails.application.config.action_dispatch.use_authenticated_cookie_encryption = true - -# Use AES-256-GCM authenticated encryption as default cipher for encrypting messages -# instead of AES-256-CBC, when use_authenticated_message_encryption is set to true. -# Rails.application.config.active_support.use_authenticated_message_encryption = true - -# Add default protection from forgery to ActionController::Base instead of in -# ApplicationController. -# Rails.application.config.action_controller.default_protect_from_forgery = true - -# Store boolean values are in sqlite3 databases as 1 and 0 instead of 't' and -# 'f' after migrating old data. -# Rails.application.config.active_record.sqlite3.represent_boolean_as_integer = true - -# Use SHA-1 instead of MD5 to generate non-sensitive digests, such as the ETag header. -# Rails.application.config.active_support.use_sha1_digests = true - -# Make `form_with` generate id attributes for any generated HTML tags. -# Rails.application.config.action_view.form_with_generates_ids = true diff --git a/config/initializers/new_framework_defaults_6_0.rb b/config/initializers/new_framework_defaults_6_0.rb deleted file mode 100644 index 92240ef5f..000000000 --- a/config/initializers/new_framework_defaults_6_0.rb +++ /dev/null @@ -1,45 +0,0 @@ -# Be sure to restart your server when you modify this file. -# -# This file contains migration options to ease your Rails 6.0 upgrade. -# -# Once upgraded flip defaults one by one to migrate to the new default. -# -# Read the Guide for Upgrading Ruby on Rails for more info on each option. - -# Don't force requests from old versions of IE to be UTF-8 encoded. -# Rails.application.config.action_view.default_enforce_utf8 = false - -# Embed purpose and expiry metadata inside signed and encrypted -# cookies for increased security. -# -# This option is not backwards compatible with earlier Rails versions. -# It's best enabled when your entire app is migrated and stable on 6.0. -# Rails.application.config.action_dispatch.use_cookies_with_metadata = true - -# Change the return value of `ActionDispatch::Response#content_type` to Content-Type header without modification. -# Rails.application.config.action_dispatch.return_only_media_type_on_content_type = false - -# Return false instead of self when enqueuing is aborted from a callback. -# Rails.application.config.active_job.return_false_on_aborted_enqueue = true - -# Send Active Storage analysis and purge jobs to dedicated queues. -# Rails.application.config.active_storage.queues.analysis = :active_storage_analysis -# Rails.application.config.active_storage.queues.purge = :active_storage_purge - -# When assigning to a collection of attachments declared via `has_many_attached`, replace existing -# attachments instead of appending. Use #attach to add new attachments without replacing existing ones. -# Rails.application.config.active_storage.replace_on_assign_to_many = true - -# Use ActionMailer::MailDeliveryJob for sending parameterized and normal mail. -# -# The default delivery jobs (ActionMailer::Parameterized::DeliveryJob, ActionMailer::DeliveryJob), -# will be removed in Rails 6.1. This setting is not backwards compatible with earlier Rails versions. -# If you send mail in the background, job workers need to have a copy of -# MailDeliveryJob to ensure all delivery jobs are processed properly. -# Make sure your entire app is migrated and stable on 6.0 before using this setting. -# Rails.application.config.action_mailer.delivery_job = "ActionMailer::MailDeliveryJob" - -# Enable the same cache key to be reused when the object being cached of type -# `ActiveRecord::Relation` changes by moving the volatile information (max updated at and count) -# of the relation's cache key into the cache version to support recycling cache key. -# Rails.application.config.active_record.collection_cache_versioning = true diff --git a/config/initializers/new_framework_defaults_6_1.rb b/config/initializers/new_framework_defaults_6_1.rb deleted file mode 100644 index 9526b835a..000000000 --- a/config/initializers/new_framework_defaults_6_1.rb +++ /dev/null @@ -1,67 +0,0 @@ -# Be sure to restart your server when you modify this file. -# -# This file contains migration options to ease your Rails 6.1 upgrade. -# -# Once upgraded flip defaults one by one to migrate to the new default. -# -# Read the Guide for Upgrading Ruby on Rails for more info on each option. - -# Support for inversing belongs_to -> has_many Active Record associations. -# Rails.application.config.active_record.has_many_inversing = true - -# Track Active Storage variants in the database. -# Rails.application.config.active_storage.track_variants = true - -# Apply random variation to the delay when retrying failed jobs. -# Rails.application.config.active_job.retry_jitter = 0.15 - -# Stop executing `after_enqueue`/`after_perform` callbacks if -# `before_enqueue`/`before_perform` respectively halts with `throw :abort`. -# Rails.application.config.active_job.skip_after_callbacks_if_terminated = true - -# Specify cookies SameSite protection level: either :none, :lax, or :strict. -# -# This change is not backwards compatible with earlier Rails versions. -# It's best enabled when your entire app is migrated and stable on 6.1. -# Rails.application.config.action_dispatch.cookies_same_site_protection = :lax - -# Generate CSRF tokens that are encoded in URL-safe Base64. -# -# This change is not backwards compatible with earlier Rails versions. -# It's best enabled when your entire app is migrated and stable on 6.1. -# Rails.application.config.action_controller.urlsafe_csrf_tokens = true - -# Specify whether `ActiveSupport::TimeZone.utc_to_local` returns a time with an -# UTC offset or a UTC time. -# ActiveSupport.utc_to_local_returns_utc_offset_times = true - -# Change the default HTTP status code to `308` when redirecting non-GET/HEAD -# requests to HTTPS in `ActionDispatch::SSL` middleware. -# Rails.application.config.action_dispatch.ssl_default_redirect_status = 308 - -# Use new connection handling API. For most applications this won't have any -# effect. For applications using multiple databases, this new API provides -# support for granular connection swapping. -# Rails.application.config.active_record.legacy_connection_handling = false - -# Make `form_with` generate non-remote forms by default. -# Rails.application.config.action_view.form_with_generates_remote_forms = false - -# Set the default queue name for the analysis job to the queue adapter default. -# Rails.application.config.active_storage.queues.analysis = nil - -# Set the default queue name for the purge job to the queue adapter default. -# Rails.application.config.active_storage.queues.purge = nil - -# Set the default queue name for the incineration job to the queue adapter default. -# Rails.application.config.action_mailbox.queues.incineration = nil - -# Set the default queue name for the routing job to the queue adapter default. -# Rails.application.config.action_mailbox.queues.routing = nil - -# Set the default queue name for the mail deliver job to the queue adapter default. -# Rails.application.config.action_mailer.deliver_later_queue_name = nil - -# Generate a `Link` header that gives a hint to modern browsers about -# preloading assets when using `javascript_include_tag` and `stylesheet_link_tag`. -# Rails.application.config.action_view.preload_links_header = true diff --git a/config/initializers/rack-attack.rb b/config/initializers/rack-attack.rb index b66d9762d..1d86c23cd 100644 --- a/config/initializers/rack-attack.rb +++ b/config/initializers/rack-attack.rb @@ -71,6 +71,17 @@ class Rack::Attack req.ip if throttled_path?(req) end + # Captcha gateway gives access for 10 minutes, we don't need to let for more + # than 6 per hour then. + throttle('unauthed captcha gateway request limit per hour', + limit: 6, + period: 1.hour) do |req| + next if req.authenticated? + + Rails.logger.debug "[rack-attack] request limit ip: #{req.ip}, content_type: #{req.content_type}" + req.ip if req.path.include?('captcha_gateway') + end + self.throttled_response = lambda do |_env| Rails.logger.warn "[rack-attack] 429 issued for #{_env['rack.attack.match_discriminator']}" [ diff --git a/config/initializers/rails_admin.rb b/config/initializers/rails_admin.rb index 5f9418518..fd14f541a 100644 --- a/config/initializers/rails_admin.rb +++ b/config/initializers/rails_admin.rb @@ -1,531 +1,529 @@ -Rails.application.config.to_prepare do - require 'rails_admin/config/actions/redact_queue' - require 'rails_admin/config/actions/redact_notice' - require 'rails_admin/config/actions/pdf_requests' - require 'rails_admin/config/actions/statistics' - require 'rails_admin/config/actions/approve_api_submitter_request' - require 'rails_admin/config/actions/reject_api_submitter_request' - require 'rails_admin/config/actions/top_notices_token_urls' - require 'rails_admin/config/fields/types/datetime_timezoned' - - RailsAdmin.config do |config| - config.parent_controller = '::ApplicationController' - - config.main_app_name = ['Lumen Database', 'Admin'] - - config.current_user_method { current_user } +require 'rails_admin/config/actions/redact_queue' +require 'rails_admin/config/actions/redact_notice' +require 'rails_admin/config/actions/pdf_requests' +require 'rails_admin/config/actions/statistics' +require 'rails_admin/config/actions/approve_api_submitter_request' +require 'rails_admin/config/actions/reject_api_submitter_request' +require 'rails_admin/config/actions/top_notices_token_urls' +require 'rails_admin/config/fields/types/datetime_timezoned' + +RailsAdmin.config do |config| + config.parent_controller = '::ApplicationController' + + config.main_app_name = ['Lumen Database', 'Admin'] + + config.current_user_method { current_user } + + config.authorize_with :cancancan + + config.audit_with :history, 'User' + config.audit_with :history, 'Role' + config.audit_with :history, 'Notice' + + boolean_true_icon = '✓'.html_safe + boolean_false_icon = '✘'.html_safe + + config.actions do + dashboard do + statistics false + end + + # collection-wide actions + index + new + export + history_index + bulk_delete + + # member actions + show + edit + delete + history_show + show_in_app + + init_actions! + + redact_queue + redact_notice + pdf_requests + statistics + approve_api_submitter_request + reject_api_submitter_request + top_notices_token_urls + end - config.authorize_with :cancancan + ['Notice', Notice::TYPES].flatten.each do |notice_type| + config.audit_with :history, notice_type - config.audit_with :history, 'User' - config.audit_with :history, 'Role' - config.audit_with :history, 'Notice' + config.model notice_type do + label { abstract_model.model.label } - boolean_true_icon = '✓'.html_safe - boolean_false_icon = '✘'.html_safe + list do + # SELECT COUNT is slow when the number of instances is large; let's + # avoid calling it for Notice and its subclasses. + limited_pagination true - config.actions do - dashboard do - statistics false + field :id + field :title + field(:date_sent) { label 'Sent' } + field(:date_received) { label 'Received' } + field(:created_at) { label 'Submitted' } + field(:original_notice_id) { label 'Legacy NoticeID' } + field :source + field :review_required + field :published + field :time_to_publish + field :body + field :entities + field :topics + field :works + field :url_count + field :action_taken + field :reviewer_id + field :language + field :rescinded + field :type + field :spam + field :hidden + field :request_type + field :webform + field :views_overall + field :views_by_notice_viewer + field :token_urls_count end - # collection-wide actions - index - new - export - history_index - bulk_delete - - # member actions - show - edit - delete - history_show - show_in_app - - init_actions! - - redact_queue - redact_notice - pdf_requests - statistics - approve_api_submitter_request - reject_api_submitter_request - top_notices_token_urls - end - - ['Notice', Notice::TYPES].flatten.each do |notice_type| - config.audit_with :history, notice_type - - config.model notice_type do - label { abstract_model.model.label } - - list do - # SELECT COUNT is slow when the number of instances is large; let's - # avoid calling it for Notice and its subclasses. - limited_pagination true - - field :id - field :title - field(:date_sent) { label 'Sent' } - field(:date_received) { label 'Received' } - field(:created_at) { label 'Submitted' } - field(:original_notice_id) { label 'Legacy NoticeID' } - field :source - field :review_required - field :published - field :time_to_publish - field :body - field :entities - field :topics - field :works - field :url_count - field :action_taken - field :reviewer_id - field :language - field :rescinded - field :type - field :spam - field :hidden - field :request_type - field :webform - field :views_overall - field :views_by_notice_viewer - field :token_urls_count - end - - show do - field :title - field :type - field :published - field :date_received - field :date_sent - field :source - field :subject - field :review_required - field :language - field :rescinded - field :spam - field :hidden - field :restricted_to_researchers do - formatted_value do - bindings[:object].restricted_to_researchers? ? boolean_true_icon : boolean_false_icon - end + show do + field :title + field :type + field :published + field :date_received + field :date_sent + field :source + field :subject + field :review_required + field :language + field :rescinded + field :spam + field :hidden + field :restricted_to_researchers do + formatted_value do + bindings[:object].restricted_to_researchers? ? boolean_true_icon : boolean_false_icon end - field :webform - field :views_overall - field :views_by_notice_viewer - field :temporary_token_urls do - formatted_value do - notice_token_urls_count_links(bindings) - end + end + field :webform + field :views_overall + field :views_by_notice_viewer + field :temporary_token_urls do + formatted_value do + notice_token_urls_count_links(bindings) end - field :permanent_token_urls do - formatted_value do - notice_token_urls_count_links(bindings, true) - end + end + field :permanent_token_urls do + formatted_value do + notice_token_urls_count_links(bindings, true) end - field :topics - field :entity_notice_roles - field :entities - field :works - field :file_uploads end + field :topics + field :entity_notice_roles + field :entities + field :works + field :file_uploads + end - edit do - # This dramatically speeds up the admin page. - configure :works do - nested_form false - end + edit do + # This dramatically speeds up the admin page. + configure :works do + nested_form false + end - configure :action_taken, :enum do - enum do - %w[Yes No Partial Unspecified] - end - default_value 'Unspecified' + configure :action_taken, :enum do + enum do + %w[Yes No Partial Unspecified] end + default_value 'Unspecified' + end - configure(:type) do - hide - end - configure :reset_type, :enum do - label 'Type' - required true - end + configure(:type) do + hide + end + configure :reset_type, :enum do + label 'Type' + required true + end - exclude_fields :topic_assignments, - :topic_relevant_questions, - :infringing_urls, - :copyrighted_urls, - :token_urls, - :entities - - configure :review_required do - visible do - ability = Ability.new(bindings[:view]._current_user) - ability.can? :publish, Notice - end + exclude_fields :topic_assignments, + :topic_relevant_questions, + :infringing_urls, + :copyrighted_urls, + :token_urls, + :entities + + configure :review_required do + visible do + ability = Ability.new(bindings[:view]._current_user) + ability.can? :publish, Notice end + end - configure :rescinded do - visible do - ability = Ability.new(bindings[:view]._current_user) - ability.can? :rescind, Notice - end + configure :rescinded do + visible do + ability = Ability.new(bindings[:view]._current_user) + ability.can? :rescind, Notice end end end end + end - config.model 'Topic' do - list do - field :id - field :name - field :parent do - formatted_value do - parent = bindings[:object].parent - parent && "#{parent.name} - ##{parent.id}" - end + config.model 'Topic' do + list do + field :id + field :name + field :parent do + formatted_value do + parent = bindings[:object].parent + parent && "#{parent.name} - ##{parent.id}" end end - edit do - # exclude_fields :notices might be a better performance option than hide, - # but it prevents topics with null ancestries from being saved. - configure(:notices) { hide } - configure(:topic_assignments) { hide } - - configure :parent_id, :enum do - enum_method do - :parent_enum - end + end + edit do + # exclude_fields :notices might be a better performance option than hide, + # but it prevents topics with null ancestries from being saved. + configure(:notices) { hide } + configure(:topic_assignments) { hide } + + configure :parent_id, :enum do + enum_method do + :parent_enum end end end + end - config.model 'EntityNoticeRole' do - edit do - configure(:notice) { hide } - configure :entity do - nested_form false - end + config.model 'EntityNoticeRole' do + edit do + configure(:notice) { hide } + configure :entity do + nested_form false end end + end - config.model 'Entity' do - list do - # See exclude_fields comment for Topic. - exclude_fields :notices - configure(:entity_notice_roles) { hide } - configure :parent do - formatted_value do - parent = bindings[:object].parent - parent && "#{parent.name} - ##{parent.id}" - end + config.model 'Entity' do + list do + # See exclude_fields comment for Topic. + exclude_fields :notices + configure(:entity_notice_roles) { hide } + configure :parent do + formatted_value do + parent = bindings[:object].parent + parent && "#{parent.name} - ##{parent.id}" end end - edit do - configure :kind, :enum do - enum do - %w[individual organization] - end - default_value 'organization' + end + edit do + configure :kind, :enum do + enum do + %w[individual organization] end - configure(:notices) { hide } - configure(:entity_notice_roles) { hide } - configure(:ancestry) { hide } - # Unfortunately, there are too many entities to make parents editable - # via default rails_admin functionality. - # configure :parent_id, :enum do - # enum_method do - # :parent_enum - # end - # end + default_value 'organization' end + configure(:notices) { hide } + configure(:entity_notice_roles) { hide } + configure(:ancestry) { hide } + # Unfortunately, there are too many entities to make parents editable + # via default rails_admin functionality. + # configure :parent_id, :enum do + # enum_method do + # :parent_enum + # end + # end end + end - config.model 'RelevantQuestion' do - object_label_method { :question } - end - - config.model 'Work' do - object_label_method { :custom_work_label } - - edit do - configure(:notices) { hide } - end + config.model 'RelevantQuestion' do + object_label_method { :question } + end - list do - limited_pagination true - configure(:copyrighted_urls) { hide } - configure(:infringing_urls) { hide } - end + config.model 'Work' do + object_label_method { :custom_work_label } - nested do - configure(:infringing_urls) { hide } - configure(:copyrighted_urls) { hide } - end + edit do + configure(:notices) { hide } end - config.model 'InfringingUrl' do - object_label_method { :url } - - list do - limited_pagination true - end + list do + limited_pagination true + configure(:copyrighted_urls) { hide } + configure(:infringing_urls) { hide } end - config.model 'FileUpload' do - edit do - configure :kind, :enum do - enum do - %w[original supporting] - end - end - end + nested do + configure(:infringing_urls) { hide } + configure(:copyrighted_urls) { hide } end + end - config.model 'ReindexRun' do - end + config.model 'InfringingUrl' do + object_label_method { :url } - def custom_work_label - %Q(#{self.id}: #{self.description && self.description[0,30]}...) + list do + limited_pagination true end + end - config.model 'User' do - object_label_method { :email } - edit do - configure :entity do - nested_form false + config.model 'FileUpload' do + edit do + configure :kind, :enum do + enum do + %w[original supporting] end - configure(:token_urls) { hide } - - field :email - field :password - field :password_confirmation - field :reset_password_sent_at - field :authentication_token - field :widget_public_key - field :publication_delay - field :can_generate_permanent_notice_token_urls - field :allow_generate_permanent_tokens_researchers_only_notices - field :full_notice_views_limit - field :full_notice_time_limit - field :viewed_notices - field :limit_notice_api_response - field :entity - field :roles - field :full_notice_only_researchers_entities - field :widget_submissions_forward_email end + end + end - list do - scopes [nil] + Role::NAMES.sort.map { |role| "#{role}s" } + config.model 'ReindexRun' do + end + + def custom_work_label + %Q(#{self.id}: #{self.description && self.description[0,30]}...) + end - field :email - field :entity - field :roles - field :created_at - field :full_notice_time_limit + config.model 'User' do + object_label_method { :email } + edit do + configure :entity do + nested_form false end + configure(:token_urls) { hide } + + field :email + field :password + field :password_confirmation + field :reset_password_sent_at + field :authentication_token + field :widget_public_key + field :publication_delay + field :can_generate_permanent_notice_token_urls + field :allow_generate_permanent_tokens_researchers_only_notices + field :full_notice_views_limit + field :full_notice_time_limit + field :viewed_notices + field :limit_notice_api_response + field :entity + field :roles + field :full_notice_only_researchers_entities + field :widget_submissions_forward_email + end + + list do + scopes [nil] + Role::NAMES.sort.map { |role| "#{role}s" } + + field :email + field :entity + field :roles + field :created_at + field :full_notice_time_limit end + end - config.model 'TokenUrl' do - token_url_config - end + config.model 'TokenUrl' do + token_url_config + end - config.model 'ArchivedTokenUrl' do - token_url_config - end + config.model 'ArchivedTokenUrl' do + token_url_config + end - config.model 'RiskTriggerCondition' do - edit do - configure :field, :enum do - enum do - RiskTriggerCondition::ALLOWED_FIELDS.sort - end + config.model 'RiskTriggerCondition' do + edit do + configure :field, :enum do + enum do + RiskTriggerCondition::ALLOWED_FIELDS.sort end - configure :matching_type, :enum do - enum do - RiskTriggerCondition::ALLOWED_MATCHING_TYPES - end + end + configure :matching_type, :enum do + enum do + RiskTriggerCondition::ALLOWED_MATCHING_TYPES end end end + end - config.model 'RiskTrigger' do - edit do - configure :matching_type, :enum do - enum do - RiskTrigger::ALLOWED_MATCHING_TYPES - end + config.model 'RiskTrigger' do + edit do + configure :matching_type, :enum do + enum do + RiskTrigger::ALLOWED_MATCHING_TYPES end end end + end - config.model 'LumenSetting' do - edit do - field :value - end + config.model 'LumenSetting' do + edit do + field :value end + end - config.model 'BlockedTokenUrlDomain' do - list do - field :name - field :comments - field :created_at - end + config.model 'BlockedTokenUrlDomain' do + list do + field :name + field :comments + field :created_at end + end - config.model 'BlockedTokenUrlIp' do - list do - field :address - field :comments - field :created_at - end + config.model 'BlockedTokenUrlIp' do + list do + field :address + field :comments + field :created_at end + end - config.model 'MediaMention' do - edit do - configure :scale_of_mention, :enum do - enum do - LumenSetting.get('media_mentions_scale_of_mentions').split(',') - end + config.model 'MediaMention' do + edit do + configure :scale_of_mention, :enum do + enum do + LumenSetting.get('media_mentions_scale_of_mentions').split(',') end - - field :title - field :author - field :description - field :source - field :link_to_source - field :scale_of_mention - field :date - field :document_type - field :comments - field :published - end - end - - config.model 'ApiSubmitterRequest' do - list do - field :id - field :email - field :entity_name - field :entity_url - field :user - field :approved end - edit do - field :email - field :submissions_forward_email - field :approved - field :entity_url - field :description - field :admin_notes - field :entity_name - field :entity_kind - field :entity_address_line_1 - field :entity_address_line_2 - field :entity_state - field :entity_country_code - field :entity_phone - field :entity_url - field :entity_email - field :entity_city - field :entity_zip - field :user - end + field :title + field :author + field :description + field :source + field :link_to_source + field :scale_of_mention + field :date + field :document_type + field :comments + field :published end + end - # Hide unused models from the admin - # == START ============================================================ - config.model 'ReindexRun' do - visible false - end - config.model 'NoticeImportError' do - visible false - end - config.model 'DocumentsUpdateNotificationNotice' do - visible false - end - config.model 'YoutubeImportError' do - visible false - end - config.model 'YtImport' do - visible false + config.model 'ApiSubmitterRequest' do + list do + field :id + field :email + field :entity_name + field :entity_url + field :user + field :approved + end + + edit do + field :email + field :submissions_forward_email + field :approved + field :entity_url + field :description + field :admin_notes + field :entity_name + field :entity_kind + field :entity_address_line_1 + field :entity_address_line_2 + field :entity_state + field :entity_country_code + field :entity_phone + field :entity_url + field :entity_email + field :entity_city + field :entity_zip + field :user end - config.model 'YoutubeImportFileLocation' do - visible false - end - config.model 'ActiveStorage::Blob' do - visible false - end - config.model 'ActiveStorage::Attachment' do - visible false - end - config.model 'ActiveStorage::VariantRecord' do - visible false - end - config.model 'Comfy::Cms::Categorization' do - visible false - end - config.model 'Comfy::Cms::Category' do - visible false - end - config.model 'Comfy::Cms::File' do - visible false - end - config.model 'Comfy::Cms::Fragment' do - visible false - end - config.model 'Comfy::Cms::Layout' do - visible false - end - config.model 'Comfy::Cms::Page' do - visible false - end - config.model 'Comfy::Cms::Revision' do - visible false - end - config.model 'Comfy::Cms::Site' do - visible false - end - config.model 'Comfy::Cms::Snippet' do - visible false - end - config.model 'Comfy::Cms::Translation' do - visible false - end - # == END ============================================================ + end - def notice_token_urls_count_links(bindings, perm = false) - bindings[:object].token_urls.where(valid_forever: perm).count - end + # Hide unused models from the admin + # == START ============================================================ + config.model 'ReindexRun' do + visible false + end + config.model 'NoticeImportError' do + visible false + end + config.model 'DocumentsUpdateNotificationNotice' do + visible false + end + config.model 'YoutubeImportError' do + visible false + end + config.model 'YtImport' do + visible false + end + config.model 'YoutubeImportFileLocation' do + visible false + end + config.model 'ActiveStorage::Blob' do + visible false + end + config.model 'ActiveStorage::Attachment' do + visible false + end + config.model 'ActiveStorage::VariantRecord' do + visible false + end + config.model 'Comfy::Cms::Categorization' do + visible false + end + config.model 'Comfy::Cms::Category' do + visible false + end + config.model 'Comfy::Cms::File' do + visible false + end + config.model 'Comfy::Cms::Fragment' do + visible false + end + config.model 'Comfy::Cms::Layout' do + visible false + end + config.model 'Comfy::Cms::Page' do + visible false + end + config.model 'Comfy::Cms::Revision' do + visible false + end + config.model 'Comfy::Cms::Site' do + visible false + end + config.model 'Comfy::Cms::Snippet' do + visible false + end + config.model 'Comfy::Cms::Translation' do + visible false + end + # == END ============================================================ - def token_url_config - list do - field :email - field :user - field :notice - field :expiration_date - field(:valid_forever) { label 'Permenent' } - field :views - field :created_at - field :ip - end + def notice_token_urls_count_links(bindings, perm = false) + bindings[:object].token_urls.where(valid_forever: perm).count + end - edit do - field :email do - required false - end - field :user - field :notice do - required true - end - field :expiration_date - field(:valid_forever) { label 'Permenent' } - field :documents_notification + def token_url_config + list do + field :email + field :user + field :notice + field :expiration_date + field(:valid_forever) { label 'Permenent' } + field :views + field :created_at + field :ip + end + + edit do + field :email do + required false + end + field :user + field :notice do + required true end + field :expiration_date + field(:valid_forever) { label 'Permenent' } + field :documents_notification end end end diff --git a/config/routes.rb b/config/routes.rb index 2959aa6f1..0ba443e0f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -74,6 +74,8 @@ resources :api_submitter_requests + resources :captcha_gateway, only: :index + root to: 'home#index' comfy_route :cms_admin, path: "/cms_admin" diff --git a/public/robots.txt b/public/robots.txt index a162fa872..bf5633029 100644 --- a/public/robots.txt +++ b/public/robots.txt @@ -8,15 +8,18 @@ Allow: /$ Allow: /pages Disallow: /notices Disallow: /faceted_search +Disallow: /captcha_gateway User-agent: ia_archiver Allow: / Disallow: /faceted_search +Disallow: /captcha_gateway User-agent: * Disallow: / Disallow: /notices Disallow: /faceted_search +Disallow: /captcha_gateway Allow: /pages Allow: /$