@@ -72,13 +72,13 @@ const logger = require('morgan');
7272const cookieParser = require ( 'cookie-parser' ) ;
7373const bodyParser = require ( 'body-parser' ) ;
7474const session = require ( "express-session" ) ;
75- const csurf = require ( "csurf" ) ;
75+ const MemoryStore = require ( 'memorystore' ) ( session ) ;
76+ const csrfApi = require ( "csurf" ) ;
7677const config = require ( "./app/config.js" ) ;
7778const simpleGit = require ( 'simple-git' ) ;
7879const utils = require ( "./app/utils.js" ) ;
7980const moment = require ( "moment" ) ;
8081const Decimal = require ( 'decimal.js' ) ;
81- const bitcoinCore = require ( "btc-rpc-client" ) ;
8282const pug = require ( "pug" ) ;
8383const momentDurationFormat = require ( "moment-duration-format" ) ;
8484const coreApi = require ( "./app/api/coreApi.js" ) ;
@@ -95,14 +95,15 @@ const auth = require('./app/auth.js');
9595const sso = require ( './app/sso.js' ) ;
9696const markdown = require ( "markdown-it" ) ( ) ;
9797const v8 = require ( "v8" ) ;
98- var compression = require ( "compression" ) ;
98+ const compression = require ( "compression" ) ;
99+ const jayson = require ( 'jayson/promise' ) ;
99100
100101const appUtils = require ( "@janoside/app-utils" ) ;
101102const s3Utils = appUtils . s3Utils ;
102103
103104let cdnS3Bucket = null ;
104105if ( config . cdn . active ) {
105- cdnS3Bucket = s3Utils . createBucket ( config . cdn . s3Bucket , config . cdn . s3BucketPath ) ;
106+ cdnS3Bucket = s3Utils . createBucket ( config . cdn . s3Bucket , config . cdn . s3BucketRegion , config . cdn . s3BucketPath ) ;
106107}
107108
108109require ( "./app/currencies.js" ) ;
@@ -203,11 +204,31 @@ if (process.env.BTCEXP_BASIC_AUTH_PASSWORD) {
203204//expressApp.use(logger('dev'));
204205expressApp . use ( bodyParser . json ( ) ) ;
205206expressApp . use ( bodyParser . urlencoded ( { extended : false } ) ) ;
206- expressApp . use ( session ( {
207+
208+
209+ const sessionConfig = {
207210 secret : config . cookieSecret ,
208211 resave : false ,
209- saveUninitialized : false
210- } ) ) ;
212+ saveUninitialized : true ,
213+ cookie : {
214+ secure : config . secureSite
215+ }
216+ } ;
217+
218+ if ( config . secureSite ) {
219+ expressApp . set ( 'trust proxy' , 1 ) ;
220+ }
221+
222+ // Helpful reference for production: nginx HTTPS proxy:
223+ // https://gist.github.com/nikmartin/5902176
224+ debugLog ( `Session config: ${ JSON . stringify ( utils . obfuscateProperties ( sessionConfig , [ "secret" ] ) ) } ) ;
225+
226+ sessionConfig . store = new MemoryStore ( {
227+ checkPeriod : 86400000 // prune expired entries every 24h
228+ } ) ;
229+
230+
231+ expressApp . use ( session ( sessionConfig ) ) ;
211232
212233expressApp . use ( compression ( ) ) ;
213234
@@ -729,6 +750,8 @@ expressApp.onStartup = async () => {
729750 global . coinConfig = coins [ config . coin ] ;
730751 global . coinConfigs = coins ;
731752
753+ global . SATS_PER_BTC = global . coinConfig . baseCurrencyUnit . multiplier ;
754+
732755 global . specialTransactions = { } ;
733756 global . specialBlocks = { } ;
734757 global . specialAddresses = { } ;
@@ -852,29 +875,67 @@ expressApp.onStartup = async () => {
852875 }
853876}
854877
855- expressApp . continueStartup = function ( ) {
856- var rpcCred = config . credentials . rpc ;
857- debugLog ( `Connecting to RPC node at ${ rpcCred . host } ${ rpcCred . port } ) ;
878+ function connectToRpcServer ( ) {
879+ // reload credentials, the main "config.credentials.rpc" can be stale
880+ // since the username/password can be sourced from the auth cookie
881+ // which changes each startup of bitcoind
882+ let credentialsForRpcConnect = config . credentials . loadFreshRpcCredentials ( ) ;
883+
884+ debugLog ( `RPC Credentials: ${ JSON . stringify ( utils . obfuscateProperties ( credentialsForRpcConnect , [ "password" ] ) , null , 4 ) } ) ;
885+
886+ let rpcCred = credentialsForRpcConnect ;
887+ debugLog ( `Connecting to RPC node at [${ rpcCred . host } ${ rpcCred . port } ) ;
858888
859- var rpcClientProperties = {
889+ let usernamePassword = `${ rpcCred . username } ${ rpcCred . password } ;
890+ let authorizationHeader = `Basic ${ btoa ( usernamePassword ) } ; // basic auth header format (base64 of "username:password")
891+
892+ let rpcClientProperties = {
860893 host : rpcCred . host ,
861894 port : rpcCred . port ,
862895 username : rpcCred . username ,
863896 password : rpcCred . password ,
864897 timeout : rpcCred . timeout
865898 } ;
866899
867- global . rpcClient = new bitcoinCore ( rpcClientProperties ) ;
900+ debugLog ( `RPC Connection properties: ${ JSON . stringify ( utils . obfuscateProperties ( rpcClientProperties , [ "password" ] ) , null , 4 ) } ) ;
901+
902+ // add after logging to avoid logging base64'd credentials
903+ rpcClientProperties . headers = {
904+ "Authorization" : authorizationHeader
905+ } ;
906+
907+ // main RPC client
908+ global . rpcClient = jayson . Client . http ( rpcClientProperties ) ;
868909
869- var rpcClientNoTimeoutProperties = {
910+ let rpcClientNoTimeoutProperties = {
870911 host : rpcCred . host ,
871912 port : rpcCred . port ,
872913 username : rpcCred . username ,
873914 password : rpcCred . password ,
874- timeout : 0
915+ timeout : 0 ,
916+ headers : {
917+ "Authorization" : authorizationHeader
918+ }
875919 } ;
876920
877- global . rpcClientNoTimeout = new bitcoinCore ( rpcClientNoTimeoutProperties ) ;
921+ // no timeout RPC client, for long-running commands
922+ global . rpcClientNoTimeout = jayson . Client . http ( rpcClientNoTimeoutProperties ) ;
923+ }
924+
925+ expressApp . continueStartup = function ( ) {
926+ connectToRpcServer ( ) ;
927+
928+ // if using cookie auth, watch for changes to the file and reconnect
929+ if ( config . credentials . rpc . authType == "cookie" ) {
930+ debugLog ( `RPC authentication is cookie based; watching for changes to the auth cookie file...` ) ;
931+
932+ fs . watchFile ( config . credentials . rpc . authCookieFilepath , ( curr , prev ) => {
933+ debugLog ( `RPC auth cookie change detected; attempting reconnect...` ) ;
934+
935+ connectToRpcServer ( ) ;
936+ } ) ;
937+ }
938+
878939
879940 // default values - after we connect via RPC, we update these
880941 global . txindexAvailable = false ;
@@ -889,7 +950,7 @@ expressApp.continueStartup = function() {
889950
890951
891952 if ( config . addressApi ) {
892- var supportedAddressApis = addressApi . getSupportedAddressApis ( ) ;
953+ let supportedAddressApis = addressApi . getSupportedAddressApis ( ) ;
893954 if ( ! supportedAddressApis . includes ( config . addressApi ) ) {
894955 utils . logError ( "32907ghsd0ge" , `Unrecognized value for BTCEXP_ADDRESS_API: '${ config . addressApi } ${ supportedAddressApis } ) ;
895956 }
@@ -1033,7 +1094,8 @@ expressApp.use(function(req, res, next) {
10331094 next ( ) ;
10341095} ) ;
10351096
1036- expressApp . use ( csurf ( ) , ( req , res , next ) => {
1097+ const csrfProtection = csrfApi ( ) ;
1098+ expressApp . use ( csrfProtection , ( req , res , next ) => {
10371099 res . locals . csrfToken = req . csrfToken ( ) ;
10381100
10391101 next ( ) ;
0 commit comments