@mokoenterprises/mokomysql-mcp 2.7.0 → 2.7.3

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.
@@ -1 +1 @@
1
- {"version":3,"file":"secrets.d.ts","sourceRoot":"","sources":["../source/secrets.ts"],"names":[],"mappings":"AA6IA;;;;;GAKG;AACH,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAenE"}
1
+ {"version":3,"file":"secrets.d.ts","sourceRoot":"","sources":["../source/secrets.ts"],"names":[],"mappings":"AAkLA;;;;;GAKG;AACH,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAenE"}
package/dist/secrets.js CHANGED
@@ -46,14 +46,29 @@ function selectFragment(json, fragment) {
46
46
  }
47
47
  /** Fields, in priority order, auto-extracted from a bare JSON token file. */
48
48
  const JSON_SECRET_FIELDS = ['token', 'password', 'api_key', 'apiKey', 'key', 'access_token'];
49
+ /**
50
+ * Google credential `type` values (service-account / user / workload-identity).
51
+ * A Google credential JSON is NEVER a usable secret here — a MySQL password is not a
52
+ * Google credential, and a private key must never be sent as one — so a bare `file:`
53
+ * ref pointing at one is refused loudly rather than leaked as the raw blob (MokoCLI #1043).
54
+ */
55
+ const GOOGLE_TYPES = new Set([
56
+ 'service_account',
57
+ 'authorized_user',
58
+ 'external_account',
59
+ 'impersonated_service_account',
60
+ ]);
49
61
  /**
50
62
  * Resolve a single config string.
51
- * - "file:<path>" -> the trimmed contents of <path>. If those contents
52
- * are a JSON object, the first present string field
53
- * among token/password/api_key/apiKey/key/access_token
54
- * is returned (fleet JSON token files, e.g.
55
- * ~/.ssh/mysql/*.json with the password under `.token`);
56
- * otherwise the raw trimmed content is used, so plain
63
+ * - "file:<path>" -> the trimmed contents of <path>. If those contents are a
64
+ * JSON object, the #1043 detection ladder applies: a Google
65
+ * credential JSON is refused (never used as a secret); else the
66
+ * first present string field among
67
+ * token/password/api_key/apiKey/key/access_token is returned
68
+ * (fleet JSON token files, e.g. ~/.ssh/mysql/*.json with the
69
+ * password under `.token`); a JSON object with no recognized
70
+ * field is refused (never leaked as a raw blob). Content that
71
+ * is not JSON falls through to the raw trimmed value, so plain
57
72
  * password files keep working.
58
73
  * - "file:<path>#<field>" -> the <field> string from the JSON in <path>
59
74
  * (back-compat with the legacy `file:X.json#token`
@@ -106,26 +121,43 @@ async function resolveRef(value) {
106
121
  }
107
122
  else {
108
123
  out = raw.replace(/\r?\n+$/, '');
109
- // Fleet JSON token files (~/.ssh/mysql/*.json): if a bare `file:` ref points
110
- // at a JSON object, auto-extract the first present secret field. Falls through
111
- // to the raw trimmed content for plain password files, preserving prior behavior.
124
+ // Fleet JSON token files (~/.ssh/mysql/*.json): if a bare `file:` ref points at a
125
+ // JSON object, apply the #1043 detection ladder. A value that does not parse as
126
+ // JSON (a plain password that happens to start with '{') falls through to the raw
127
+ // trimmed content, preserving prior behavior for plain password files.
112
128
  const s = out.trim();
113
129
  if (s.startsWith('{')) {
130
+ let json;
114
131
  try {
115
- const json = JSON.parse(s);
116
- if (json && typeof json === 'object' && !Array.isArray(json)) {
117
- const rec = json;
118
- for (const field of JSON_SECRET_FIELDS) {
119
- const v = rec[field];
120
- if (typeof v === 'string' && v.trim() !== '') {
121
- out = v.trim();
122
- break;
123
- }
124
- }
125
- }
132
+ json = JSON.parse(s);
126
133
  }
127
134
  catch {
128
- // Not JSON — fall through to the raw trimmed content.
135
+ json = undefined; // Not JSON — keep the raw trimmed content below.
136
+ }
137
+ if (json && typeof json === 'object' && !Array.isArray(json)) {
138
+ const rec = json;
139
+ // Google credential JSON is never a usable secret here — refuse loudly and
140
+ // never send a private key as the password (#1043).
141
+ const gtype = typeof rec.type === 'string' ? rec.type : '';
142
+ if (GOOGLE_TYPES.has(gtype) || (typeof rec.refresh_token === 'string' && typeof rec.token_uri === 'string')) {
143
+ throw new Error(`Secret file "${path}" (referenced as "${value}") is a Google ${gtype || 'OAuth token-cache'} JSON credential, which cannot be used as a secret here; refusing (a private key must never be used as a password).`);
144
+ }
145
+ // GitHub/OAuth-style and fleet JSON token files: take the first present
146
+ // string field among token/password/api_key/apiKey/key/access_token.
147
+ let picked;
148
+ for (const field of JSON_SECRET_FIELDS) {
149
+ const v = rec[field];
150
+ if (typeof v === 'string' && v.trim() !== '') {
151
+ picked = v.trim();
152
+ break;
153
+ }
154
+ }
155
+ if (picked === undefined) {
156
+ // A recognized JSON object with no known secret field: do NOT fall through
157
+ // to the raw blob (that would send the whole JSON as the secret) (#1043).
158
+ throw new Error(`Secret file "${path}" (referenced as "${value}") is a JSON object with no recognized secret field (${JSON_SECRET_FIELDS.join('/')}); refusing to use the raw JSON as a secret.`);
159
+ }
160
+ out = picked;
129
161
  }
130
162
  }
131
163
  }
@@ -1 +1 @@
1
- {"version":3,"file":"secrets.js","sourceRoot":"","sources":["../source/secrets.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,mFAAmF;AACnF,SAAS,UAAU,CAAC,CAAS;IAC5B,IAAI,CAAC,KAAK,GAAG;QAAE,OAAO,OAAO,EAAE,CAAC;IAChC,IAAI,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;QAC/C,OAAO,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACvC,CAAC;IACD,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC;AACnB,CAAC;AAED;;;;;GAKG;AACH,SAAS,cAAc,CAAC,IAAa,EAAE,QAAgB;IACtD,MAAM,KAAK,GAAG,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC;QACrC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACpF,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IACd,IAAI,GAAG,GAAY,IAAI,CAAC;IACxB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QAC1B,IAAI,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,IAAI,IAAK,GAA+B,EAAE,CAAC;YAChF,GAAG,GAAI,GAA+B,CAAC,IAAI,CAAC,CAAC;QAC9C,CAAC;aAAM,CAAC;YACP,OAAO,SAAS,CAAC;QAClB,CAAC;IACF,CAAC;IACD,OAAO,GAAG,CAAC;AACZ,CAAC;AAED,6EAA6E;AAC7E,MAAM,kBAAkB,GAAG,CAAC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,cAAc,CAAU,CAAC;AAEtG;;;;;;;;;;;;;;;;;;GAkBG;AACH,KAAK,UAAU,UAAU,CAAC,KAAa;IACtC,MAAM,CAAC,GAAG,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;IAC5C,IAAI,CAAC,CAAC;QAAE,OAAO,KAAK,CAAC;IACrB,8EAA8E;IAC9E,+EAA+E;IAC/E,oCAAoC;IACpC,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IACtB,IAAI,QAAQ,GAAkB,IAAI,CAAC;IACnC,MAAM,OAAO,GAAG,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IACrC,IAAI,OAAO,IAAI,CAAC,EAAE,CAAC;QAClB,QAAQ,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC;QAClC,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;IAC7B,CAAC;IACD,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;IACpC,IAAI,GAAW,CAAC;IAChB,IAAI,CAAC;QACJ,GAAG,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACrC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACd,MAAM,GAAG,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC7D,MAAM,IAAI,KAAK,CAAC,+BAA+B,IAAI,qBAAqB,KAAK,OAAO,GAAG,EAAE,CAAC,CAAC;IAC5F,CAAC;IACD,IAAI,GAAW,CAAC;IAChB,IAAI,QAAQ,KAAK,IAAI,IAAI,QAAQ,KAAK,EAAE,EAAE,CAAC;QAC1C,IAAI,IAAa,CAAC;QAClB,IAAI,CAAC;YACJ,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACxB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACd,MAAM,GAAG,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAC7D,MAAM,IAAI,KAAK,CACd,gBAAgB,IAAI,qBAAqB,KAAK,qCAAqC,QAAQ,oBAAoB,GAAG,EAAE,CACpH,CAAC;QACH,CAAC;QACD,MAAM,MAAM,GAAG,cAAc,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAC9C,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YAChC,MAAM,IAAI,KAAK,CACd,WAAW,QAAQ,qBAAqB,IAAI,qBAAqB,KAAK,gCAAgC,CACtG,CAAC;QACH,CAAC;QACD,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;IACrC,CAAC;SAAM,CAAC;QACP,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QACjC,6EAA6E;QAC7E,+EAA+E;QAC/E,kFAAkF;QAClF,MAAM,CAAC,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;QACrB,IAAI,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YACvB,IAAI,CAAC;gBACJ,MAAM,IAAI,GAAY,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBACpC,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC9D,MAAM,GAAG,GAAG,IAA+B,CAAC;oBAC5C,KAAK,MAAM,KAAK,IAAI,kBAAkB,EAAE,CAAC;wBACxC,MAAM,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC;wBACrB,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;4BAC9C,GAAG,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;4BACf,MAAM;wBACP,CAAC;oBACF,CAAC;gBACF,CAAC;YACF,CAAC;YAAC,MAAM,CAAC;gBACR,sDAAsD;YACvD,CAAC;QACF,CAAC;IACF,CAAC;IACD,IAAI,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CACd,gBAAgB,IAAI,qBAAqB,KAAK,wEAAwE,CACtH,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAC;AACZ,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,GAAY;IACnD,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QACxB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACrC,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;YACjB,IAAI,OAAO,CAAC,KAAK,QAAQ;gBAAE,GAAG,CAAC,CAAC,CAAC,GAAG,MAAM,UAAU,CAAC,CAAC,CAAC,CAAC;iBACnD,IAAI,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ;gBAAE,MAAM,iBAAiB,CAAC,CAAC,CAAC,CAAC;QACjE,CAAC;IACF,CAAC;SAAM,IAAI,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QAC3C,MAAM,GAAG,GAAG,GAA8B,CAAC;QAC3C,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YAClC,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;YACjB,IAAI,OAAO,CAAC,KAAK,QAAQ;gBAAE,GAAG,CAAC,CAAC,CAAC,GAAG,MAAM,UAAU,CAAC,CAAC,CAAC,CAAC;iBACnD,IAAI,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ;gBAAE,MAAM,iBAAiB,CAAC,CAAC,CAAC,CAAC;QACjE,CAAC;IACF,CAAC;AACF,CAAC"}
1
+ {"version":3,"file":"secrets.js","sourceRoot":"","sources":["../source/secrets.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mokoenterprises/mokomysql-mcp",
3
- "version": "2.7.0",
3
+ "version": "2.7.3",
4
4
  "description": "MCP server for MySQL database management — queries, schema, users, maintenance, and Joomla helpers",
5
5
  "type": "module",
6
6
  "main": "dist/index.js",
package/source/secrets.ts CHANGED
@@ -49,14 +49,30 @@ function selectFragment(json: unknown, fragment: string): unknown {
49
49
  /** Fields, in priority order, auto-extracted from a bare JSON token file. */
