step-node-agent 3.28.4 → 3.29.1

package/node_modules/yaml/browser/dist/parse/parser.js

@@ -226,7 +226,7 @@ class Parser {
     }
     *step() {
         const top = this.peek(1);
-        if (this.type === 'doc-end' && (!top || top.type !== 'doc-end')) {
+        if (this.type === 'doc-end' && top?.type !== 'doc-end') {
             while (this.stack.length > 0)
                 yield* this.pop();
             this.stack.push({
@@ -758,7 +758,7 @@ class Parser {
             do {
                 yield* this.pop();
                 top = this.peek(1);
-            } while (top && top.type === 'flow-collection');
+            } while (top?.type === 'flow-collection');
         }
         else if (fc.end.length === 0) {
             switch (this.type) {

package/node_modules/yaml/browser/dist/stringify/stringifyNumber.js

@@ -4,7 +4,7 @@ function stringifyNumber({ format, minFractionDigits, tag, value }) {
     const num = typeof value === 'number' ? value : Number(value);
     if (!isFinite(num))
         return isNaN(num) ? '.nan' : num < 0 ? '-.inf' : '.inf';
-    let n = JSON.stringify(value);
+    let n = Object.is(value, -0) ? '-0' : JSON.stringify(value);
     if (!format &&
         minFractionDigits &&
         (!tag || tag === 'tag:yaml.org,2002:float') &&

package/node_modules/yaml/browser/dist/stringify/stringifyPair.js

@@ -101,7 +101,7 @@ function stringifyPair({ key, value }, ctx, onComment, onChompKeep) {
             ws += `\n${indentComment(cs, ctx.indent)}`;
         }
         if (valueStr === '' && !ctx.inFlow) {
-            if (ws === '\n')
+            if (ws === '\n' && valueComment)
                 ws = '\n\n';
         }
         else {

package/node_modules/yaml/dist/compose/compose-collection.js

@@ -61,7 +61,7 @@ function composeCollection(CN, ctx, token, props, onError) {
     let tag = ctx.schema.tags.find(t => t.tag === tagName && t.collection === expType);
     if (!tag) {
         const kt = ctx.schema.knownTags[tagName];
-        if (kt && kt.collection === expType) {
+        if (kt?.collection === expType) {
             ctx.schema.tags.push(Object.assign({}, kt, { default: false }));
             tag = kt;
         }

package/node_modules/yaml/dist/compose/resolve-block-seq.js

@@ -24,7 +24,7 @@ function resolveBlockSeq({ composeNode, composeEmptyNode }, ctx, bs, onError, ta
         });
         if (!props.found) {
             if (props.anchor || props.tag || value) {
-                if (value && value.type === 'block-seq')
+                if (value?.type === 'block-seq')
                     onError(props.end, 'BAD_INDENT', 'All sequence items must start at the same column');
                 else
                     onError(offset, 'MISSING_CHAR', 'Sequence item without - indicator');

package/node_modules/yaml/dist/compose/resolve-flow-collection.js

@@ -135,7 +135,7 @@ function resolveFlowCollection({ composeNode, composeEmptyNode }, ctx, fc, onErr
                 }
             }
             else if (value) {
-                if ('source' in value && value.source && value.source[0] === ':')
+                if ('source' in value && value.source?.[0] === ':')
                     onError(value, 'MISSING_CHAR', `Missing space after : in ${fcName}`);
                 else
                     onError(valueProps.start, 'MISSING_CHAR', `Missing , or : between ${fcName} items`);
@@ -179,7 +179,7 @@ function resolveFlowCollection({ composeNode, composeEmptyNode }, ctx, fc, onErr
     const expectedEnd = isMap ? '}' : ']';
     const [ce, ...ee] = fc.end;
     let cePos = offset;
-    if (ce && ce.source === expectedEnd)
+    if (ce?.source === expectedEnd)
         cePos = ce.offset + ce.source.length;
     else {
         const name = fcName[0].toUpperCase() + fcName.substring(1);

package/node_modules/yaml/dist/errors.js

@@ -48,7 +48,7 @@ const prettifyError = (src, lc) => (error) => {
     if (/[^ ]/.test(lineStr)) {
         let count = 1;
         const end = error.linePos[1];
-        if (end && end.line === line && end.col > col) {
+        if (end?.line === line && end.col > col) {
             count = Math.max(1, Math.min(end.col - col, 80 - ci));
         }
         const pointer = ' '.repeat(ci) + '^'.repeat(count);

package/node_modules/yaml/dist/nodes/Alias.js

@@ -61,7 +61,7 @@ class Alias extends Node.NodeBase {
             data = anchors.get(source);
         }
         /* istanbul ignore if */
-        if (!data || data.res === undefined) {
+        if (data?.res === undefined) {
             const msg = 'This should not happen: Alias anchor was not resolved?';
             throw new ReferenceError(msg);
         }

package/node_modules/yaml/dist/parse/parser.js

@@ -231,7 +231,7 @@ class Parser {
     }
     *step() {
         const top = this.peek(1);
-        if (this.type === 'doc-end' && (!top || top.type !== 'doc-end')) {
+        if (this.type === 'doc-end' && top?.type !== 'doc-end') {
             while (this.stack.length > 0)
                 yield* this.pop();
             this.stack.push({
@@ -763,7 +763,7 @@ class Parser {
             do {
                 yield* this.pop();
                 top = this.peek(1);
-            } while (top && top.type === 'flow-collection');
+            } while (top?.type === 'flow-collection');
         }
         else if (fc.end.length === 0) {
             switch (this.type) {

package/node_modules/yaml/dist/stringify/stringifyNumber.js

@@ -6,7 +6,7 @@ function stringifyNumber({ format, minFractionDigits, tag, value }) {
     const num = typeof value === 'number' ? value : Number(value);
     if (!isFinite(num))
         return isNaN(num) ? '.nan' : num < 0 ? '-.inf' : '.inf';
-    let n = JSON.stringify(value);
+    let n = Object.is(value, -0) ? '-0' : JSON.stringify(value);
     if (!format &&
         minFractionDigits &&
         (!tag || tag === 'tag:yaml.org,2002:float') &&

package/node_modules/yaml/dist/stringify/stringifyPair.js

@@ -103,7 +103,7 @@ function stringifyPair({ key, value }, ctx, onComment, onChompKeep) {
             ws += `\n${stringifyComment.indentComment(cs, ctx.indent)}`;
         }
         if (valueStr === '' && !ctx.inFlow) {
-            if (ws === '\n')
+            if (ws === '\n' && valueComment)
                 ws = '\n\n';
         }
         else {

package/node_modules/yaml/package.json

@@ -1,8 +1,9 @@
 {
   "name": "yaml",
-  "version": "2.8.1",
+  "version": "2.8.2",
   "license": "ISC",
   "author": "Eemeli Aro <eemeli@gmail.com>",
+  "funding": "https://github.com/sponsors/eemeli",
   "repository": "github:eemeli/yaml",
   "description": "JavaScript parser and stringifier for YAML",
   "keywords": [
@@ -73,14 +74,13 @@
     "@babel/preset-env": "^7.12.11",
     "@eslint/js": "^9.9.1",
     "@rollup/plugin-babel": "^6.0.3",
-    "@rollup/plugin-replace": "^5.0.2",
+    "@rollup/plugin-replace": "^6.0.3",
     "@rollup/plugin-typescript": "^12.1.1",
     "@types/jest": "^29.2.4",
     "@types/node": "^20.11.20",
     "babel-jest": "^29.0.1",
-    "cross-env": "^7.0.3",
     "eslint": "^9.9.1",
-    "eslint-config-prettier": "^9.0.0",
+    "eslint-config-prettier": "^10.1.8",
     "fast-check": "^2.12.0",
     "jest": "^29.0.1",
     "jest-resolve": "^29.7.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "step-node-agent",
-  "version": "3.28.4",
+  "version": "3.29.1",
   "description": "The official STEP Agent implementation for Node.js",
   "main": "index.js",
   "scripts": {
@@ -32,6 +32,7 @@
     "express": "^4.17.1",
     "get-fqdn": "^1.0.0",
     "http": "0.0.0",
+    "jsonwebtoken": "^9.0.2",
     "minimist": "^1.2.5",
     "npm": "^6.14.15",
     "request": "^2.88.0",

package/server.js

@@ -4,7 +4,7 @@ const YAML = require('yaml')
 
 let args = minimist(process.argv.slice(2), {
   default: {
-    f: path.join(__dirname, 'AgentConf.json')
+    f: path.join(__dirname, 'AgentConf.yaml')
   }
 })
 console.log('[Agent] Using arguments ' + JSON.stringify(args))
@@ -26,9 +26,10 @@ if(agentConfFileExt === '.yaml') {
 console.log('[Agent] Creating agent context and tokens')
 const uuid = require('uuid/v4')
 const _ = require('underscore')
+const jwtUtils = require('./utils/jwtUtils')
 const agentType = 'node'
 const agent = {id: uuid()}
-let agentContext = { tokens: [], tokenSessions: [], tokenProperties: [], properties: agentConf.properties, controllerUrl: agentConf.gridHost }
+let agentContext = { tokens: [], tokenSessions: [], tokenProperties: [], properties: agentConf.properties, controllerUrl: agentConf.gridHost, gridSecurity: agentConf.gridSecurity }
 _.each(agentConf.tokenGroups, function (tokenGroup) {
   const tokenConf = tokenGroup.tokenConf
   let attributes = tokenConf.attributes
@@ -60,6 +61,11 @@ const bodyParser = require('body-parser')
 app.use(bodyParser.urlencoded({extended: true}))
 app.use(bodyParser.json())
 
+// Apply JWT authentication middleware
+const createJwtAuthMiddleware = require('./middleware/jwtAuth')
+const jwtAuthMiddleware = createJwtAuthMiddleware(agentConf.gridSecurity)
+app.use(jwtAuthMiddleware)
+
 const routes = require('./api/routes/routes')
 routes(app, agentContext)
 
@@ -72,19 +78,32 @@ startWithAgentUrl = function(agentUrl) {
   const registrationPeriod = agentConf.registrationPeriod || 5000
   const request = require('request')
   setInterval(function () {
-    request({
+    const requestOptions = {
       uri: agentConf.gridHost + '/grid/register',
       method: 'POST',
       json: true,
       body: { agentRef: { agentId: agent.id, agentUrl: agentUrl, agentType: agentType }, tokens: agentContext.tokens }
-    }, function (err, res, body) {
+    };
+
+    // Add bearer token if gridSecurity is configured
+    const token = jwtUtils.generateJwtToken(agentConf.gridSecurity, 3600); // 1 hour expiration
+    if (token) {
+      requestOptions.headers = {
+        'Authorization': 'Bearer ' + token
+      };
+    }
+
+    request(requestOptions, function (err, res, body) {
       if (err) {
+        console.log("[Agent] Error while registering agent to grid")
         console.log(err)
+      } else if (res.statusCode !== 204) {
+        console.log("[Agent] Failed to register agent: grid responded with status " + res.statusCode + (body != null ? ". Response body: " + JSON.stringify(body) : ""))
       }
     })
   }, registrationPeriod)
-  
-  console.log('[Agent] Successfully started on: ' + port)  
+
+  console.log('[Agent] Successfully started on: ' + port)
 }
 
 if(agentConf.agentUrl) {
@@ -92,8 +111,8 @@ if(agentConf.agentUrl) {
 } else {
   const getFQDN = require('get-fqdn');
   getFQDN().then(FQDN => {
-    startWithAgentUrl('http://' + FQDN + ':' + port) 
+    startWithAgentUrl('http://' + FQDN + ':' + port)
   }).catch(e => {
     console.log('[Agent] Error while getting FQDN ' + e)
   })
-}
+}

package/utils/jwtUtils.js

@@ -0,0 +1,21 @@
+const jwt = require('jsonwebtoken')
+
+module.exports = {
+  generateJwtToken: function(gridSecurity, expirationSeconds) {
+    if (!gridSecurity || !gridSecurity.jwtSecretKey) {
+      return null;
+    }
+
+    const now = Math.floor(Date.now() / 1000);
+    const expiration = now + expirationSeconds;
+
+    return jwt.sign(
+      {
+        iat: now,
+        exp: expiration
+      },
+      gridSecurity.jwtSecretKey,
+      { algorithm: 'HS256' }
+    );
+  }
+}

package/node_modules/body-parser/SECURITY.md

@@ -1,25 +0,0 @@
-# Security Policies and Procedures
-
-## Reporting a Bug
-
-The Express team and community take all security bugs seriously. Thank you
-for improving the security of Express. We appreciate your efforts and
-responsible disclosure and will make every effort to acknowledge your
-contributions.
-
-Report security bugs by emailing the current owner(s) of `body-parser`. This
-information can be found in the npm registry using the command
-`npm owner ls body-parser`.
-If unsure or unable to get the information from the above, open an issue
-in the [project issue tracker](https://github.com/expressjs/body-parser/issues)
-asking for the current contact information.
-
-To ensure the timely response to your report, please ensure that the entirety
-of the report is contained within the email body and not solely behind a web
-link or an attachment.
-
-At least one owner will acknowledge your email within 48 hours, and will send a
-more detailed response within 48 hours indicating the next steps in handling
-your report. After the initial reply to your report, the owners will
-endeavor to keep you informed of the progress towards a fix and full
-announcement, and may ask for additional information or guidance.

package/node_modules/cookie-signature/.npmignore

@@ -1,4 +0,0 @@
-support
-test
-examples
-*.sock

package/node_modules/raw-body/HISTORY.md

@@ -1,308 +0,0 @@
-2.5.2 / 2023-02-21
-==================
-
-  * Fix error message for non-stream argument
-
-2.5.1 / 2022-02-28
-==================
-
-  * Fix error on early async hooks implementations
-
-2.5.0 / 2022-02-21
-==================
-
-  * Prevent loss of async hooks context
-  * Prevent hanging when stream is not readable
-  * deps: http-errors@2.0.0
-    - deps: depd@2.0.0
-    - deps: statuses@2.0.1
-
-2.4.3 / 2022-02-14
-==================
-
-  * deps: bytes@3.1.2
-
-2.4.2 / 2021-11-16
-==================
-
-  * deps: bytes@3.1.1
-  * deps: http-errors@1.8.1
-    - deps: setprototypeof@1.2.0
-    - deps: toidentifier@1.0.1
-
-2.4.1 / 2019-06-25
-==================
-
-  * deps: http-errors@1.7.3
-    - deps: inherits@2.0.4
-
-2.4.0 / 2019-04-17
-==================
-
-  * deps: bytes@3.1.0
-    - Add petabyte (`pb`) support
-  * deps: http-errors@1.7.2
-    - Set constructor name when possible
-    - deps: setprototypeof@1.1.1
-    - deps: statuses@'>= 1.5.0 < 2'
-  * deps: iconv-lite@0.4.24
-    - Added encoding MIK
-
-2.3.3 / 2018-05-08
-==================
-
-  * deps: http-errors@1.6.3
-    - deps: depd@~1.1.2
-    - deps: setprototypeof@1.1.0
-    - deps: statuses@'>= 1.3.1 < 2'
-  * deps: iconv-lite@0.4.23
-    - Fix loading encoding with year appended
-    - Fix deprecation warnings on Node.js 10+
-
-2.3.2 / 2017-09-09
-==================
-
-  * deps: iconv-lite@0.4.19
-    - Fix ISO-8859-1 regression
-    - Update Windows-1255
-
-2.3.1 / 2017-09-07
-==================
-
-  * deps: bytes@3.0.0
-  * deps: http-errors@1.6.2
-    - deps: depd@1.1.1
-  * perf: skip buffer decoding on overage chunk
-
-2.3.0 / 2017-08-04
-==================
-
-  * Add TypeScript definitions
-  * Use `http-errors` for standard emitted errors
-  * deps: bytes@2.5.0
-  * deps: iconv-lite@0.4.18
-    - Add support for React Native
-    - Add a warning if not loaded as utf-8
-    - Fix CESU-8 decoding in Node.js 8
-    - Improve speed of ISO-8859-1 encoding
-
-2.2.0 / 2017-01-02
-==================
-
-  * deps: iconv-lite@0.4.15
-    - Added encoding MS-31J
-    - Added encoding MS-932
-    - Added encoding MS-936
-    - Added encoding MS-949
-    - Added encoding MS-950
-    - Fix GBK/GB18030 handling of Euro character
-
-2.1.7 / 2016-06-19
-==================
-
-  * deps: bytes@2.4.0
-  * perf: remove double-cleanup on happy path
-
-2.1.6 / 2016-03-07
-==================
-
-  * deps: bytes@2.3.0
-    - Drop partial bytes on all parsed units
-    - Fix parsing byte string that looks like hex
-
-2.1.5 / 2015-11-30
-==================
-
-  * deps: bytes@2.2.0
-  * deps: iconv-lite@0.4.13
-
-2.1.4 / 2015-09-27
-==================
-
-  * Fix masking critical errors from `iconv-lite`
-  * deps: iconv-lite@0.4.12
-    - Fix CESU-8 decoding in Node.js 4.x
-
-2.1.3 / 2015-09-12
-==================
-
-  * Fix sync callback when attaching data listener causes sync read
-    - Node.js 0.10 compatibility issue
-
-2.1.2 / 2015-07-05
-==================
-
-  * Fix error stack traces to skip `makeError`
-  * deps: iconv-lite@0.4.11
-    - Add encoding CESU-8
-
-2.1.1 / 2015-06-14
-==================
-
-  * Use `unpipe` module for unpiping requests
-
-2.1.0 / 2015-05-28
-==================
-
-  * deps: iconv-lite@0.4.10
-    - Improved UTF-16 endianness detection
-    - Leading BOM is now removed when decoding
-    - The encoding UTF-16 without BOM now defaults to UTF-16LE when detection fails
-
-2.0.2 / 2015-05-21
-==================
-
-  * deps: bytes@2.1.0
-    - Slight optimizations
-
-2.0.1 / 2015-05-10
-==================
-
-  * Fix a false-positive when unpiping in Node.js 0.8
-
-2.0.0 / 2015-05-08
-==================
-
-  * Return a promise without callback instead of thunk
-  * deps: bytes@2.0.1
-    - units no longer case sensitive when parsing
-
-1.3.4 / 2015-04-15
-==================
-
-  * Fix hanging callback if request aborts during read
-  * deps: iconv-lite@0.4.8
-    - Add encoding alias UNICODE-1-1-UTF-7
-
-1.3.3 / 2015-02-08
-==================
-
-  * deps: iconv-lite@0.4.7
-    - Gracefully support enumerables on `Object.prototype`
-
-1.3.2 / 2015-01-20
-==================
-
-  * deps: iconv-lite@0.4.6
-    - Fix rare aliases of single-byte encodings
-
-1.3.1 / 2014-11-21
-==================
-
-  * deps: iconv-lite@0.4.5
-    - Fix Windows-31J and X-SJIS encoding support
-
-1.3.0 / 2014-07-20
-==================
-
-  * Fully unpipe the stream on error
-    - Fixes `Cannot switch to old mode now` error on Node.js 0.10+
-
-1.2.3 / 2014-07-20
-==================
-
-  * deps: iconv-lite@0.4.4
-    - Added encoding UTF-7
-
-1.2.2 / 2014-06-19
-==================
-
-  * Send invalid encoding error to callback
-
-1.2.1 / 2014-06-15
-==================
-
-  * deps: iconv-lite@0.4.3
-    - Added encodings UTF-16BE and UTF-16 with BOM
-
-1.2.0 / 2014-06-13
-==================
-
-  * Passing string as `options` interpreted as encoding
-  * Support all encodings from `iconv-lite`
-
-1.1.7 / 2014-06-12
-==================
-
-  * use `string_decoder` module from npm
-
-1.1.6 / 2014-05-27
-==================
-
-  * check encoding for old streams1
-  * support node.js < 0.10.6
-
-1.1.5 / 2014-05-14
-==================
-
-  * bump bytes
-
-1.1.4 / 2014-04-19
-==================
-
-  * allow true as an option
-  * bump bytes
-
-1.1.3 / 2014-03-02
-==================
-
-  * fix case when length=null
-
-1.1.2 / 2013-12-01
-==================
-
-  * be less strict on state.encoding check
-
-1.1.1 / 2013-11-27
-==================
-
-  * add engines
-
-1.1.0 / 2013-11-27
-==================
-
-  * add err.statusCode and err.type
-  * allow for encoding option to be true
-  * pause the stream instead of dumping on error
-  * throw if the stream's encoding is set
-
-1.0.1 / 2013-11-19
-==================
-
-  * dont support streams1, throw if dev set encoding
-
-1.0.0 / 2013-11-17
-==================
-
-  * rename `expected` option to `length`
-
-0.2.0 / 2013-11-15
-==================
-
-  * republish
-
-0.1.1 / 2013-11-15
-==================
-
-  * use bytes
-
-0.1.0 / 2013-11-11
-==================
-
-  * generator support
-
-0.0.3 / 2013-10-10
-==================
-
-  * update repo
-
-0.0.2 / 2013-09-14
-==================
-
-  * dump stream on bad headers
-  * listen to events after defining received and buffers
-
-0.0.1 / 2013-09-14
-==================
-
-  * Initial release