+ <%= f.invisible_captcha :osuny_verification %>
+ <%= hashcash_hidden_field_tag %>
<%= f.input :email,
required: true,
input_html: {
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index 4cee540f2a..425b965076 100644
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -38,6 +38,8 @@
<%= simple_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
+ <%= f.invisible_captcha :osuny_verification %>
+ <%= hashcash_hidden_field_tag %>
<%= f.input :email,
required: false,
autofocus: true,
diff --git a/config/initializers/active_hashcash.rb b/config/initializers/active_hashcash.rb
new file mode 100644
index 0000000000..e97273492b
--- /dev/null
+++ b/config/initializers/active_hashcash.rb
@@ -0,0 +1 @@
+ActiveHashcash.bits = 18
diff --git a/config/initializers/invisible_captcha.rb b/config/initializers/invisible_captcha.rb
new file mode 100644
index 0000000000..749bf310ec
--- /dev/null
+++ b/config/initializers/invisible_captcha.rb
@@ -0,0 +1,6 @@
+InvisibleCaptcha.setup do |config|
+ # Timestamp check enabled except in test environment
+ config.timestamp_enabled = !Rails.env.test?
+ # Spinner check enabled except in test environment
+ config.spinner_enabled = !Rails.env.test?
+end
\ No newline at end of file
diff --git a/db/migrate/20250224215711_create_active_hashcash_stamps.active_hashcash.rb b/db/migrate/20250224215711_create_active_hashcash_stamps.active_hashcash.rb
new file mode 100644
index 0000000000..af04483b6a
--- /dev/null
+++ b/db/migrate/20250224215711_create_active_hashcash_stamps.active_hashcash.rb
@@ -0,0 +1,26 @@
+# This migration comes from active_hashcash (originally 20240215143453)
+class CreateActiveHashcashStamps < ActiveRecord::Migration[7.2]
+ def change
+ create_table :active_hashcash_stamps do |t|
+ t.string :version, null: false
+ t.integer :bits, null: false
+ t.date :date, null: false
+ t.string :resource, null: false
+ t.string :ext, null: false
+ t.string :rand, null: false
+ t.string :counter, null: false
+ t.string :request_path
+ t.string :ip_address
+
+ if t.respond_to?(:jsonb)
+ t.jsonb :context # SQLite JSONB support from version 3.45 (2024-01-15)
+ elsif t.respond_to?(:json)
+ t.json :context
+ end
+
+ t.timestamps
+ end
+ add_index :active_hashcash_stamps, [:ip_address, :created_at], where: "ip_address IS NOT NULL"
+ add_index :active_hashcash_stamps, [:counter, :rand, :date, :resource, :bits, :version, :ext], name: "index_active_hashcash_stamps_unique", unique: true
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index fc7923f350..63ea4c7229 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema[7.2].define(version: 2025_02_07_120835) do
+ActiveRecord::Schema[7.2].define(version: 2025_02_24_215711) do
# These are extensions that must be enabled in order to support this database
enable_extension "pg_trgm"
enable_extension "pgcrypto"
@@ -27,6 +27,23 @@
t.index ["record_type", "record_id", "name"], name: "index_action_text_rich_texts_uniqueness", unique: true
end
+ create_table "active_hashcash_stamps", force: :cascade do |t|
+ t.string "version", null: false
+ t.integer "bits", null: false
+ t.date "date", null: false
+ t.string "resource", null: false
+ t.string "ext", null: false
+ t.string "rand", null: false
+ t.string "counter", null: false
+ t.string "request_path"
+ t.string "ip_address"
+ t.jsonb "context"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.index ["counter", "rand", "date", "resource", "bits", "version", "ext"], name: "index_active_hashcash_stamps_unique", unique: true
+ t.index ["ip_address", "created_at"], name: "index_active_hashcash_stamps_on_ip_address_and_created_at", where: "(ip_address IS NOT NULL)"
+ end
+
create_table "active_storage_attachments", id: :uuid, default: -> { "public.gen_random_uuid()" }, force: :cascade do |t|
t.string "name", null: false
t.string "record_type", null: false
diff --git a/test/controllers/users/registrations_controller_test.rb b/test/controllers/users/registrations_controller_test.rb
index 142aea363c..e09c986523 100644
--- a/test/controllers/users/registrations_controller_test.rb
+++ b/test/controllers/users/registrations_controller_test.rb
@@ -1,6 +1,8 @@
require "test_helper"
class Users::RegistrationsControllerTest < ActionDispatch::IntegrationTest
+ ActiveHashcash.bits = 2
+
def test_extranet_create
host! default_extranet.host
default_extranet.connect(olivia)
@@ -12,7 +14,8 @@ def test_extranet_create
password: "MyP4ssw0rd!",
password_confirmation: "MyP4ssw0rd!",
language_id: french.id
- }
+ },
+ hashcash: ActiveHashcash::Stamp.mint(host).to_s
}
assert_redirected_to root_path
user = User.find_by(email: olivia.email)