collavre_github 0.6.3 → 0.7.0

data/app/services/collavre_github/webhook_reprovisioner.rb

@@ -0,0 +1,118 @@
+module CollavreGithub
+  # Reconciles every ID-backed repository hook with WebhookProvisioner's current
+  # event list. New event subscriptions in code do not change hooks already
+  # stored at GitHub, so deploys run this once after the new app is live.
+  #
+  # Name-only legacy rows are never mutated automatically. Older provisioners
+  # copied a hook registration and secret to every same-name row, so neither
+  # value is independent proof that a legacy row belongs to the repository
+  # currently owning that name. Their presence is reported as requiring manual
+  # verification so deploys cannot silently leave them unreconciled.
+  class WebhookReprovisioner
+    def self.call(webhook_url: default_webhook_url)
+      new(webhook_url: webhook_url).call
+    end
+
+    def self.default_webhook_url
+      CollavreGithub::Engine.routes.url_helpers.webhooks_url(
+        Rails.application.config.action_mailer.default_url_options
+      )
+    end
+
+    def initialize(webhook_url:)
+      @webhook_url = webhook_url
+    end
+
+    def call
+      repository_names.map do |repository_name|
+        [ repository_name, reprovision(repository_name) ]
+      end
+    end
+
+    private
+
+    attr_reader :webhook_url
+
+    def repository_names
+      CollavreGithub::RepositoryLink
+        .order(:id)
+        .pluck(:repository_full_name)
+        .filter_map { |name| name.to_s.downcase.presence }
+        .uniq
+        .sort
+    end
+
+    def reprovision(repository_name)
+      links = CollavreGithub::RepositoryLink
+        .where("LOWER(repository_full_name) = ?", repository_name)
+        .order(:id)
+        .to_a
+      manual_verification_required = links.any? { |link| link.repository_id.blank? }
+      failed = false
+
+      links.select { |link| link.repository_id.present? }.each do |candidate|
+        repository_id = candidate.repository_id
+        status = CollavreGithub::RepositoryProvisioningLock.with_lock(repository_id) do
+          locked_candidate = CollavreGithub::RepositoryLink.find_by(
+            id: candidate.id,
+            repository_id: repository_id
+          )
+          next :skipped_unverified unless locked_candidate
+          next :failed unless locked_candidate.github_account
+
+          link = establish_repository_identity(locked_candidate)
+          next :skipped_unverified unless link
+
+          result = CollavreGithub::WebhookProvisioner.ensure_for_links(
+            account: link.github_account,
+            links: [ link ],
+            webhook_url: webhook_url,
+            force_hook_refresh: true
+          )
+          result.first&.last || :failed
+        end
+
+        if status == :failed
+          failed = true
+          next
+        end
+        next if status == :skipped_unverified
+
+        return :manual_verification_required if manual_verification_required
+
+        return status
+      rescue => e
+        failed = true
+        log_failure(repository_name, e)
+      end
+
+      return :failed if failed
+      return :manual_verification_required if manual_verification_required
+
+      :skipped_unverified
+    end
+
+    def log_failure(repository_name, error)
+      Rails.logger.warn(
+        "[CollavreGithub::WebhookReprovisioner] #{repository_name} failed: " \
+        "#{error.class}: #{error.message}"
+      )
+    end
+
+    def establish_repository_identity(link)
+      return if link.repository_id.blank?
+
+      client = CollavreGithub::Client.new(link.github_account)
+      identity = client.repository_identity(link.repository_full_name)
+      return if identity&.id.blank? || identity&.full_name.blank?
+      return if link.repository_id.to_s != identity.id.to_s
+
+      synchronized = CollavreGithub::RepositoryIdentitySynchronizer.call(
+        anchor: link,
+        repository_id: identity.id,
+        full_name: identity.full_name
+      )
+      synchronized.find { |candidate| candidate.creative_id == link.creative_id }
+    end
+  end
+end

data/config/locales/en.yml

@@ -107,6 +107,7 @@ en:
         closed_message: "%{label} was **%{verb}**. Detaching channel."
         attached_message: "%{label} monitoring started.\n\n%{url}"
         reopened_message: "%{label} was reopened. Monitoring resumed.\n\n%{url}"
