From f67fedce2e9a93f262d2d05e9b6ab12489eca2da Mon Sep 17 00:00:00 2001 From: ShahanaFarooqui Date: Mon, 22 Apr 2024 19:12:56 -0700 Subject: [PATCH] Unified config models --- backend/controllers/shared/RTLConf.js | 35 +++++++++--- backend/models/config.model.js | 45 +++++++-------- server/controllers/shared/RTLConf.ts | 36 +++++++++--- server/models/config.model.ts | 57 +++++++++---------- src/app/app.component.html | 4 +- src/app/app.component.ts | 6 +- .../side-navigation.component.html | 2 +- .../side-navigation.component.ts | 18 +++--- .../node-config/node-config.component.ts | 2 +- .../node-settings/node-settings.component.ts | 8 +-- .../boltz-service-settings.component.ts | 6 +- .../loop-service-settings.component.html | 4 +- .../loop-service-settings.component.ts | 6 +- .../services-settings.component.html | 10 ++-- .../services-settings.component.ts | 2 +- .../components/settings/settings.component.ts | 2 +- src/app/shared/models/RTLconfig.ts | 24 ++++---- src/app/store/rtl.effects.ts | 10 ++-- src/app/store/rtl.state.ts | 2 +- 19 files changed, 159 insertions(+), 120 deletions(-) diff --git a/backend/controllers/shared/RTLConf.js b/backend/controllers/shared/RTLConf.js index eddf5a6a..94656bec 100644 --- a/backend/controllers/shared/RTLConf.js +++ b/backend/controllers/shared/RTLConf.js @@ -8,7 +8,7 @@ import { Database } from '../../utils/database.js'; import { Logger } from '../../utils/logger.js'; import { Common } from '../../utils/common.js'; import { WSServer } from '../../utils/webSocketServer.js'; -import { NodeAuthentication, SSO } from '../../models/config.model.js'; +import { Authentication, SSO } from '../../models/config.model.js'; const options = { url: '' }; const logger = Logger; const common = Common; @@ -32,7 +32,7 @@ export const maskPasswords = (obj) => { } return obj; }; -export const removeSensitiveData = (config) => { +export const removeSecureData = (config) => { delete config.rtlConfFilePath; delete config.rtlPass; delete config.multiPass; @@ -46,6 +46,26 @@ export const removeSensitiveData = (config) => { }); return config; }; +export const addSecureData = (config) => { + config.SSO.rtlCookiePath = common.appConfig.SSO.rtlCookiePath; + config.rtlPass = common.appConfig.rtlPass; + config.multiPass = common.appConfig.multiPass; + config.multiPassHashed = common.appConfig.multiPassHashed; + config.secret2FA = common.appConfig.secret2FA; + config.nodes.map((node, i) => { + if (common.appConfig && common.appConfig.nodes && common.appConfig.nodes.length > i && common.appConfig.nodes[i].Authentication && common.appConfig.nodes[i].Authentication.macaroonPath) { + node.Authentication.macaroonPath = common.appConfig.nodes[i].Authentication.macaroonPath; + } + if (common.appConfig && common.appConfig.nodes && common.appConfig.nodes.length > i && common.appConfig.nodes[i].Authentication && common.appConfig.nodes[i].Authentication.runePath) { + node.Authentication.runePath = common.appConfig.nodes[i].Authentication.runePath; + } + if (common.appConfig && common.appConfig.nodes && common.appConfig.nodes.length > i && common.appConfig.nodes[i].Authentication && common.appConfig.nodes[i].Authentication.lnApiPassword) { + node.Authentication.lnApiPassword = common.appConfig.nodes[i].Authentication.lnApiPassword; + } + return node; + }); + return config; +}; export const getCurrencyRates = (req, res, next) => { logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'RTLConf', msg: 'Getting Currency Rates..' }); options.url = 'https://blockchain.info/ticker'; @@ -88,7 +108,7 @@ export const getApplicationSettings = (req, res, next) => { return res.status(err.statusCode).json({ message: err.error, error: err.error }); } else { - const appConfData = removeSensitiveData(JSON.parse(data)); + const appConfData = removeSecureData(JSON.parse(data)); appConfData.allowPasswordUpdate = common.appConfig.allowPasswordUpdate; appConfData.enable2FA = common.appConfig.enable2FA; appConfData.selectedNodeIndex = (req.session.selectedNode && req.session.selectedNode.index ? req.session.selectedNode.index : common.selectedNode.index); @@ -100,7 +120,7 @@ export const getApplicationSettings = (req, res, next) => { appConfData.SSO = new SSO(); appConfData.secret2FA = ''; appConfData.dbDirectoryPath = ''; - appConfData.nodes[selNodeIdx].Authentication = new NodeAuthentication(); + appConfData.nodes[selNodeIdx].Authentication = new Authentication(); delete appConfData.nodes[selNodeIdx].Settings.bitcoindConfigPath; delete appConfData.nodes[selNodeIdx].Settings.lnServerUrl; delete appConfData.nodes[selNodeIdx].Settings.swapServerUrl; @@ -212,10 +232,11 @@ export const updateApplicationSettings = (req, res, next) => { logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'RTLConf', msg: 'Updating Application Settings..' }); const RTLConfFile = common.appConfig.rtlConfFilePath + sep + 'RTL-Config.json'; try { - fs.writeFileSync(RTLConfFile, JSON.stringify(req.body, null, 2), 'utf-8'); - common.appConfig = req.body; + const config = addSecureData(req.body); + fs.writeFileSync(RTLConfFile, JSON.stringify(config, null, 2), 'utf-8'); + common.appConfig = config; logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'RTLConf', msg: 'Application Settings Updated', data: maskPasswords(common.appConfig) }); - res.status(201).json(removeSensitiveData(common.appConfig)); + res.status(201).json(removeSecureData(config)); } catch (errRes) { const errMsg = 'Update Default Node Error'; diff --git a/backend/models/config.model.js b/backend/models/config.model.js index eb1b2319..8a3f8a46 100644 --- a/backend/models/config.model.js +++ b/backend/models/config.model.js @@ -1,4 +1,12 @@ -export class NodeSettings { +export class SSO { + constructor(rtlSso, rtlCookiePath, logoutRedirectLink, cookieValue) { + this.rtlSso = rtlSso; + this.rtlCookiePath = rtlCookiePath; + this.logoutRedirectLink = logoutRedirectLink; + this.cookieValue = cookieValue; + } +} +export class Settings { constructor(lnServerUrl, swapServerUrl, boltzServerUrl, bitcoindConfigPath, channelBackupPath, logLevel, logFile, userPersona, themeMode, themeColor, unannouncedChannels, fiatConversion, currencyUnit, enableOffers, enablePeerswap) { this.lnServerUrl = lnServerUrl; this.swapServerUrl = swapServerUrl; @@ -17,7 +25,7 @@ export class NodeSettings { this.enablePeerswap = enablePeerswap; } } -export class NodeAuthentication { +export class Authentication { constructor(options, configPath, macaroonPath, macaroonValue, runePath, runeValue, lnApiPassword, swapMacaroonPath, boltzMacaroonPath) { this.options = options; this.configPath = configPath; @@ -30,27 +38,6 @@ export class NodeAuthentication { this.boltzMacaroonPath = boltzMacaroonPath; } } -export class SelectedNode { - constructor(logLevel, logFile, index, lnNode, lnImplementation, lnVersion, apiVersion, Settings, Authentication) { - this.logLevel = logLevel; - this.logFile = logFile; - this.index = index; - this.lnNode = lnNode; - this.lnImplementation = lnImplementation; - this.lnVersion = lnVersion; - this.apiVersion = apiVersion; - this.Settings = Settings; - this.Authentication = Authentication; - } -} -export class SSO { - constructor(rtlSso, rtlCookiePath, logoutRedirectLink, cookieValue) { - this.rtlSso = rtlSso; - this.rtlCookiePath = rtlCookiePath; - this.logoutRedirectLink = logoutRedirectLink; - this.cookieValue = cookieValue; - } -} export class ApplicationConfig { constructor(defaultNodeIndex, selectedNodeIndex, dbDirectoryPath, rtlConfFilePath, rtlPass, multiPass, multiPassHashed, allowPasswordUpdate, enable2FA, secret2FA, SSO, nodes) { this.defaultNodeIndex = defaultNodeIndex; @@ -67,6 +54,18 @@ export class ApplicationConfig { this.nodes = nodes; } } +export class SelectedNode { + constructor(logLevel, logFile, index, lnNode, lnImplementation, lnVersion, Settings, Authentication) { + this.logLevel = logLevel; + this.logFile = logFile; + this.index = index; + this.lnNode = lnNode; + this.lnImplementation = lnImplementation; + this.lnVersion = lnVersion; + this.Settings = Settings; + this.Authentication = Authentication; + } +} export class LogJSONObj { constructor(level, msg, data, error, fileName, selectedNode) { this.level = level; diff --git a/server/controllers/shared/RTLConf.ts b/server/controllers/shared/RTLConf.ts index 7d423d78..c000ede9 100644 --- a/server/controllers/shared/RTLConf.ts +++ b/server/controllers/shared/RTLConf.ts @@ -8,7 +8,7 @@ import { Database, DatabaseService } from '../../utils/database.js'; import { Logger, LoggerService } from '../../utils/logger.js'; import { Common, CommonService } from '../../utils/common.js'; import { WSServer } from '../../utils/webSocketServer.js'; -import { ApplicationConfig, NodeAuthentication, SSO } from '../../models/config.model.js'; +import { ApplicationConfig, Authentication, SSO } from '../../models/config.model.js'; const options = { url: '' }; const logger: LoggerService = Logger; @@ -36,7 +36,7 @@ export const maskPasswords = (obj) => { return obj; }; -export const removeSensitiveData = (config: ApplicationConfig) => { +export const removeSecureData = (config: ApplicationConfig) => { delete config.rtlConfFilePath; delete config.rtlPass; delete config.multiPass; @@ -51,6 +51,27 @@ export const removeSensitiveData = (config: ApplicationConfig) => { return config; }; +export const addSecureData = (config: ApplicationConfig) => { + config.SSO.rtlCookiePath = common.appConfig.SSO.rtlCookiePath; + config.rtlPass = common.appConfig.rtlPass; + config.multiPass = common.appConfig.multiPass; + config.multiPassHashed = common.appConfig.multiPassHashed; + config.secret2FA = common.appConfig.secret2FA; + config.nodes.map((node, i) => { + if (common.appConfig && common.appConfig.nodes && common.appConfig.nodes.length > i && common.appConfig.nodes[i].Authentication && common.appConfig.nodes[i].Authentication.macaroonPath) { + node.Authentication.macaroonPath = common.appConfig.nodes[i].Authentication.macaroonPath; + } + if (common.appConfig && common.appConfig.nodes && common.appConfig.nodes.length > i && common.appConfig.nodes[i].Authentication && common.appConfig.nodes[i].Authentication.runePath) { + node.Authentication.runePath = common.appConfig.nodes[i].Authentication.runePath; + } + if (common.appConfig && common.appConfig.nodes && common.appConfig.nodes.length > i && common.appConfig.nodes[i].Authentication && common.appConfig.nodes[i].Authentication.lnApiPassword) { + node.Authentication.lnApiPassword = common.appConfig.nodes[i].Authentication.lnApiPassword; + } + return node; + }); + return config; +}; + export const getCurrencyRates = (req, res, next) => { logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'RTLConf', msg: 'Getting Currency Rates..' }); options.url = 'https://blockchain.info/ticker'; @@ -91,7 +112,7 @@ export const getApplicationSettings = (req, res, next) => { const err = common.handleError({ statusCode: 500, message: errMsg, error: errRes }, 'RTLConf', errMsg, req.session.selectedNode); return res.status(err.statusCode).json({ message: err.error, error: err.error }); } else { - const appConfData = removeSensitiveData(JSON.parse(data)); + const appConfData = removeSecureData(JSON.parse(data)); appConfData.allowPasswordUpdate = common.appConfig.allowPasswordUpdate; appConfData.enable2FA = common.appConfig.enable2FA; appConfData.selectedNodeIndex = (req.session.selectedNode && req.session.selectedNode.index ? req.session.selectedNode.index : common.selectedNode.index); @@ -103,7 +124,7 @@ export const getApplicationSettings = (req, res, next) => { appConfData.SSO = new SSO(); appConfData.secret2FA = ''; appConfData.dbDirectoryPath = ''; - appConfData.nodes[selNodeIdx].Authentication = new NodeAuthentication(); + appConfData.nodes[selNodeIdx].Authentication = new Authentication(); delete appConfData.nodes[selNodeIdx].Settings.bitcoindConfigPath; delete appConfData.nodes[selNodeIdx].Settings.lnServerUrl; delete appConfData.nodes[selNodeIdx].Settings.swapServerUrl; @@ -216,10 +237,11 @@ export const updateApplicationSettings = (req, res, next) => { logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'RTLConf', msg: 'Updating Application Settings..' }); const RTLConfFile = common.appConfig.rtlConfFilePath + sep + 'RTL-Config.json'; try { - fs.writeFileSync(RTLConfFile, JSON.stringify(req.body, null, 2), 'utf-8'); - common.appConfig = req.body; + const config = addSecureData(req.body); + fs.writeFileSync(RTLConfFile, JSON.stringify(config, null, 2), 'utf-8'); + common.appConfig = config; logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'RTLConf', msg: 'Application Settings Updated', data: maskPasswords(common.appConfig) }); - res.status(201).json(removeSensitiveData(common.appConfig)); + res.status(201).json(removeSecureData(config)); } catch (errRes) { const errMsg = 'Update Default Node Error'; const err = common.handleError({ statusCode: 500, message: errMsg, error: errRes }, 'RTLConf', errMsg, req.session.selectedNode); diff --git a/server/models/config.model.ts b/server/models/config.model.ts index 501f54e2..2207301c 100644 --- a/server/models/config.model.ts +++ b/server/models/config.model.ts @@ -1,4 +1,15 @@ -export class NodeSettings { +export class SSO { + + constructor( + public rtlSso?: number, + public rtlCookiePath?: string, + public logoutRedirectLink?: string, + public cookieValue?: string + ) { } + +} + +export class Settings { constructor( public lnServerUrl?: string, @@ -20,7 +31,7 @@ export class NodeSettings { } -export class NodeAuthentication { +export class Authentication { constructor( public options?: any, @@ -36,33 +47,6 @@ export class NodeAuthentication { } -export class SelectedNode { - - constructor( - public logLevel?: string, - public logFile?: string, - public index?: number, - public lnNode?: string, - public lnImplementation?: string, - public lnVersion?: string, - public apiVersion?: string, - public Settings?: NodeSettings, - public Authentication?: NodeAuthentication - ) { } - -} - -export class SSO { - - constructor( - public rtlSso?: number, - public rtlCookiePath?: string, - public logoutRedirectLink?: string, - public cookieValue?: string - ) { } - -} - export class ApplicationConfig { constructor( @@ -82,6 +66,21 @@ export class ApplicationConfig { } +export class SelectedNode { + + constructor( + public logLevel?: string, + public logFile?: string, + public index?: number, + public lnNode?: string, + public lnImplementation?: string, + public lnVersion?: string, + public Settings?: Settings, + public Authentication?: Authentication + ) { } + +} + export class LogJSONObj { constructor( diff --git a/src/app/app.component.html b/src/app/app.component.html index 2b857179..ccb645d4 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,4 +1,4 @@ -
+
-