Skip to content

Federated auth support #395

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

Merged
tehcrashxor merged 2 commits into from
Apr 25, 2024
Merged

Federated auth support #395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4946d97
Add FederatedCredential type
tehcrashxor Apr 25, 2024
a19acc2
Move to public nuget for GH Actions builds
tehcrashxor Apr 25, 2024
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
20 changes: 10 additions & 10 deletions nuget.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,28 @@
"name": "nuget.org",
"url": "https://api.nuget.org/v3-flatcontainer/",
"authenticated": false,
"packages": [
]
},
{
"name": "CAP_ISVExp_Tools_Stable",
"url": "https://pkgs.dev.azure.com/msazure/_packaging/b0441cf8-0bc8-4fad-b126-841a6184e784/nuget/v3/flat2/",
"authenticated": true,
"patEnvironmentVariable": "AZ_DevOps_Read_PAT",
"packages": [
{
"name": "Microsoft.PowerApps.CLI",
"version": "1.28.3",
"version": "1.31.6",
"internalName": "pac"
},
{
"name": "Microsoft.PowerApps.CLI.Core.linux-x64",
"version": "1.28.3",
"version": "1.31.6",
"internalName": "pac_linux",
"chmod": "tools/pac"
}
]
},
{
"name": "CAP_ISVExp_Tools_Stable",
"url": "https://pkgs.dev.azure.com/msazure/_packaging/b0441cf8-0bc8-4fad-b126-841a6184e784/nuget/v3/flat2/",
"authenticated": true,
"patEnvironmentVariable": "AZ_DevOps_Read_PAT",
"packages": [
]
},
{
"name": "CAP_ISVExp_Tools_Daily",
"url": "https://pkgs.dev.azure.com/msazure/_packaging/d3fb5788-d047-47f9-9aba-76890f5cecf0/nuget/v3/flat2/",
Expand Down
11 changes: 10 additions & 1 deletion src/pac/auth/authParameters.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,15 @@ export interface ClientCredentials
scheme: string;
}

export interface FederatedCredentials
{
appId: string;
tenantId: string;
cloudInstance: string;
scheme: string;
federationProvider : "AzureDevOps" | "GitHub";
}

export interface UsernamePassword
{
username: string;
Expand All @@ -16,5 +25,5 @@ export interface UsernamePassword
cloudInstance: string;
}

export type AuthCredentials = UsernamePassword | ClientCredentials;
export type AuthCredentials = UsernamePassword | ClientCredentials | FederatedCredentials;

22 changes: 20 additions & 2 deletions src/pac/auth/authenticate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { CommandRunner } from "../../CommandRunner";
import { Logger } from "../../Logger";
import { ClientCredentials, AuthCredentials, UsernamePassword } from "./authParameters";
import { ClientCredentials, AuthCredentials, UsernamePassword, FederatedCredentials } from "./authParameters";

export function authenticateAdmin(pac: CommandRunner, credentials: AuthCredentials, logger: Logger): Promise<string[]> {
logger.log(`authN to admin API: authType=${isUsernamePassword(credentials) ? 'UserPass' : 'SPN'}; cloudInstance: ${credentials.cloudInstance || '<not set>'}`);
Expand All @@ -23,13 +23,31 @@ function addUrl(url: string) {
}

function addCredentials(credentials: AuthCredentials) {
return isUsernamePassword(credentials) ? addUsernamePassword(credentials) : addClientCredentials(credentials);
if (isUsernamePassword(credentials)) {
return addUsernamePassword(credentials);
} else if (isFederatedCredentials(credentials)) {
return addFederatedCredentials(credentials);
} else {
return addClientCredentials(credentials);
}
}

function isUsernamePassword(credentials: AuthCredentials): credentials is UsernamePassword {
return "username" in credentials;
}

function isFederatedCredentials(credentials: AuthCredentials): credentials is FederatedCredentials {
return "federationProvider" in credentials;
}

function addFederatedCredentials(parameters: FederatedCredentials) {
return [
"--applicationId", parameters.appId,
"--tenant", parameters.tenantId,
parameters.federationProvider == "AzureDevOps" ? "--azureDevOpsFederated" : "--githubFederated",
];
}

function addClientCredentials(parameters: ClientCredentials) {

if (parameters.scheme == "ManagedServiceIdentity"){
Expand Down