-
Notifications
You must be signed in to change notification settings - Fork 7
feat: handle Authorization_RequestDenied errors with informative message #254
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
bgdnext64
wants to merge
3
commits into
main
Choose a base branch
from
bgdnext64/45-handle-authorization_requestdenied-error
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| // MIT License | ||
| // | ||
| // Copyright (c) Microsoft Corporation. | ||
| // | ||
| // Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| // of this software and associated documentation files (the "Software"), to deal | ||
| // in the Software without restriction, including without limitation the rights | ||
| // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| // copies of the Software, and to permit persons to whom the Software is | ||
| // furnished to do so, subject to the following conditions: | ||
| // | ||
| // The above copyright notice and this permission notice shall be included in all | ||
| // copies or substantial portions of the Software. | ||
| // | ||
| // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| // SOFTWARE | ||
|
|
||
| package e2etests | ||
|
|
||
| import ( | ||
| "os" | ||
| "path" | ||
| "runtime" | ||
| "strings" | ||
| "testing" | ||
|
|
||
| "github.com/Azure/mpf/pkg/infrastructure/authorizationCheckers/terraform" | ||
| rgm "github.com/Azure/mpf/pkg/infrastructure/resourceGroupManager" | ||
| spram "github.com/Azure/mpf/pkg/infrastructure/spRoleAssignmentManager" | ||
| "github.com/Azure/mpf/pkg/usecase" | ||
| log "github.com/sirupsen/logrus" | ||
| "github.com/stretchr/testify/assert" | ||
| ) | ||
|
|
||
| // TestTerraformAuthorizationRequestDenied exercises the Authorization_RequestDenied | ||
| // path end-to-end. The sample creates an azuread_group, which requires Microsoft | ||
| // Graph application permissions (admin consent / Global Administrator) that MPF | ||
| // cannot auto-discover. MPF should fail with a clear guidance error instead of | ||
| // silently looping or producing a misleading parse error. | ||
| func TestTerraformAuthorizationRequestDenied(t *testing.T) { | ||
| mpfArgs, err := getTestingMPFArgs() | ||
| if err != nil { | ||
| t.Skip("required environment variables not set, skipping end to end test") | ||
| } | ||
| mpfArgs.MPFMode = "terraform" | ||
|
|
||
| if os.Getenv("MPF_TFPATH") == "" { | ||
| t.Skip("Terraform Path MPF_TFPATH not set, skipping end to end test") | ||
| } | ||
| tfpath := os.Getenv("MPF_TFPATH") | ||
|
|
||
| _, filename, _, _ := runtime.Caller(0) | ||
| curDir := path.Dir(filename) | ||
| log.Infof("curDir: %s", curDir) | ||
| wrkDir := path.Join(curDir, "../samples/terraform/authorization-request-denied") | ||
| log.Infof("wrkDir: %s", wrkDir) | ||
|
|
||
| // Clean up Terraform artifacts before and after test | ||
| cleanTerraformWorkingDir(t, wrkDir) | ||
| t.Cleanup(func() { cleanTerraformWorkingDir(t, wrkDir) }) | ||
|
|
||
| ctx := t.Context() | ||
|
|
||
| mpfConfig := getMPFConfig(mpfArgs) | ||
|
|
||
| var rgManager usecase.ResourceGroupManager = rgm.NewResourceGroupManager(mpfArgs.SubscriptionID) | ||
| var spRoleAssignmentManager usecase.ServicePrincipalRolemAssignmentManager = spram.NewSPRoleAssignmentManager(mpfArgs.SubscriptionID) | ||
|
|
||
| initialPermissionsToAdd := []string{"Microsoft.Resources/deployments/read", "Microsoft.Resources/deployments/write"} | ||
| permissionsToAddToResult := []string{"Microsoft.Resources/deployments/read", "Microsoft.Resources/deployments/write"} | ||
| deploymentAuthorizationCheckerCleaner := terraform.NewTerraformAuthorizationChecker(wrkDir, tfpath, "", true, "") | ||
| mpfService := usecase.NewMPFService(ctx, rgManager, spRoleAssignmentManager, deploymentAuthorizationCheckerCleaner, mpfConfig, initialPermissionsToAdd, permissionsToAddToResult, false, true, false) | ||
|
|
||
| _, err = mpfService.GetMinimumPermissionsRequired() | ||
| assert.Error(t, err) | ||
| if err != nil { | ||
| assert.True(t, | ||
| strings.Contains(err.Error(), "Authorization_RequestDenied"), | ||
| "expected error to mention Authorization_RequestDenied, got: %v", err) | ||
| } | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| module github.com/Azure/mpf | ||
|
|
||
| go 1.26.1 | ||
| go 1.26.2 | ||
|
|
||
| require ( | ||
| github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.0 | ||
|
|
||
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| terraform { | ||
| required_providers { | ||
| azurerm = { | ||
| source = "hashicorp/azurerm" | ||
| version = "~> 4.0" | ||
| } | ||
| azuread = { | ||
| source = "hashicorp/azuread" | ||
| version = "~> 3.0" | ||
| } | ||
| random = { | ||
| source = "hashicorp/random" | ||
| version = "~> 3.0" | ||
| } | ||
| } | ||
| } | ||
|
|
||
| provider "azurerm" { | ||
| features {} | ||
| } | ||
|
|
||
| provider "azuread" {} | ||
|
|
||
| # This sample is intentionally minimal and is used to exercise the | ||
| # Authorization_RequestDenied error path in MPF. Creating an Azure AD group | ||
| # requires Microsoft Graph application permissions (e.g. Group.Create) that | ||
| # require admin consent or Global Administrator role; these cannot be | ||
| # auto-discovered by MPF, so MPF should surface a clear guidance error. | ||
| resource "random_string" "rand" { | ||
| length = 8 | ||
| special = false | ||
| numeric = false | ||
| upper = false | ||
| lower = true | ||
| } | ||
|
|
||
| resource "azuread_group" "mpf_test" { | ||
| display_name = "mpf-authreqdenied-${random_string.rand.result}" | ||
| security_enabled = true | ||
| } |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good coverage for the pure
Authorization_RequestDeniedcase. Could you also add a test for a mixed error message that contains bothAuthorization_RequestDeniedand parseableAuthorizationFailed/Authorization failedentries? That would guard against the early-return regression where extractable permissions are silently lost.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added
TestMixedAuthorizationRequestDeniedAndAuthorizationFailedErrorwhich covers exactly that — an error blob containing both anAuthorization_RequestDeniedline and a parseableAuthorizationFailedentry. It asserts theMicrosoft.Storage/storageAccounts/writepermission is still extracted, so the regression you flagged would be caught.