decidim-cdtb 0.5.0 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4545daf0386a7705e4c372eb8a0c49812d2e9b7bb35e9cb704b4d3c4d0a8958a
-  data.tar.gz: c8c831e68a8766c2bf3cd4a1486ce7bfc1c199aa150a285b21e1abc23e856eab
+  metadata.gz: 6241713e113ab066abfe43c43d7262929e758583440148ef3410d12c3a4375b7
+  data.tar.gz: 15ff2f42ce709a998482e7790259f645be2ea914bef19298f09f30ba907e3272
 SHA512:
-  metadata.gz: 33c54f1f56b68b0b15ae5aed1338c81e236808d14bb7c2e8055eb3dbc7add79aa85e28c8a14e06c63b855713a4265dfaaba2cbb09f8f4c89911ed43285ab2d88
-  data.tar.gz: b0001f706bf9083b3049bc223644bd44d41373e56cff44870c092c867bc6054034eaef8a9f96813d3da3cdfe7df83749877c6c3235831e4c6d5499779444df87
+  metadata.gz: 4092451ddead10f5af1f2f298258f99ba1b1ebf8e0844d8707be6471a042986042da6a7483ed42145f23c8cdc316d8d15110bc201d4e23e9cdfe139efc8174d5
+  data.tar.gz: 8ae262af44f440fdeeae32e0f4c664d724e8d51eb5241f617a05da92e1604e6734ba4d5a74ed5c06f209c303c712153193565e7128bba598efa873fd7ebbcdee

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 ## [Unreleased]
 
+## [0.5.3] - 2025-07-10 (patch - Aperitius explosius)
+
+- Add "cdtb" in RackAttack logs to ease finding them.
+- Optimize Users::Remover task, retrieve reporter_user only once
+- Update way of retrieving manifest form attributes on census task
+- Check zeitwerk class loading.
+
+## [0.5.2] - 2025-05-23 (patch - Sense por ni flotador)
+
+- Update validate_migrations generator template.
+- Add last_sign_in_at to spam users detector.
+
+## [0.5.1] - 2025-04-14 (minor - Diferents però igual)
+
+- Add remove ActionLogs of users on remove users task.
+- Fix error on add content blocks task.
+
 ## [0.5.0] - 2025-04-28 (minor - Unes roques molt gracioses)
 
 - Add task to export the list of admins.

data/Gemfile.lock

@@ -141,7 +141,7 @@ GIT
 PATH
   remote: .
   specs:
-    decidim-cdtb (0.5.0)
+    decidim-cdtb (0.5.3)
       decidim (>= 0.28.0)
       rails (>= 6)
       ruby-progressbar

data/README.md

@@ -12,8 +12,10 @@ Install the gem and add to the application's Gemfile by executing:
 
 Install CI tests on your app with:
 
-    $ bin/rails generate cdtb:validate_migrations_ci
-
+    $ bin/rails g cdtb:github_actions:github_actions ci_app
+    $ bin/rails g cdtb:github_actions:github_actions linters
+    $ bin/rails g cdtb:github_actions:github_actions validate_migrations
+    $ bin/rails g cdtb:github_actions:github_actions zeitwerk
 
 ## Usage
 

data/config/initializers/rack_attack.rb

@@ -17,17 +17,17 @@ unless ENV["CDTB_RACK_ATTACK_DISABLED"].to_i.positive? || %w[development test].i
   limit= ENV.fetch("RACK_ATTACK_THROTTLE_LIMIT", 30)
   period= ENV.fetch("RACK_ATTACK_THROTTLE_PERIOD", 60)
   Rails.logger.info("Configuring Rack::Attack.throttle with limit: #{limit}, period: #{period}")
-  Rack::Attack.throttle("requests by ip", limit: limit.to_i, period: period.to_i) do |request|
+  Rack::Attack.throttle("cdtb: requests by ip", limit: limit.to_i, period: period.to_i) do |request|
     # ignore requests to assets
     next if request.path.start_with?("/rails/active_storage")
 
     extract_ip(request)
   end
 
