Skip to content

Fix for Azure Service Principals who have no permission to access the Graph API #39

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.

Sign up for GitHub

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
SvenTo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix for Azure Service Principals who have no permission to access the Graph API #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,10 @@ import (
"github.com/bloodhoundad/azurehound/v2/client/config"
"github.com/bloodhoundad/azurehound/v2/client/rest"
"github.com/bloodhoundad/azurehound/v2/models/azure"
"github.com/go-logr/logr"
)

func NewClient(config config.Config) (AzureClient, error) {
func NewClient(config config.Config, log logr.Logger) (AzureClient, error) {
if msgraph, err := rest.NewRestClient(config.GraphUrl(), config); err != nil {
return nil, err
} else if resourceManager, err := rest.NewRestClient(config.ResourceManagerUrl(), config); err != nil {
Expand All @@ -41,7 +42,7 @@ func NewClient(config config.Config) (AzureClient, error) {
if aud, err := rest.ParseAud(config.JWT); err != nil {
return nil, err
} else if aud == config.GraphUrl() {
return initClientViaGraph(msgraph, resourceManager)
return initClientViaGraph(msgraph, resourceManager, config.Tenant, log)
} else if aud == config.ResourceManagerUrl() {
if body, err := rest.ParseBody(config.JWT); err != nil {
return nil, err
Expand All @@ -52,7 +53,7 @@ func NewClient(config config.Config) (AzureClient, error) {
return nil, fmt.Errorf("error: invalid token audience")
}
} else {
return initClientViaGraph(msgraph, resourceManager)
return initClientViaGraph(msgraph, resourceManager, config.Tenant, log)
}
}
}
Expand All @@ -75,13 +76,24 @@ func initClientViaRM(msgraph, resourceManager rest.RestClient, tid interface{})
}
}

func initClientViaGraph(msgraph, resourceManager rest.RestClient) (AzureClient, error) {
func initClientViaGraph(msgraph, resourceManager rest.RestClient, tid string, log logr.Logger) (AzureClient, error) {
client := &azureClient{
msgraph: msgraph,
resourceManager: resourceManager,
}
if org, err := client.GetAzureADOrganization(context.Background(), nil); err != nil {
return nil, err
log.V(0).Error(err, "unable to get Azure AD organization. It is likely that your user don't have MS Graph API permissions. If you list non AAD objects (e.g., az-rm) this should be okay.")
if result, err := client.GetAzureADTenants(context.Background(), true); err != nil {
return nil, err
} else {
for _, tenant := range result.Value {
if tenant.TenantId == tid {
client.tenant = tenant
break
}
}
return client, nil
}
} else {
client.tenant = org.ToTenant()
return client, nil
Expand Down
2 changes: 1 addition & 1 deletion cmd/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ func newAzureClient() (client.AzureClient, error) {
Tenant: config.AzTenant.Value().(string),
Username: config.AzUsername.Value().(string),
}
return client.NewClient(config)
return client.NewClient(config, log)
}

func newSigningHttpClient(signature, tokenId, token, proxyUrl string) (*http.Client, error) {
Expand Down