Encode all components in the url

Signed-off-by: Andrew Shirley <andrew.shirley@sainsburys.co.uk>
Signed-off-by: blam <ben@blam.sh>
This commit is contained in:
Andrew Shirley
2021-07-08 17:34:25 +01:00
committed by blam
parent b240ef73e2
commit 24d786e197
+17 -11
View File
@@ -126,9 +126,11 @@ export class JenkinsClient implements JenkinsApi {
filter: { branch?: string },
): Promise<Project[]> {
const url = new URL(
`${await this.discoveryApi.getBaseUrl('jenkins')}/v1/entity/${
entity.namespace
}/${entity.kind}/${entity.name}/projects`,
`${await this.discoveryApi.getBaseUrl(
'jenkins',
)}/v1/entity/${encodeURIComponent(entity.namespace)}/${encodeURIComponent(
entity.kind,
)}/${encodeURIComponent(entity.name)}/projects`,
);
if (filter.branch) {
@@ -158,11 +160,13 @@ export class JenkinsClient implements JenkinsApi {
jobName: string,
buildNumber: string,
): Promise<Build> {
const url = `${await this.discoveryApi.getBaseUrl('jenkins')}/v1/entity/${
entity.namespace
}/${entity.kind}/${entity.name}/job/${encodeURIComponent(
const url = `${await this.discoveryApi.getBaseUrl(
'jenkins',
)}/v1/entity/${encodeURIComponent(entity.namespace)}/${encodeURIComponent(
entity.kind,
)}/${encodeURIComponent(entity.name)}/job/${encodeURIComponent(
jobName,
)}/${buildNumber}`;
)}/${encodeURIComponent(buildNumber)}`;
const idToken = await this.identityApi.getIdToken();
const response = await fetch(url, {
@@ -180,11 +184,13 @@ export class JenkinsClient implements JenkinsApi {
jobName: string,
buildNumber: string,
): Promise<void> {
const url = `${await this.discoveryApi.getBaseUrl('jenkins')}/v1/entity/${
entity.namespace
}/${entity.kind}/${entity.name}/job/${encodeURIComponent(
const url = `${await this.discoveryApi.getBaseUrl(
'jenkins',
)}/v1/entity/${encodeURIComponent(entity.namespace)}/${encodeURIComponent(
entity.kind,
)}/${encodeURIComponent(entity.name)}/job/${encodeURIComponent(
jobName,
)}/${buildNumber}:rebuild`;
)}/${encodeURIComponent(buildNumber)}:rebuild`;
const idToken = await this.identityApi.getIdToken();
await fetch(url, {