50
50
  const JSON_SECRET_FIELDS = ['token', 'password', 'api_key', 'apiKey', 'key', 'access_token'] as const;
51
51
 
52
+ /**
53
+ * Google credential `type` values (service-account / user / workload-identity).
54
+ * A Google credential JSON is NEVER a usable secret here — a MySQL password is not a
55
+ * Google credential, and a private key must never be sent as one — so a bare `file:`
56
+ * ref pointing at one is refused loudly rather than leaked as the raw blob (MokoCLI #1043).
57
+ */
58
+ const GOOGLE_TYPES = new Set([
59
+ 'service_account',
60
+ 'authorized_user',
61
+ 'external_account',
62
+ 'impersonated_service_account',
63
+ ]);
64
+
52
65
  /**
53
66
  * Resolve a single config string.
54
- * - "file:<path>" -> the trimmed contents of <path>. If those contents
55
- * are a JSON object, the first present string field
56
- * among token/password/api_key/apiKey/key/access_token
57
- * is returned (fleet JSON token files, e.g.
58
- * ~/.ssh/mysql/*.json with the password under `.token`);
59
- * otherwise the raw trimmed content is used, so plain
67
+ * - "file:<path>" -> the trimmed contents of <path>. If those contents are a
68
+ * JSON object, the #1043 detection ladder applies: a Google
69
+ * credential JSON is refused (never used as a secret); else the
70
+ * first present string field among
71
+ * token/password/api_key/apiKey/key/access_token is returned
72
+ * (fleet JSON token files, e.g. ~/.ssh/mysql/*.json with the
73
+ * password under `.token`); a JSON object with no recognized
74
+ * field is refused (never leaked as a raw blob). Content that
75
+ * is not JSON falls through to the raw trimmed value, so plain
60
76
  * password files keep working.
61
77
  * - "file:<path>#<field>" -> the <field> string from the JSON in <path>
62
78
  * (back-compat with the legacy `file:X.json#token`
@@ -109,25 +125,46 @@ async function resolveRef(value: string): Promise<string> {
109
125
  out = picked.replace(/\r?\n+$/, '');
110
126
  } else {
111
127
  out = raw.replace(/\r?\n+$/, '');
112
- // Fleet JSON token files (~/.ssh/mysql/*.json): if a bare `file:` ref points
113
- // at a JSON object, auto-extract the first present secret field. Falls through
114
- // to the raw trimmed content for plain password files, preserving prior behavior.
128
+ // Fleet JSON token files (~/.ssh/mysql/*.json): if a bare `file:` ref points at a
129
+ // JSON object, apply the #1043 detection ladder. A value that does not parse as
130
+ // JSON (a plain password that happens to start with '{') falls through to the raw
131
+ // trimmed content, preserving prior behavior for plain password files.
115
132
  const s = out.trim();
116
133
  if (s.startsWith('{')) {
134
+ let json: unknown;
117
135
  try {
118
- const json: unknown = JSON.parse(s);
119
- if (json && typeof json === 'object' && !Array.isArray(json)) {
120
- const rec = json as Record<string, unknown>;
121
- for (const field of JSON_SECRET_FIELDS) {
122
- const v = rec[field];
123
- if (typeof v === 'string' && v.trim() !== '') {
124
- out = v.trim();
125
- break;
126
- }
136
+ json = JSON.parse(s);
137
+ } catch {
138
+ json = undefined; // Not JSON — keep the raw trimmed content below.
139
+ }
140
+ if (json && typeof json === 'object' && !Array.isArray(json)) {
141
+ const rec = json as Record<string, unknown>;
142
+ // Google credential JSON is never a usable secret here — refuse loudly and
143
+ // never send a private key as the password (#1043).
144
+ const gtype = typeof rec.type === 'string' ? rec.type : '';
145
+ if (GOOGLE_TYPES.has(gtype) || (typeof rec.refresh_token === 'string' && typeof rec.token_uri === 'string')) {
146
+ throw new Error(
147
+ `Secret file "${path}" (referenced as "${value}") is a Google ${gtype || 'OAuth token-cache'} JSON credential, which cannot be used as a secret here; refusing (a private key must never be used as a password).`
148
+ );
149
+ }
150
+ // GitHub/OAuth-style and fleet JSON token files: take the first present
151
+ // string field among token/password/api_key/apiKey/key/access_token.
152
+ let picked: string | undefined;
153
+ for (const field of JSON_SECRET_FIELDS) {
154
+ const v = rec[field];
155
+ if (typeof v === 'string' && v.trim() !== '') {
156
+ picked = v.trim();
157
+ break;
127
158
  }
128
159
  }
129
- } catch {
130
- // Not JSON — fall through to the raw trimmed content.
160
+ if (picked === undefined) {
161
+ // A recognized JSON object with no known secret field: do NOT fall through
162
+ // to the raw blob (that would send the whole JSON as the secret) (#1043).
163
+ throw new Error(
164
+ `Secret file "${path}" (referenced as "${value}") is a JSON object with no recognized secret field (${JSON_SECRET_FIELDS.join('/')}); refusing to use the raw JSON as a secret.`
165
+ );
166
+ }
167
+ out = picked;
131
168
  }
132
169
  }
133
170
  }