default configs

This commit is contained in:
Evanfeenstra 2021-07-19 15:17:43 -07:00
parent 51934a7308
commit 0760f350a0
14 changed files with 64 additions and 46 deletions

5
.gitignore vendored
View file

@ -35,4 +35,7 @@ connection_string.txt
testing/greenlight/*.pem
testing/greenlight/*.crt
hsm_secret
testing/scripts/stuff.json
testing/scripts/stuff.json
creds/*
!creds/.gitkeep
!creds/scheduler_creds

0
creds/.gitkeep Normal file
View file

View file

@ -28,9 +28,9 @@ function initGreenlight() {
exports.initGreenlight = initGreenlight;
var schedulerClient = null;
const loadSchedulerCredentials = () => {
var glCert = fs.readFileSync(config.scheduler_tls_location || './config/scheduler_creds/ca.pem');
var glPriv = fs.readFileSync(config.scheduler_key_location || './config/scheduler_creds/device-key.pem');
var glChain = fs.readFileSync(config.scheduler_chain_location || './config/scheduler_creds/device.crt');
var glCert = fs.readFileSync(config.scheduler_tls_location);
var glPriv = fs.readFileSync(config.scheduler_key_location);
var glChain = fs.readFileSync(config.scheduler_chain_location);
return grpc.credentials.createSsl(glCert, glPriv, glChain);
};
function loadScheduler() {
@ -54,7 +54,7 @@ function startGreenlightInit() {
return __awaiter(this, void 0, void 0, function* () {
try {
let needToRegister = false;
const secretPath = config.hsm_secret_path || "./hsm_secret";
const secretPath = config.hsm_secret_path;
let rootkey;
if (!fs.existsSync(secretPath)) {
needToRegister = true;
@ -77,7 +77,7 @@ function startGreenlightInit() {
if (needToRegister) {
yield registerGreenlight(GID, rootkey, secretPath);
}
const keyLoc = config.tls_key_location || "./device-key.pem";
const keyLoc = config.tls_key_location;
const noNeedToRecover = fs.existsSync(keyLoc);
if (!noNeedToRecover) {
yield recoverGreenlight(GID);
@ -120,8 +120,8 @@ function recoverGreenlight(gid) {
const challenge = yield get_challenge(gid.node_id);
const signature = yield sign_challenge(challenge);
const res = yield recover(gid.node_id, challenge, signature);
const keyLoc = config.tls_key_location || "./device-key.pem";
const chainLoc = config.tls_chain_location || './device.crt';
const keyLoc = config.tls_key_location;
const chainLoc = config.tls_chain_location;
console.log("RECOVER KEY", keyLoc, res.device_key);
fs.writeFileSync(keyLoc, res.device_key);
fs.writeFileSync(chainLoc, res.device_cert);
@ -133,9 +133,9 @@ function recoverGreenlight(gid) {
});
}
function writeTlsLocation() {
var glCert = fs.readFileSync(config.scheduler_tls_location || './config/scheduler_creds/ca.pem');
var glCert = fs.readFileSync(config.scheduler_tls_location);
if (glCert) {
fs.writeFileSync(config.tls_location || './ca.pem', glCert);
fs.writeFileSync(config.tls_location, glCert);
}
}
function registerGreenlight(gid, rootkey, secretPath) {
@ -144,8 +144,8 @@ function registerGreenlight(gid, rootkey, secretPath) {
const challenge = yield get_challenge(gid.node_id);
const signature = yield sign_challenge(challenge);
const res = yield register(gid.node_id, gid.bip32_key + gid.bolt12_key, challenge, signature);
const keyLoc = config.tls_key_location || "./device-key.pem";
const chainLoc = config.tls_chain_location || './device.crt';
const keyLoc = config.tls_key_location;
const chainLoc = config.tls_chain_location;
console.log("WRITE KEY", keyLoc, res.device_key);
fs.writeFileSync(keyLoc, res.device_key);
fs.writeFileSync(chainLoc, res.device_cert);

File diff suppressed because one or more lines are too long

View file

@ -49,9 +49,9 @@ const loadCredentials = (macName) => {
};
exports.loadCredentials = loadCredentials;
const loadGreenlightCredentials = () => {
var glCert = fs.readFileSync(config.tls_location || './ca.pem');
var glPriv = fs.readFileSync(config.tls_key_location || "./device-key.pem");
var glChain = fs.readFileSync(config.tls_chain_location || './device.crt');
var glCert = fs.readFileSync(config.tls_location);
var glPriv = fs.readFileSync(config.tls_key_location);
var glChain = fs.readFileSync(config.tls_chain_location);
return grpc.credentials.createSsl(glCert, glPriv, glChain);
};
function loadLightning(tryProxy, ownerPubkey) {

File diff suppressed because one or more lines are too long

View file

@ -8,6 +8,13 @@ const configFile = argv.config ? argv.config : path.join(__dirname, '../../confi
const env = process.env.NODE_ENV || 'development';
const config = require(configFile)[env];
const ENV = process.env;
const DEFAULT_HSM_SECRET_PATH = './creds/hsm_secret';
const DEFAULT_TLS_LOCATION = "./creds/ca.pem";
const DEFAULT_TLS_KEY_LOCATION = "./creds/device-key.pem";
const DEFAULT_TLS_CHAIN_LOCAION = './creds/device.crt';
const DEFAULT_SCHEDULER_TLS_LOCATION = './config/scheduler_creds/ca.pem';
const DEFAULT_SCHEDULER_KEY_LOCATION = './config/scheduler_creds/device-key.pem';
const DEFAULT_SCHEDULER_CHAIN_LOCATION = './config/scheduler_creds/device.crt';
function loadConfig() {
const logg = ENV.LOGGING || config.logging;
const provider = ENV.LIGHTNING_PROVIDER || config.lightning_provider || 'LND';
@ -18,14 +25,14 @@ function loadConfig() {
macaroon_location: ENV.MACAROON_LOCATION || config.macaroon_location,
router_macaroon_location: ENV.ROUTER_MACAROON_LOCATION || config.router_macaroon_location,
signer_macaroon_location: ENV.SIGNER_MACAROON_LOCATION || config.signer_macaroon_location,
tls_location: ENV.TLS_LOCATION || config.tls_location,
tls_key_location: ENV.TLS_KEY_LOCATION || config.tls_key_location,
tls_chain_location: ENV.TLS_CHAIN_LOCATION || config.tls_chain_location,
scheduler_tls_location: ENV.SCHEDULER_TLS_LOCATION || config.scheduler_tls_location,
scheduler_key_location: ENV.SCHEDULER_KEY_LOCATION || config.scheduler_key_location,
scheduler_chain_location: ENV.SCHEDULER_CHAIN_LOCATION || config.scheduler_chain_location,
tls_location: ENV.TLS_LOCATION || config.tls_location || DEFAULT_TLS_LOCATION,
tls_key_location: ENV.TLS_KEY_LOCATION || config.tls_key_location || DEFAULT_TLS_KEY_LOCATION,
tls_chain_location: ENV.TLS_CHAIN_LOCATION || config.tls_chain_location || DEFAULT_TLS_CHAIN_LOCAION,
scheduler_tls_location: ENV.SCHEDULER_TLS_LOCATION || config.scheduler_tls_location || DEFAULT_SCHEDULER_TLS_LOCATION,
scheduler_key_location: ENV.SCHEDULER_KEY_LOCATION || config.scheduler_key_location || DEFAULT_SCHEDULER_KEY_LOCATION,
scheduler_chain_location: ENV.SCHEDULER_CHAIN_LOCATION || config.scheduler_chain_location || DEFAULT_SCHEDULER_CHAIN_LOCATION,
scheduler_default_pubkey: ENV.SCHEDULER_DEFAULT_PUBKEY || config.scheduler_default_pubkey,
hsm_secret_path: ENV.HSM_SECRET_PATH || config.hsm_secret_path,
hsm_secret_path: ENV.HSM_SECRET_PATH || config.hsm_secret_path || DEFAULT_HSM_SECRET_PATH,
lnd_log_location: ENV.LND_LOG_LOCATION || config.lnd_log_location,
node_ip: ENV.NODE_IP || config.node_ip,
lnd_ip: ENV.LND_IP || config.lnd_ip,

View file

@ -1 +1 @@
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/utils/config.ts"],"names":[],"mappings":"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"}
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/utils/config.ts"],"names":[],"mappings":"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"}

View file

@ -17,9 +17,9 @@ export async function initGreenlight() {
var schedulerClient = <any>null;
const loadSchedulerCredentials = () => {
var glCert = fs.readFileSync(config.scheduler_tls_location || './config/scheduler_creds/ca.pem');
var glPriv = fs.readFileSync(config.scheduler_key_location || './config/scheduler_creds/device-key.pem');
var glChain = fs.readFileSync(config.scheduler_chain_location || './config/scheduler_creds/device.crt');
var glCert = fs.readFileSync(config.scheduler_tls_location);
var glPriv = fs.readFileSync(config.scheduler_key_location);
var glChain = fs.readFileSync(config.scheduler_chain_location);
return grpc.credentials.createSsl(glCert, glPriv, glChain);
};
@ -53,7 +53,7 @@ let GID: GreenlightIdentity;
export async function startGreenlightInit() {
try {
let needToRegister = false;
const secretPath = config.hsm_secret_path || "./hsm_secret";
const secretPath = config.hsm_secret_path
let rootkey:string
if (!fs.existsSync(secretPath)) {
needToRegister = true;
@ -75,7 +75,7 @@ export async function startGreenlightInit() {
if (needToRegister) {
await registerGreenlight(GID, rootkey, secretPath);
}
const keyLoc = config.tls_key_location || "./device-key.pem";
const keyLoc = config.tls_key_location
const noNeedToRecover = fs.existsSync(keyLoc)
if(!noNeedToRecover) {
await recoverGreenlight(GID)
@ -124,8 +124,8 @@ async function recoverGreenlight(gid: GreenlightIdentity) {
challenge,
signature
)
const keyLoc = config.tls_key_location || "./device-key.pem";
const chainLoc = config.tls_chain_location || './device.crt'
const keyLoc = config.tls_key_location
const chainLoc = config.tls_chain_location
console.log("RECOVER KEY", keyLoc, res.device_key)
fs.writeFileSync(keyLoc, res.device_key)
fs.writeFileSync(chainLoc, res.device_cert)
@ -136,9 +136,9 @@ async function recoverGreenlight(gid: GreenlightIdentity) {
}
function writeTlsLocation() {
var glCert = fs.readFileSync(config.scheduler_tls_location|| './config/scheduler_creds/ca.pem');
var glCert = fs.readFileSync(config.scheduler_tls_location);
if(glCert) {
fs.writeFileSync(config.tls_location || './ca.pem', glCert)
fs.writeFileSync(config.tls_location, glCert)
}
}
@ -152,8 +152,8 @@ async function registerGreenlight(gid: GreenlightIdentity, rootkey: string, secr
challenge,
signature
)
const keyLoc = config.tls_key_location || "./device-key.pem";
const chainLoc = config.tls_chain_location || './device.crt'
const keyLoc = config.tls_key_location
const chainLoc = config.tls_chain_location
console.log("WRITE KEY", keyLoc, res.device_key)
fs.writeFileSync(keyLoc, res.device_key)
fs.writeFileSync(chainLoc, res.device_cert)

View file

@ -42,9 +42,9 @@ export const loadCredentials = (macName?: string) => {
}
const loadGreenlightCredentials = () => {
var glCert = fs.readFileSync(config.tls_location || './ca.pem');
var glPriv = fs.readFileSync(config.tls_key_location || "./device-key.pem");
var glChain = fs.readFileSync(config.tls_chain_location || './device.crt');
var glCert = fs.readFileSync(config.tls_location);
var glPriv = fs.readFileSync(config.tls_key_location);
var glChain = fs.readFileSync(config.tls_chain_location);
return grpc.credentials.createSsl(glCert, glPriv, glChain);
}

View file

@ -11,6 +11,14 @@ const ENV = process.env
type LightningProvider = 'LND' | 'GREENLIGHT'
const DEFAULT_HSM_SECRET_PATH = './creds/hsm_secret'
const DEFAULT_TLS_LOCATION = "./creds/ca.pem"
const DEFAULT_TLS_KEY_LOCATION = "./creds/device-key.pem"
const DEFAULT_TLS_CHAIN_LOCAION = './creds/device.crt'
const DEFAULT_SCHEDULER_TLS_LOCATION = './config/scheduler_creds/ca.pem'
const DEFAULT_SCHEDULER_KEY_LOCATION = './config/scheduler_creds/device-key.pem'
const DEFAULT_SCHEDULER_CHAIN_LOCATION = './config/scheduler_creds/device.crt'
export function loadConfig() {
const logg = ENV.LOGGING || config.logging
const provider: LightningProvider = ENV.LIGHTNING_PROVIDER || config.lightning_provider || 'LND'
@ -21,14 +29,14 @@ export function loadConfig() {
macaroon_location: ENV.MACAROON_LOCATION || config.macaroon_location,
router_macaroon_location: ENV.ROUTER_MACAROON_LOCATION || config.router_macaroon_location,
signer_macaroon_location: ENV.SIGNER_MACAROON_LOCATION || config.signer_macaroon_location,
tls_location: ENV.TLS_LOCATION || config.tls_location,
tls_key_location: ENV.TLS_KEY_LOCATION || config.tls_key_location,
tls_chain_location: ENV.TLS_CHAIN_LOCATION || config.tls_chain_location,
scheduler_tls_location: ENV.SCHEDULER_TLS_LOCATION || config.scheduler_tls_location,
scheduler_key_location: ENV.SCHEDULER_KEY_LOCATION || config.scheduler_key_location,
scheduler_chain_location: ENV.SCHEDULER_CHAIN_LOCATION || config.scheduler_chain_location,
tls_location: ENV.TLS_LOCATION || config.tls_location || DEFAULT_TLS_LOCATION,
tls_key_location: ENV.TLS_KEY_LOCATION || config.tls_key_location || DEFAULT_TLS_KEY_LOCATION,
tls_chain_location: ENV.TLS_CHAIN_LOCATION || config.tls_chain_location || DEFAULT_TLS_CHAIN_LOCAION,
scheduler_tls_location: ENV.SCHEDULER_TLS_LOCATION || config.scheduler_tls_location || DEFAULT_SCHEDULER_TLS_LOCATION,
scheduler_key_location: ENV.SCHEDULER_KEY_LOCATION || config.scheduler_key_location || DEFAULT_SCHEDULER_KEY_LOCATION,
scheduler_chain_location: ENV.SCHEDULER_CHAIN_LOCATION || config.scheduler_chain_location || DEFAULT_SCHEDULER_CHAIN_LOCATION,
scheduler_default_pubkey: ENV.SCHEDULER_DEFAULT_PUBKEY || config.scheduler_default_pubkey,
hsm_secret_path: ENV.HSM_SECRET_PATH || config.hsm_secret_path,
hsm_secret_path: ENV.HSM_SECRET_PATH || config.hsm_secret_path || DEFAULT_HSM_SECRET_PATH,
lnd_log_location: ENV.LND_LOG_LOCATION || config.lnd_log_location,
node_ip: ENV.NODE_IP || config.node_ip,
lnd_ip: ENV.LND_IP || config.lnd_ip,