@jurislm/woodpecker-ci-plugin 1.1.8 → 1.1.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.codex-plugin/plugin.json +1 -1
- package/dist/client.d.ts +1 -0
- package/dist/client.js +49 -7
- package/dist/client.js.map +1 -1
- package/dist/config.d.ts +2 -5
- package/dist/config.js +3 -30
- package/dist/config.js.map +1 -1
- package/dist/errors.d.ts +14 -0
- package/dist/errors.js +29 -0
- package/dist/errors.js.map +1 -1
- package/package.json +1 -1
- package/plugin.json +1 -1
package/dist/client.d.ts
CHANGED
|
@@ -15,6 +15,7 @@ export interface BinaryEnvelope {
|
|
|
15
15
|
value: string;
|
|
16
16
|
}
|
|
17
17
|
export type FetchLike = (input: RequestInfo | URL, init?: RequestInit) => Promise<Response>;
|
|
18
|
+
export declare function redactSensitive<T>(value: T): T;
|
|
18
19
|
export declare class WoodpeckerClient {
|
|
19
20
|
private readonly config;
|
|
20
21
|
private readonly fetchImpl;
|
package/dist/client.js
CHANGED
|
@@ -1,10 +1,26 @@
|
|
|
1
|
-
import { WoodpeckerApiError } from "./errors.js";
|
|
1
|
+
import { redactErrorText, WoodpeckerApiError } from "./errors.js";
|
|
2
2
|
import { collectServerSentEvents } from "./stream.js";
|
|
3
|
+
const sensitiveKey = /(real_?value|private_?key|token|secret|password|authorization|cookie|^wss_url$)/iu;
|
|
4
|
+
export function redactSensitive(value) {
|
|
5
|
+
if (Array.isArray(value))
|
|
6
|
+
return value.map((item) => redactSensitive(item));
|
|
7
|
+
if (!value || typeof value !== "object")
|
|
8
|
+
return value;
|
|
9
|
+
if (value.encoding === "base64" && typeof value.value === "string")
|
|
10
|
+
return value;
|
|
11
|
+
return Object.fromEntries(Object.entries(value).map(([key, child]) => [
|
|
12
|
+
key,
|
|
13
|
+
sensitiveKey.test(key) && child != null ? "[REDACTED]" : redactSensitive(child),
|
|
14
|
+
]));
|
|
15
|
+
}
|
|
3
16
|
function pathValue(value, name) {
|
|
4
17
|
if (value === undefined || value === null) {
|
|
5
18
|
throw new Error("Missing required path parameter: " + name);
|
|
6
19
|
}
|
|
7
|
-
|
|
20
|
+
const segment = String(value);
|
|
21
|
+
if (/^\.+$/u.test(segment))
|
|
22
|
+
throw new Error("Invalid dot-only path parameter: " + name);
|
|
23
|
+
return encodeURIComponent(segment);
|
|
8
24
|
}
|
|
9
25
|
function appendQuery(url, name, value) {
|
|
10
26
|
if (value === undefined || value === null)
|
|
@@ -31,6 +47,12 @@ export class WoodpeckerClient {
|
|
|
31
47
|
this.fetchImpl = fetchImpl;
|
|
32
48
|
}
|
|
33
49
|
async request(operation, input) {
|
|
50
|
+
const baseUrl = this.config.baseUrl;
|
|
51
|
+
const token = this.config.token;
|
|
52
|
+
if (!baseUrl)
|
|
53
|
+
throw new WoodpeckerApiError(0, operation.method, operation.path, "WOODPECKER_URL is required");
|
|
54
|
+
if (!token)
|
|
55
|
+
throw new WoodpeckerApiError(0, operation.method, operation.path, "WOODPECKER_API_TOKEN is required");
|
|
34
56
|
let path = operation.path;
|
|
35
57
|
for (const parameter of operation.parameters) {
|
|
36
58
|
if (parameter.location !== "path")
|
|
@@ -39,14 +61,34 @@ export class WoodpeckerClient {
|
|
|
39
61
|
}
|
|
40
62
|
if (path.includes("{"))
|
|
41
63
|
throw new Error("Unresolved path parameter in " + operation.path);
|
|
42
|
-
|
|
64
|
+
let apiUrl;
|
|
65
|
+
try {
|
|
66
|
+
apiUrl = new URL(baseUrl);
|
|
67
|
+
}
|
|
68
|
+
catch {
|
|
69
|
+
throw new WoodpeckerApiError(0, operation.method, path, "WOODPECKER_URL must be a valid HTTP(S) URL");
|
|
70
|
+
}
|
|
71
|
+
if (apiUrl.protocol !== "http:" && apiUrl.protocol !== "https:") {
|
|
72
|
+
throw new WoodpeckerApiError(0, operation.method, path, "WOODPECKER_URL must use http:// or https://");
|
|
73
|
+
}
|
|
74
|
+
if (apiUrl.username || apiUrl.password) {
|
|
75
|
+
throw new WoodpeckerApiError(0, operation.method, path, "WOODPECKER_URL must not include credentials");
|
|
76
|
+
}
|
|
77
|
+
apiUrl.pathname = apiUrl.pathname.replace(/\/+$/u, "");
|
|
78
|
+
if (!apiUrl.pathname.endsWith("/api")) {
|
|
79
|
+
throw new WoodpeckerApiError(0, operation.method, path, "WOODPECKER_URL must include the /api path");
|
|
80
|
+
}
|
|
81
|
+
if (apiUrl.search || apiUrl.hash) {
|
|
82
|
+
throw new WoodpeckerApiError(0, operation.method, path, "WOODPECKER_URL must not include a query or fragment");
|
|
83
|
+
}
|
|
84
|
+
const url = new URL(apiUrl.toString().replace(/\/$/u, "") + path);
|
|
43
85
|
for (const parameter of operation.parameters) {
|
|
44
86
|
if (parameter.location === "query")
|
|
45
87
|
appendQuery(url, parameter.name, input[parameter.name]);
|
|
46
88
|
}
|
|
47
89
|
const headers = new Headers({
|
|
48
90
|
accept: operation.stream ? "text/event-stream" : "application/json, text/plain, */*",
|
|
49
|
-
authorization: "Bearer " +
|
|
91
|
+
authorization: "Bearer " + token,
|
|
50
92
|
});
|
|
51
93
|
const init = {
|
|
52
94
|
method: operation.method,
|
|
@@ -63,7 +105,7 @@ export class WoodpeckerClient {
|
|
|
63
105
|
}
|
|
64
106
|
catch (error) {
|
|
65
107
|
throw new WoodpeckerApiError(0, operation.method, path, "Woodpecker request failed for " + operation.method + " " + path + ": " +
|
|
66
|
-
(error instanceof Error ? error.message : String(error)));
|
|
108
|
+
redactErrorText(error instanceof Error ? error.message : String(error), [token]));
|
|
67
109
|
}
|
|
68
110
|
if (!response.ok) {
|
|
69
111
|
throw new WoodpeckerApiError(response.status, operation.method, path, "Woodpecker API returned " + response.status + " for " + operation.method + " " + path);
|
|
@@ -71,12 +113,12 @@ export class WoodpeckerClient {
|
|
|
71
113
|
let data = null;
|
|
72
114
|
if (operation.stream) {
|
|
73
115
|
const durationMs = Math.min(30_000, Math.max(1, typeof input.duration_ms === "number" ? input.duration_ms : 5_000));
|
|
74
|
-
data = (await collectServerSentEvents(response, durationMs));
|
|
116
|
+
data = redactSensitive(await collectServerSentEvents(response, durationMs));
|
|
75
117
|
}
|
|
76
118
|
else if (response.status !== 204) {
|
|
77
119
|
const contentType = response.headers.get("content-type")?.toLowerCase() ?? "";
|
|
78
120
|
if (contentType.includes("json"))
|
|
79
|
-
data = (await response.json());
|
|
121
|
+
data = redactSensitive(await response.json());
|
|
80
122
|
else if (contentType.startsWith("text/") || contentType.includes("xml"))
|
|
81
123
|
data = await response.text();
|
|
82
124
|
else
|
package/dist/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
|
package/dist/config.d.ts
CHANGED
|
@@ -1,9 +1,6 @@
|
|
|
1
1
|
export interface WoodpeckerConfig {
|
|
2
|
-
baseUrl: string;
|
|
3
|
-
token: string;
|
|
2
|
+
baseUrl: string | undefined;
|
|
3
|
+
token: string | undefined;
|
|
4
4
|
timeoutMs: number;
|
|
5
5
|
}
|
|
6
|
-
export declare class ConfigError extends Error {
|
|
7
|
-
constructor(message: string);
|
|
8
|
-
}
|
|
9
6
|
export declare function loadConfig(env?: Record<string, string | undefined>): WoodpeckerConfig;
|
package/dist/config.js
CHANGED
|
@@ -1,36 +1,9 @@
|
|
|
1
|
-
export class ConfigError extends Error {
|
|
2
|
-
constructor(message) {
|
|
3
|
-
super(message);
|
|
4
|
-
this.name = "ConfigError";
|
|
5
|
-
}
|
|
6
|
-
}
|
|
7
1
|
export function loadConfig(env = process.env) {
|
|
8
|
-
const
|
|
2
|
+
const baseUrl = env.WOODPECKER_URL?.trim().replace(/\/+$/u, "");
|
|
9
3
|
const token = env.WOODPECKER_API_TOKEN?.trim();
|
|
10
|
-
if (!rawUrl)
|
|
11
|
-
throw new ConfigError("WOODPECKER_URL is required");
|
|
12
|
-
if (!token)
|
|
13
|
-
throw new ConfigError("WOODPECKER_API_TOKEN is required");
|
|
14
|
-
let url;
|
|
15
|
-
try {
|
|
16
|
-
url = new URL(rawUrl);
|
|
17
|
-
}
|
|
18
|
-
catch {
|
|
19
|
-
throw new ConfigError("WOODPECKER_URL must be a valid HTTP(S) URL");
|
|
20
|
-
}
|
|
21
|
-
if (url.protocol !== "http:" && url.protocol !== "https:") {
|
|
22
|
-
throw new ConfigError("WOODPECKER_URL must use http:// or https://");
|
|
23
|
-
}
|
|
24
|
-
url.pathname = url.pathname.replace(/\/+$/u, "");
|
|
25
|
-
if (!url.pathname.endsWith("/api")) {
|
|
26
|
-
throw new ConfigError("WOODPECKER_URL must include the /api path");
|
|
27
|
-
}
|
|
28
|
-
if (url.search || url.hash) {
|
|
29
|
-
throw new ConfigError("WOODPECKER_URL must not include a query or fragment");
|
|
30
|
-
}
|
|
31
4
|
return {
|
|
32
|
-
baseUrl:
|
|
33
|
-
token,
|
|
5
|
+
baseUrl: baseUrl || undefined,
|
|
6
|
+
token: token || undefined,
|
|
34
7
|
timeoutMs: 30_000,
|
|
35
8
|
};
|
|
36
9
|
}
|
package/dist/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAMA,MAAM,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAMA,MAAM,UAAU,UAAU,CAAC,MAA0C,OAAO,CAAC,GAAG;IAC9E,MAAM,OAAO,GAAG,GAAG,CAAC,cAAc,EAAE,IAAI,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IAChE,MAAM,KAAK,GAAG,GAAG,CAAC,oBAAoB,EAAE,IAAI,EAAE,CAAC;IAC/C,OAAO;QACL,OAAO,EAAE,OAAO,IAAI,SAAS;QAC7B,KAAK,EAAE,KAAK,IAAI,SAAS;QACzB,SAAS,EAAE,MAAM;KAClB,CAAC;AACJ,CAAC"}
|
package/dist/errors.d.ts
CHANGED
|
@@ -4,3 +4,17 @@ export declare class WoodpeckerApiError extends Error {
|
|
|
4
4
|
readonly path: string;
|
|
5
5
|
constructor(status: number, method: string, path: string, message: string);
|
|
6
6
|
}
|
|
7
|
+
export declare function redactErrorText(message: string, tokens?: Array<string | undefined>): string;
|
|
8
|
+
export declare function formatToolError(error: unknown, tokens: Array<string | undefined>): {
|
|
9
|
+
code: string;
|
|
10
|
+
message: string;
|
|
11
|
+
status?: undefined;
|
|
12
|
+
method?: undefined;
|
|
13
|
+
path?: undefined;
|
|
14
|
+
} | {
|
|
15
|
+
code: string;
|
|
16
|
+
status: number;
|
|
17
|
+
method: string;
|
|
18
|
+
path: string;
|
|
19
|
+
message: string;
|
|
20
|
+
};
|
package/dist/errors.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { ZodError } from "zod";
|
|
1
2
|
export class WoodpeckerApiError extends Error {
|
|
2
3
|
status;
|
|
3
4
|
method;
|
|
@@ -10,4 +11,32 @@ export class WoodpeckerApiError extends Error {
|
|
|
10
11
|
this.path = path;
|
|
11
12
|
}
|
|
12
13
|
}
|
|
14
|
+
export function redactErrorText(message, tokens = []) {
|
|
15
|
+
let redacted = message;
|
|
16
|
+
for (const token of tokens)
|
|
17
|
+
if (token)
|
|
18
|
+
redacted = redacted.replaceAll(token, "[REDACTED]");
|
|
19
|
+
return redacted.replace(/Bearer\s+[^\s,;]+/giu, "Bearer [REDACTED]");
|
|
20
|
+
}
|
|
21
|
+
export function formatToolError(error, tokens) {
|
|
22
|
+
if (error instanceof ZodError) {
|
|
23
|
+
return {
|
|
24
|
+
code: "WOODPECKER_RESPONSE_SCHEMA_ERROR",
|
|
25
|
+
message: "Woodpecker API returned an unexpected response shape",
|
|
26
|
+
};
|
|
27
|
+
}
|
|
28
|
+
if (error instanceof WoodpeckerApiError) {
|
|
29
|
+
return {
|
|
30
|
+
code: "WOODPECKER_API_ERROR",
|
|
31
|
+
status: error.status,
|
|
32
|
+
method: error.method,
|
|
33
|
+
path: error.path,
|
|
34
|
+
message: redactErrorText(error.message, tokens),
|
|
35
|
+
};
|
|
36
|
+
}
|
|
37
|
+
return {
|
|
38
|
+
code: "WOODPECKER_TOOL_ERROR",
|
|
39
|
+
message: redactErrorText(error instanceof Error ? error.message : String(error), tokens),
|
|
40
|
+
};
|
|
41
|
+
}
|
|
13
42
|
//# sourceMappingURL=errors.js.map
|
package/dist/errors.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,kBAAmB,SAAQ,KAAK;IAClC,MAAM,CAAS;IACf,MAAM,CAAS;IACf,IAAI,CAAS;IAEtB,YAAY,MAAc,EAAE,MAAc,EAAE,IAAY,EAAE,OAAe;QACvE,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,oBAAoB,CAAC;QACjC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;CACF"}
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,KAAK,CAAC;AAE/B,MAAM,OAAO,kBAAmB,SAAQ,KAAK;IAClC,MAAM,CAAS;IACf,MAAM,CAAS;IACf,IAAI,CAAS;IAEtB,YAAY,MAAc,EAAE,MAAc,EAAE,IAAY,EAAE,OAAe;QACvE,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,oBAAoB,CAAC;QACjC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;CACF;AAED,MAAM,UAAU,eAAe,CAAC,OAAe,EAAE,SAAoC,EAAE;IACrF,IAAI,QAAQ,GAAG,OAAO,CAAC;IACvB,KAAK,MAAM,KAAK,IAAI,MAAM;QAAE,IAAI,KAAK;YAAE,QAAQ,GAAG,QAAQ,CAAC,UAAU,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;IAC3F,OAAO,QAAQ,CAAC,OAAO,CAAC,sBAAsB,EAAE,mBAAmB,CAAC,CAAC;AACvE,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,KAAc,EAAE,MAAiC;IAC/E,IAAI,KAAK,YAAY,QAAQ,EAAE,CAAC;QAC9B,OAAO;YACL,IAAI,EAAE,kCAAkC;YACxC,OAAO,EAAE,sDAAsD;SAChE,CAAC;IACJ,CAAC;IACD,IAAI,KAAK,YAAY,kBAAkB,EAAE,CAAC;QACxC,OAAO;YACL,IAAI,EAAE,sBAAsB;YAC5B,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,OAAO,EAAE,eAAe,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC;SAChD,CAAC;IACJ,CAAC;IACD,OAAO;QACL,IAAI,EAAE,uBAAuB;QAC7B,OAAO,EAAE,eAAe,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;KACzF,CAAC;AACJ,CAAC"}
|
package/package.json
CHANGED
package/plugin.json
CHANGED