-  limit= ENV.fetch("RACK_ATTACK_THROTTLE_RANGE_LIMIT", 10)
-  period= ENV.fetch("RACK_ATTACK_THROTTLE_RANGE_PERIOD", 20)
+  limit= ENV.fetch("RACK_ATTACK_THROTTLE_RANGE_LIMIT", 30)
+  period= ENV.fetch("RACK_ATTACK_THROTTLE_RANGE_PERIOD", 60)
   Rails.logger.info("Configuring Rack::Attack.throttle with limits for IP Ranges: #{limit}, period: #{period}")
-  Rack::Attack.throttle("requests by ip range", limit: limit.to_i, period: period.to_i) do |request|
+  Rack::Attack.throttle("cdtb: requests by ip range", limit: limit.to_i, period: period.to_i) do |request|
     # ignore requests to assets
     next if request.path.start_with?("/rails/active_storage")
 
@@ -37,13 +37,13 @@ unless ENV["CDTB_RACK_ATTACK_DISABLED"].to_i.positive? || %w[development test].i
     # rubocop: enable Lint/UselessAssignment
   end
 
-  Rack::Attack.blocklist("block all /.well-known/traffic-advice") do |request|
+  Rack::Attack.blocklist("cdtb: block all /.well-known/traffic-advice") do |request|
     request.path.start_with?("/.well-known/traffic-advice")
   end
 
   if ENV["RACK_ATTACK_BLOCKED_IPS"].present?
     blocked_ips_and_subnets= ENV["RACK_ATTACK_BLOCKED_IPS"].split(",")
-    Rack::Attack.blocklist("block all unaccepted IPs") do |request|
+    Rack::Attack.blocklist("cdtb:block all unaccepted IPs") do |request|
       ip= extract_ip(request)
       blocked_ips_and_subnets.any? { |ip_or_subnet| ip.start_with?(ip_or_subnet) }
     end

data/lib/decidim/cdtb/participatory_spaces/add_content_blocks.rb

@@ -73,6 +73,7 @@ module Decidim
 
           current_content_blocks.each do |content_block|
             # hero is usually the first content block
+            next if content_block.nil?
             next if content_block == extra_data_content_block || content_block.manifest_name == "hero"
 
             content_block.update(weight: content_block.weight + 10)

data/lib/decidim/cdtb/spam/{user_spam_detector.rb → spam_users_detector.rb}

@@ -7,7 +7,7 @@ module Decidim
     module Spam
       # Detect spam behavior in users
       #
