Merge branch 'v2-master' into tabs-layout-change

* v2-master: (130 commits)
  docs update
  Fix unit test
  Fix issues from review - Ensure extensions/extension-types.ts remains free from other imports - Now check endpoint detail type is correct at runtime - Cf Endpoint Type is now registered in cf package - Ensure cf package tests & lint execute correctly - Ensure endpoint details components are destroyed correctly
  Fix merge issue
  Fix merge issue
  More info
  Fix lint issues
  Add note
  Fix missing .entity
  Priorities & tweaks
  Remove index.html file
  Add support for endpoint sub type (and metadata) (#3423)
  Fix service broker action - Ensure that the guid property is properly set - This means error handling happens correcty
  Update cf-api-v3.md
  Updaes
  Another lint fix
  Fix linting, don't show image if no image
  Disable endpoint card routerLink using new directive
  Missing images
  Fix existing getIconButton bug - There may be other places where this magically worked and now correctly won't
  ...

.gitignore

@@ -92,17 +92,17 @@ src/jetstream/config.properties
 
 # Customisations
 
-src/frontend/favicon.ico
-src/frontend/sass/custom.scss
-src/frontend/assets/eula.html
-src/frontend/assets/logo.png
-src/frontend/assets/nav-logo.png
-src/frontend/assets/login-bg.jpg
-src/frontend/app/custom-import.module.ts
-src/frontend/app/custom
-src/frontend/assets/custom
-src/frontend/sass/custom
-src/frontend/index.html
+src/frontend/packages/core/favicon.ico
+src/frontend/packages/core/sass/custom.scss
+src/frontend/packages/core/assets/eula.html
+src/frontend/packages/core/assets/logo.png
+src/frontend/packages/core/assets/nav-logo.png
+src/frontend/packages/core/assets/login-bg.jpg
+src/frontend/packages/core/src/custom-import.module.ts
+src/frontend/packages/core/src/custom
+src/frontend/packages/core/assets/custom
+src/frontend/packages/core/sass/custom
+src/frontend/packages/core/src/index.html
 
 # Prebuild package
 

.travis.yml

@@ -49,7 +49,7 @@ jobs:
     env:
     - CI_ENV=true
     script:
-    - npm test
+    - npm run test
     - npm run codecov
   - name: Backend Unit Tests
     before_script:

CHANGELOG.md

@@ -4,6 +4,13 @@
 
 [Full Changelog](https://github.com/cloudfoundry-incubator/stratos/compare/2.2.0...2.3.0)
 
+### Important Security Fixes
+
+This release fixes two CVEs identified in Stratos related to the Session Cookie - we recommend you update to 2.3.0.
+
+* [CVE-2019-3783: Stratos Deploys With Public Default Session Store Secret](https://www.cloudfoundry.org/blog/cve-2019-3783)
+* [CVE-2019-3784: Stratos contains a Session Collision Vulnerability](https://www.cloudfoundry.org/blog/cve-2019-3784/)
+
 This release contains a number of fixes and improvements:
 
 **Fixes:**

angular.json

@@ -1,28 +1,28 @@
 {
   "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
   "version": 1,
-  "newProjectRoot": "projects",
+  "newProjectRoot": "src/frontend/packages",
   "projects": {
     "stratos": {
       "root": "",
-      "sourceRoot": "src/frontend",
+      "sourceRoot": "src/frontend/packages",
       "projectType": "application",
       "architect": {
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
             "preserveSymlinks": true,
             "outputPath": "dist",
-            "index": "src/frontend/index.html",
-            "main": "src/frontend/main.ts",
-            "tsConfig": "src/frontend/tsconfig.app.json",
-            "polyfills": "src/frontend/polyfills.ts",
+            "index": "src/frontend/packages/core/src/index.html",
+            "main": "src/frontend/packages/core/src/main.ts",
+            "tsConfig": "src/frontend/packages/core/tsconfig.app.json",
+            "polyfills": "src/frontend/packages/core/src/polyfills.ts",
             "assets": [
-              "src/frontend/assets",
-              "src/frontend/favicon.ico"
+              "src/frontend/packages/core/assets",
+              "src/frontend/packages/core/favicon.ico"
             ],
             "styles": [
-              "src/frontend/styles.scss",
+              "src/frontend/packages/core/src/styles.scss",
               "node_modules/xterm/dist/xterm.css"
             ],
             "scripts": []
@@ -39,8 +39,8 @@
               "vendorChunk": false,
               "buildOptimizer": true,
               "fileReplacements": [{
-                "replace": "src/frontend/environments/environment.ts",
-                "with": "src/frontend/environments/environment.prod.ts"
+                "replace": "src/frontend/packages/core/src/environments/environment.ts",
+                "with": "src/frontend/packages/core/src/environments/environment.prod.ts"
               }]
             }
           }
@@ -66,64 +66,200 @@
           "options": {
             "browserTarget": "stratos:build"
           }
+        }
+      }
+    },
+    "stratos-e2e": {
+      "root": "",
+      "sourceRoot": "",
+      "projectType": "application",
+      "architect": {
+        "e2e": {
+          "builder": "@angular-devkit/build-angular:protractor",
+          "options": {
+            "protractorConfig": "./protractor.conf.js",
+            "devServerTarget": "stratos:serve"
+          }
+        }
+      }
+    },
+    "core": {
+      "root": "src/frontend/packages/core/",
+      "sourceRoot": "src/frontend/packages/core/src",
+      "projectType": "application",
+      "prefix": "app",
+      "schematics": {},
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:browser",
+          "options": {
+            "outputPath": "dist/core",
+            "index": "src/frontend/packages/core/src/index.html",
+            "main": "src/frontend/packages/core/src/main.ts",
+            "polyfills": "src/frontend/packages/core/src/polyfills.ts",
+            "tsConfig": "src/frontend/packages/core/tsconfig.app.json",
+            "assets": [
+              "src/frontend/packages/core/favicon.ico",
+              "src/frontend/packages/core/assets"
+            ],
+            "styles": [
+              "src/frontend/packages/core/src/styles.css"
+            ],
+            "scripts": []
+          },
+          "configurations": {
+            "production": {
+              "fileReplacements": [{
+                "replace": "src/frontend/packages/core/src/environments/environment.ts",
+                "with": "src/frontend/packages/core/src/environments/environment.prod.ts"
+              }],
+              "optimization": true,
+              "outputHashing": "all",
+              "sourceMap": false,
+              "extractCss": true,
+              "namedChunks": false,
+              "aot": true,
+              "extractLicenses": true,
+              "vendorChunk": false,
+              "buildOptimizer": true
+            }
+          }
+        },
+        "serve": {
+          "builder": "@angular-devkit/build-angular:dev-server",
+          "options": {
+            "browserTarget": "core:build"
+          },
+          "configurations": {
+            "production": {
+              "browserTarget": "core:build:production"
+            }
+          }
+        },
+        "extract-i18n": {
+          "builder": "@angular-devkit/build-angular:extract-i18n",
+          "options": {
+            "browserTarget": "core:build"
+          }
         },
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
-            "preserveSymlinks": true,
-            "sourceMap": false,
-            "main": "src/frontend/test.ts",
-            "karmaConfig": "./karma.conf.js",
-            "polyfills": "src/frontend/polyfills.ts",
-            "tsConfig": "src/frontend/tsconfig.spec.json",
-            "scripts": [],
+            "main": "src/frontend/packages/core/src/test.ts",
+            "polyfills": "src/frontend/packages/core/src/polyfills.ts",
+            "tsConfig": "src/frontend/packages/core/tsconfig.spec.json",
+            "karmaConfig": "src/frontend/packages/core/karma.conf.js",
             "styles": [
-              "src/frontend/styles.scss",
-              "node_modules/xterm/dist/xterm.css"
+              "src/frontend/packages/core/src/styles.css"
             ],
+            "scripts": [],
             "assets": [
-              "src/frontend/assets",
-              "src/frontend/favicon.ico"
+              "src/frontend/packages/core/src/favicon.ico",
+              "src/frontend/packages/core/src/assets"
             ]
           }
         },
         "lint": {
           "builder": "@angular-devkit/build-angular:tslint",
           "options": {
-            "typeCheck": true,
-            "format": "stylish",
-            "tsConfig": [
-              "src/frontend/tsconfig.app.json",
-              "src/frontend/tsconfig.spec.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
+            "tsConfig": ["src/tsconfig.json"],
+            "tslintConfig": "src/frontend/packages/core/tslint.json",
+            "files": [
+              "src/frontend/packages/core/src/**/*.ts"
             ]
           }
         }
       }
     },
