Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Admin ENV Update #316

Merged
merged 5 commits into from
May 14, 2024
Merged

Admin ENV Update #316

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cd848d1
cve update for nodemailer and pm2
adl-trey Feb 1, 2024
ad2632b
Merge branch 'master' of https://github.com/vbhayden/CASS
adl-trey Apr 30, 2024
57521f7
adding admin env check
adl-trey Apr 30, 2024
b1ace58
fixing admin key syntax
adl-trey May 1, 2024
6a9d4e3
clarifying names for env email config
vbhayden May 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 38 additions & 1 deletion src/main/server/shims/auth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,24 @@ var skyrepoAdminPpk = function() {
fileSave(EcPpk.fromPem(rsaGenerate()).toPem(), "etc/skyAdmin2.pem");
return EcPpk.fromPem(fileToString(fileLoad("etc/skyAdmin2.pem"))).toPem();
};
const skyrepoAdminKey = function () {
if (!fs.existsSync('etc/skyAdmin2.pem')) {
fileSave(EcPpk.fromPem(rsaGenerate()).toPem(), 'etc/skyAdmin2.pem');
}
return EcPpk.fromPem(fileToString(fileLoad('etc/skyAdmin2.pem')));
};

function interpretAdminCSV(envCSV) {
if (envCSV == undefined || typeof envCSV !== "string" || envCSV === "")
return [];

return envCSV.split(",");
}

// Optional Admin Config
const allowEnvEmails = process.env.AUTH_ALLOW_ENV_ADMINS == "true";
const envEmailArray = interpretAdminCSV(process.env.AUTH_ENV_ADMIN_EMAILS);

let getPk = async(identifier) => {
if (getPkCache[identifier] != null)
{
Expand Down Expand Up @@ -387,13 +405,32 @@ app.use(async function (req, res, next) {
}
if (signatureSheet == null)
{
signatureSheet = await eim.signatureSheet(60000,repo.selectedServerProxy == null ? repo.selectedServer : repo.selectedServerProxy,null,null,"SHA-256");
let signatureServer = repo.selectedServerProxy == null ? repo.selectedServer : repo.selectedServerProxy;

signatureSheet = await eim.signatureSheet(60000, signatureServer, null, null, "SHA-256");

let considerUserAnAdmin = allowEnvEmails && envEmailArray.includes(email);
if (considerUserAnAdmin && signatureSheet != null) {

let adminKey = skyrepoAdminKey();
let adminSignature = await eim.createSignature(60000, signatureServer, adminKey, "SHA-256");

let signatureSheetObj = JSON.parse(signatureSheet);
let adminSignatureObj = JSON.parse(JSON.stringify(adminSignature));

global.auditLogger.report(global.auditLogger.LogCategory.AUTH, global.auditLogger.Severity.INFO, "CassSigSheetCreated", `Securing Proxy: Adding ADMIN signature for due to ENV config for ${email}.`, signatureSheet);

signatureSheetObj.push(adminSignatureObj);
signatureSheet = JSON.stringify(signatureSheetObj);
}

//THIS IS NOT OK, THE KEY INTO THE CACHE SHOULD NOT BE THE SERVER NAME!!!!!!!!!!
signatureSheetCache[p.shortId()] = signatureSheet;
global.auditLogger.report(global.auditLogger.LogCategory.AUTH, global.auditLogger.Severity.INFO, "CassSigSheetCreated", `Securing Proxy: Created signature sheet for request from ${email}.`, signatureSheet);
}
else
global.auditLogger.report(global.auditLogger.LogCategory.AUTH, global.auditLogger.Severity.INFO, "CassSigSheetCreated", `Securing Proxy: Reused signature sheet for request from ${email}.`, signatureSheet);

req.headers.signatureSheet = signatureSheet;
req.eim = eim;
}
Expand Down
Loading