-      class UserSpamDetector < ::Decidim::Cdtb::Task
+      class SpamUsersDetector < ::Decidim::Cdtb::Task
         # rubocop:disable Style/RedundantRegexpEscape
         URL_REGEX = %r{(https?:\/\/(?:www\.|(?!www))[a-zA-Z0-9][a-zA-Z0-9-]+[a-zA-Z0-9]\.[^\s]{2,}|
         www\.[a-zA-Z0-9][a-zA-Z0-9-]+[a-zA-Z0-9]\.[^\s]{2,}|https?:\/\/(?:www\.|
@@ -44,7 +44,7 @@ module Decidim
           filepath= Rails.env.test? ? "tmp/#{filename}" : filename
           CSV.open(filepath, "w") do |csv|
             csv_headers = ["ID", "Is suspicious?", "Name", "Email", "Nickname", "Personal URL", "About",
-                           "Organization ID", "Organization Name"]
+                           "Organization ID", "Organization Name", "Last Sign In At"]
             csv << csv_headers
 
             @users.find_each do |user|
@@ -56,7 +56,7 @@ module Decidim
               end
 
               csv << [user.id, suspicious, user.name, user.email, user.nickname, user.personal_url, user.about,
-                      user.organization.id, user.organization.name]
+                      user.organization.id, user.organization.name, user.last_sign_in_at&.strftime(Decidim::Cdtb::STRFTIME_FORMAT)]
 
               progress_bar.increment
             end

data/lib/decidim/cdtb/tasks.rb

@@ -8,7 +8,7 @@ require "decidim/cdtb/users/remover"
 require "decidim/cdtb/multitenants/org_by_host_like"
 require "decidim/cdtb/participatory_spaces/add_content_blocks"
 require "decidim/cdtb/participatory_spaces/move_images_to_content_block"
-require "decidim/cdtb/spam/user_spam_detector"
+require "decidim/cdtb/spam/spam_users_detector"
 require "decidim/cdtb/storage/local_sharding"
 require "decidim/cdtb/storage/set_local_on_blobs"
 require "decidim/cdtb/upgrades/validate_migrations_task"

data/lib/decidim/cdtb/users/remover.rb

@@ -7,7 +7,8 @@ module Decidim
       #
       # rubocop:disable Metrics/ClassLength
       class Remover < ::Decidim::Cdtb::Task
-        def initialize(csv_path, reporter_user_email)
+        def initialize(organization, csv_path, reporter_user_email)
+          @organization= organization
           @csv_path = csv_path
           @reporter_user_email = reporter_user_email
           progress_bar = { title: "Decidim::User" }
@@ -24,7 +25,10 @@ module Decidim
         def do_execution(context)
           progress_bar = context[:progress_bar]
 
-          emails_on_moderations = Decidim::User.where(email_on_moderations: true).pluck(:email)
+          reporter_user = @organization.users.find_by(email: @reporter_user_email,
+                                                      organization: user.organization)
+
+          emails_on_moderations = @organization.users.where(email_on_moderations: true).pluck(:email)
 
           disable_email_moderations(emails_on_moderations)
 
@@ -32,11 +36,12 @@ module Decidim
             user = Decidim::User.find_by(id: row[0])
             next unless user.present?
 
-            reporter_user = Decidim::User.find_by(email: @reporter_user_email,
-                                                  organization: user.organization)
             comments = Decidim::Comments::Comment.where(decidim_author_id: user.id)
             manage_comments(comments, user, reporter_user) unless comments.empty?
-            destroy_user(user) if block_user(user, reporter_user)
+            if block_user(user, reporter_user)
+              remove_action_logs_by(user)
+              destroy_user(user)
+            end
             progress_bar.increment
           end
         ensure
@@ -53,28 +58,18 @@ module Decidim
         def disable_email_moderations(users_emails)
           log_task_step("Disabling email on moderations...")
 
-          users = Decidim::User.where(email: users_emails)
-
-          users.find_each do |user|
-            user.email_on_moderations = false
-            user.save(validate: false)
-          end
+          Decidim::User.where(email: users_emails).update_all(email_on_moderations: false)
         end
 
         def enable_email_moderations(users_emails)
           log_task_step("Enabling email on moderations...")
 
-          users = Decidim::User.where(email: users_emails)
-
-          users.find_each do |user|
-            user.email_on_moderations = true
-            user.save(validate: false)
-          end
+          Decidim::User.where(email: users_emails).update_all(email_on_moderations: true)
         end
 
         def manage_comments(comments, user, reporter_user)
           comments.find_each do |comment|
-            report_comment(comment, user, reporter_user)
+            report_comment(comment, user, reporter_user) unless comment.reported?
             hide_comment(comment, user, reporter_user) unless comment.hidden?
           end
         end
@@ -163,6 +158,12 @@ module Decidim
             current_participatory_space: comment.participatory_space
           }
         end
+
+        def remove_action_logs_by(user)
+          puts "Removing ActionLog from user #{user.id}..."
+
+          ActiveRecord::Base.connection.execute("DELETE FROM decidim_action_logs WHERE decidim_user_id = #{user.id}")
+        end
       end
       # rubocop:enable Metrics/ClassLength
     end