-    "stratos-e2e": {
-      "root": "",
-      "sourceRoot": "",
-      "projectType": "application",
+    "store": {
+      "root": "src/frontend/packages/store",
+      "sourceRoot": "src/frontend/packages/store/src",
+      "projectType": "library",
+      "prefix": "lib",
       "architect": {
-        "e2e": {
-          "builder": "@angular-devkit/build-angular:protractor",
+        "build": {
+          "builder": "@angular-devkit/build-ng-packagr:build",
           "options": {
-            "protractorConfig": "./protractor.conf.js",
-            "devServerTarget": "stratos:serve"
+            "tsConfig": "src/frontend/packages/store/tsconfig.lib.json",
+            "project": "src/frontend/packages/store/ng-package.json"
+          }
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "main": "src/frontend/packages/store/src/test.ts",
+            "tsConfig": "src/frontend/packages/store/tsconfig.spec.json",
+            "karmaConfig": "src/frontend/packages/store/karma.conf.js"
           }
         },
         "lint": {
           "builder": "@angular-devkit/build-angular:tslint",
           "options": {
-            "tsConfig": [
-              "src/test-e2e/tsconfig.e2e.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
+            "tsConfig": ["src/tsconfig.json"],
+            "tslintConfig": "src/frontend/packages/store/tslint.json",
+            "files": ["src/frontend/packages/store/src/**/*.ts"]
+          }
+        }
+      }
+    },
+    "store-helpers": {
+      "root": "src/frontend/packages/store-helpers",
+      "sourceRoot": "src/frontend/packages/store-helpers/src",
+      "projectType": "library",
+      "prefix": "lib",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-ng-packagr:build",
+          "options": {
+            "tsConfig": "src/frontend/packages/store-helpers/tsconfig.lib.json",
+            "project": "src/frontend/packages/store-helpers/ng-package.json"
+          }
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "main": "src/frontend/packages/store-helpers/src/test.ts",
+            "tsConfig": "src/frontend/packages/store-helpers/tsconfig.spec.json",
+            "karmaConfig": "src/frontend/packages/store-helpers/karma.conf.js"
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": ["src/tsconfig.json"],
+            "tslintConfig": "src/frontend/packages/store-helpers/tslint.json",
+            "files": ["src/frontend/packages/store-helpers/src/**/*.ts"]
+          }
+        }
+      }
+    },
+    "cloud-foundry": {
+      "root": "src/frontend/packages/cloud-foundry",
+      "sourceRoot": "src/frontend/packages/cloud-foundry/src",
+      "projectType": "library",
+      "prefix": "lib",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-ng-packagr:build",
+          "options": {
+            "tsConfig": "src/frontend/packages/cloud-foundry/tsconfig.lib.json",
+            "project": "src/frontend/packages/cloud-foundry/ng-package.json"
+          }
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "main": "src/frontend/packages/cloud-foundry/src/test.ts",
+            "tsConfig": "src/frontend/packages/cloud-foundry/tsconfig.spec.json",
+            "karmaConfig": "src/frontend/packages/cloud-foundry/karma.conf.js"
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": ["src/tsconfig.json"],
+            "tslintConfig": "src/frontend/packages/cloud-foundry/tslint.json",
+            "files": ["src/frontend/packages/cloud-foundry/src/**/*.ts"]
           }
         }
       }

build/combine-coverage.js

@@ -0,0 +1,10 @@
+const createReporter = require('istanbul-api').createReporter;
+const istanbulCoverage = require('istanbul-lib-coverage');
+const coverage = require('../coverage/coverage-final.json');
+
+const map = istanbulCoverage.createCoverageMap();
+Object.keys(coverage).forEach(filename => map.addFileCoverage(coverage[filename]));
+
+const reporter = createReporter();
+reporter.addAll(['html', 'lcovonly', 'json']);
+reporter.write(map);