mirror of
https://github.com/hashicorp/vault-action.git
synced 2026-07-31 10:53:14 +03:00
fix secrets stored in JSON format
This commit is contained in:
+62
-3
@@ -72,7 +72,21 @@ async function getSecrets(secretRequests, client) {
|
||||
*/
|
||||
async function selectData(data, selector) {
|
||||
const ata = jsonata(selector);
|
||||
let result = JSON.stringify(await ata.evaluate(data));
|
||||
let d = await ata.evaluate(data);
|
||||
|
||||
// If we have a Javascript Object, then this data was stored in Vault as
|
||||
// pure JSON (not a JSON string)
|
||||
const storedAsJSONData = isObject(d);
|
||||
|
||||
if (isJSONString(d)) {
|
||||
// If we already have a JSON string we will not "stringify" it yet so
|
||||
// that we don't end up calling JSON.parse. This would break the
|
||||
// secrets that are stored as pure JSON. See: https://github.com/hashicorp/vault-action/issues/194
|
||||
result = d;
|
||||
} else {
|
||||
result = JSON.stringify(d);
|
||||
}
|
||||
|
||||
// Compat for custom engines
|
||||
if (!result && ((ata.ast().type === "path" && ata.ast()['steps'].length === 1) || ata.ast().type === "string") && selector !== 'data' && 'data' in data) {
|
||||
result = JSON.stringify(await jsonata(`data.${selector}`).evaluate(data));
|
||||
@@ -81,12 +95,57 @@ async function selectData(data, selector) {
|
||||
}
|
||||
|
||||
if (result.startsWith(`"`)) {
|
||||
result = JSON.parse(result);
|
||||
// we need to strip the beginning and ending quotes otherwise it will
|
||||
// always successfully parse as a JSON string
|
||||
result = result.substring(1, result.length - 1);
|
||||
if (!isJSONString(result)) {
|
||||
// add the quotes back so we can parse it into a Javascript object
|
||||
// to allow support for multi-line secrets. See https://github.com/hashicorp/vault-action/issues/160
|
||||
result = `"${result}"`
|
||||
result = JSON.parse(result);
|
||||
}
|
||||
} else if (isJSONString(result)) {
|
||||
if (storedAsJSONData) {
|
||||
// Support secrets stored in Vault as pure JSON.
|
||||
// See https://github.com/hashicorp/vault-action/issues/194 and https://github.com/hashicorp/vault-action/pull/173
|
||||
result = JSON.stringify(result);
|
||||
result = result.substring(1, result.length - 1);
|
||||
} else {
|
||||
// Support secrets stored in Vault as JSON Strings
|
||||
result = JSON.stringify(result);
|
||||
result = JSON.parse(result);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* isOjbect returns true if target is a Javascript object
|
||||
* @param {Type} target
|
||||
*/
|
||||
function isObject(target) {
|
||||
return typeof target === 'object' && target !== null;
|
||||
}
|
||||
|
||||
/**
|
||||
* isJSONString returns true if target parses as a valid JSON string
|
||||
* @param {Type} target
|
||||
*/
|
||||
function isJSONString(target) {
|
||||
if (typeof target !== "string"){
|
||||
return false;
|
||||
}
|
||||
|
||||
try {
|
||||
let o = JSON.parse(target);
|
||||
} catch (e) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
getSecrets,
|
||||
selectData
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user