Add security fix servicing guide for release branches - #11839
Open
Harshit (harshit7962) wants to merge 1 commit into
Open
Harshit (harshit7962) wants to merge 1 commit into
Harshit (harshit7962) wants to merge 1 commit into
Conversation
Documents how a security fix is landed on the internal servicing branch during embargo and published to the public servicing branch at disclosure. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 1338e11c-4b33-40f7-a7b0-e7d8ad772ec7
|
Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run. |
microsoft-github-policy-service
Bot
added
the
needs-triage
Contributor
Author
|
/azp run |
|
Azure Pipelines: 1 pipeline(s) were filtered out due to trigger conditions. |
|
|
||
| ```powershell | ||
| git fetch origin release/3.0-stable | ||
| git cat-file -e origin/release/3.0-stable:path/to/file.cpp 2>$null; if ($LASTEXITCODE -eq 0) { "public" } else { "internal-only" } |
Contributor
There was a problem hiding this comment.
In a clone tracking only main, this fetch can succeed without creating origin/release/3.0-stable, so this check labels a public file as internal-only and Phase 2 skips its fix. We may have to fetch to an explicit ref and verify it before classifying the file. Please check.
|
|
||
| 1. **The fix lands in branch 3 first.** Public pushes wait for the MSRC release date. | ||
| 2. **Branch 2 is read-only.** It is a mirror rather than a working branch. | ||
| 3. **You own the public disclosure commit.** It is a manual step, which is why it is worth tracking. |
Contributor
There was a problem hiding this comment.
Would be good if a work item gets created for this automatically
| ### 4. Open the PR against branch 3 | ||
|
|
||
| Target `release/3.0-stable` in ADO. Follow the normal servicing review and approval bar for that branch, plus MSRC | ||
| sign-off on the case. |
Contributor
There was a problem hiding this comment.
MSRC sign-off reviewers gets added automatically for the PRs I hope
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Adds a developer guide covering how a security fix is landed on the internal servicing branch during embargo and published to the public servicing branch at disclosure.
Documentation only. No code or build changes.