GlcoinCore/RTL
1
0
Fork 0
mirror of https://github.com/Ride-The-Lightning/RTL.git synced 2026-08-13 12:33:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Add defensive auth guards and cleanup iteration usage

Browse source
This commit is contained in:
Cosimo Ricciardi 2026-05-14 11:39:11 +02:00 • committed by Suheb
parent 40bd25d921
commit bd0f515a6e
4 changed files with 52 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

48
backend/controllers/shared/RTLConf.js
View file

@ -201,17 +201,19 @@ export const updateNodeSettings = (req, res, next) => {
const node = config.nodes.find((node) => (node.index === req.session.selectedNode.index)); const node = config.nodes.find((node) => (node.index === req.session.selectedNode.index));
if (node && node.settings) { if (node && node.settings) {
node.settings = { ...node.settings, ...req.body.settings }; node.settings = { ...node.settings, ...req.body.settings };
if (req.body.authentication.boltzMacaroonPath) { if (node.authentication && req.body.authentication) {
node.authentication.boltzMacaroonPath = req.body.authentication.boltzMacaroonPath; if (req.body.authentication.boltzMacaroonPath) {
} node.authentication.boltzMacaroonPath = req.body.authentication.boltzMacaroonPath;
else { }
delete node.authentication.boltzMacaroonPath; else {
} delete node.authentication.boltzMacaroonPath;
if (req.body.authentication.swapMacaroonPath) { }
node.authentication.swapMacaroonPath = req.body.authentication.swapMacaroonPath; if (req.body.authentication.swapMacaroonPath) {
} node.authentication.swapMacaroonPath = req.body.authentication.swapMacaroonPath;
else { }
delete node.authentication.swapMacaroonPath; else {
delete node.authentication.swapMacaroonPath;
}
} }
} }
try { try {
@ -219,17 +221,19 @@ export const updateNodeSettings = (req, res, next) => {
const selectedNode = common.findNode(req.session.selectedNode.index); const selectedNode = common.findNode(req.session.selectedNode.index);
if (selectedNode && selectedNode.settings) { if (selectedNode && selectedNode.settings) {
selectedNode.settings = { ...selectedNode.settings, ...req.body.settings }; selectedNode.settings = { ...selectedNode.settings, ...req.body.settings };
if (req.body.authentication.boltzMacaroonPath) { if (selectedNode.authentication && req.body.authentication) {
selectedNode.authentication.boltzMacaroonPath = req.body.authentication.boltzMacaroonPath; if (req.body.authentication.boltzMacaroonPath) {
} selectedNode.authentication.boltzMacaroonPath = req.body.authentication.boltzMacaroonPath;
else { }
delete selectedNode.authentication.boltzMacaroonPath; else {
} delete selectedNode.authentication.boltzMacaroonPath;
if (req.body.authentication.swapMacaroonPath) { }
selectedNode.authentication.swapMacaroonPath = req.body.authentication.swapMacaroonPath; if (req.body.authentication.swapMacaroonPath) {
} selectedNode.authentication.swapMacaroonPath = req.body.authentication.swapMacaroonPath;
else { }
delete selectedNode.authentication.swapMacaroonPath; else {
delete selectedNode.authentication.swapMacaroonPath;
}
} }
common.replaceNode(req, selectedNode); common.replaceNode(req, selectedNode);
} }

5
backend/utils/common.js
View file

@ -55,7 +55,7 @@ export class CommonService {
delete config.multiPass; delete config.multiPass;
delete config.multiPassHashed; delete config.multiPassHashed;
delete config.secret2FA; delete config.secret2FA;
config.nodes?.map((node) => this.removeAuthSecureData(node)); config.nodes?.forEach((node) => this.removeAuthSecureData(node));
return config; return config;
}; };
this.addSecureData = (config) => { this.addSecureData = (config) => {
@ -70,7 +70,7 @@ export class CommonService {
config.secret2FA = this.appConfig.secret2FA; config.secret2FA = this.appConfig.secret2FA;
} }
const appConfigNodes = new Map(this.appConfig.nodes?.map((node) => [node.index, node])); const appConfigNodes = new Map(this.appConfig.nodes?.map((node) => [node.index, node]));
config.nodes.map((node) => { config.nodes.forEach((node) => {
const appConfigNode = appConfigNodes.get(node.index); const appConfigNode = appConfigNodes.get(node.index);
if (appConfigNode?.authentication) { if (appConfigNode?.authentication) {
if (appConfigNode.authentication.macaroonPath) { if (appConfigNode.authentication.macaroonPath) {
@ -83,7 +83,6 @@ export class CommonService {
node.authentication.lnApiPassword = appConfigNode.authentication.lnApiPassword; node.authentication.lnApiPassword = appConfigNode.authentication.lnApiPassword;
} }
} }
return node;
}); });
return config; return config;
}; };

40
server/controllers/shared/RTLConf.ts
View file

@ -205,15 +205,17 @@ export const updateNodeSettings = (req, res, next) => {
const node = config.nodes.find((node) => (node.index === req.session.selectedNode.index)); const node = config.nodes.find((node) => (node.index === req.session.selectedNode.index));
if (node && node.settings) { if (node && node.settings) {
node.settings = { ...node.settings, ...req.body.settings }; node.settings = { ...node.settings, ...req.body.settings };
if (req.body.authentication.boltzMacaroonPath) { if (node.authentication && req.body.authentication) {
node.authentication.boltzMacaroonPath = req.body.authentication.boltzMacaroonPath; if (req.body.authentication.boltzMacaroonPath) {
} else { node.authentication.boltzMacaroonPath = req.body.authentication.boltzMacaroonPath;
delete node.authentication.boltzMacaroonPath; } else {
} delete node.authentication.boltzMacaroonPath;
if (req.body.authentication.swapMacaroonPath) { }
node.authentication.swapMacaroonPath = req.body.authentication.swapMacaroonPath; if (req.body.authentication.swapMacaroonPath) {
} else { node.authentication.swapMacaroonPath = req.body.authentication.swapMacaroonPath;
delete node.authentication.swapMacaroonPath; } else {
delete node.authentication.swapMacaroonPath;
}
} }
} }
try { try {
@ -221,15 +223,17 @@ export const updateNodeSettings = (req, res, next) => {
const selectedNode = common.findNode(req.session.selectedNode.index); const selectedNode = common.findNode(req.session.selectedNode.index);
if (selectedNode && selectedNode.settings) { if (selectedNode && selectedNode.settings) {
selectedNode.settings = { ...selectedNode.settings, ...req.body.settings }; selectedNode.settings = { ...selectedNode.settings, ...req.body.settings };
if (req.body.authentication.boltzMacaroonPath) { if (selectedNode.authentication && req.body.authentication) {
selectedNode.authentication.boltzMacaroonPath = req.body.authentication.boltzMacaroonPath; if (req.body.authentication.boltzMacaroonPath) {
} else { selectedNode.authentication.boltzMacaroonPath = req.body.authentication.boltzMacaroonPath;
delete selectedNode.authentication.boltzMacaroonPath; } else {
} delete selectedNode.authentication.boltzMacaroonPath;
if (req.body.authentication.swapMacaroonPath) { }
selectedNode.authentication.swapMacaroonPath = req.body.authentication.swapMacaroonPath; if (req.body.authentication.swapMacaroonPath) {
} else { selectedNode.authentication.swapMacaroonPath = req.body.authentication.swapMacaroonPath;
delete selectedNode.authentication.swapMacaroonPath; } else {
delete selectedNode.authentication.swapMacaroonPath;
}
} }
common.replaceNode(req, selectedNode); common.replaceNode(req, selectedNode);
} }

5
server/utils/common.ts
View file

@ -63,7 +63,7 @@ export class CommonService {
delete config.multiPass; delete config.multiPass;
delete config.multiPassHashed; delete config.multiPassHashed;
delete config.secret2FA; delete config.secret2FA;
config.nodes?.map((node) => this.removeAuthSecureData(node)); config.nodes?.forEach((node) => this.removeAuthSecureData(node));
return config; return config;
}; };
@ -79,7 +79,7 @@ export class CommonService {
config.secret2FA = this.appConfig.secret2FA; config.secret2FA = this.appConfig.secret2FA;
} }
const appConfigNodes = new Map(this.appConfig.nodes?.map((node) => [node.index, node])); const appConfigNodes = new Map(this.appConfig.nodes?.map((node) => [node.index, node]));
config.nodes.map((node) => { config.nodes.forEach((node) => {
const appConfigNode = appConfigNodes.get(node.index); const appConfigNode = appConfigNodes.get(node.index);
if (appConfigNode?.authentication) { if (appConfigNode?.authentication) {
if (appConfigNode.authentication.macaroonPath) { if (appConfigNode.authentication.macaroonPath) {
@ -92,7 +92,6 @@ export class CommonService {
node.authentication.lnApiPassword = appConfigNode.authentication.lnApiPassword; node.authentication.lnApiPassword = appConfigNode.authentication.lnApiPassword;
} }
} }
return node;
}); });
return config; return config;
}; };