Fix bootstrap token check and secure token status guard logic#244
Merged
CKunze-MSFT merged 1 commit intomasterfrom Apr 1, 2026
Merged
Fix bootstrap token check and secure token status guard logic#244CKunze-MSFT merged 1 commit intomasterfrom
CKunze-MSFT merged 1 commit intomasterfrom
Conversation
- Fix bootstrap token escrow check to actually execute the command instead of echoing a literal string - Populate SECURE_TOKEN_STATUS variable so disabled/unknown user guards work correctly
CKunze-MSFT
approved these changes
Apr 1, 2026
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.
Fixes bugs identified in #240:
Bootstrap token escrow check was a no-op —
echo "profiles status -type bootstraptoken"echoed a literal string instead of executing the command. Fixed to pipe actual command output through grep.$SECURE_TOKEN_STATUS was never populated — The disabled/unknown-user guards were dead code. Added
sysadminctl -secureTokenStatuscall to populate the variable.This preserves the existing guard logic (unlike #240 which removed it) while making it actually functional.
Tested all 6 code paths via dry-run stubbing — all pass correctly.