Merge branch 'main' into fix/DE-980-email-only-maintainer-link

Author: joanagmaia

AGENTS.md

@@ -35,3 +35,6 @@ CROWD_PACKAGES_DB_PORT=5432
 CROWD_PACKAGES_DB_USERNAME=postgres
 CROWD_PACKAGES_DB_PASSWORD=example
 CROWD_PACKAGES_DB_DATABASE=packages-db
+
+# security-contacts-worker
+SECURITY_CONTACTS_USER_AGENT="lfx-security-contacts-worker"

backend/.env.dist.composed

@@ -185,6 +185,9 @@ ENRICHER_BATCH_SIZE=100
 ENRICHER_REPO_UPDATE_INTERVAL_HOURS=24
 ENRICHER_IDLE_SLEEP_SEC=60
 
+# security-contacts-worker
+SECURITY_CONTACTS_USER_AGENT="lfx-security-contacts-worker"
+
 OSSPCKGS_GCP_PROJECT=local-dev
 OSSPCKGS_GCS_BUCKET=local-dev
 OSSPCKGS_GCP_CREDENTIALS_B64=e30=

backend/.env.dist.local

@@ -19,6 +19,7 @@
     "script:continue-run": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/continue-run.ts",
     "script:trigger-webhook": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/trigger-webhook.ts",
     "script:send-weekly-analytics-email": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/send-weekly-analytics-email.ts",
+    "script:merge-members": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/merge-members.ts",
     "script:merge-organizations": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/merge-organizations.ts",
     "script:refresh-materialized-views": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/refresh-materialized-views.ts",
     "script:unmerge-members": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/unmerge-members.ts",

backend/package.json

@@ -65,7 +65,7 @@ export async function getMyActivityHandler(req: Request, res: Response): Promise
       description: r.content,
       actor: r.actor,
       createdAt: r.createdAt,
-      suggestedAction: SUGGESTED_ACTIONS[r.stewardshipStatus] ?? null,
+      suggestedAction: SUGGESTED_ACTIONS[r.currentStewardshipStatus] ?? null,
     })),
     meta: {
       total,

backend/src/api/public/v1/stewardships/getMyActivity.ts

@@ -3,6 +3,7 @@ import commandLineUsage from 'command-line-usage'
 import * as fs from 'fs'
 import path from 'path'
 
+import { generateUUIDv1 } from '@crowd/common'
 import { CommonMemberService } from '@crowd/common_services'
 import { optionsQx } from '@crowd/data-access-layer'
 import { MemberField, findMemberById } from '@crowd/data-access-layer/src/members'
@@ -33,6 +34,13 @@ const options = [
     description:
       'The unique ID of a member that will be merged into the first one. This one will be destroyed. You can provide multiple ids here separated by comma.',
   },
+  {
+    name: 'userId',
+    alias: 'u',
+    typeLabel: '{underline userId}',
+    type: String,
+    description: 'User ID of the user performing the merge.',
+  },
   {
     name: 'help',
     alias: 'h',
@@ -65,6 +73,8 @@ if (parameters.help || !parameters.originalId || !parameters.targetId) {
     const originalId = parameters.originalId
     const targetIds = parameters.targetId.split(',')
 
+    const userId = parameters.userId
+
     const options = await SequelizeRepository.getDefaultIRepositoryOptions()
     const qx = SequelizeRepository.getQueryExecutor(options)
 
@@ -74,6 +84,16 @@ if (parameters.help || !parameters.originalId || !parameters.targetId) {
     ])
 
     options.currentTenant = { id: originalMember.tenantId }
+    options.currentUser = { id: userId }
+
+    const ctx = {
+      ...options,
+      requestId: generateUUIDv1(),
+      userData: {
+        ip: '127.0.0.1',
+        userAgent: 'merge-members-script',
+      },
+    }
 
     for (const targetId of targetIds) {
       const targetMember = await findMemberById(qx, targetId, [
@@ -89,7 +109,7 @@ if (parameters.help || !parameters.originalId || !parameters.targetId) {
         log.info(`Merging ${targetId} into ${originalId}...`)
         const service = new CommonMemberService(optionsQx(options), options.temporal, log)
         try {
-          await service.merge(originalId, targetId)
+          await service.merge(originalId, targetId, ctx)
         } catch (err) {
           log.error(`Error merging members: ${err.message}`)
           process.exit(1)

backend/src/bin/scripts/merge-members.ts

@@ -0,0 +1,4 @@
+-- Store the stewardship status as it was at the moment each activity was logged.
+-- Existing rows get NULL (no history to reconstruct); queries fall back to s.status for them.
+ALTER TABLE stewardship_activity
+  ADD COLUMN IF NOT EXISTS status_at_time TEXT;

backend/src/osspckgs/migrations/V1782400000__stewardship-activity-status-at-time.sql

@@ -0,0 +1,27 @@
+CREATE TABLE IF NOT EXISTS security_contacts (
+    id              BIGSERIAL PRIMARY KEY,
+    repo_id         BIGINT NOT NULL REFERENCES repos(id) ON DELETE CASCADE,
+    channel         TEXT NOT NULL,
+    value           TEXT NOT NULL,
+    role            TEXT NOT NULL,
+    name            TEXT,
+    score           NUMERIC(4,3) NOT NULL,
+    confidence      TEXT NOT NULL,
+    provenance      JSONB NOT NULL DEFAULT '[]',
+    last_refreshed  TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    created_at      TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    updated_at      TIMESTAMPTZ NOT NULL DEFAULT NOW()
+);
+
+CREATE UNIQUE INDEX IF NOT EXISTS security_contacts_repo_channel_value_uq
+    ON security_contacts (repo_id, channel, value);
+
+CREATE INDEX IF NOT EXISTS security_contacts_repo_confidence_idx
+    ON security_contacts (repo_id, confidence);
+
+ALTER TABLE repos ADD COLUMN IF NOT EXISTS pvr_enabled                 BOOL;
+ALTER TABLE repos ADD COLUMN IF NOT EXISTS security_policy_url         TEXT;
+ALTER TABLE repos ADD COLUMN IF NOT EXISTS vulnerability_reporting_url TEXT;
+ALTER TABLE repos ADD COLUMN IF NOT EXISTS bug_bounty_url              TEXT;
+ALTER TABLE repos ADD COLUMN IF NOT EXISTS security_txt_url            TEXT;
+ALTER TABLE repos ADD COLUMN IF NOT EXISTS contacts_last_refreshed     TIMESTAMPTZ;

backend/src/osspckgs/migrations/V1782950400__security_contacts.sql

@@ -1,4 +1,4 @@
 DOCKERFILE="./services/docker/Dockerfile.packages"
 CONTEXT="../"
 REPO="sjc.ocir.io/axbydjxa5zuh/packages"
-SERVICES="github-repos-enricher bq-dataset-ingest npm-worker maven-worker osv-worker dockerhub-sync cargo-worker go-worker nuget-worker"
+SERVICES="github-repos-enricher bq-dataset-ingest npm-worker maven-worker osv-worker dockerhub-sync cargo-worker go-worker nuget-worker security-contacts-worker"