Merge branch 'main' into TLSminVersion

open-amt-cloud-toolkit · Jun 17, 2022 · cf0a0b6 · cf0a0b6
2 parents 29fbb35 + dbc8f13
commit cf0a0b6
Show file tree

Hide file tree

Showing 139 changed files with 641 additions and 178 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -19,9 +19,14 @@
         "project": "./tsconfig.json"
     },
     "plugins": [
-        "@typescript-eslint"
+        "@typescript-eslint",
+        "license-header"
     ],
     "rules": {
+        "license-header/header": [
+            "warn",
+            "./license-header.js"
+        ],
         "@typescript-eslint/strict-boolean-expressions": 0,
         "@typescript-eslint/restrict-template-expressions": 0,
         "@typescript-eslint/no-dynamic-delete": 0,

diff --git a/.github/workflows/api-test.yml b/.github/workflows/api-test.yml
@@ -16,6 +16,7 @@ jobs:
     - run: docker-compose up -d
     - run: sleep 30
     - run: docker run --network=host -v  /home/runner/work/mps/mps/src/test/collections/:/collections postman/newman run /collections/MPS.postman_collection.json -e /collections/MPS.postman_environment.json --insecure
+    - run: docker run --network=host -v  /home/runner/work/mps/mps/src/test/collections/:/collections postman/newman run /collections/mps_security_api_test_postman_collection.json -e /collections/MPS.postman_environment.json -d /collections/data/mps_security_api_test_data.json --insecure
     - name: Dump docker logs on
       if: failure()
       uses: jwalton/gh-docker-logs@v1
diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
@@ -20,7 +20,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12.x, 14.x, 16.x, 17.x]
+        node-version: [14.x, 16.x, 18.x]
 
     steps:
     - uses: actions/checkout@v2

diff --git a/license-header.js b/license-header.js
@@ -0,0 +1,4 @@
+/*********************************************************************
+ * Copyright (c) Intel Corporation 2022
+ * SPDX-License-Identifier: Apache-2.0
+ **********************************************************************/
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -47,7 +47,7 @@
     "pg": "^8.7.3",
     "rc": "^1.2.8",
     "winston": "^3.7.2",
-    "ws": "^8.7.0",
+    "ws": "^8.8.0",
     "xml2js": "^0.4.23"
   },
   "devDependencies": {
@@ -63,14 +63,16 @@
     "eslint": "^7.32.0",
     "eslint-config-standard": "^16.0.3",
     "eslint-config-standard-with-typescript": "^21.0.1",
+    "eslint-plugin-header": "^3.1.1",
     "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-license-header": "^0.4.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^5.0.0",
     "jest": "27.5.1",
     "jest-junit": "^13.2.0",
     "jest-transform-stub": "^2.0.0",
     "ts-jest": "^27.1.4",
-    "ts-node": "^10.8.0",
+    "ts-node": "^10.8.1",
     "typescript": "^4.7.3"
   }
 }
diff --git a/src/Healthcheck.ts b/src/Healthcheck.ts
@@ -1,7 +1,8 @@
 /*********************************************************************
- * Copyright (c) Intel Corporation 2021
+ * Copyright (c) Intel Corporation 2022
  * SPDX-License-Identifier: Apache-2.0
  **********************************************************************/
+
 import { request } from 'http'
 import { RequestOptions } from 'https'
 

diff --git a/src/amt/APFProcessor.test.ts b/src/amt/APFProcessor.test.ts
@@ -1,3 +1,8 @@
+/*********************************************************************
+ * Copyright (c) Intel Corporation 2022
+ * SPDX-License-Identifier: Apache-2.0
+ **********************************************************************/
+
 import Common from '../utils/common'
 import { logger } from '../logging'
 import APFProcessor, { APFProtocol } from './APFProcessor'

diff --git a/src/amt/APFProcessor.ts b/src/amt/APFProcessor.ts
@@ -1,5 +1,5 @@
 /*********************************************************************
- * Copyright (c) Intel Corporation 2018-2021
+ * Copyright (c) Intel Corporation 2022
  * SPDX-License-Identifier: Apache-2.0
  **********************************************************************/
 

diff --git a/src/amt/CIRAChannel.test.ts b/src/amt/CIRAChannel.test.ts
@@ -1,3 +1,8 @@
+/*********************************************************************
+ * Copyright (c) Intel Corporation 2022
+ * SPDX-License-Identifier: Apache-2.0
+ **********************************************************************/
+
 import { CIRASocket } from '../models/models'
 import APFProcessor from './APFProcessor'
 import { CIRAChannel } from './CIRAChannel'

diff --git a/src/amt/CIRAChannel.ts b/src/amt/CIRAChannel.ts
@@ -1,5 +1,5 @@
 /*********************************************************************
- * Copyright (c) Intel Corporation 2018-2021
+ * Copyright (c) Intel Corporation 2022
  * SPDX-License-Identifier: Apache-2.0
  **********************************************************************/
 

diff --git a/src/amt/CIRAHandler.test.ts b/src/amt/CIRAHandler.test.ts
@@ -1,3 +1,8 @@
+/*********************************************************************
+ * Copyright (c) Intel Corporation 2022
+ * SPDX-License-Identifier: Apache-2.0
+ **********************************************************************/
+
 // import { CIRASocket } from '../models/models'
 // import { card, computerSystemPackage, enumerateResponseCIMSoftwareIdentity } from '../test/helper/wsmanResponses'
 import { HttpZResponseModel } from 'http-z'

