mirror of
https://github.com/hashicorp/vault-action.git
synced 2026-04-09 21:50:05 +00:00
fix secrets stored in JSON format (#473)
* fix secrets stored in JSON format * add more tests * fix lint and pass token to build * add test cases * add debug * fix ordering of build steps * fix test string format * update test check * fix test string format * final cleanup * remove comment * remove unused var assignment * simplify more * simplify code and add more comments
This commit is contained in:
parent
e926631bb2
commit
b138504969
7 changed files with 153 additions and 6 deletions
|
|
@ -67,12 +67,13 @@ async function getSecrets(secretRequests, client) {
|
|||
|
||||
/**
|
||||
* Uses a Jsonata selector retrieve a bit of data from the result
|
||||
* @param {object} data
|
||||
* @param {string} selector
|
||||
* @param {object} data
|
||||
* @param {string} selector
|
||||
*/
|
||||
async function selectData(data, selector) {
|
||||
const ata = jsonata(selector);
|
||||
let result = JSON.stringify(await ata.evaluate(data));
|
||||
|
||||
// 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,7 +82,18 @@ async function selectData(data, selector) {
|
|||
}
|
||||
|
||||
if (result.startsWith(`"`)) {
|
||||
// Support multi-line secrets like JSON strings and ssh keys, see https://github.com/hashicorp/vault-action/pull/173
|
||||
// Deserialize the value so that newlines and special characters are
|
||||
// not escaped in our return value.
|
||||
result = JSON.parse(result);
|
||||
} else {
|
||||
// Support secrets stored in Vault as pure JSON, see https://github.com/hashicorp/vault-action/issues/194
|
||||
// Serialize the value so that any special characters in the data are
|
||||
// properly escaped.
|
||||
result = JSON.stringify(result);
|
||||
// strip the surrounding quotes added by stringify because the data did
|
||||
// not have them in the first place
|
||||
result = result.substring(1, result.length - 1);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
|
@ -89,4 +101,4 @@ async function selectData(data, selector) {
|
|||
module.exports = {
|
||||
getSecrets,
|
||||
selectData
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue