Page MenuHomePhabricator

Notify MediaWiki security tasks as soon as an uploaded patch fails to apply
Closed, ResolvedPublic

Description

When a security patch will fail to apply to the next MediaWiki release we want to:

  1. Leave a comment on the security task for the patch that it's failing to apply
  2. Set the task as UBN!
  3. Add it as a train blocker for the next release
  4. The task comment should give next steps
    • where to put the new security patch on the deployment server
    • i.e., where should this patch should go/what commands should be run so the new patch is in the right place for next week's deployment

Background

When there is a security problem in MediaWiki requiring a security patch

  1. A security task is created for the issue
  2. A patch is uploaded to the task
  3. The patch is added to the /srv/patches directory on the deployment server for the relevant version(s); e.g., /srv/patches/1.41.0-wmf.1/core/01-TXXXX.patch
  4. Until a security release is made, that patch is copied forward by our deployment tooling

If a patch fails to apply the next version of MediaWiki (e.g., a patch for 1.41.0-wmf.1 that will have conflicts with 1.41.0-wmf.2), the current status is Release-Engineering-Team is notified. And then Release-Engineering-Team notifies people manually in phabricator to help find a fix.

This task changes who is notified and where/how they're notified to better streamline the process of finding and uploading patch fixes.

Event Timeline

jnuche changed the task status from Open to In Progress.Jan 31 2024, 3:53 PM
jnuche changed the task status from In Progress to Stalled.Feb 7 2024, 10:16 AM

Waiting on the outcome of T356852

Waiting on the outcome of T356852

Normally we (Security-Team) get to these during our weekly clinic (Mondays). Unless there's more urgency around this.

Normally we (Security-Team) get to these during our weekly clinic (Mondays). Unless there's more urgency around this.

Thanks for keeping an eye on this! I saw the review would happen next Monday and marked this task as stalled to signal that it's blocked until T356852 is resolved, I didn't mean to signal urgency. Sorry if this caused some noise.

jnuche changed the task status from Stalled to In Progress.Feb 19 2024, 1:21 PM

Change 1007319 had a related patch set uploaded (by Jaime Nuche; author: Jaime Nuche):

[labs/private@master] jenkins: add security patch bot token to releases instance secrets

https://gerrit.wikimedia.org/r/1007319

Change 1007323 had a related patch set uploaded (by Jaime Nuche; author: Jaime Nuche):

[operations/puppet@production] jenkins: add security patch bot token to releases instance

https://gerrit.wikimedia.org/r/1007323

Change 1007319 merged by EoghanGaffney:

[labs/private@master] jenkins: add security patch bot token to releases instance secrets

https://gerrit.wikimedia.org/r/1007319

Change 1007323 merged by EoghanGaffney:

[operations/puppet@production] jenkins: add security patch bot token to releases instance

https://gerrit.wikimedia.org/r/1007323

Jdforrester-WMF subscribed.

This is brilliant, thank you for this!

This is brilliant, thank you for this!

Agreed! Very nice work @jnuche !

jnuche merged https://gitlab.wikimedia.org/repos/releng/scap/-/merge_requests/255

prep: filter out pretest branch from candidates for reference clone

This should be complete now, including notifying failing patches during the weekly train branch cut.