data/lib/decidim/cdtb/version.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module Cdtb
-    VERSION = "0.5.0"
+    VERSION = "0.5.3"
     DECIDIM_MIN_VERSION = ">= 0.28.0"
   end
 end

data/lib/generators/cdtb/github_actions/USAGE

@@ -0,0 +1,14 @@
+Description:
+    Installs a GitHub workflow to validate that all migrations from all engines have been installed
+
+    Available workflows:
+    - linters: Analizes app artifacts with Rubocop.
+    - ci_app: Runs Rspec specs for the Rails app.
+    - validate_migrations: Validates that the app has the migrations from all gems already installed.
+    - zeitwerk: Cheks that all artifacts accomplish with Zeitwerk's loading rules.
+
+Example:
+    rails generate cdtb:github_actions:github_actions validate_migrations
+
+    This will create:
+        .github/workflows/validate_migrations.yml

data/lib/generators/cdtb/github_actions/github_actions_generator.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Cdtb
+  module GithubActions
+    # Generates the given GitHub workflow that validates that the app has the migrations from all gems already installed
+    class GithubActionsGenerator < Rails::Generators::NamedBase
+      source_root File.expand_path("templates", __dir__)
+
+      def copy_github_workflow_file
+        copy_file "#{file_name}.yml", ".github/workflows/#{file_name}.yml"
+      end
+
+      def replace_ruby_version
+        path= File.join(Rails.root, ".ruby-version")
+        return unless File.exist?(path)
+
+        ruby_version= File.read(path).strip
+        gsub_file ".github/workflows/#{file_name}.yml", /RUBY_VERSION: \d+\.\d+\.\d+/, "RUBY_VERSION: #{ruby_version}"
+      end
+
+      def replace_node_version
+        path= File.join(Rails.root, ".node-version")
+        return unless File.exist?(path)
+
+        node_version= File.read(path).strip
+        gsub_file ".github/workflows/#{file_name}.yml", /NODE_VERSION: \d+\.\d+\.\d+/, "NODE_VERSION: #{node_version}"
+      end
+    end
+  end
+end

data/lib/generators/cdtb/github_actions/templates/ci_app.yml

