diff --git a/app-backend/built/injection/Injector.js b/app-backend/built/injection/Injector.js index 3034fad..6e3dc8a 100644 --- a/app-backend/built/injection/Injector.js +++ b/app-backend/built/injection/Injector.js @@ -1,16 +1,19 @@ -const DataStoreProvider = require('../datastore/DataStoreProvider'); -const Authenticator = require('../user/Authenticator'); -const CaptainConstants = require('../utils/CaptainConstants'); -const CaptainManager = require('../user/CaptainManager'); -const ServiceManager = require('../user/ServiceManager'); -const dockerApi = require('../docker/DockerApi').get(); -const BaseApi = require('../api/BaseApi'); -const Logger = require('../utils/Logger'); +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +const DataStoreProvider = require("../datastore/DataStoreProvider"); +const Authenticator = require("../user/Authenticator"); +const CaptainConstants = require("../utils/CaptainConstants"); +const CaptainManager = require("../user/CaptainManager"); +const ServiceManager = require("../user/ServiceManager"); +const DockerApiProvider = require("../docker/DockerApi"); +const BaseApi = require("../api/BaseApi"); +const Logger = require("../utils/Logger"); +const dockerApi = DockerApiProvider.get(); const serviceMangerCache = {}; /** * Global dependency injection module */ -module.exports.injectGlobal = function (req, res) { +module.exports.injectGlobal = function () { return function (req, res, next) { const locals = res.locals; locals.initialized = CaptainManager.get().isInitialized(); @@ -30,8 +33,9 @@ module.exports.injectUser = function () { } const namespace = res.locals.namespace; Authenticator.get(namespace) - .decodeAuthToken(req.header(CaptainConstants.header.auth)) - .then(function (user) { + .decodeAuthToken(req.header(CaptainConstants.header.auth) || "") + .then(function (userDecoded) { + const user = userDecoded; if (user) { user.dataStore = DataStoreProvider.getDataStore(namespace); if (!serviceMangerCache[user.namespace]) { @@ -49,7 +53,7 @@ module.exports.injectUser = function () { return; } Logger.e(error); - res.locals.user = null; + res.locals.user = undefined; next(); }); }; @@ -59,28 +63,28 @@ module.exports.injectUser = function () { */ module.exports.injectUserForWebhook = function () { return function (req, res, next) { - let token = req.query.token; - let namespace = req.query.namespace; - let app = null; + const token = req.query.token; + const namespace = req.query.namespace; + let app = undefined; if (!token || !namespace) { - Logger.e('Trigger build is called with no token/namespace'); + Logger.e("Trigger build is called with no token/namespace"); next(); return; } - let dataStore = DataStoreProvider.getDataStore(namespace); - let decodedInfo = null; + const dataStore = DataStoreProvider.getDataStore(namespace); + let decodedInfo; Authenticator.get(namespace).decodeAppPushWebhookToken(token) .then(function (data) { decodedInfo = data; return dataStore.getAppsDataStore() - .getAppDefinition(data.appName); + .getAppDefinition(decodedInfo.appName); }) .then(function (appFound) { app = appFound; if (app.appPushWebhook.tokenVersion !== decodedInfo.tokenVersion) { - throw new Error('Token Info do not match'); + throw new Error("Token Info do not match"); } - let user = { + const user = { namespace: namespace }; user.dataStore = DataStoreProvider.getDataStore(namespace); @@ -96,7 +100,7 @@ module.exports.injectUserForWebhook = function () { }) .catch(function (error) { Logger.e(error); - res.locals.app = null; + res.locals.app = undefined; next(); }); }; @@ -119,7 +123,7 @@ module.exports.injectUserUsingCookieDataOnly = function () { return; } Logger.e(error); - res.locals.user = null; + res.locals.user = undefined; next(); }); }; diff --git a/app-backend/built/injection/Injector.js.map b/app-backend/built/injection/Injector.js.map index dec585e..987e0cf 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.js"],"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":"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"} \ No newline at end of file diff --git a/app-backend/built/models/ICacheGeneric.js b/app-backend/built/models/ICacheGeneric.js new file mode 100644 index 0000000..28cb5f7 --- /dev/null +++ b/app-backend/built/models/ICacheGeneric.js @@ -0,0 +1 @@ +//# sourceMappingURL=ICacheGeneric.js.map \ No newline at end of file diff --git a/app-backend/built/models/ICacheGeneric.js.map b/app-backend/built/models/ICacheGeneric.js.map new file mode 100644 index 0000000..97a1bce --- /dev/null +++ b/app-backend/built/models/ICacheGeneric.js.map @@ -0,0 +1 @@ +{"version":3,"file":"ICacheGeneric.js","sourceRoot":"","sources":["../../src/models/ICacheGeneric.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/app-backend/built/models/InjectionInterfaces.js b/app-backend/built/models/InjectionInterfaces.js new file mode 100644 index 0000000..b4d87ec --- /dev/null +++ b/app-backend/built/models/InjectionInterfaces.js @@ -0,0 +1,3 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +//# sourceMappingURL=InjectionInterfaces.js.map \ No newline at end of file diff --git a/app-backend/built/models/InjectionInterfaces.js.map b/app-backend/built/models/InjectionInterfaces.js.map new file mode 100644 index 0000000..97fd077 --- /dev/null +++ b/app-backend/built/models/InjectionInterfaces.js.map @@ -0,0 +1 @@ +{"version":3,"file":"InjectionInterfaces.js","sourceRoot":"","sources":["../../src/models/InjectionInterfaces.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/app-backend/built/user/Authenticator.js.map b/app-backend/built/user/Authenticator.js.map index e51606d..8aa61c6 100644 --- a/app-backend/built/user/Authenticator.js.map +++ b/app-backend/built/user/Authenticator.js.map @@ -1 +1 @@ -{"version":3,"file":"Authenticator.js","sourceRoot":"","sources":["../../src/user/Authenticator.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"Authenticator.js","sourceRoot":"","sources":["../../src/user/Authenticator.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/app-backend/built/user/ServiceManager.js b/app-backend/built/user/ServiceManager.js index f800189..82c2787 100644 --- a/app-backend/built/user/ServiceManager.js +++ b/app-backend/built/user/ServiceManager.js @@ -1,5 +1,4 @@ "use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); const CaptainConstants = require("../utils/CaptainConstants"); const Logger = require("../utils/Logger"); const fs = require("fs-extra"); diff --git a/app-backend/built/user/ServiceManager.js.map b/app-backend/built/user/ServiceManager.js.map index 7bc9ff6..2be880e 100644 --- a/app-backend/built/user/ServiceManager.js.map +++ b/app-backend/built/user/ServiceManager.js.map @@ -1 +1 @@ -{"version":3,"file":"ServiceManager.js","sourceRoot":"","sources":["../../src/user/ServiceManager.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ServiceManager.js","sourceRoot":"","sources":["../../src/user/ServiceManager.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/app-backend/package-lock.json b/app-backend/package-lock.json index 385f0e1..ece7ff9 100644 --- a/app-backend/package-lock.json +++ b/app-backend/package-lock.json @@ -42,6 +42,15 @@ "resolved": "https://registry.npmjs.org/@types/bcryptjs/-/bcryptjs-2.4.2.tgz", "integrity": "sha512-LiMQ6EOPob/4yUL66SZzu6Yh77cbzJFYll+ZfaPiPPFswtIlA/Fs1MzdKYA7JApHU49zQTbJGX3PDmCpIdDBRQ==" }, + "@types/body-parser": { + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.17.0.tgz", + "integrity": "sha512-a2+YeUjPkztKJu5aIF2yArYFQQp8d51wZ7DavSHjFuY1mqVgidGyzEQ41JIVNy82fXj8yPgy2vJmfIywgESW6w==", + "requires": { + "@types/connect": "*", + "@types/node": "*" + } + }, "@types/caseless": { "version": "0.12.1", "resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.1.tgz", @@ -52,6 +61,14 @@ "resolved": "https://registry.npmjs.org/@types/configstore/-/configstore-2.1.1.tgz", "integrity": "sha1-zR6FU2M60xhcPy8jns/10mQ+krY=" }, + "@types/connect": { + "version": "3.4.32", + "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.32.tgz", + "integrity": "sha512-4r8qa0quOvh7lGD0pre62CAb1oni1OO6ecJLGCezTmhQ8Fz50Arx9RUszryR8KlgK6avuSXvviL6yWyViQABOg==", + "requires": { + "@types/node": "*" + } + }, "@types/ejs": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/@types/ejs/-/ejs-2.6.0.tgz", @@ -62,6 +79,26 @@ "resolved": "http://registry.npmjs.org/@types/events/-/events-1.2.0.tgz", "integrity": "sha512-KEIlhXnIutzKwRbQkGWb/I4HFqBuUykAdHgDED6xqwXJfONCjF5VoE0cXEiurh3XauygxzeDzgtXUqvLkxFzzA==" }, + "@types/express": { + "version": "4.16.0", + "resolved": "https://registry.npmjs.org/@types/express/-/express-4.16.0.tgz", + "integrity": "sha512-TtPEYumsmSTtTetAPXlJVf3kEqb6wZK0bZojpJQrnD/djV4q1oB6QQ8aKvKqwNPACoe02GNiy5zDzcYivR5Z2w==", + "requires": { + "@types/body-parser": "*", + "@types/express-serve-static-core": "*", + "@types/serve-static": "*" + } + }, + "@types/express-serve-static-core": { + "version": "4.16.0", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.16.0.tgz", + "integrity": "sha512-lTeoCu5NxJU4OD9moCgm0ESZzweAx0YqsAcab6OB0EB3+As1OaHtKnaGJvcngQxYsi9UNv0abn4/DRavrRxt4w==", + "requires": { + "@types/events": "*", + "@types/node": "*", + "@types/range-parser": "*" + } + }, "@types/form-data": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/@types/form-data/-/form-data-2.2.1.tgz", @@ -86,11 +123,21 @@ "@types/node": "*" } }, + "@types/mime": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@types/mime/-/mime-2.0.0.tgz", + "integrity": "sha512-A2TAGbTFdBw9azHbpVd+/FkdW2T6msN1uct1O9bH3vTerEHKZhTXJUQXy+hNq1B0RagfU8U+KBdqiZpxjhOUQA==" + }, "@types/node": { "version": "10.12.9", "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.9.tgz", "integrity": "sha512-eajkMXG812/w3w4a1OcBlaTwsFPO5F7fJ/amy+tieQxEMWBlbV1JGSjkFM+zkHNf81Cad+dfIRA+IBkvmvdAeA==" }, + "@types/range-parser": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.2.tgz", + "integrity": "sha512-HtKGu+qG1NPvYe1z7ezLsyIaXYyi8SoAVqWDZgDQ8dLrsZvSzUNCwZyfX33uhWxL/SU0ZDQZ3nwZ0nimt507Kw==" + }, "@types/request": { "version": "2.48.1", "resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.1.tgz", @@ -107,6 +154,15 @@ "resolved": "https://registry.npmjs.org/@types/require-from-string/-/require-from-string-1.2.0.tgz", "integrity": "sha512-5vE9WoOOC9/DoD3Zj53UISpM+5tSvh8k0mL4fe2zFI6vO715/W4IQ3EdVUrWVMrFi1/NZhyMvm2iKsDFkEGddQ==" }, + "@types/serve-static": { + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.2.tgz", + "integrity": "sha512-/BZ4QRLpH/bNYgZgwhKEh+5AsboDBcUdlBYgzoLX0fpj3Y2gp6EApyOlM3bK53wQS/OE1SrdSYBAbux2D1528Q==", + "requires": { + "@types/express-serve-static-core": "*", + "@types/mime": "*" + } + }, "@types/ssh2": { "version": "0.5.36", "resolved": "https://registry.npmjs.org/@types/ssh2/-/ssh2-0.5.36.tgz", diff --git a/app-backend/package.json b/app-backend/package.json index 2ba1165..0d38281 100644 --- a/app-backend/package.json +++ b/app-backend/package.json @@ -11,6 +11,7 @@ "@types/bcryptjs": "^2.4.2", "@types/configstore": "^2.1.1", "@types/ejs": "^2.6.0", + "@types/express": "^4.16.0", "@types/fs-extra": "^5.0.4", "@types/jsonwebtoken": "^8.3.0", "@types/request": "^2.48.1", diff --git a/app-backend/src/injection/Injector.js b/app-backend/src/injection/Injector.ts similarity index 64% rename from app-backend/src/injection/Injector.js rename to app-backend/src/injection/Injector.ts index 679d473..57eeb1e 100644 --- a/app-backend/src/injection/Injector.js +++ b/app-backend/src/injection/Injector.ts @@ -1,20 +1,25 @@ -const DataStoreProvider = require('../datastore/DataStoreProvider'); -const Authenticator = require('../user/Authenticator'); -const CaptainConstants = require('../utils/CaptainConstants'); -const CaptainManager = require('../user/CaptainManager'); -const ServiceManager = require('../user/ServiceManager'); -const dockerApi = require('../docker/DockerApi').get(); -const BaseApi = require('../api/BaseApi'); -const Logger = require('../utils/Logger'); +import DataStoreProvider = require("../datastore/DataStoreProvider"); +import Authenticator = require("../user/Authenticator"); +import CaptainConstants = require("../utils/CaptainConstants"); +import CaptainManager = require("../user/CaptainManager"); +import ServiceManager = require("../user/ServiceManager"); +import DockerApiProvider = require("../docker/DockerApi"); +import BaseApi = require("../api/BaseApi"); +import UserModel = require("../models/InjectionInterfaces"); +import Logger = require("../utils/Logger"); +import { NextFunction } from "connect"; +import { Response, Request } from "express"; +import requireFromString = require("require-from-string"); +const dockerApi = DockerApiProvider.get(); -const serviceMangerCache = {}; +const serviceMangerCache = {} as ICacheGeneric; /** * Global dependency injection module */ -module.exports.injectGlobal = function (req, res) { +module.exports.injectGlobal = function () { - return function (req, res, next) { + return function (req: Request, res: Response, next: NextFunction) { const locals = res.locals; @@ -23,7 +28,7 @@ module.exports.injectGlobal = function (req, res) { locals.forceSsl = CaptainManager.get().getForceSslValue(); next(); - } + }; }; @@ -32,7 +37,7 @@ module.exports.injectGlobal = function (req, res) { */ module.exports.injectUser = function () { - return function (req, res, next) { + return function (req: Request, res: Response, next: NextFunction) { if (res.locals.user) { next(); @@ -42,8 +47,11 @@ module.exports.injectUser = function () { const namespace = res.locals.namespace; Authenticator.get(namespace) - .decodeAuthToken(req.header(CaptainConstants.header.auth)) - .then(function (user) { + .decodeAuthToken(req.header(CaptainConstants.header.auth) || "") + .then(function (userDecoded: UserModel.UserJwt) { + + const user = userDecoded as UserModel.UserInjected ; + if (user) { user.dataStore = DataStoreProvider.getDataStore(namespace); if (!serviceMangerCache[user.namespace]) { @@ -58,17 +66,17 @@ module.exports.injectUser = function () { next(); }) - .catch(function (error) { + .catch(function (error: any) { if (error && error.captainErrorType) { res.send(new BaseApi(error.captainErrorType, error.apiMessage)); return; } Logger.e(error); - res.locals.user = null; + res.locals.user = undefined; next(); }); - } + }; }; /** @@ -76,29 +84,29 @@ module.exports.injectUser = function () { */ module.exports.injectUserForWebhook = function () { - return function (req, res, next) { + return function (req: Request, res: Response, next: NextFunction) { - let token = req.query.token; - let namespace = req.query.namespace; - let app = null; + const token = req.query.token; + const namespace = req.query.namespace; + let app = undefined; if (!token || !namespace) { - Logger.e('Trigger build is called with no token/namespace'); + Logger.e("Trigger build is called with no token/namespace"); next(); return; } - let dataStore = DataStoreProvider.getDataStore(namespace); + const dataStore = DataStoreProvider.getDataStore(namespace); - let decodedInfo = null; + let decodedInfo: UserModel.IAppWebHookToken; Authenticator.get(namespace).decodeAppPushWebhookToken(token) .then(function (data) { - decodedInfo = data; + decodedInfo = data as UserModel.IAppWebHookToken; return dataStore.getAppsDataStore() - .getAppDefinition(data.appName) + .getAppDefinition(decodedInfo.appName); }) .then(function (appFound) { @@ -106,12 +114,13 @@ module.exports.injectUserForWebhook = function () { app = appFound; if (app.appPushWebhook.tokenVersion !== decodedInfo.tokenVersion) { - throw new Error('Token Info do not match'); + throw new Error("Token Info do not match"); } - let user = { + const user = { namespace: namespace - }; + } as UserModel.UserInjected; + user.dataStore = DataStoreProvider.getDataStore(namespace); if (!serviceMangerCache[user.namespace]) { serviceMangerCache[user.namespace] = new ServiceManager(user, dockerApi, CaptainManager.get().getLoadBalanceManager()); @@ -128,11 +137,11 @@ module.exports.injectUserForWebhook = function () { }) .catch(function (error) { Logger.e(error); - res.locals.app = null; + res.locals.app = undefined; next(); }); - } + }; }; /** @@ -141,7 +150,7 @@ module.exports.injectUserForWebhook = function () { */ module.exports.injectUserUsingCookieDataOnly = function () { - return function (req, res, next) { + return function (req: Request, res: Response, next: NextFunction) { Authenticator.get(CaptainConstants.rootNameSpace) .decodeAuthTokenFromCookies(req.cookies[CaptainConstants.header.cookieAuth]) @@ -157,8 +166,8 @@ module.exports.injectUserUsingCookieDataOnly = function () { return; } Logger.e(error); - res.locals.user = null; + res.locals.user = undefined; next(); }); - } + }; }; \ No newline at end of file diff --git a/app-backend/src/models/ICacheGeneric.ts b/app-backend/src/models/ICacheGeneric.ts new file mode 100644 index 0000000..7d2cf08 --- /dev/null +++ b/app-backend/src/models/ICacheGeneric.ts @@ -0,0 +1,3 @@ +interface ICacheGeneric< T > { + [id: string]: T; +} \ No newline at end of file diff --git a/app-backend/src/models/InjectionInterfaces.ts b/app-backend/src/models/InjectionInterfaces.ts new file mode 100644 index 0000000..d768ea9 --- /dev/null +++ b/app-backend/src/models/InjectionInterfaces.ts @@ -0,0 +1,21 @@ +import DataStore = require("../datastore/DataStoreImpl"); +import ServiceManager = require("../user/ServiceManager"); + +export interface UserJwt { + namespace: string; + tokenVersion: string|undefined; +} + + +export interface UserInjected extends UserJwt { + dataStore: DataStore; + serviceManager: ServiceManager; + + initialized: boolean; +} + + +export interface IAppWebHookToken { + appName: string; + tokenVersion: string; +} \ No newline at end of file diff --git a/app-backend/src/user/Authenticator.ts b/app-backend/src/user/Authenticator.ts index c922ab7..f796ea2 100644 --- a/app-backend/src/user/Authenticator.ts +++ b/app-backend/src/user/Authenticator.ts @@ -9,6 +9,7 @@ import CaptainManager = require("./CaptainManager"); import CaptainConstants = require("../utils/CaptainConstants"); import Logger = require("../utils/Logger"); import DataStoreProvider = require("../datastore/DataStoreProvider"); +import { UserJwt } from "../models/InjectionInterfaces"; const captainDefaultPassword = EnvVar.DEFAULT_PASSWORD || "captain42"; @@ -103,7 +104,7 @@ class Authenticator { ); } - const userObj = { + const userObj: UserJwt = { namespace: self.namespace, tokenVersion: self.tokenVersion, }; @@ -122,7 +123,7 @@ class Authenticator { return this.decodeAuthToken(token, COOKIE_AUTH_SUFFIX); } - decodeAuthToken(token: string, keySuffix: string) { + decodeAuthToken(token: string, keySuffix?: string) { const self = this; return new Promise(function(resolve, reject) { diff --git a/app-backend/src/user/ServiceManager.ts b/app-backend/src/user/ServiceManager.ts index 912133d..78a57ff 100644 --- a/app-backend/src/user/ServiceManager.ts +++ b/app-backend/src/user/ServiceManager.ts @@ -1015,4 +1015,4 @@ class ServiceManager { } } -module.exports = ServiceManager; \ No newline at end of file +export = ServiceManager; \ No newline at end of file