From 62e6bf4a75da44720e82133c24dcf3cf8fe0b57f Mon Sep 17 00:00:00 2001 From: Preston Hales Date: Tue, 3 Feb 2026 16:34:47 -0700 Subject: [PATCH 1/2] Fix conn save and conn describe tests --- .../conn-describe.e2e.test.js.snap | 14 +++++------ .../__snapshots__/conn-save.e2e.test.js.snap | 12 +++++----- test/e2e/conn-describe.e2e.test.js | 9 +++---- test/e2e/conn-save.e2e.test.js | 24 +++++++++++-------- test/e2e/env/Connections.json | 6 +++++ test/e2e/utils/TestConfig.js | 8 ++++++- test/e2e/utils/TestUtils.js | 2 ++ 7 files changed, 47 insertions(+), 28 deletions(-) diff --git a/test/e2e/__snapshots__/conn-describe.e2e.test.js.snap b/test/e2e/__snapshots__/conn-describe.e2e.test.js.snap index b442ef4ca..b28ce1b4b 100644 --- a/test/e2e/__snapshots__/conn-describe.e2e.test.js.snap +++ b/test/e2e/__snapshots__/conn-describe.e2e.test.js.snap @@ -1,12 +1,12 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`frodo conn describe "frodo conn describe http://openam-frodo-dev.classic.com:8080/am": should describe the classic connection 1`] = ` -"Host │http://openam-frodo-dev.classic.com:8080/am -Deployment Type │classic -Username │amadmin -Password │ -Authentication Service│MockAmsterService -Amster Private Key │[present] +exports[`frodo conn describe "frodo conn describe http://openam-frodo-dev.amster.com:8080/am": should describe the classic connection 1`] = ` +"Host │http://openam-frodo-dev.amster.com:8080/am +Deployment Type │classic +Username │amadmin +Password │ +Authentication Service│MockAmsterService +Amster Private Key │[present] " `; diff --git a/test/e2e/__snapshots__/conn-save.e2e.test.js.snap b/test/e2e/__snapshots__/conn-save.e2e.test.js.snap index f7ee31994..b5470bcf2 100644 --- a/test/e2e/__snapshots__/conn-save.e2e.test.js.snap +++ b/test/e2e/__snapshots__/conn-save.e2e.test.js.snap @@ -1,9 +1,8 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`frodo conn save "frodo conn save --no-validate --private-key /home/user/am/security/keys/amster/amster_rsa --authentication-service MockAmsterService http://openam-frodo-dev.classic.com:8080/am": save new classic connection profile with private key and custom authentication service. 1`] = ` -"Error parsing private key from file /home/user/am/security/keys/amster/amster_rsa: ENOENT: no such file or directory, open '/home/user/am/security/keys/amster/amster_rsa' -Advanced setting: Authentication Service: MockAmsterService -Saved connection profile http://openam-frodo-dev.classic.com:8080/am +exports[`frodo conn save "frodo conn save --no-validate --private-key test/fs_tmp/conn-save-pk --authentication-service MockAmsterService http://openam-frodo-dev.amster.com:8080/am": save new classic connection profile with private key and custom authentication service. 1`] = ` +"Advanced setting: Authentication Service: MockAmsterService +Saved connection profile http://openam-frodo-dev.amster.com:8080/am " `; @@ -12,8 +11,9 @@ exports[`frodo conn save "frodo conn save --no-validate --sa-id b672336b-41ef-42 " `; -exports[`frodo conn save "frodo conn save --no-validate http://openam-frodo-dev.classic.com:8080/am amAdmin Sup3rS3cr3t!": save new classic connection profile using an admin account. 1`] = ` -"Saved connection profile http://openam-frodo-dev.classic.com:8080/am +exports[`frodo conn save "frodo conn save --no-validate http://openam-frodo-dev.amster.com:8080/am amAdmin undefined": save new classic connection profile using an admin account. 1`] = ` +"Advanced setting: Authentication Service: MockAmsterService +Saved connection profile http://openam-frodo-dev.amster.com:8080/am " `; diff --git a/test/e2e/conn-describe.e2e.test.js b/test/e2e/conn-describe.e2e.test.js index 77eb9b0c0..18143e76e 100644 --- a/test/e2e/conn-describe.e2e.test.js +++ b/test/e2e/conn-describe.e2e.test.js @@ -58,14 +58,15 @@ import cp from 'child_process'; import { promisify } from 'util'; import { getEnv, removeAnsiEscapeCodes, testif } from './utils/TestUtils'; -import { connection as c, classic_connection as cc } from './utils/TestConfig'; +import { connection as c, amster_connection as cc } from './utils/TestConfig'; const exec = promisify(cp.exec); process.env['FRODO_MOCK'] = '1'; process.env['FRODO_CONNECTION_PROFILES_PATH'] = './test/e2e/env/Connections.json'; -const env = getEnv(); +const env = getEnv(c); +const classicEnv = getEnv(cc); describe('frodo conn describe', () => { testif(process.env['FRODO_MASTER_KEY'] || process.env['FRODO_MASTER_KEY_PATH'])( @@ -81,7 +82,7 @@ describe('frodo conn describe', () => { `"frodo conn describe ${cc.host}": should describe the classic connection`, async () => { const CMD = `frodo conn describe ${cc.host}`; - const { stdout } = await exec(CMD, env); + const { stdout } = await exec(CMD, classicEnv); expect(removeAnsiEscapeCodes(stdout)).toMatchSnapshot(); } ); @@ -100,7 +101,7 @@ describe('frodo conn describe', () => { `"frodo conn describe --show-secrets ${cc.host}": should describe the classic connection and show the associated secrets`, async () => { const CMD = `frodo conn describe --show-secrets ${cc.host}`; - const { stdout } = await exec(CMD, env); + const { stdout } = await exec(CMD, classicEnv); //Don't test with snapshot, otherwise the snapshot would contain secrets. Instead, just check to make sure "[present]" doesn't exist anywhere. expect(removeAnsiEscapeCodes(stdout).includes("[present]")).toBeFalsy(); } diff --git a/test/e2e/conn-save.e2e.test.js b/test/e2e/conn-save.e2e.test.js index fb905d1a2..233cc1577 100644 --- a/test/e2e/conn-save.e2e.test.js +++ b/test/e2e/conn-save.e2e.test.js @@ -48,7 +48,7 @@ import cp from 'child_process'; import { promisify } from 'util'; import {getEnv, removeAnsiEscapeCodes, testif} from './utils/TestUtils'; -import { connection as c, classic_connection as cc } from './utils/TestConfig'; +import { connection as c, amster_connection as cc } from './utils/TestConfig'; import { writeFileSync, rmSync } from 'fs'; const exec = promisify(cp.exec); @@ -58,22 +58,26 @@ const connectionsSaveFile = './test/e2e/env/ConnectionsSave.json'; process.env['FRODO_MOCK'] = '1'; process.env['FRODO_CONNECTION_PROFILES_PATH'] = './test/e2e/env/ConnectionsSave.json'; -const env = getEnv(); +const env = getEnv(c); +const classicEnv = getEnv(cc); const jwkFile = 'test/fs_tmp/conn-save-jwk.json'; +const pkFile = 'test/fs_tmp/conn-save-pk'; beforeAll(() => { writeFileSync(jwkFile, c.saJwk); + writeFileSync(pkFile, cc.pk); writeFileSync(connectionsSaveFile, '{}'); }); afterAll(() => { rmSync(jwkFile); + rmSync(pkFile); rmSync(connectionsSaveFile); }); describe('frodo conn save', () => { - testif(process.env['FRODO_MASTER_KEY'])( + testif(process.env['FRODO_MASTER_KEY'] || process.env['FRODO_MASTER_KEY_PATH'])( `"frodo conn save --no-validate ${c.host} ${c.user} ${c.pass}": save new connection profile using an admin account.`, async () => { const CMD = `frodo conn save --no-validate ${c.host} ${c.user} ${c.pass}`; @@ -82,7 +86,7 @@ describe('frodo conn save', () => { } ); - testif(process.env['FRODO_MASTER_KEY'])( + testif(process.env['FRODO_MASTER_KEY'] || process.env['FRODO_MASTER_KEY_PATH'])( `"frodo conn save --no-validate --sa-id ${c.saId} --sa-jwk-file ${jwkFile} ${c.host}": save new connection profile with existing service account and without admin account.`, async () => { const CMD = `frodo conn save --no-validate --sa-id ${c.saId} --sa-jwk-file ${jwkFile} ${c.host}`; @@ -91,20 +95,20 @@ describe('frodo conn save', () => { } ); - testif(process.env['FRODO_MASTER_KEY'])( + testif(process.env['FRODO_MASTER_KEY'] || process.env['FRODO_MASTER_KEY_PATH'])( `"frodo conn save --no-validate ${cc.host} ${cc.user} ${cc.pass}": save new classic connection profile using an admin account.`, async () => { const CMD = `frodo conn save --no-validate ${cc.host} ${cc.user} ${cc.pass}`; - const { stderr } = await exec(CMD, env); + const { stderr } = await exec(CMD, classicEnv); expect(removeAnsiEscapeCodes(stderr)).toMatchSnapshot(); } ); - testif(process.env['FRODO_MASTER_KEY'])( - `"frodo conn save --no-validate --private-key ${cc.pk} --authentication-service ${cc.authService} ${cc.host}": save new classic connection profile with private key and custom authentication service.`, + testif(process.env['FRODO_MASTER_KEY'] || process.env['FRODO_MASTER_KEY_PATH'])( + `"frodo conn save --no-validate --private-key ${pkFile} --authentication-service ${cc.authService} ${cc.host}": save new classic connection profile with private key and custom authentication service.`, async () => { - const CMD = `frodo conn save --no-validate --private-key ${cc.pk} --authentication-service ${cc.authService} ${cc.host}`; - const { stderr } = await exec(CMD, env); + const CMD = `frodo conn save --no-validate --private-key ${pkFile} --authentication-service ${cc.authService} ${cc.host}`; + const { stderr } = await exec(CMD, classicEnv); expect(removeAnsiEscapeCodes(stderr)).toMatchSnapshot(); } ); diff --git a/test/e2e/env/Connections.json b/test/e2e/env/Connections.json index c16ec8ebb..6cd8a1175 100644 --- a/test/e2e/env/Connections.json +++ b/test/e2e/env/Connections.json @@ -5,5 +5,11 @@ "svcacctId": "912dcd07-421b-4ba9-b019-edbfe66a89be", "svcacctName": "Frodo-SA-1758728043147", "svcacctScope": "fr:idc:custom-domain:* fr:idc:release:* fr:idc:sso-cookie:* fr:am:* fr:autoaccess:* fr:idc:content-security-policy:* fr:idc:esv:* fr:idc:certificate:* fr:idm:* fr:idc:analytics:* fr:idc:cookie-domain:* fr:idc:promotion:*" + }, + "http://openam-frodo-dev.amster.com:8080/am": { + "authenticationService": "MockAmsterService", + "deploymentType": "classic", + "encodedAmsterPrivateKey": "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", + "username": "amadmin" } } diff --git a/test/e2e/utils/TestConfig.js b/test/e2e/utils/TestConfig.js index c6bdafe9a..f4d7aac94 100644 --- a/test/e2e/utils/TestConfig.js +++ b/test/e2e/utils/TestConfig.js @@ -13,6 +13,12 @@ export const classic_connection = { user: 'amAdmin', pass: 'Sup3rS3cr3t!', realm: '/', - pk: '/home/user/am/security/keys/amster/amster_rsa', +} + +export const amster_connection = { + host: 'http://openam-frodo-dev.amster.com:8080/am', + user: 'amAdmin', + realm: '/', + pk: '-----BEGIN PRIVATE KEY-----\n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\nnBZ7tjPhmJQ9O1dzsZhHvAkiD+U7Lw==\n-----END PRIVATE KEY-----', authService: 'MockAmsterService' } diff --git a/test/e2e/utils/TestUtils.js b/test/e2e/utils/TestUtils.js index 9a0e46b0a..ed5aa36da 100644 --- a/test/e2e/utils/TestUtils.js +++ b/test/e2e/utils/TestUtils.js @@ -252,6 +252,8 @@ export function getEnv(connection = undefined) { ...(connection?.saJwk && { FRODO_SA_JWK: connection.saJwk }), ...(connection?.user && { FRODO_USERNAME: connection.user }), ...(connection?.pass && { FRODO_PASSWORD: connection.pass }), + ...(connection?.pk && { FRODO_AMSTER_PRIVATE_KEY: connection.pk }), + ...(connection?.authService && { FRODO_AUTHENTICATION_SERVICE: connection.authService }), }, }; } From 7a3140b99b00ea869d798176535deabf675c0376 Mon Sep 17 00:00:00 2001 From: Preston Hales Date: Tue, 3 Feb 2026 16:43:06 -0700 Subject: [PATCH 2/2] Run audit fix --- package-lock.json | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5071a0f7f..2759f4593 100644 --- a/package-lock.json +++ b/package-lock.json @@ -92,7 +92,6 @@ "integrity": "sha512-2BCOP7TN8M+gVDj7/ht3hsaO/B/n5oDbiAyyvnRlNOs+u1o+JWNYTQrmpuNp1/Wq2gcFrI01JAW+paEKDMx/CA==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@babel/code-frame": "^7.27.1", "@babel/generator": "^7.28.3", @@ -1191,9 +1190,9 @@ } }, "node_modules/@isaacs/brace-expansion": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz", - "integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.1.tgz", + "integrity": "sha512-WMz71T1JS624nWj2n2fnYAuPovhv7EUhk69R6i9dsVyzxt5eM3bjwvgk9L+APE1TRscGysAVMANkB0jh0LQZrQ==", "dev": true, "license": "MIT", "dependencies": { @@ -2400,7 +2399,6 @@ "integrity": "sha512-94EQTWZ40mzBc42ATNIBimBEDltSJ9RQHCC8vc/PDbxi4k8dVwUAv4o98dk50M1zB+JGFxp43FP7f8+FP8R6Sw==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@eslint-community/regexpp": "^4.10.0", "@typescript-eslint/scope-manager": "7.18.0", @@ -2435,7 +2433,6 @@ "integrity": "sha512-4Z+L8I2OqhZV8qA132M4wNL30ypZGYOQVBfMgxDH/K5UX0PNqTu1c6za9ST5r9+tavvHiTWmBnKzpCJ/GlVFtg==", "dev": true, "license": "BSD-2-Clause", - "peer": true, "dependencies": { "@typescript-eslint/scope-manager": "7.18.0", "@typescript-eslint/types": "7.18.0", @@ -2646,7 +2643,6 @@ "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", "dev": true, "license": "MIT", - "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -3219,7 +3215,6 @@ } ], "license": "MIT", - "peer": true, "dependencies": { "caniuse-lite": "^1.0.30001737", "electron-to-chromium": "^1.5.211", @@ -4229,7 +4224,6 @@ "dev": true, "hasInstallScript": true, "license": "MIT", - "peer": true, "bin": { "esbuild": "bin/esbuild" }, @@ -4295,7 +4289,6 @@ "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", @@ -4352,7 +4345,6 @@ "integrity": "sha512-82GZUjRS0p/jganf6q1rEO25VSoHH0hKPCTrgillPjdI/3bgBhAE1QzHrHTizjpRvy6pGAvKjDJtk2pF9NDq8w==", "dev": true, "license": "MIT", - "peer": true, "bin": { "eslint-config-prettier": "bin/cli.js" }, @@ -6279,7 +6271,6 @@ "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@jest/core": "^29.7.0", "@jest/types": "^29.6.3", @@ -8178,7 +8169,6 @@ "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==", "dev": true, "license": "MIT", - "peer": true, "bin": { "prettier": "bin/prettier.cjs" }, @@ -9992,7 +9982,6 @@ "integrity": "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==", "dev": true, "license": "Apache-2.0", - "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver"