Skip to content

In case we fail to decrypt auth info is omitted #453

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
merged 1 commit into from
Dec 5, 2024
Merged

In case we fail to decrypt auth info is omitted #453

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
26 changes: 20 additions & 6 deletions src/features/projects/data/GitHubProjectDataSource.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ import {
ProjectConfigRemoteVersion,
IGitHubRepositoryDataSource,
GitHubRepository,
GitHubRepositoryRef
GitHubRepositoryRef,
ProjectConfigRemoteSpecification
} from "../domain"
import RemoteConfig from "../domain/RemoteConfig"
import { IRemoteConfigEncoder } from "../domain/RemoteConfigEncoder"
Expand Down Expand Up @@ -178,11 +179,7 @@ export default class GitHubProjectDataSource implements IProjectDataSource {
const specifications = remoteVersion.specifications.map(e => {
const remoteConfig: RemoteConfig = {
url: e.url,
auth: e.auth ? {
type: e.auth.type,
username: this.encryptionService.decrypt(e.auth.encryptedUsername),
password: this.encryptionService.decrypt(e.auth.encryptedPassword)
} : undefined
auth: this.tryDecryptAuth(e)
};

const encodedRemoteConfig = this.remoteConfigEncoder.encode(remoteConfig);
Expand Down Expand Up @@ -232,4 +229,21 @@ export default class GitHubProjectDataSource implements IProjectDataSource {
.replace(/ /g, "-")
.replace(/[^A-Za-z0-9-]/g, "")
}

private tryDecryptAuth(projectConfigRemoteSpec: ProjectConfigRemoteSpecification): { type: string, username: string, password: string } | undefined {
if (!projectConfigRemoteSpec.auth) {
return undefined
}

try {
return {
type: projectConfigRemoteSpec.auth.type,
username: this.encryptionService.decrypt(projectConfigRemoteSpec.auth.encryptedUsername),
password: this.encryptionService.decrypt(projectConfigRemoteSpec.auth.encryptedPassword)
}
} catch (error) {
console.error(`Failed to decrypt remote specification auth for ${projectConfigRemoteSpec.url}. Perhaps a different public key was used?:`, error);
return undefined
}
}
}
Loading