+        auth_failure_message: "⚠️ A GitHub webhook delivery for `%{repo}` could not be verified, so events for %{label} are **not being received**.\n\nThis usually means the repository was renamed or its webhook secret was changed. Re-run the GitHub integration setup for this repository to restore delivery.\n\n%{url}"
         badge:
           open: "Open"
           merged: "Merged"

data/config/locales/ko.yml

@@ -107,6 +107,7 @@ ko:
         closed_message: "%{label}이(가) **%{verb}** 되었습니다. 채널을 해제합니다."
         attached_message: "%{label} 모니터링이 시작되었습니다.\n\n%{url}"
         reopened_message: "%{label}이(가) 재오픈되어 모니터링이 재개되었습니다.\n\n%{url}"
+        auth_failure_message: "⚠️ `%{repo}` 저장소의 GitHub 웹훅 전달을 검증하지 못해 %{label}의 이벤트를 **수신하지 못하고 있습니다**.\n\n저장소 이름이 변경되었거나 웹훅 시크릿이 바뀐 경우입니다. 해당 저장소의 GitHub 연동 설정을 다시 실행하면 복구됩니다.\n\n%{url}"
         badge:
           open: "열림"
           merged: "머지됨"

data/config/routes.rb

@@ -1,9 +1,19 @@
 CollavreGithub::Engine.routes.draw do
-  # Webhook endpoint (public, no auth)
-  # Both singular and plural for backward compatibility
-  post "webhook", to: "webhooks#create", as: :webhook
+  # Webhook endpoint (public, no auth).
   post "webhooks", to: "webhooks#create"
 
+  # Deprecated singular alias, kept only until no repository points a hook at
+  # it. Repos provisioned before the plural path existed still target this URL,
+  # and nothing migrates them at deploy time — `WebhookProvisioner` deletes such
+  # hooks, but only for repositories it happens to touch when an integration is
+  # saved or `pr_monitor` runs. Dropping the route outright would 404 every
+  # untouched repository's hook and silently stop its events.
+  #
+  # Serving both spellings no longer duplicates anything: a repo carrying a hook
+  # on each receives the same X-GitHub-Delivery GUID twice and the second is
+  # discarded by the idempotency ledger.
+  post "webhook", to: "webhooks#create", as: :webhook
+
   # OAuth setup flow (popup wizard after callback)
   get "auth/setup", to: "auth#setup", as: :setup_auth
   post "auth/store_creative", to: "auth#store_creative", as: :store_creative_auth

data/db/migrate/20260727000001_add_webhook_hook_id_to_github_repository_links.rb

@@ -0,0 +1,17 @@
+class AddWebhookHookIdToGithubRepositoryLinks < ActiveRecord::Migration[8.1]
+  # The GitHub hook id that an instance of this app created for the repository.
+  #
+  # It is the only positive evidence that a hook found on GitHub belongs to a
+  # deployment sharing THIS database: the id was written here by whichever
+  # instance created it. Host or path similarity proves nothing — an unrelated
+  # deployment can serve the very same path — and deferring to a hook that
+  # feeds someone else's database would leave this instance receiving nothing.
+  #
+  # Stored on every link for the repository rather than only the primary one so
+  # that deleting a link does not lose the registration and let the next
+  # provisioning run create a second hook. This mirrors how `webhook_secret` is
+  # already aligned across a repository's links.
+  def change
+    add_column :github_repository_links, :webhook_hook_id, :bigint
+  end
+end

data/db/migrate/20260727000002_create_github_webhook_deliveries.rb

@@ -0,0 +1,30 @@
+class CreateGithubWebhookDeliveries < ActiveRecord::Migration[8.1]
+  # Durable idempotency key for GitHub webhook deliveries. GitHub stamps the
+  # `X-GitHub-Delivery` GUID per EVENT, not per delivery, so one GUID covers
+  # redeliveries AND the fan-out to every hook configured on the repo. A
+  # UNIQUE index therefore collapses both duplicate sources into one processed
+  # request. It must live in the DB, not in a process-local cache: multiple app
+  # instances share this database and each one receives its own copy.
+  #
+  # `processed_at` is what actually suppresses a redelivery. The row alone only
+  # records that some request claimed the GUID; if that request then died, the
+  # claim must not outlive it, or the redelivery would be answered 200 and the
+  # event dropped for good.
+  #
+  # `claim_token` identifies WHICH run holds the claim. A run that outlives
+  # STALE_CLAIM_AFTER has its claim taken over by the next delivery of the same
+  # GUID, and without a token the original run's cleanup would act on the GUID
+  # alone and delete the replacement's claim.
+  def change
+    create_table :github_webhook_deliveries do |t|
+      t.string :delivery_guid, null: false
+      t.string :event
+      t.string :claim_token
+      t.datetime :created_at, null: false
+      t.datetime :processed_at
+    end
+
+    add_index :github_webhook_deliveries, :delivery_guid, unique: true
+    add_index :github_webhook_deliveries, :created_at
+  end
+end