@@ -0,0 +1,92 @@
+name: "[CI] App"
+
+on:
+  push:
+    branches:
+      - master
+      - release/*
+      - "*-stable"
+  pull_request:
+
+env:
+  RUBY_VERSION: 3.1.7
+  NODE_VERSION: 16.9.1
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    services:
+      postgres:
+        image: postgres:11
+        ports: ["5432:5432"]
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        env:
+          POSTGRES_PASSWORD: postgres
+      redis:
+        image: redis:3.2-alpine
+        ports: ["6379:6379"]
+    env:
+      DB_TEST_DATABASE: app-test
+      DB_DATABASE: app
+      DB_USERNAME: postgres
+      DB_PASSWORD: postgres
+      DB_HOST: localhost
+      SECRET_KEY_BASE: "secret_key_base"
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+      - uses: ruby/setup-ruby@master
+        with:
+          ruby-version: ${{ env.RUBY_VERSION }}
+          bundler-cache: true
+
+      # Workaround https://github.com/decidim/decidim/issues/12369
+      - uses: nanasess/setup-chromedriver@v2
+        with:
+          chromedriver-version: 119.0.6045.105
+
+      - name: List Chrome
+        run: apt list --installed | grep chrome
+
+      - name: Remove Chrome
+        run: sudo apt remove google-chrome-stable
+
+      - uses: browser-actions/setup-chrome@v1
+        with:
+          chrome-version: 119.0.6045.105
+
+      - name: Recover Ruby dependency cache
+        uses: actions/cache@v4
+        with:
+          path: ./vendor/bundle
+          key: ${{ runner.OS }}-app-rubydeps-${{ hashFiles('Gemfile.lock') }}
+          restore-keys: |
+            ${{ runner.OS }}-app-rubydeps-${{ env.cache-name }}-
+            ${{ runner.OS }}-app-rubydeps-
+
+      - name: Set bundle local config vendor/bundle path
+        run: bundle config set --local path 'vendor/bundle'
+
+      - name: Install Ruby deps
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 10
+          max_attempts: 3
+          retry_on: error
+          command: bundle install --jobs 4 --retry 3
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+          cache: 'npm'
+      - run: npm install
+      - run: bundle exec rake db:test:prepare
+        name: Setup database
+      - run: bundle exec rspec
+        name: Run specs

data/lib/generators/cdtb/github_actions/templates/linters.yml

@@ -0,0 +1,48 @@
+name: "[CI] Lint / Lint code"
+
+on:
+  push:
+    branches:
+      - master
+      - release/*
+      - "*-stable"
+  pull_request:
+
+env:
+  RUBY_VERSION: 3.1.7
+
+jobs:
+  test-report:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+
+      - uses: ruby/setup-ruby@master
+        with:
+          ruby-version: ${{ env.RUBY_VERSION }}
+
+      - name: Recover Ruby dependency cache
+        uses: actions/cache@v4
+        with:
+          path: ./vendor/bundle
+          key: ${{ runner.OS }}-rubydeps-${{ hashFiles('Gemfile.lock') }}
+          restore-keys: |
+            ${{ runner.OS }}-rubydeps-${{ env.cache-name }}-
+            ${{ runner.OS }}-rubydeps-
+            ${{ runner.OS }}-
+
+      - name: Set bundle local config configvendor/bundle path
+        run: bundle config set --local path 'vendor/bundle'
+
+      - name: Install Ruby deps
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 10
+          max_attempts: 3
+          command: bundle install --jobs 4 --retry 3
+
+      - name: Rubocop
+        run: bundle exec rubocop -P

data/lib/generators/cdtb/{templates → github_actions/templates}/validate_migrations.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     services:
       postgres:
-        image: postgres:11
+        image: postgres:16
         ports: ["5432:5432"]
         options: >-
           --health-cmd pg_isready
@@ -36,7 +36,7 @@ jobs:
       SECRET_KEY_BASE: "secret_key_base"
 
     steps:
-      - uses: actions/checkout@v2.0.0
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
       - uses: ruby/setup-ruby@master
@@ -44,7 +44,7 @@ jobs:
           ruby-version: ${{ env.RUBY_VERSION }}
           bundler-cache: true
       - name: Recover Ruby dependency cache
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ./vendor/bundle
           key: ${{ runner.OS }}-app-rubydeps-${{ hashFiles('Gemfile.lock') }}
@@ -56,7 +56,7 @@ jobs:
         run: bundle config set --local path 'vendor/bundle'
 
       - name: Install Ruby deps
-        uses: nick-invision/retry@v2
+        uses: nick-fields/retry@v3
         with:
           timeout_minutes: 10
           max_attempts: 3

data/lib/generators/cdtb/github_actions/templates/zeitwerk.yml

@@ -0,0 +1,48 @@
+name: "[CI] Check Zeitwerk Class Loading"
+
+on:
+  push:
+    branches:
+      - master
+      - release/*
+      - "*-stable"
+  pull_request:
+
+env:
+  RUBY_VERSION: 3.1.7
+
+jobs:
+  test-report:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+
+      - uses: ruby/setup-ruby@master
+        with:
+          ruby-version: ${{ env.RUBY_VERSION }}
+
+      - name: Recover Ruby dependency cache
+        uses: actions/cache@v4
+        with:
+          path: ./vendor/bundle
+          key: ${{ runner.OS }}-rubydeps-${{ hashFiles('Gemfile.lock') }}
+          restore-keys: |
+            ${{ runner.OS }}-rubydeps-${{ env.cache-name }}-
+            ${{ runner.OS }}-rubydeps-
+            ${{ runner.OS }}-
+
+      - name: Set bundle local config configvendor/bundle path
+        run: bundle config set --local path 'vendor/bundle'
+
+      - name: Install Ruby deps
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 10
+          max_attempts: 3
+          command: bundle install --jobs 4 --retry 3
+
+      - name: Check zeitwerk class loading
+        run: bundle exec rails zeitwerk:check

data/lib/tasks/census.rake

@@ -11,7 +11,7 @@ namespace :cdtb do
       puts "Verification Handlers in this Decidim application:"
       Decidim.authorization_handlers.each do |manifest|
         attrs= if manifest.form.present?
-                 manifest.form.constantize.attribute_set.to_a.map(&:name).excluding(:id, :user, :handler_name).join(", ")
+                 manifest.form.constantize.attribute_names.excluding("id", "user", "handler_name").join(", ")
                else
                  "No form."
                end

data/lib/tasks/spam.rake

@@ -2,11 +2,11 @@
 
 namespace :cdtb do
   namespace :spam do
-    desc "Show a list with users suspected of spam"
+    desc "Show a list with users suspicious of being spammers"
     task :users, %i[org_id] => :environment do |_task, args|
       organization = args.org_id.present? ? Decidim::Organization.find(args.org_id) : nil
 
-      detector = Decidim::Cdtb::Spam::UserSpamDetector.new(organization)
+      detector = Decidim::Cdtb::Spam::SpamUsersDetector.new(organization)
       detector.execute!
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-cdtb
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.3
 platform: ruby
 authors:
 - Oliver Valls
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-04-28 00:00:00.000000000 Z
+date: 2025-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim
@@ -96,7 +96,7 @@ files:
 - lib/decidim/cdtb/participatory_spaces/add_content_blocks.rb
 - lib/decidim/cdtb/participatory_spaces/manages_content_blocks.rb
 - lib/decidim/cdtb/participatory_spaces/move_images_to_content_block.rb
-- lib/decidim/cdtb/spam/user_spam_detector.rb
+- lib/decidim/cdtb/spam/spam_users_detector.rb
 - lib/decidim/cdtb/storage/local_sharding.rb
 - lib/decidim/cdtb/storage/set_local_on_blobs.rb
 - lib/decidim/cdtb/task.rb
@@ -107,9 +107,12 @@ files:
 - lib/decidim/cdtb/upgrades/validate_migrations_task.rb
 - lib/decidim/cdtb/users/remover.rb
 - lib/decidim/cdtb/version.rb
-- lib/generators/cdtb/USAGE
-- lib/generators/cdtb/templates/validate_migrations.yml
-- lib/generators/cdtb/validate_migrations_ci_generator.rb
+- lib/generators/cdtb/github_actions/USAGE
+- lib/generators/cdtb/github_actions/github_actions_generator.rb
+- lib/generators/cdtb/github_actions/templates/ci_app.yml
+- lib/generators/cdtb/github_actions/templates/linters.yml
+- lib/generators/cdtb/github_actions/templates/validate_migrations.yml
+- lib/generators/cdtb/github_actions/templates/zeitwerk.yml
 - lib/tasks/anonymize.rake
 - lib/tasks/census.rake
 - lib/tasks/fix_youtube_embeds.rake

data/lib/generators/cdtb/USAGE

@@ -1,8 +0,0 @@
-Description:
-    Installs a GitHub workflow to validate that all migrations from all engines have been installed
-
-Example:
-    rails generate validate_migrations
-
-    This will create:
-        .github/workflows/validate_migrations.yml

data/lib/generators/cdtb/validate_migrations_ci_generator.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-module Cdtb
-  # Generates the GitHub workflow that validates that the app has the migrations from all gems already installed
-  class ValidateMigrationsCiGenerator < Rails::Generators::Base
-    source_root File.expand_path("templates", __dir__)
-
-    def copy_github_workflow_file
-      copy_file "validate_migrations.yml", ".github/workflows/validate_migrations.yml"
-    end
-  end
-end