diff --git a/app-backend/built/app.js b/app-backend/built/app.js index 80822b1..3af1e94 100644 --- a/app-backend/built/app.js +++ b/app-backend/built/app.js @@ -31,9 +31,9 @@ if (CaptainConstants.isDebug) { app.use('*', function (req, res, next) { res.setHeader('Access-Control-Allow-Origin', '*'); res.setHeader('Access-Control-Allow-Credentials', 'true'); - res.setHeader('Access-Control-Allow-Headers', CaptainConstants.header.namespace + + res.setHeader('Access-Control-Allow-Headers', CaptainConstants.headerNamespace + ',' + - CaptainConstants.header.auth + + CaptainConstants.headerAuth + ',Content-Type'); next(); }); diff --git a/app-backend/built/app.js.map b/app-backend/built/app.js.map index 8f34601..9817c4b 100644 --- a/app-backend/built/app.js.map +++ b/app-backend/built/app.js.map @@ -1 +1 @@ -{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/app-backend/built/datastore/DataStore.js b/app-backend/built/datastore/DataStore.js index 54e238a..cbfbe8d 100644 --- a/app-backend/built/datastore/DataStore.js +++ b/app-backend/built/datastore/DataStore.js @@ -31,7 +31,7 @@ const DEFAULT_NGINX_CONFIG_FOR_APP = fs class DataStore { constructor(namespace) { const data = new Configstore('captain-store', {}, { - configPath: CaptainConstants.captainRootDirectory + '/config.json', + configPath: CaptainConstants.captainDataDirectory + '/config.json', }); this.data = data; this.namespace = namespace; diff --git a/app-backend/built/injection/Injector.js b/app-backend/built/injection/Injector.js index 642ac9d..7b6118c 100644 --- a/app-backend/built/injection/Injector.js +++ b/app-backend/built/injection/Injector.js @@ -19,7 +19,7 @@ function injectGlobal() { return function (req, res, next) { const locals = res.locals; locals.initialized = CaptainManager.get().isInitialized(); - locals.namespace = req.header(CaptainConstants.header.namespace); + locals.namespace = req.header(CaptainConstants.headerNamespace); locals.forceSsl = CaptainManager.get().getForceSslValue(); if (locals.namespace && locals.namespace !== CaptainConstants.rootNameSpace) { @@ -40,7 +40,7 @@ function injectUser() { } const namespace = res.locals.namespace; Authenticator.get(namespace) - .decodeAuthToken(req.header(CaptainConstants.header.auth) || '') + .decodeAuthToken(req.header(CaptainConstants.headerAuth) || '') .then(function (userDecoded) { if (userDecoded) { const datastore = DataStoreProvider.getDataStore(namespace); @@ -128,7 +128,7 @@ exports.injectUserForWebhook = injectUserForWebhook; function injectUserUsingCookieDataOnly() { return function (req, res, next) { Authenticator.get(CaptainConstants.rootNameSpace) - .decodeAuthTokenFromCookies(req.cookies[CaptainConstants.header.cookieAuth]) + .decodeAuthTokenFromCookies(req.cookies[CaptainConstants.headerCookieAuth]) .then(function (user) { res.locals.user = user; next(); diff --git a/app-backend/built/injection/Injector.js.map b/app-backend/built/injection/Injector.js.map index dc4c9d0..d0e08eb 100644 --- a/app-backend/built/injection/Injector.js.map +++ b/app-backend/built/injection/Injector.js.map @@ -1 +1 @@ -{"version":3,"file":"Injector.js","sourceRoot":"","sources":["../../src/injection/Injector.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"Injector.js","sourceRoot":"","sources":["../../src/injection/Injector.ts"],"names":[],"mappings":";;AAAA,oEAAoE;AACpE,uDAAuD;AACvD,8DAA8D;AAC9D,yDAAyD;AACzD,yDAAyD;AACzD,yDAAyD;AACzD,0CAA0C;AAE1C,0CAA0C;AAG1C,2DAA2D;AAC3D,wDAAwD;AAExD,MAAM,SAAS,GAAG,iBAAiB,CAAC,GAAG,EAAE,CAAA;AAEzC,MAAM,kBAAkB,GAAG,EAAqC,CAAA;AAEhE;;GAEG;AACH,SAAgB,YAAY;IACxB,OAAO,UAAS,GAAY,EAAE,GAAa,EAAE,IAAkB;QAC3D,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAA;QAEzB,MAAM,CAAC,WAAW,GAAG,cAAc,CAAC,GAAG,EAAE,CAAC,aAAa,EAAE,CAAA;QACzD,MAAM,CAAC,SAAS,GAAG,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,eAAe,CAAC,CAAA;QAC/D,MAAM,CAAC,QAAQ,GAAG,cAAc,CAAC,GAAG,EAAE,CAAC,gBAAgB,EAAE,CAAA;QAEzD,IACI,MAAM,CAAC,SAAS;YAChB,MAAM,CAAC,SAAS,KAAK,gBAAgB,CAAC,aAAa,EACrD;YACE,MAAM,cAAc,CAAC,WAAW,CAC5B,cAAc,CAAC,oBAAoB,EACnC,mBAAmB,CACtB,CAAA;SACJ;QAED,IAAI,EAAE,CAAA;IACV,CAAC,CAAA;AACL,CAAC;AApBD,oCAoBC;AAED;;GAEG;AACH,SAAgB,UAAU;IACtB,OAAO,UAAS,GAAY,EAAE,GAAa,EAAE,IAAkB;QAC3D,IAAI,kBAAkB,CAAC,uBAAuB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE;YACtD,IAAI,EAAE,CAAA;YACN,OAAM,CAAC,4CAA4C;SACtD;QAED,MAAM,SAAS,GAAG,GAAG,CAAC,MAAM,CAAC,SAAS,CAAA;QAEtC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC;aACvB,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;aAC9D,IAAI,CAAC,UAAS,WAAW;YACtB,IAAI,WAAW,EAAE;gBACb,MAAM,SAAS,GAAG,iBAAiB,CAAC,YAAY,CAAC,SAAS,CAAC,CAAA;gBAC3D,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,EAAE;oBAChC,kBAAkB,CAAC,SAAS,CAAC,GAAG,IAAI,cAAc,CAC9C,SAAS,EACT,SAAS,EACT,cAAc,CAAC,GAAG,EAAE,CAAC,qBAAqB,EAAE,CAC/C,CAAA;iBACJ;gBACD,MAAM,IAAI,GAA2B;oBACjC,SAAS,EAAE,SAAS;oBACpB,SAAS,EAAE,SAAS;oBACpB,cAAc,EAAE,kBAAkB,CAAC,SAAS,CAAC;oBAC7C,WAAW,EAAE,kBAAkB,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE;iBACxD,CAAA;gBACD,GAAG,CAAC,MAAM,CAAC,IAAI,GAAG,IAAI,CAAA;aACzB;YAED,IAAI,EAAE,CAAA;QACV,CAAC,CAAC;aACD,KAAK,CAAC,UAAS,KAAmB;YAC/B,IAAI,KAAK,IAAI,KAAK,CAAC,gBAAgB,EAAE;gBACjC,GAAG,CAAC,IAAI,CACJ,IAAI,OAAO,CAAC,KAAK,CAAC,gBAAgB,EAAE,KAAK,CAAC,UAAU,CAAC,CACxD,CAAA;gBACD,OAAM;aACT;YACD,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;YACf,GAAG,CAAC,MAAM,CAAC,IAAI,GAAG,SAAS,CAAA;YAC3B,IAAI,EAAE,CAAA;QACV,CAAC,CAAC,CAAA;IACV,CAAC,CAAA;AACL,CAAC;AA5CD,gCA4CC;AAED;;GAEG;AACH,SAAgB,oBAAoB;IAChC,OAAO,UAAS,GAAY,EAAE,GAAa,EAAE,IAAkB;QAC3D,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,CAAA;QAC7B,MAAM,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC,SAAS,CAAA;QACrC,IAAI,GAAG,GAAG,SAAS,CAAA;QAEnB,IAAI,CAAC,KAAK,IAAI,CAAC,SAAS,EAAE;YACtB,MAAM,CAAC,CAAC,CAAC,iDAAiD,CAAC,CAAA;YAC3D,IAAI,EAAE,CAAA;YACN,OAAM;SACT;QAED,MAAM,SAAS,GAAG,iBAAiB,CAAC,YAAY,CAAC,SAAS,CAAC,CAAA;QAE3D,IAAI,WAAuC,CAAA;QAE3C,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC;aACvB,yBAAyB,CAAC,KAAK,CAAC;aAChC,IAAI,CAAC,UAAS,IAAI;YACf,WAAW,GAAG,IAAI,CAAA;YAElB,OAAO,SAAS;iBACX,gBAAgB,EAAE;iBAClB,gBAAgB,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;QAC9C,CAAC,CAAC;aACD,IAAI,CAAC,UAAS,QAAQ;YACnB,GAAG,GAAG,QAAQ,CAAA;YAEd,IACI,GAAG,CAAC,cAAc;gBAClB,GAAG,CAAC,cAAc,CAAC,YAAY,KAAK,WAAW,CAAC,YAAY,EAC9D;gBACE,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;aAC7C;YAED,MAAM,SAAS,GAAG,iBAAiB,CAAC,YAAY,CAAC,SAAS,CAAC,CAAA;YAE3D,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,EAAE;gBAChC,kBAAkB,CAAC,SAAS,CAAC,GAAG,IAAI,cAAc,CAC9C,SAAS,EACT,SAAS,EACT,cAAc,CAAC,GAAG,EAAE,CAAC,qBAAqB,EAAE,CAC/C,CAAA;aACJ;YAED,MAAM,IAAI,GAA2B;gBACjC,SAAS,EAAE,SAAS;gBACpB,SAAS,EAAE,SAAS;gBACpB,cAAc,EAAE,kBAAkB,CAAC,SAAS,CAAC;gBAC7C,WAAW,EAAE,kBAAkB,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE;aACxD,CAAA;YAED,GAAG,CAAC,MAAM,CAAC,IAAI,GAAG,IAAI,CAAA;YACtB,GAAG,CAAC,MAAM,CAAC,GAAG,GAAG,GAAG,CAAA;YACpB,GAAG,CAAC,MAAM,CAAC,OAAO,GAAG,WAAW,CAAC,OAAO,CAAA;YAExC,IAAI,EAAE,CAAA;QACV,CAAC,CAAC;aACD,KAAK,CAAC,UAAS,KAAK;YACjB,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;YACf,GAAG,CAAC,MAAM,CAAC,GAAG,GAAG,SAAS,CAAA;YAC1B,IAAI,EAAE,CAAA;QACV,CAAC,CAAC,CAAA;IACV,CAAC,CAAA;AACL,CAAC;AAhED,oDAgEC;AAED;;;GAGG;AACH,SAAgB,6BAA6B;IACzC,OAAO,UAAS,GAAY,EAAE,GAAa,EAAE,IAAkB;QAC3D,aAAa,CAAC,GAAG,CAAC,gBAAgB,CAAC,aAAa,CAAC;aAC5C,0BAA0B,CACvB,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,CACjD;aACA,IAAI,CAAC,UAAS,IAAI;YACf,GAAG,CAAC,MAAM,CAAC,IAAI,GAAG,IAAI,CAAA;YAEtB,IAAI,EAAE,CAAA;QACV,CAAC,CAAC;aACD,KAAK,CAAC,UAAS,KAAK;YACjB,IAAI,KAAK,IAAI,KAAK,CAAC,gBAAgB,EAAE;gBACjC,GAAG,CAAC,IAAI,CACJ,IAAI,OAAO,CAAC,KAAK,CAAC,gBAAgB,EAAE,KAAK,CAAC,UAAU,CAAC,CACxD,CAAA;gBACD,OAAM;aACT;YACD,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;YACf,GAAG,CAAC,MAAM,CAAC,IAAI,GAAG,SAAS,CAAA;YAC3B,IAAI,EAAE,CAAA;QACV,CAAC,CAAC,CAAA;IACV,CAAC,CAAA;AACL,CAAC;AAvBD,sEAuBC"} \ No newline at end of file diff --git a/app-backend/built/routes/LoginRouter.js b/app-backend/built/routes/LoginRouter.js index acdc771..f0b93dd 100644 --- a/app-backend/built/routes/LoginRouter.js +++ b/app-backend/built/routes/LoginRouter.js @@ -23,7 +23,7 @@ router.post('/', function (req, res, next) { return Authenticator.get(namespace).getAuthTokenForCookies(password); }) .then(function (cookieAuth) { - res.cookie(CaptainConstants.header.cookieAuth, cookieAuth); + res.cookie(CaptainConstants.headerCookieAuth, cookieAuth); let baseApi = new BaseApi(ApiStatusCodes.STATUS_OK, 'Login succeeded'); baseApi.data = { token: authToken }; res.send(baseApi); diff --git a/app-backend/built/routes/LoginRouter.js.map b/app-backend/built/routes/LoginRouter.js.map index b86214f..a0800a9 100644 --- a/app-backend/built/routes/LoginRouter.js.map +++ b/app-backend/built/routes/LoginRouter.js.map @@ -1 +1 @@ -{"version":3,"file":"LoginRouter.js","sourceRoot":"","sources":["../../src/routes/LoginRouter.ts"],"names":[],"mappings":";AAAA,mCAAmC;AACnC,0CAA0C;AAC1C,uDAAuD;AACvD,wDAAwD;AAExD,8DAA8D;AAC9D,sEAAsE;AAEtE,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAA;AAE/B,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,UAAS,GAAG,EAAE,GAAG,EAAE,IAAI;IACpC,IAAI,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAA;IAEtC,IAAI,CAAC,QAAQ,EAAE;QACX,IAAI,QAAQ,GAAG,IAAI,OAAO,CACtB,cAAc,CAAC,oBAAoB,EACnC,oBAAoB,CACvB,CAAA;QACD,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAClB,OAAM;KACT;IAED,IAAI,SAAiB,CAAA;IAErB,MAAM,SAAS,GAAG,kBAAkB,CAAC,0BAA0B,CAAC,GAAG,CAAC;SAC/D,SAAS,CAAA;IAEd,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC;SACvB,YAAY,CAAC,QAAQ,CAAC;SACtB,IAAI,CAAC,UAAS,KAAK;QAChB,SAAS,GAAG,KAAK,CAAA;QACjB,OAAO,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAA;IACxE,CAAC,CAAC;SACD,IAAI,CAAC,UAAS,UAAU;QACrB,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,UAAU,EAAE,UAAU,CAAC,CAAA;QAC1D,IAAI,OAAO,GAAG,IAAI,OAAO,CACrB,cAAc,CAAC,SAAS,EACxB,iBAAiB,CACpB,CAAA;QACD,OAAO,CAAC,IAAI,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,CAAA;QACnC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACrB,CAAC,CAAC;SACD,KAAK,CAAC,cAAc,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAA;AACjD,CAAC,CAAC,CAAA;AAEF,iBAAS,MAAM,CAAA"} \ No newline at end of file +{"version":3,"file":"LoginRouter.js","sourceRoot":"","sources":["../../src/routes/LoginRouter.ts"],"names":[],"mappings":";AAAA,mCAAmC;AACnC,0CAA0C;AAC1C,uDAAuD;AACvD,wDAAwD;AAExD,8DAA8D;AAC9D,sEAAsE;AAEtE,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAA;AAE/B,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,UAAS,GAAG,EAAE,GAAG,EAAE,IAAI;IACpC,IAAI,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAA;IAEtC,IAAI,CAAC,QAAQ,EAAE;QACX,IAAI,QAAQ,GAAG,IAAI,OAAO,CACtB,cAAc,CAAC,oBAAoB,EACnC,oBAAoB,CACvB,CAAA;QACD,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAClB,OAAM;KACT;IAED,IAAI,SAAiB,CAAA;IAErB,MAAM,SAAS,GAAG,kBAAkB,CAAC,0BAA0B,CAAC,GAAG,CAAC;SAC/D,SAAS,CAAA;IAEd,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC;SACvB,YAAY,CAAC,QAAQ,CAAC;SACtB,IAAI,CAAC,UAAS,KAAK;QAChB,SAAS,GAAG,KAAK,CAAA;QACjB,OAAO,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAA;IACxE,CAAC,CAAC;SACD,IAAI,CAAC,UAAS,UAAU;QACrB,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,gBAAgB,EAAE,UAAU,CAAC,CAAA;QACzD,IAAI,OAAO,GAAG,IAAI,OAAO,CACrB,cAAc,CAAC,SAAS,EACxB,iBAAiB,CACpB,CAAA;QACD,OAAO,CAAC,IAAI,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,CAAA;QACnC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACrB,CAAC,CAAC;SACD,KAAK,CAAC,cAAc,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAA;AACjD,CAAC,CAAC,CAAA;AAEF,iBAAS,MAAM,CAAA"} \ No newline at end of file diff --git a/app-backend/built/utils/CaptainConstants.js b/app-backend/built/utils/CaptainConstants.js index 8840696..985a35d 100644 --- a/app-backend/built/utils/CaptainConstants.js +++ b/app-backend/built/utils/CaptainConstants.js @@ -1,71 +1,72 @@ "use strict"; const fs = require("fs-extra"); const EnvVars = require("./EnvVars"); -const CAPTAIN_ROOT_DIRECTORY = '/captain'; -const CONSTANT_FILE_OVERRIDE = CAPTAIN_ROOT_DIRECTORY + '/constants.conf'; -const CAPTAIN_ROOT_DIRECTORY_TEMP = CAPTAIN_ROOT_DIRECTORY + '/temp'; -const CAPTAIN_ROOT_DIRECTORY_GENERATED = CAPTAIN_ROOT_DIRECTORY + '/generated'; +const CAPTAIN_BASE_DIRECTORY = '/captain'; +const CAPTAIN_DATA_DIRECTORY = +CAPTAIN_BASE_DIRECTORY + '/data'; // data that sits here can be backed up +const CAPTAIN_ROOT_DIRECTORY_TEMP = CAPTAIN_BASE_DIRECTORY + '/temp'; +const CAPTAIN_ROOT_DIRECTORY_GENERATED = CAPTAIN_BASE_DIRECTORY + '/generated'; +const CONSTANT_FILE_OVERRIDE = CAPTAIN_DATA_DIRECTORY + '/constants.json'; let data = { + // ******************** Global Constants ********************* apiVersion: 'v1', + version: '0.7.3', + isDebug: EnvVars.CAPTAIN_IS_DEBUG, + captainServiceExposedPort: 3000, + rootNameSpace: 'captain', + // *********************** Disk Paths ************************ + dockerSocketPath: '/var/run/docker.sock', + sourcePathInContainer: '/usr/src/app', + nginxStaticRootDir: '/usr/share/nginx', + nginxDefaultHtmlDir: '/default', + letsEncryptEtcPathOnNginx: '/letencrypt/etc', + nginxSharedPathOnNginx: '/nginx-shared', + nginxDomainSpecificHtmlDir: '/domains', + captainConfirmationPath: '/.well-known/captain-identifier', + captainBaseDirectory: CAPTAIN_BASE_DIRECTORY, + captainRootDirectoryTemp: CAPTAIN_ROOT_DIRECTORY_TEMP, + captainRawSourceDirectoryBase: CAPTAIN_ROOT_DIRECTORY_TEMP + '/image_raw', + captainRootDirectoryGenerated: CAPTAIN_ROOT_DIRECTORY_GENERATED, + registryAuthPathOnHost: CAPTAIN_ROOT_DIRECTORY_GENERATED + '/registry-auth', + captainStaticFilesDir: CAPTAIN_ROOT_DIRECTORY_GENERATED + '/static', + baseNginxConfigPath: CAPTAIN_ROOT_DIRECTORY_GENERATED + '/nginx/nginx.conf', + rootNginxConfigPath: CAPTAIN_ROOT_DIRECTORY_GENERATED + '/nginx/conf.d/captain-root', + perAppNginxConfigPathBase: CAPTAIN_ROOT_DIRECTORY_GENERATED + '/nginx/conf.d', + captainDataDirectory: CAPTAIN_DATA_DIRECTORY, + letsEncryptLibPath: CAPTAIN_DATA_DIRECTORY + '/letencrypt/lib', + letsEncryptEtcPath: CAPTAIN_DATA_DIRECTORY + '/letencrypt/etc', + registryPathOnHost: CAPTAIN_DATA_DIRECTORY + '/registry', + nginxSharedPathOnHost: CAPTAIN_DATA_DIRECTORY + '/nginx-shared', + debugSourceDirectory: '', + // **************** DockerHub Image Names ******************** publishedNameOnDockerHub: 'dockersaturn/captainduckduck', certbotImageName: 'dockersaturn/certbot-sleeping:v0.17.0', netDataImageName: 'titpetric/netdata:1.8', registryImageName: 'registry:2', appPlaceholderImageName: 'dockersaturn/app-placeholder:latest', nginxImageName: 'nginx', + // ********************* Local Docker Constants ************************ defaultEmail: 'runner@captainduckduck.com', defaultMaxLogSize: '512m', buildLogSize: 50, - isDebug: EnvVars.CAPTAIN_IS_DEBUG, - version: '0.7.3', captainSaltSecretKey: 'captain-salt', nginxServiceName: 'captain-nginx', - nginxPortNumber: 80, - rootNameSpace: 'captain', captainServiceName: 'captain-captain', certbotServiceName: 'captain-certbot', netDataContainerName: 'captain-netdata-container', - netDataRelativePath: '/net-data-monitor', + registryServiceName: 'captain-registry', + captainNetworkName: 'captain-overlay-network', + captainRegistryUsername: 'captain', + // ********************* HTTP Related Constants ************************ preCheckForWildCard: true, + nginxPortNumber: 80, + registrySubDomainPort: 996, + netDataRelativePath: '/net-data-monitor', + healthCheckEndPoint: '/checkhealth', captainSubDomain: 'captain', registrySubDomain: 'registry', - registryServiceName: 'captain-registry', - registrySubDomainPort: 996, - captainRegistryUsername: 'captain', - captainNetworkName: 'captain-overlay-network', - header: { - cookieAuth: 'captainCookieAuth', - auth: 'x-captain-auth', - namespace: 'x-namespace', - }, - healthCheckEndPoint: '/checkhealth', - prefixManagerNode: 'captainManager', - prefixWorkerNode: 'captainWorker', - dockerSocketPath: '/var/run/docker.sock', - sourcePathInContainer: '/usr/src/app', - captainServiceExposedPort: 3000, - nginxStaticRootDir: '/usr/share/nginx', - nginxDefaultHtmlDir: '/default', - nginxDomainSpecificHtmlDir: '/domains', - captainConfirmationPath: '/.well-known/captain-identifier', - captainRootDirectory: CAPTAIN_ROOT_DIRECTORY, - captainRootDirectoryTemp: CAPTAIN_ROOT_DIRECTORY_TEMP, - captainRootDirectoryGenerated: CAPTAIN_ROOT_DIRECTORY_GENERATED, - letsEncryptLibPath: CAPTAIN_ROOT_DIRECTORY + '/letencrypt/lib', - letsEncryptEtcPath: CAPTAIN_ROOT_DIRECTORY + '/letencrypt/etc', - registryPathOnHost: CAPTAIN_ROOT_DIRECTORY + '/registry', - registryAuthPathOnHost: CAPTAIN_ROOT_DIRECTORY_GENERATED + '/registry-auth', - nginxSharedPathOnHost: CAPTAIN_ROOT_DIRECTORY + '/nginx-shared', - letsEncryptEtcPathOnNginx: '/letencrypt/etc', - nginxSharedPathOnNginx: '/nginx-shared', - captainStaticFilesDir: CAPTAIN_ROOT_DIRECTORY_GENERATED + '/static', - captainRawSourceDirectoryBase: CAPTAIN_ROOT_DIRECTORY_TEMP + '/image_raw', - captainTarImagesDir: CAPTAIN_ROOT_DIRECTORY_TEMP + '/img_tar', - captainDefinitionTempDir: CAPTAIN_ROOT_DIRECTORY_TEMP + '/captain_definition', - baseNginxConfigPath: CAPTAIN_ROOT_DIRECTORY_GENERATED + '/nginx/nginx.conf', - rootNginxConfigPath: CAPTAIN_ROOT_DIRECTORY_GENERATED + '/nginx/conf.d/captain-root', - perAppNginxConfigPathBase: CAPTAIN_ROOT_DIRECTORY_GENERATED + '/nginx/conf.d', - debugSourceDirectory: '', + headerCookieAuth: 'captainCookieAuth', + headerAuth: 'x-captain-auth', + headerNamespace: 'x-namespace', }; let overridingValues = fs.readJsonSync(CONSTANT_FILE_OVERRIDE, { throws: false, diff --git a/app-backend/built/utils/CaptainConstants.js.map b/app-backend/built/utils/CaptainConstants.js.map index 7a71902..daa3c07 100644 --- a/app-backend/built/utils/CaptainConstants.js.map +++ b/app-backend/built/utils/CaptainConstants.js.map @@ -1 +1 @@ -{"version":3,"file":"CaptainConstants.js","sourceRoot":"","sources":["../../src/utils/CaptainConstants.ts"],"names":[],"mappings":";AAAA,+BAA+B;AAC/B,qCAAqC;AAErC,MAAM,sBAAsB,GAAG,UAAU,CAAA;AACzC,MAAM,sBAAsB,GAAG,sBAAsB,GAAG,iBAAiB,CAAA;AACzE,MAAM,2BAA2B,GAAG,sBAAsB,GAAG,OAAO,CAAA;AACpE,MAAM,gCAAgC,GAAG,sBAAsB,GAAG,YAAY,CAAA;AAE9E,IAAI,IAAI,GAAG;IACP,UAAU,EAAE,IAAI;IAEhB,wBAAwB,EAAE,8BAA8B;IAExD,gBAAgB,EAAE,uCAAuC;IAEzD,gBAAgB,EAAE,uBAAuB;IAEzC,iBAAiB,EAAE,YAAY;IAE/B,uBAAuB,EAAE,qCAAqC;IAE9D,cAAc,EAAE,OAAO;IAEvB,YAAY,EAAE,4BAA4B;IAE1C,iBAAiB,EAAE,MAAM;IAEzB,YAAY,EAAE,EAAE;IAEhB,OAAO,EAAE,OAAO,CAAC,gBAAgB;IAEjC,OAAO,EAAE,OAAO;IAEhB,oBAAoB,EAAE,cAAc;IAEpC,gBAAgB,EAAE,eAAe;IAEjC,eAAe,EAAE,EAAE;IAEnB,aAAa,EAAE,SAAS;IAExB,kBAAkB,EAAE,iBAAiB;IAErC,kBAAkB,EAAE,iBAAiB;IAErC,oBAAoB,EAAE,2BAA2B;IAEjD,mBAAmB,EAAE,mBAAmB;IAExC,mBAAmB,EAAE,IAAI;IAEzB,gBAAgB,EAAE,SAAS;IAE3B,iBAAiB,EAAE,UAAU;IAE7B,mBAAmB,EAAE,kBAAkB;IAEvC,qBAAqB,EAAE,GAAG;IAE1B,uBAAuB,EAAE,SAAS;IAElC,kBAAkB,EAAE,yBAAyB;IAE7C,MAAM,EAAE;QACJ,UAAU,EAAE,mBAAmB;QAC/B,IAAI,EAAE,gBAAgB;QACtB,SAAS,EAAE,aAAa;KAC3B;IAED,mBAAmB,EAAE,cAAc;IAEnC,iBAAiB,EAAE,gBAAgB;IAEnC,gBAAgB,EAAE,eAAe;IAEjC,gBAAgB,EAAE,sBAAsB;IAExC,qBAAqB,EAAE,cAAc;IAErC,yBAAyB,EAAE,IAAI;IAE/B,kBAAkB,EAAE,kBAAkB;IAEtC,mBAAmB,EAAE,UAAU;IAE/B,0BAA0B,EAAE,UAAU;IAEtC,uBAAuB,EAAE,iCAAiC;IAE1D,oBAAoB,EAAE,sBAAsB;IAE5C,wBAAwB,EAAE,2BAA2B;IAErD,6BAA6B,EAAE,gCAAgC;IAE/D,kBAAkB,EAAE,sBAAsB,GAAG,iBAAiB;IAE9D,kBAAkB,EAAE,sBAAsB,GAAG,iBAAiB;IAE9D,kBAAkB,EAAE,sBAAsB,GAAG,WAAW;IAExD,sBAAsB,EAAE,gCAAgC,GAAG,gBAAgB;IAE3E,qBAAqB,EAAE,sBAAsB,GAAG,eAAe;IAE/D,yBAAyB,EAAE,iBAAiB;IAE5C,sBAAsB,EAAE,eAAe;IAEvC,qBAAqB,EAAE,gCAAgC,GAAG,SAAS;IAEnE,6BAA6B,EAAE,2BAA2B,GAAG,YAAY;IAEzE,mBAAmB,EAAE,2BAA2B,GAAG,UAAU;IAE7D,wBAAwB,EACpB,2BAA2B,GAAG,qBAAqB;IAEvD,mBAAmB,EAAE,gCAAgC,GAAG,mBAAmB;IAE3E,mBAAmB,EACf,gCAAgC,GAAG,4BAA4B;IAEnE,yBAAyB,EACrB,gCAAgC,GAAG,eAAe;IAEtD,oBAAoB,EAAE,EAAE;CAC3B,CAAA;AAED,IAAI,gBAAgB,GAAG,EAAE,CAAC,YAAY,CAAC,sBAAsB,EAAE;IAC3D,MAAM,EAAE,KAAK;CAChB,CAAC,CAAA;AAEF,IAAI,CAAC,CAAC,gBAAgB,EAAE;IACpB,KAAK,IAAI,IAAI,IAAI,gBAAgB,EAAE;QAC/B,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE;YACxC,SAAQ;SACX;QAED,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,IAAI,CAAC,CAAA;QACjC,aAAa;QACb,IAAI,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAA;KACtC;CACJ;AAED,IAAI,IAAI,CAAC,OAAO,EAAE;IACd,IAAI,0BAA0B,GAAG,EAAE;SAC9B,YAAY,CAAC,SAAS,GAAG,yBAAyB,CAAC;SACnD,QAAQ,EAAE;SACV,IAAI,EAAE,CAAA;IAEX,IAAI,CAAC,0BAA0B,EAAE;QAC7B,MAAM,IAAI,KAAK,CACX,wEAAwE,CAC3E,CAAA;KACJ;IAED,IAAI,CAAC,oBAAoB,GAAG,0BAA0B,CAAA;IACtD,IAAI,CAAC,wBAAwB,GAAG,eAAe,CAAA;IAC/C,IAAI,CAAC,eAAe,GAAG,EAAE,CAAA;CAC5B;AAED,iBAAS,IAAI,CAAA"} \ No newline at end of file +{"version":3,"file":"CaptainConstants.js","sourceRoot":"","sources":["../../src/utils/CaptainConstants.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/app-backend/built/utils/CaptainInstaller.js b/app-backend/built/utils/CaptainInstaller.js index d0f22a6..e046bde 100644 --- a/app-backend/built/utils/CaptainInstaller.js +++ b/app-backend/built/utils/CaptainInstaller.js @@ -202,8 +202,8 @@ function install() { .then(function (nodeId) { let volumeToMount = [ { - hostPath: CaptainConstants.captainRootDirectory, - containerPath: CaptainConstants.captainRootDirectory, + hostPath: CaptainConstants.captainBaseDirectory, + containerPath: CaptainConstants.captainBaseDirectory, }, ]; let env = []; diff --git a/app-backend/src/app.ts b/app-backend/src/app.ts index d849da2..e8c98a1 100644 --- a/app-backend/src/app.ts +++ b/app-backend/src/app.ts @@ -41,9 +41,9 @@ if (CaptainConstants.isDebug) { res.setHeader('Access-Control-Allow-Credentials', 'true') res.setHeader( 'Access-Control-Allow-Headers', - CaptainConstants.header.namespace + + CaptainConstants.headerNamespace + ',' + - CaptainConstants.header.auth + + CaptainConstants.headerAuth + ',Content-Type' ) next() diff --git a/app-backend/src/datastore/DataStore.ts b/app-backend/src/datastore/DataStore.ts index cbd9440..c048602 100644 --- a/app-backend/src/datastore/DataStore.ts +++ b/app-backend/src/datastore/DataStore.ts @@ -45,7 +45,7 @@ class DataStore { {}, { configPath: - CaptainConstants.captainRootDirectory + '/config.json', + CaptainConstants.captainDataDirectory + '/config.json', } ) diff --git a/app-backend/src/injection/Injector.ts b/app-backend/src/injection/Injector.ts index 5ea43d8..0d72e31 100644 --- a/app-backend/src/injection/Injector.ts +++ b/app-backend/src/injection/Injector.ts @@ -24,7 +24,7 @@ export function injectGlobal() { const locals = res.locals locals.initialized = CaptainManager.get().isInitialized() - locals.namespace = req.header(CaptainConstants.header.namespace) + locals.namespace = req.header(CaptainConstants.headerNamespace) locals.forceSsl = CaptainManager.get().getForceSslValue() if ( @@ -54,7 +54,7 @@ export function injectUser() { const namespace = res.locals.namespace Authenticator.get(namespace) - .decodeAuthToken(req.header(CaptainConstants.header.auth) || '') + .decodeAuthToken(req.header(CaptainConstants.headerAuth) || '') .then(function(userDecoded) { if (userDecoded) { const datastore = DataStoreProvider.getDataStore(namespace) @@ -167,7 +167,7 @@ export function injectUserUsingCookieDataOnly() { return function(req: Request, res: Response, next: NextFunction) { Authenticator.get(CaptainConstants.rootNameSpace) .decodeAuthTokenFromCookies( - req.cookies[CaptainConstants.header.cookieAuth] + req.cookies[CaptainConstants.headerCookieAuth] ) .then(function(user) { res.locals.user = user diff --git a/app-backend/src/routes/LoginRouter.ts b/app-backend/src/routes/LoginRouter.ts index 867bc82..1dba5ac 100644 --- a/app-backend/src/routes/LoginRouter.ts +++ b/app-backend/src/routes/LoginRouter.ts @@ -32,7 +32,7 @@ router.post('/', function(req, res, next) { return Authenticator.get(namespace).getAuthTokenForCookies(password) }) .then(function(cookieAuth) { - res.cookie(CaptainConstants.header.cookieAuth, cookieAuth) + res.cookie(CaptainConstants.headerCookieAuth, cookieAuth) let baseApi = new BaseApi( ApiStatusCodes.STATUS_OK, 'Login succeeded' diff --git a/app-backend/src/utils/CaptainConstants.ts b/app-backend/src/utils/CaptainConstants.ts index 4e9a441..8efc9cb 100644 --- a/app-backend/src/utils/CaptainConstants.ts +++ b/app-backend/src/utils/CaptainConstants.ts @@ -1,14 +1,78 @@ import fs = require('fs-extra') import EnvVars = require('./EnvVars') -const CAPTAIN_ROOT_DIRECTORY = '/captain' -const CONSTANT_FILE_OVERRIDE = CAPTAIN_ROOT_DIRECTORY + '/constants.conf' -const CAPTAIN_ROOT_DIRECTORY_TEMP = CAPTAIN_ROOT_DIRECTORY + '/temp' -const CAPTAIN_ROOT_DIRECTORY_GENERATED = CAPTAIN_ROOT_DIRECTORY + '/generated' +const CAPTAIN_BASE_DIRECTORY = '/captain' +const CAPTAIN_DATA_DIRECTORY = +CAPTAIN_BASE_DIRECTORY + '/data' // data that sits here can be backed up +const CAPTAIN_ROOT_DIRECTORY_TEMP = CAPTAIN_BASE_DIRECTORY + '/temp' +const CAPTAIN_ROOT_DIRECTORY_GENERATED = CAPTAIN_BASE_DIRECTORY + '/generated' + +const CONSTANT_FILE_OVERRIDE = CAPTAIN_DATA_DIRECTORY + '/constants.json' let data = { + // ******************** Global Constants ********************* + apiVersion: 'v1', + version: '0.7.3', + + isDebug: EnvVars.CAPTAIN_IS_DEBUG, + + captainServiceExposedPort: 3000, + + rootNameSpace: 'captain', + + // *********************** Disk Paths ************************ + + dockerSocketPath: '/var/run/docker.sock', + + sourcePathInContainer: '/usr/src/app', + + nginxStaticRootDir: '/usr/share/nginx', + + nginxDefaultHtmlDir: '/default', + + letsEncryptEtcPathOnNginx: '/letencrypt/etc', + + nginxSharedPathOnNginx: '/nginx-shared', + + nginxDomainSpecificHtmlDir: '/domains', + + captainConfirmationPath: '/.well-known/captain-identifier', + + captainBaseDirectory: CAPTAIN_BASE_DIRECTORY, + + captainRootDirectoryTemp: CAPTAIN_ROOT_DIRECTORY_TEMP, + + captainRawSourceDirectoryBase: CAPTAIN_ROOT_DIRECTORY_TEMP + '/image_raw', + + captainRootDirectoryGenerated: CAPTAIN_ROOT_DIRECTORY_GENERATED, + + registryAuthPathOnHost: CAPTAIN_ROOT_DIRECTORY_GENERATED + '/registry-auth', // this is a file + + captainStaticFilesDir: CAPTAIN_ROOT_DIRECTORY_GENERATED + '/static', + + baseNginxConfigPath: CAPTAIN_ROOT_DIRECTORY_GENERATED + '/nginx/nginx.conf', + + rootNginxConfigPath: + CAPTAIN_ROOT_DIRECTORY_GENERATED + '/nginx/conf.d/captain-root', + + perAppNginxConfigPathBase: + CAPTAIN_ROOT_DIRECTORY_GENERATED + '/nginx/conf.d', + + captainDataDirectory: CAPTAIN_DATA_DIRECTORY, + + letsEncryptLibPath: CAPTAIN_DATA_DIRECTORY + '/letencrypt/lib', + + letsEncryptEtcPath: CAPTAIN_DATA_DIRECTORY + '/letencrypt/etc', + + registryPathOnHost: CAPTAIN_DATA_DIRECTORY + '/registry', + + nginxSharedPathOnHost: CAPTAIN_DATA_DIRECTORY + '/nginx-shared', + + debugSourceDirectory: '', // Only used in debug mode + + // **************** DockerHub Image Names ******************** + publishedNameOnDockerHub: 'dockersaturn/captainduckduck', certbotImageName: 'dockersaturn/certbot-sleeping:v0.17.0', @@ -21,110 +85,51 @@ let data = { nginxImageName: 'nginx', + // ********************* Local Docker Constants ************************ + defaultEmail: 'runner@captainduckduck.com', defaultMaxLogSize: '512m', buildLogSize: 50, - isDebug: EnvVars.CAPTAIN_IS_DEBUG, - - version: '0.7.3', - captainSaltSecretKey: 'captain-salt', nginxServiceName: 'captain-nginx', - nginxPortNumber: 80, - - rootNameSpace: 'captain', - captainServiceName: 'captain-captain', certbotServiceName: 'captain-certbot', netDataContainerName: 'captain-netdata-container', - netDataRelativePath: '/net-data-monitor', + registryServiceName: 'captain-registry', + + captainNetworkName: 'captain-overlay-network', + + captainRegistryUsername: 'captain', + + // ********************* HTTP Related Constants ************************ preCheckForWildCard: true, + nginxPortNumber: 80, + + registrySubDomainPort: 996, + + netDataRelativePath: '/net-data-monitor', + + healthCheckEndPoint: '/checkhealth', + captainSubDomain: 'captain', registrySubDomain: 'registry', - registryServiceName: 'captain-registry', + headerCookieAuth: 'captainCookieAuth', - registrySubDomainPort: 996, + headerAuth: 'x-captain-auth', - captainRegistryUsername: 'captain', - - captainNetworkName: 'captain-overlay-network', - - header: { - cookieAuth: 'captainCookieAuth', - auth: 'x-captain-auth', - namespace: 'x-namespace', - }, - - healthCheckEndPoint: '/checkhealth', - - prefixManagerNode: 'captainManager', - - prefixWorkerNode: 'captainWorker', - - dockerSocketPath: '/var/run/docker.sock', - - sourcePathInContainer: '/usr/src/app', - - captainServiceExposedPort: 3000, - - nginxStaticRootDir: '/usr/share/nginx', - - nginxDefaultHtmlDir: '/default', - - nginxDomainSpecificHtmlDir: '/domains', - - captainConfirmationPath: '/.well-known/captain-identifier', - - captainRootDirectory: CAPTAIN_ROOT_DIRECTORY, - - captainRootDirectoryTemp: CAPTAIN_ROOT_DIRECTORY_TEMP, - - captainRootDirectoryGenerated: CAPTAIN_ROOT_DIRECTORY_GENERATED, - - letsEncryptLibPath: CAPTAIN_ROOT_DIRECTORY + '/letencrypt/lib', - - letsEncryptEtcPath: CAPTAIN_ROOT_DIRECTORY + '/letencrypt/etc', - - registryPathOnHost: CAPTAIN_ROOT_DIRECTORY + '/registry', - - registryAuthPathOnHost: CAPTAIN_ROOT_DIRECTORY_GENERATED + '/registry-auth', // this is a file - - nginxSharedPathOnHost: CAPTAIN_ROOT_DIRECTORY + '/nginx-shared', - - letsEncryptEtcPathOnNginx: '/letencrypt/etc', - - nginxSharedPathOnNginx: '/nginx-shared', - - captainStaticFilesDir: CAPTAIN_ROOT_DIRECTORY_GENERATED + '/static', - - captainRawSourceDirectoryBase: CAPTAIN_ROOT_DIRECTORY_TEMP + '/image_raw', - - captainTarImagesDir: CAPTAIN_ROOT_DIRECTORY_TEMP + '/img_tar', - - captainDefinitionTempDir: - CAPTAIN_ROOT_DIRECTORY_TEMP + '/captain_definition', - - baseNginxConfigPath: CAPTAIN_ROOT_DIRECTORY_GENERATED + '/nginx/nginx.conf', - - rootNginxConfigPath: - CAPTAIN_ROOT_DIRECTORY_GENERATED + '/nginx/conf.d/captain-root', - - perAppNginxConfigPathBase: - CAPTAIN_ROOT_DIRECTORY_GENERATED + '/nginx/conf.d', - - debugSourceDirectory: '', // Only used in debug mode + headerNamespace: 'x-namespace', } let overridingValues = fs.readJsonSync(CONSTANT_FILE_OVERRIDE, { diff --git a/app-backend/src/utils/CaptainInstaller.ts b/app-backend/src/utils/CaptainInstaller.ts index 26d58db..b0352ff 100644 --- a/app-backend/src/utils/CaptainInstaller.ts +++ b/app-backend/src/utils/CaptainInstaller.ts @@ -251,8 +251,8 @@ export function install() { .then(function(nodeId: string) { let volumeToMount = [ { - hostPath: CaptainConstants.captainRootDirectory, - containerPath: CaptainConstants.captainRootDirectory, + hostPath: CaptainConstants.captainBaseDirectory, + containerPath: CaptainConstants.captainBaseDirectory, }, ]