data/db/migrate/20260729000000_add_repository_id_index_to_github_repository_links.rb

@@ -0,0 +1,13 @@
+class AddRepositoryIdIndexToGithubRepositoryLinks < ActiveRecord::Migration[8.1]
+  # The column has existed since the engine's first migration but was never
+  # written or read. Webhook routing now matches on it (it is the only
+  # repository identifier that survives a rename), so it needs an index.
+  # `webhook_hook_id` is also used as a request-time fallback for links that
+  # have not received a repository id yet, and must not require a table scan.
+  #
+  # Not unique: one repository is deliberately linked to many creatives.
+  def change
+    add_index :github_repository_links, :repository_id
+    add_index :github_repository_links, :webhook_hook_id
+  end
+end

data/db/seeds.rb

@@ -77,6 +77,7 @@ module CollavreGithub
       creative_retrieval_service
       creative_batch_service
       pr_monitor
+      pr_state_set
     ].freeze
 
     def self.call

data/lib/collavre_github/version.rb

@@ -1,3 +1,3 @@
 module CollavreGithub
-  VERSION = "0.6.3"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: collavre_github
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
 platform: ruby
 authors:
 - Collavre
@@ -71,22 +71,30 @@ files:
 - app/javascript/github_wizard_state.js
 - app/jobs/collavre_github/initial_markdown_sync_job.rb
 - app/jobs/collavre_github/markdown_sync_job.rb
+- app/jobs/collavre_github/webhook_delivery_prune_job.rb
 - app/models/collavre_github/account.rb
 - app/models/collavre_github/application_record.rb
 - app/models/collavre_github/github_pr_channel.rb
 - app/models/collavre_github/repository_link.rb
+- app/models/collavre_github/webhook_delivery.rb
 - app/services/collavre_github/client.rb
 - app/services/collavre_github/markdown_sync/content_processor.rb
 - app/services/collavre_github/markdown_sync/incremental_sync_service.rb
 - app/services/collavre_github/markdown_sync/initial_import_service.rb
+- app/services/collavre_github/pr_channel_state_updater.rb
 - app/services/collavre_github/pr_topic_link_parser.rb
+- app/services/collavre_github/repository_identity_synchronizer.rb
+- app/services/collavre_github/repository_provisioning_lock.rb
 - app/services/collavre_github/tools/concerns/github_client_finder.rb
+- app/services/collavre_github/tools/concerns/pr_channel_locator.rb
 - app/services/collavre_github/tools/github_pr_commits_service.rb
 - app/services/collavre_github/tools/github_pr_details_service.rb
 - app/services/collavre_github/tools/github_pr_diff_service.rb
 - app/services/collavre_github/tools/permission_denied_error.rb
 - app/services/collavre_github/tools/pr_monitor_service.rb
+- app/services/collavre_github/tools/pr_state_set_service.rb
 - app/services/collavre_github/webhook_provisioner.rb
+- app/services/collavre_github/webhook_reprovisioner.rb
 - app/views/collavre_github/auth/setup.html.erb
 - app/views/collavre_github/integrations/_modal.html.erb
 - config/initializers/integration_settings.rb
@@ -101,6 +109,9 @@ files:
 - db/migrate/20260412000000_add_markdown_sync_to_repository_links.rb
 - db/migrate/20260416000000_add_markdown_root_creative_index.rb
 - db/migrate/20260711000000_encrypt_github_repository_link_webhook_secrets.rb
+- db/migrate/20260727000001_add_webhook_hook_id_to_github_repository_links.rb
+- db/migrate/20260727000002_create_github_webhook_deliveries.rb
+- db/migrate/20260729000000_add_repository_id_index_to_github_repository_links.rb
 - db/seeds.rb
 - lib/collavre_github.rb
 - lib/collavre_github/engine.rb