diff --git a/src/amt/CIRAHandler.ts b/src/amt/CIRAHandler.ts
@@ -1,5 +1,5 @@
 /*********************************************************************
- * Copyright (c) Intel Corporation 2018-2021
+ * Copyright (c) Intel Corporation 2022
  * SPDX-License-Identifier: Apache-2.0
  **********************************************************************/
 

diff --git a/src/amt/ConnectedDevice.ts b/src/amt/ConnectedDevice.ts
@@ -1,7 +1,8 @@
 /*********************************************************************
-* Copyright (c) Intel Corporation 2022
-* SPDX-License-Identifier: Apache-2.0
-**********************************************************************/
+ * Copyright (c) Intel Corporation 2022
+ * SPDX-License-Identifier: Apache-2.0
+ **********************************************************************/
+
 import { CIRASocket } from '../models/models'
 import { HttpHandler } from './HttpHandler'
 

diff --git a/src/amt/DeviceAction.ts b/src/amt/DeviceAction.ts
@@ -1,7 +1,8 @@
 /*********************************************************************
-* Copyright (c) Intel Corporation 2022
-* SPDX-License-Identifier: Apache-2.0
-**********************************************************************/
+ * Copyright (c) Intel Corporation 2022
+ * SPDX-License-Identifier: Apache-2.0
+ **********************************************************************/
+
 import { logger, messages } from '../logging'
 import { CIRAHandler } from './CIRAHandler'
 import { AMT, CIM, IPS, Common } from '@open-amt-cloud-toolkit/wsman-messages'

diff --git a/src/amt/HttpHandler.ts b/src/amt/HttpHandler.ts
@@ -1,7 +1,7 @@
 /*********************************************************************
-* Copyright (c) Intel Corporation 2021
-* SPDX-License-Identifier: Apache-2.0
-**********************************************************************/
+ * Copyright (c) Intel Corporation 2022
+ * SPDX-License-Identifier: Apache-2.0
+ **********************************************************************/
 
 import { logger, messages } from '../logging'
 import { createHash } from 'crypto'

diff --git a/src/amt/connectedDevice.test.ts b/src/amt/connectedDevice.test.ts
@@ -1,3 +1,8 @@
+/*********************************************************************
+ * Copyright (c) Intel Corporation 2022
+ * SPDX-License-Identifier: Apache-2.0
+ **********************************************************************/
+
 import { CIRASocket } from '../models/models'
 import { ConnectedDevice } from './ConnectedDevice'
 

diff --git a/src/amt/deviceAction.test.ts b/src/amt/deviceAction.test.ts
@@ -1,3 +1,8 @@
+/*********************************************************************
+ * Copyright (c) Intel Corporation 2022
+ * SPDX-License-Identifier: Apache-2.0
+ **********************************************************************/
+
 import { CIRASocket } from '../models/models'
 import {
   amtMessageLog,

diff --git a/src/amt/httpHandler.test.ts b/src/amt/httpHandler.test.ts
@@ -1,3 +1,8 @@
+/*********************************************************************
+ * Copyright (c) Intel Corporation 2022
+ * SPDX-License-Identifier: Apache-2.0
+ **********************************************************************/
+
 import { CIM, Common } from '@open-amt-cloud-toolkit/wsman-messages'
 import { connectionParams, HttpHandler } from './HttpHandler'
 

diff --git a/src/custom.d.ts b/src/custom.d.ts
@@ -1,7 +1,8 @@
 /*********************************************************************
- * Copyright (c) Intel Corporation 2021
+ * Copyright (c) Intel Corporation 2022
  * SPDX-License-Identifier: Apache-2.0
  **********************************************************************/
+
 import { DeviceAction } from './amt/DeviceAction'
 import { IDB } from './interfaces/IDb'
 import { ISecretManagerService } from './interfaces/ISecretManagerService'

diff --git a/src/data/postgres/index.ts b/src/data/postgres/index.ts
@@ -1,7 +1,8 @@
 /*********************************************************************
- * Copyright (c) Intel Corporation 2021
+ * Copyright (c) Intel Corporation 2022
  * SPDX-License-Identifier: Apache-2.0
  **********************************************************************/
+
 /*
   Code pattern used to make connections and queries.
   Pattern referred from https://node-postgres.com/guides/project-structure

diff --git a/src/data/postgres/postgresDb.test.ts b/src/data/postgres/postgresDb.test.ts
@@ -1,3 +1,8 @@
+/*********************************************************************
+ * Copyright (c) Intel Corporation 2022
+ * SPDX-License-Identifier: Apache-2.0
+ **********************************************************************/
+
 import { QueryResult } from 'pg'
 import PostgresDb, { POSTGRES_RESPONSE_CODES } from '.'
 

diff --git a/src/data/postgres/tables/device.test.ts b/src/data/postgres/tables/device.test.ts
@@ -1,3 +1,8 @@
+/*********************************************************************
+ * Copyright (c) Intel Corporation 2022
+ * SPDX-License-Identifier: Apache-2.0
+ **********************************************************************/
+
 import { DeviceTable } from './device'
 import { Device } from '../../../models/models'
 import PostgresDb from '..'