npm - @continuoussecuritytooling/keycloak-reporter - Versions diffs - 0.4.0 → 0.5.0 - Mend

@continuoussecuritytooling/keycloak-reporter 0.4.0 → 0.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (17) hide show

package/.bin/wait-for-server.sh +1 -0
package/.eslintrc.cjs +3 -3
package/.github/CONTRIBUTING.md +5 -5
package/.github/workflows/pipeline.yml +13 -10
package/.prettierrc +6 -0
package/charts/keycloak-reporter/Chart.yaml +3 -2
package/charts/keycloak-reporter/README.md +2 -2
package/charts/keycloak-reporter/values.yaml +1 -0
package/cli.ts +49 -22
package/dist/cli.js +34 -17
package/dist/cli.js.map +1 -1
package/dist/lib/output.js +53 -50
package/dist/lib/output.js.map +1 -1
package/e2e/spec/webhooks.js +80 -10
package/lib/output.ts +63 -57
package/package.json +3 -1
package/renovate.json +15 -7

package/.bin/wait-for-server.sh CHANGED Viewed

@@ -7,6 +7,7 @@ until $(curl --output /dev/null --silent --head --fail http://localhost:8080/rea
     sleep 5
     if [[ "$counter" -gt 24 ]]; then
         printf "Keycloak server failed to start. Timeout!"
+        curl --head --fail http://localhost:8080/realms/master/.well-known/openid-configuration
         exit 1
     fi
     counter=$((counter + 1))

package/.eslintrc.cjs CHANGED Viewed

@@ -2,13 +2,13 @@
 module.exports = {
   env: {
     node: true,
-    commonjs: true,
+    commonjs: true
   },
   extends: ['eslint:recommended', 'plugin:@typescript-eslint/recommended'],
   parser: '@typescript-eslint/parser',
   plugins: ['@typescript-eslint'],
   root: true,
   rules: {
-    quotes: [2, 'single', { avoidEscape: true }],
-  },
+    quotes: [2, 'single', { avoidEscape: true }]
+  }
 };

package/.github/CONTRIBUTING.md CHANGED Viewed

@@ -3,10 +3,10 @@
 We'd love for you to contribute to our source code and to make this package even better than it is
 today! Here are the guidelines we'd like you to follow:
- - [Issues and Bugs](#issue)
- - [Feature Requests](#feature)
- - [Coding Rules](#rules)
- - [Commit Message Guidelines](#commit)
+- [ Found an Issue?](#-found-an-issue)
+- [ Want a Feature?](#-want-a-feature)
+- [ Coding Rules](#-coding-rules)
+- [ Git Commit Guidelines](#-git-commit-guidelines)
 ## <a name="issue"></a> Found an Issue?
@@ -17,7 +17,7 @@ with a fix. But first search if the issue is already described!
 If not create a new issue:
 * Tell about your environment:
-  * java version
+  * NodeJS version
   * used platform and version
 * Describe your issue
   * describe your steps leading to the issue

package/.github/workflows/pipeline.yml CHANGED Viewed

@@ -11,7 +11,6 @@ jobs:
     strategy:
       matrix:
         node_version:
-          - 16
           - 18
           - 20
         os:
@@ -47,7 +46,7 @@ jobs:
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.9'
+          python-version: "3.9"
           check-latest: true
       - name: Helm Chart Testing
@@ -81,16 +80,11 @@ jobs:
   end2end:
     name: "End2End Test on Node ${{ matrix.node_version }} and ${{ matrix.os }}"
     runs-on: "${{ matrix.os }}"
-    needs:
-      - build
-      - chart
     strategy:
       matrix:
         node_version:
-          - 16
-          # TODO: Support Node 16+
-          #- 18
-          #- 20
+          - 18
+          - 20
         os:
           - ubuntu-latest
     steps:
@@ -99,10 +93,17 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: "${{ matrix.node_version }}"
+      - name: Install Java
+        uses: actions/setup-java@v3
+        with:
+          distribution: "temurin" # See 'Supported distributions' for available options
+          java-version: "17"
       - name: npm build and test
         run: |
           npm run clean
           npm run build
+      - name: Tune GitHub-hosted runner network
+        uses: smorimoto/tune-github-hosted-runner-network@v1
       - name: Start Keycloak server
         run: npm run end2end:start-server &
@@ -120,11 +121,13 @@ jobs:
     name: Build Container Image
     runs-on: ubuntu-latest
     needs:
+      - build
+      - chart
       - end2end
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v3
-      # TODO: Support Node 16+
+        # TODO: Support Node 16+
         with:
           node-version: "16"
       - name: "Build Package"

package/.prettierrc ADDED Viewed

@@ -0,0 +1,6 @@
+{
+  "semi": true,
+  "trailingComma": "none",
+  "singleQuote": true,
+  "printWidth": 80
+}

package/charts/keycloak-reporter/Chart.yaml CHANGED Viewed

@@ -15,13 +15,14 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.4.1
+version: 0.5.0
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.2.0"
+# renovate: datasource=github-tags depName=ContinuousSecurityTooling/keycloak-reporter
+appVersion: "0.5.0"
 maintainers:
   # Martin Reinhardt
   - name: hypery2k

package/charts/keycloak-reporter/README.md CHANGED Viewed

@@ -1,6 +1,6 @@
 # keycloak-reporter
-![Version: 0.4.1](https://img.shields.io/badge/Version-0.4.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.2.0](https://img.shields.io/badge/AppVersion-0.2.0-informational?style=flat-square)
+![Version: 0.5.0](https://img.shields.io/badge/Version-0.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.0](https://img.shields.io/badge/AppVersion-0.5.0-informational?style=flat-square)
 A Helm chart for Kubernetes
@@ -31,7 +31,7 @@ A Helm chart for Kubernetes
 | keycloak.config.clientSecret | string | `""` |  |
 | keycloak.config.output | string | `"webhook"` |  |
 | keycloak.config.url | string | `""` |  |
-| keycloak.config.webhookMessage | string | `""` |  |
+| keycloak.config.webhookMessage | string | `""` | optional message for the webhook post |
 | keycloak.config.webhookType | string | `""` |  |
 | keycloak.config.webhookUrl | string | `""` |  |
 | keycloak.volumes.reports | string | `""` |  |

package/charts/keycloak-reporter/values.yaml CHANGED Viewed

@@ -46,6 +46,7 @@ keycloak:
     output: "webhook"
     webhookType: ""
     webhookUrl: ""
+    # -- optional message for the webhook post
     webhookMessage: ""
   volumes:
     reports: ""

package/cli.ts CHANGED Viewed

@@ -9,11 +9,10 @@ import {
   listClients,
   Options,
   convertJSON2CSV,
-  post2Webhook,
+  post2Webhook
 } from './index.js';
 import config from './src/config.js';
 class WebhookConfig {
   type: string;
   url: string;
@@ -50,7 +49,15 @@ async function convert(
   }
   if (reports.directory) {
     const date = new Date();
-    writeFileSync(path.join(`${reports.directory}`,`${reports.name}_${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}.${format.toLowerCase()}`), outputContent);
+    writeFileSync(
+      path.join(
+        `${reports.directory}`,
+        `${reports.name}_${date.getFullYear()}-${
+          date.getMonth() + 1
+        }-${date.getDate()}.${format.toLowerCase()}`
+      ),
+      outputContent
+    );
   }
   switch (output) {
     case 'webhook':
@@ -60,11 +67,23 @@ async function convert(
           config.url,
           config.title,
           outputContent,
-          config.message,
+          config.message
         );
       } catch (e) {
-        console.error('Error during sending webhook: ', e);
-        throw e;
+        switch (e.code || e.message) {
+          case 'Request failed with status code 400':
+            console.error('Invalid Teams Webhook Payload. Check your params.');
+            throw new Error('Invalid Teams Payload');
+          case 'slack_webhook_http_error':
+            console.error('Invalid Slack Webhook Payload. Check your params.');
+            throw new Error('Invalid Slack Payload');
+          default:
+            console.error(
+              `Error during sending webhook.(${e?.code})`,
+              e?.original
+            );
+            throw e;
+        }
       }
       break;
     // defaulting to standard out
@@ -81,22 +100,26 @@ yargs(hideBin(process.argv))
     () => {},
     async (argv) => {
       const users = await listUsers(<Options>{
-        clientId: argv.clientId ? argv.clientId as string: config.clientId,
-        clientSecret: argv.clientSecret ? argv.clientSecret as string: config.clientSecret,
-        rootUrl:argv.url ? argv.url as string: config.url,
+        clientId: argv.clientId ? (argv.clientId as string) : config.clientId,
+        clientSecret: argv.clientSecret
+          ? (argv.clientSecret as string)
+          : config.clientSecret,
+        rootUrl: argv.url ? (argv.url as string) : config.url
       });
       await convert(
         argv.format as string,
         argv.output as string,
         {
           name: 'user_listing',
-          directory: argv.reports as string,
+          directory: argv.reports as string
         },
         new WebhookConfig(
           argv.webhookType as string,
           argv.webhookUrl as string,
           'User Listing',
-          argv.webhookMessage ? argv.webhookMessage as string: config.webhookMessage
+          argv.webhookMessage
+            ? (argv.webhookMessage as string)
+            : config.webhookMessage
         ),
         users
       );
@@ -109,22 +132,26 @@ yargs(hideBin(process.argv))
     () => {},
     async (argv) => {
       const clients = await listClients(<Options>{
-        clientId: argv.clientId ? argv.clientId as string: config.clientId,
-        clientSecret: argv.clientSecret ? argv.clientSecret as string: config.clientSecret,
-        rootUrl:argv.url ? argv.url as string: config.url,
+        clientId: argv.clientId ? (argv.clientId as string) : config.clientId,
+        clientSecret: argv.clientSecret
+          ? (argv.clientSecret as string)
+          : config.clientSecret,
+        rootUrl: argv.url ? (argv.url as string) : config.url
       });
       await convert(
         argv.format as string,
         argv.output as string,
         {
           name: 'client_listing',
-          directory: argv.reports as string,
+          directory: argv.reports as string
         },
         new WebhookConfig(
           argv.webhookType as string,
           argv.webhookUrl as string,
           'Client Listing',
-          argv.webhookMessage ? argv.webhookMessage as string: config.webhookMessage
+          argv.webhookMessage
+            ? (argv.webhookMessage as string)
+            : config.webhookMessage
         ),
         clients
       );
@@ -134,33 +161,33 @@ yargs(hideBin(process.argv))
     alias: 'f',
     type: 'string',
     default: 'json',
-    description: 'output format, e.g. JSON|CSV',
+    description: 'output format, e.g. JSON|CSV'
   })
   .option('output', {
     alias: 'o',
     type: 'string',
     default: 'stdout',
-    description: 'output channel',
+    description: 'output channel'
   })
   .option('webhookType', {
     alias: 'w',
     type: 'string',
     default: 'slack',
-    description: 'Webhook Type',
+    description: 'Webhook Type'
   })
   .option('webhookMessage', {
     alias: 'm',
     type: 'string',
-    description: 'Webhook Message',
+    description: 'Webhook Message'
   })
   .option('webhookUrl', {
     alias: 't',
     type: 'string',
-    description: 'Webhook URL',
+    description: 'Webhook URL'
   })
   .option('reports', {
     alias: 'r',
     type: 'string',
-    description: 'Reports directory',
+    description: 'Reports directory'
   })
   .parse();

package/dist/cli.js CHANGED Viewed

@@ -3,7 +3,7 @@ import { writeFileSync } from 'node:fs';
 import path from 'path';
 import yargs from 'yargs/yargs';
 import { hideBin } from 'yargs/helpers';
-import { listUsers, listClients, convertJSON2CSV, post2Webhook, } from './index.js';
+import { listUsers, listClients, convertJSON2CSV, post2Webhook } from './index.js';
 import config from './src/config.js';
 class WebhookConfig {
     constructor(type, url, title, message) {
@@ -35,8 +35,17 @@ async function convert(format, output, reports, config, json) {
                 await post2Webhook(config.type, config.url, config.title, outputContent, config.message);
             }
             catch (e) {
-                console.error('Error during sending webhook: ', e);
-                throw e;
+                switch (e.code || e.message) {
+                    case 'Request failed with status code 400':
+                        console.error('Invalid Teams Webhook Payload. Check your params.');
+                        throw new Error('Invalid Teams Payload');
+                    case 'slack_webhook_http_error':
+                        console.error('Invalid Slack Webhook Payload. Check your params.');
+                        throw new Error('Invalid Slack Payload');
+                    default:
+                        console.error(`Error during sending webhook.(${e === null || e === void 0 ? void 0 : e.code})`, e === null || e === void 0 ? void 0 : e.original);
+                        throw e;
+                }
             }
             break;
         // defaulting to standard out
@@ -50,59 +59,67 @@ yargs(hideBin(process.argv))
 () => { }, async (argv) => {
     const users = await listUsers({
         clientId: argv.clientId ? argv.clientId : config.clientId,
-        clientSecret: argv.clientSecret ? argv.clientSecret : config.clientSecret,
-        rootUrl: argv.url ? argv.url : config.url,
+        clientSecret: argv.clientSecret
+            ? argv.clientSecret
+            : config.clientSecret,
+        rootUrl: argv.url ? argv.url : config.url
     });
     await convert(argv.format, argv.output, {
         name: 'user_listing',
-        directory: argv.reports,
-    }, new WebhookConfig(argv.webhookType, argv.webhookUrl, 'User Listing', argv.webhookMessage ? argv.webhookMessage : config.webhookMessage), users);
+        directory: argv.reports
+    }, new WebhookConfig(argv.webhookType, argv.webhookUrl, 'User Listing', argv.webhookMessage
+        ? argv.webhookMessage
+        : config.webhookMessage), users);
 })
     .command('listClients [url] [clientId] [clientSecret]', 'fetches all clients in the realms.',
 // eslint-disable-next-line @typescript-eslint/no-empty-function
 () => { }, async (argv) => {
     const clients = await listClients({
         clientId: argv.clientId ? argv.clientId : config.clientId,
-        clientSecret: argv.clientSecret ? argv.clientSecret : config.clientSecret,
-        rootUrl: argv.url ? argv.url : config.url,
+        clientSecret: argv.clientSecret
+            ? argv.clientSecret
+            : config.clientSecret,
+        rootUrl: argv.url ? argv.url : config.url
     });
     await convert(argv.format, argv.output, {
         name: 'client_listing',
-        directory: argv.reports,
-    }, new WebhookConfig(argv.webhookType, argv.webhookUrl, 'Client Listing', argv.webhookMessage ? argv.webhookMessage : config.webhookMessage), clients);
+        directory: argv.reports
+    }, new WebhookConfig(argv.webhookType, argv.webhookUrl, 'Client Listing', argv.webhookMessage
+        ? argv.webhookMessage
+        : config.webhookMessage), clients);
 })
     .option('format', {
     alias: 'f',
     type: 'string',
     default: 'json',
-    description: 'output format, e.g. JSON|CSV',
+    description: 'output format, e.g. JSON|CSV'
 })
     .option('output', {
     alias: 'o',
     type: 'string',
     default: 'stdout',
-    description: 'output channel',
+    description: 'output channel'
 })
     .option('webhookType', {
     alias: 'w',
     type: 'string',
     default: 'slack',
-    description: 'Webhook Type',
+    description: 'Webhook Type'
 })
     .option('webhookMessage', {
     alias: 'm',
     type: 'string',
-    description: 'Webhook Message',
+    description: 'Webhook Message'
 })
     .option('webhookUrl', {
     alias: 't',
     type: 'string',
-    description: 'Webhook URL',
+    description: 'Webhook URL'
 })
     .option('reports', {
     alias: 'r',
     type: 'string',
-    description: 'Reports directory',
+    description: 'Reports directory'
 })
     .parse();
 //# sourceMappingURL=cli.js.map

package/dist/cli.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"cli.js","sourceRoot":"","sources":["../cli.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACxC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,KAAK,MAAM,aAAa,CAAC;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EACL,SAAS,EACT,WAAW,EAEX,eAAe,EACf,YAAY,~~GACb~~,MAAM,YAAY,CAAC;AACpB,OAAO,MAAM,MAAM,iBAAiB,CAAC;~~AAGrC~~,MAAM,aAAa;IAKjB,YAAY,IAAY,EAAE,GAAW,EAAE,KAAa,EAAE,OAAgB;QACpE,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;CACF;AAED,MAAM,YAAY;CAGjB;AAED,KAAK,UAAU,OAAO,CACpB,MAAc,EACd,MAAc,EACd,OAAqB,EACrB,MAAqB,EACrB,IAAY;IAEZ,IAAI,aAAqB,CAAC;IAC1B,QAAQ,MAAM,EAAE;QACd,KAAK,KAAK;YACR,aAAa,GAAG,CAAC,MAAM,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;YACzD,MAAM;QACR,qBAAqB;QACrB;YACE,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;KACxC;IACD,IAAI,OAAO,CAAC,SAAS,EAAE;QACrB,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;QACxB,aAAa,~~CAAC~~,IAAI,CAAC,IAAI,~~CAAC~~,GAAG,OAAO,CAAC,SAAS,EAAE,~~EAAC~~,GAAG,OAAO,CAAC,IAAI,IAAI,IAAI,CAAC,WAAW,EAAE,~~IAAI~~,IAAI,CAAC,QAAQ,EAAE,GAAG,~~CAAC~~,IAAI,IAAI,CAAC,OAAO,EAAE,IAAI,MAAM,CAAC,WAAW,EAAE,EAAE,~~CAAC~~,~~EAAE~~,aAAa,~~CAAC~~,CAAC;~~KAC1K~~;IACD,QAAQ,MAAM,EAAE;QACd,KAAK,SAAS;YACZ,IAAI;gBACF,MAAM,YAAY,CAChB,MAAM,CAAC,IAAI,EACX,MAAM,CAAC,GAAG,EACV,MAAM,CAAC,KAAK,EACZ,aAAa,EACb,MAAM,CAAC,OAAO,CACf,CAAC;aACH;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,CAAC,KAAK,CAAC,~~gCAAgC~~,~~EAAE~~,CAAC,CAAC,CAAC;~~gBACnD~~,MAAM,CAAC,CAAC;~~aACT~~;YACD,MAAM;QACR,6BAA6B;QAC7B;YACE,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;KAC9B;AACH,CAAC;AAED,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;KACzB,OAAO,CACN,2CAA2C,EAC3C,kCAAkC;AAClC,gEAAgE;AAChE,GAAG,EAAE,GAAE,CAAC,EACR,KAAK,EAAE,IAAI,EAAE,EAAE;IACb,MAAM,KAAK,GAAG,MAAM,SAAS,CAAU;QACrC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,~~CAAC~~,IAAI,CAAC,~~QAAkB~~,~~CAAA~~,CAAC,CAAC,MAAM,CAAC,QAAQ;~~QAClE~~,YAAY,EAAE,IAAI,CAAC,YAAY,CAAC,~~CAAC~~,~~CAAC,~~IAAI,CAAC,~~YAAsB~~,~~CAAA,~~CAAC,CAAC,MAAM,CAAC,YAAY;~~QAClF~~,OAAO,~~EAAC~~,IAAI,CAAC,GAAG,CAAC,CAAC,~~CAAC~~,IAAI,CAAC,~~GAAa~~,~~CAAA~~,CAAC,CAAC,MAAM,CAAC,GAAG;~~KAClD~~,CAAC,CAAC;IACH,MAAM,OAAO,CACX,IAAI,CAAC,MAAgB,EACrB,IAAI,CAAC,MAAgB,EACrB;QACE,IAAI,EAAE,cAAc;QACpB,SAAS,EAAE,IAAI,CAAC,OAAiB;KAClC,EACD,IAAI,aAAa,CACf,IAAI,CAAC,WAAqB,EAC1B,IAAI,CAAC,UAAoB,EACzB,cAAc,EACd,IAAI,CAAC,cAAc,CAAC,~~CAAC~~,~~CAAC,~~IAAI,CAAC,~~cAAwB~~,~~CAAA,~~CAAC,CAAC,MAAM,CAAC,cAAc,~~CAC3E~~,EACD,KAAK,CACN,CAAC;AACJ,CAAC,CACF;KACA,OAAO,CACN,6CAA6C,EAC7C,oCAAoC;AACpC,gEAAgE;AAChE,GAAG,EAAE,GAAE,CAAC,EACR,KAAK,EAAE,IAAI,EAAE,EAAE;IACb,MAAM,OAAO,GAAG,MAAM,WAAW,CAAU;QACzC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,~~CAAC~~,IAAI,CAAC,~~QAAkB~~,~~CAAA~~,CAAC,CAAC,MAAM,CAAC,QAAQ;~~QAClE~~,YAAY,EAAE,IAAI,CAAC,YAAY,CAAC,~~CAAC~~,~~CAAC,~~IAAI,CAAC,~~YAAsB~~,~~CAAA,~~CAAC,CAAC,MAAM,CAAC,YAAY;~~QAClF~~,OAAO,~~EAAC~~,IAAI,CAAC,GAAG,CAAC,CAAC,~~CAAC~~,IAAI,CAAC,~~GAAa~~,~~CAAA~~,CAAC,CAAC,MAAM,CAAC,GAAG;~~KAClD~~,CAAC,CAAC;IACH,MAAM,OAAO,CACX,IAAI,CAAC,MAAgB,EACrB,IAAI,CAAC,MAAgB,EACrB;QACE,IAAI,EAAE,gBAAgB;QACtB,SAAS,EAAE,IAAI,CAAC,OAAiB;KAClC,EACD,IAAI,aAAa,CACf,IAAI,CAAC,WAAqB,EAC1B,IAAI,CAAC,UAAoB,EACzB,gBAAgB,EAChB,IAAI,CAAC,cAAc,CAAC,~~CAAC~~,~~CAAC,~~IAAI,CAAC,~~cAAwB~~,~~CAAA,~~CAAC,CAAC,MAAM,CAAC,cAAc,~~CAC3E~~,EACD,OAAO,CACR,CAAC;AACJ,CAAC,CACF;KACA,MAAM,CAAC,QAAQ,EAAE;IAChB,KAAK,EAAE,GAAG;IACV,IAAI,EAAE,QAAQ;IACd,OAAO,EAAE,MAAM;IACf,WAAW,EAAE,8BAA8B;CAC5C,CAAC;KACD,MAAM,CAAC,QAAQ,EAAE;IAChB,KAAK,EAAE,GAAG;IACV,IAAI,EAAE,QAAQ;IACd,OAAO,EAAE,QAAQ;IACjB,WAAW,EAAE,gBAAgB;CAC9B,CAAC;KACD,MAAM,CAAC,aAAa,EAAE;IACrB,KAAK,EAAE,GAAG;IACV,IAAI,EAAE,QAAQ;IACd,OAAO,EAAE,OAAO;IAChB,WAAW,EAAE,cAAc;CAC5B,CAAC;KACD,MAAM,CAAC,gBAAgB,EAAE;IACxB,KAAK,EAAE,GAAG;IACV,IAAI,EAAE,QAAQ;IACd,WAAW,EAAE,iBAAiB;CAC/B,CAAC;KACD,MAAM,CAAC,YAAY,EAAE;IACpB,KAAK,EAAE,GAAG;IACV,IAAI,EAAE,QAAQ;IACd,WAAW,EAAE,aAAa;CAC3B,CAAC;KACD,MAAM,CAAC,SAAS,EAAE;IACjB,KAAK,EAAE,GAAG;IACV,IAAI,EAAE,QAAQ;IACd,WAAW,EAAE,mBAAmB;CACjC,CAAC;KACD,KAAK,EAAE,CAAC"}
1	+ {"version":3,"file":"cli.js","sourceRoot":"","sources":["../cli.ts"],"names":[],"mappings":"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"}

package/dist/lib/output.js CHANGED Viewed

@@ -25,19 +25,19 @@ export async function post2Webhook(type, url, title, reportContent, text) {
                                     facts: [
                                         {
                                             title: 'Type',
-                                            value: title,
+                                            value: title
                                         },
                                         {
                                             title: 'Date',
-                                            value: `${date.getDate()}-${date.getMonth() + 1}-${date.getFullYear()}`,
-                                        },
-                                    ],
+                                            value: `${date.getDate()}-${date.getMonth() + 1}-${date.getFullYear()}`
+                                        }
+                                    ]
                                 },
                                 {
                                     type: 'TextBlock',
                                     text: text != null ? text : '',
-                                    wrap: true,
-                                },
+                                    wrap: true
+                                }
                             ],
                             actions: [
                                 {
@@ -49,59 +49,62 @@ export async function post2Webhook(type, url, title, reportContent, text) {
                                             {
                                                 type: 'TextBlock',
                                                 text: reportContent,
-                                                wrap: true,
-                                            },
+                                                wrap: true
+                                            }
                                         ],
-                                        $schema: 'http://adaptivecards.io/schemas/adaptive-card.json',
-                                    },
-                                },
-                            ],
-                        },
-                    },
-                ],
+                                        $schema: 'http://adaptivecards.io/schemas/adaptive-card.json'
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                ]
             });
         // defaulting to Slack
         default:
-            return new SlackWebhook(url).send({
-                blocks: [
-                    {
-                        type: 'section',
-                        fields: [
-                            { type: 'mrkdwn', text: `*Type*: ${title}` },
-                            {
-                                type: 'mrkdwn',
-                                text: `*Date*: ${date.getDate()}-${date.getMonth() + 1}-${date.getFullYear()}`,
-                            },
-                        ],
-                    },
+            // eslint-disable-next-line no-case-declarations
+            const blockEntries = [
+                {
+                    type: 'section',
+                    fields: [
+                        { type: 'mrkdwn', text: `*Type*: ${title}` },
+                        {
+                            type: 'mrkdwn',
+                            text: `*Date*: ${date.getDate()}-${date.getMonth() + 1}-${date.getFullYear()}`
+                        }
+                    ]
+                },
+                {
+                    type: 'divider'
+                }
+            ];
+            if (text != null) {
+                blockEntries.push({
+                    type: 'context',
+                    elements: [{ type: 'plain_text', text: text }]
+                });
+                blockEntries.push({
+                    type: 'divider'
+                });
+            }
+            blockEntries.push({
+                type: 'context',
+                elements: [
                     {
-                        type: 'divider',
-                    },
-                    {
-                        type: 'context',
-                        elements: [{ type: 'plain_text', text: text != null ? text : '' }],
-                    },
-                    {
-                        type: 'divider',
-                    },
-                    {
-                        type: 'context',
-                        elements: [
-                            {
-                                type: 'mrkdwn',
-                                text: `
+                        type: 'mrkdwn',
+                        text: `
 \`\`\`
 ${reportContent}
 \`\`\`
 `
-                            },
-                        ],
-                    },
-                    {
-                        type: 'context',
-                        elements: [{ type: 'plain_text', text: 'Raw report data' }],
-                    },
-                ],
+                    }
+                ]
+            }, {
+                type: 'context',
+                elements: [{ type: 'plain_text', text: 'Raw report data' }]
+            });
+            return new SlackWebhook(url).send({
+                blocks: blockEntries
             });
     }
 }

package/dist/lib/output.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"output.js","sourceRoot":"","sources":["../../lib/output.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,IAAI,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEnE,OAAO,EAAE,eAAe,IAAI,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAEjE,IAAK,WAGJ;AAHD,WAAK,WAAW;IACd,8BAAe,CAAA;IACf,8BAAe,CAAA;AACjB,CAAC,EAHI,WAAW,KAAX,WAAW,QAGf;AAOD,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,IAAY,EACZ,GAAW,EACX,KAAa,EACb,aAAqB,EACrB,IAAa;IAEb,oCAAoC;IACpC,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;IACxB,QAAQ,IAAI,EAAE;QACZ,KAAK,WAAW,CAAC,KAAK,CAAC,QAAQ,EAAE;YAC/B,OAAO,IAAI,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBAChC,IAAI,EAAE,SAAS;gBACf,WAAW,EAAE;oBACX;wBACE,WAAW,EAAE,yCAAyC;wBACtD,OAAO,EAAE;4BACP,OAAO,EAAE,oDAAoD;4BAC7D,IAAI,EAAE,cAAc;4BACpB,OAAO,EAAE,KAAK;4BACd,IAAI,EAAE;gCACJ;oCACE,IAAI,EAAE,SAAS;oCACf,KAAK,EAAE;wCACL;4CACE,KAAK,EAAE,MAAM;4CACb,KAAK,EAAE,KAAK;yCACb;wCACD;4CACE,KAAK,EAAE,MAAM;4CACb,KAAK,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,IACtB,IAAI,CAAC,QAAQ,EAAE,GAAG,CACpB,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE;yCACzB;qCACF;iCACF;gCACD;oCACE,IAAI,EAAE,WAAW;oCACjB,IAAI,EAAE,IAAI,~~IAAE~~,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;~~oCAC5B~~,IAAI,EAAE,IAAI;iCACX;6BACF;4BACD,OAAO,EAAE;gCACP;oCACE,IAAI,EAAE,iBAAiB;oCACvB,KAAK,EAAE,sBAAsB;oCAC7B,IAAI,EAAE;wCACJ,IAAI,EAAE,cAAc;wCACpB,IAAI,EAAE;4CACJ;gDACE,IAAI,EAAE,WAAW;gDACjB,IAAI,EAAE,aAAa;gDACnB,IAAI,EAAE,IAAI;6CACX;yCACF;wCACD,OAAO,EACL,oDAAoD;qCACvD;iCACF;6BACF;yBACF;qBACF;iBACF;aACF,CAAC,CAAC;QACL,sBAAsB;QACtB;YACE,~~OAAO~~,~~IAAI~~,YAAY,~~CAAC,GAAG,CAAC,CAAC,IAAI,CAAC~~;~~gBAChC,MAAM,EAAE~~;~~oBACN;wBACE~~,IAAI,EAAE,SAAS;~~wBACf~~,MAAM,EAAE;~~4BACN~~,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,KAAK,EAAE,EAAE;~~4BAC5C~~;~~gCACE~~,IAAI,EAAE,QAAQ;~~gCACd~~,IAAI,EAAE,WAAW,IAAI,CAAC,OAAO,EAAE,IAC7B,IAAI,CAAC,QAAQ,EAAE,GAAG,CACpB,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE;~~6BACzB~~;~~yBACF;~~qBACF;~~oBACD~~;~~wBACE~~,IAAI,EAAE,SAAS;~~qBAChB~~;~~oBACD~~;~~wBACE~~,IAAI,EAAE,SAAS;~~wBACf~~,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,~~EAAG~~,IAAI,~~IAAE~~,~~IAAI~~,CAAC,CAAC,CAAC,IAAI,CAAC,~~CAAC~~,~~CAAC,~~EAAE,~~EAAC~~,CAAC;~~qBACjE~~;~~oBACD;wBACE~~,IAAI,~~EAAE,SAAS~~;~~qBAChB;oBACD;wBACE~~,IAAI,EAAE,SAAS;~~wBACf~~,QAAQ,EAAE;~~4BACR~~;~~gCACE~~,IAAI,EAAE,QAAQ;~~gCACd~~,IAAI,EAAE;;~~EAEpB~~,aAAa;;CAEd;~~6BACc~~;~~yBACF~~;~~qBACF~~;~~oBACD;wBACE~~,IAAI,EAAE,SAAS;~~wBACf~~,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC;~~qBAC5D~~;~~iBACF~~;~~aACF~~,CAAC,CAAC;KACN;AACH,CAAC;AAED;GACG"}
1	+ {"version":3,"file":"output.js","sourceRoot":"","sources":["../../lib/output.ts"],"names":[],"mappings":"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"}

package/e2e/spec/webhooks.js CHANGED Viewed

@@ -4,7 +4,7 @@ import { test } from 'tape';
 import { spawn } from 'node:child_process';
 import path from 'node:path';
-test('Should post message to Teams',  { timeout: 10000 }, (t) => {
+test('Should post message to Teams', { timeout: 10000 }, (t) => {
   const cli = spawn(
     path.join(path.dirname('.'), 'node'),
     [
@@ -15,26 +15,64 @@ test('Should post message to Teams',  { timeout: 10000 }, (t) => {
       '3UYhI2hryFwoVtcd7ljlaDuD9HXrGV5r',
       '--output=webhook',
       '--webhookType=teams',
-      '--webhookUrl=' + process.env.WEBHOOK_TESTING_TEAMS,
+      '--webhookUrl=' + process.env.WEBHOOK_TESTING_TEAMS
     ],
     {
       env: {
-        ...process.env,
-      },
+        ...process.env
+      }
     }
   );
   cli.stdout.on('data', (chunk) => {
     console.log(chunk.toString());
   });
   cli.stderr.on('data', (msg) => {
-    t.fail(msg)
+    t.fail(msg);
   });
   cli.stdout.on('end', () => {
     t.end();
   });
 });
-test('Should post message to Slack', { timeout: 10000 }, (t) => {
+test(
+  'Should post message to Teams with additional message',
+  { timeout: 10000 },
+  (t) => {
+    const cli = spawn(
+      path.join(path.dirname('.'), 'node'),
+      [
+        'dist/cli.js',
+        'listUsers',
+        'http://localhost:8080',
+        'keycloak-reporter',
+        '3UYhI2hryFwoVtcd7ljlaDuD9HXrGV5r',
+        '--output=webhook',
+        '--webhookType=teams',
+        '--webhookUrl=' + process.env.WEBHOOK_TESTING_TEAMS,
+        '--webhookMessage="From Github Actions"'
+      ],
+      {
+        env: {
+          ...process.env
+        }
+      }
+    );
+    cli.stdout.on('data', (chunk) => {
+      console.log(chunk.toString());
+    });
+    cli.stderr.on('data', (msg) => {
+      t.fail(msg);
+    });
+    cli.stdout.on('end', () => {
+      t.end();
+    });
+  }
+);
+test(
+  'Should post message to Slack with additional message',
+  { timeout: 10000 },
+  (t) => {
     const cli = spawn(
       path.join(path.dirname('.'), 'node'),
       [
@@ -46,20 +84,52 @@ test('Should post message to Slack', { timeout: 10000 }, (t) => {
         '--output=webhook',
         '--webhookType=slack',
         '--webhookUrl=' + process.env.WEBHOOK_TESTING_SLACK,
+        '--webhookMessage="From Github Actions"'
       ],
       {
         env: {
-          ...process.env,
-        },
+          ...process.env
+        }
       }
     );
     cli.stdout.on('data', (chunk) => {
-      console.log(chunk.toString())
+      console.log(chunk.toString());
     });
     cli.stderr.on('data', (msg) => {
-      t.fail(msg)
+      t.fail(msg);
     });
     cli.stdout.on('end', () => {
       t.end();
     });
+  }
+);
+test('Should post message to Slack', { timeout: 10000 }, (t) => {
+  const cli = spawn(
+    path.join(path.dirname('.'), 'node'),
+    [
+      'dist/cli.js',
+      'listUsers',
+      'http://localhost:8080',
+      'keycloak-reporter',
+      '3UYhI2hryFwoVtcd7ljlaDuD9HXrGV5r',
+      '--output=webhook',
+      '--webhookType=slack',
+      '--webhookUrl=' + process.env.WEBHOOK_TESTING_SLACK
+    ],
+    {
+      env: {
+        ...process.env
+      }
+    }
+  );
+  cli.stdout.on('data', (chunk) => {
+    console.log(chunk.toString());
   });
+  cli.stderr.on('data', (msg) => {
+    t.fail(msg);
+  });
+  cli.stdout.on('end', () => {
+    t.end();
+  });
+});

package/lib/output.ts CHANGED Viewed

@@ -1,10 +1,10 @@
 import { IncomingWebhook as TeamsWebhook } from 'ms-teams-webhook';
-import { Block, SectionBlock } from '@slack/types';
+import { Block, ContextBlock, SectionBlock } from '@slack/types';
 import { IncomingWebhook as SlackWebhook } from '@slack/webhook';
 enum WebhookType {
   SLACK = 'slack',
-  TEAMS = 'teams',
+  TEAMS = 'teams'
 }
 export interface WebhookMessage {
@@ -17,7 +17,7 @@ export async function post2Webhook(
   url: string,
   title: string,
   reportContent: string,
-  text?: string,
+  text?: string
 ): Promise<unknown> {
   //const title= 'Keycloak Reporting';
   const date = new Date();
@@ -38,21 +38,21 @@ export async function post2Webhook(
                   facts: [
                     {
                       title: 'Type',
-                      value: title,
+                      value: title
                     },
                     {
                       title: 'Date',
                       value: `${date.getDate()}-${
                         date.getMonth() + 1
-                      }-${date.getFullYear()}`,
-                    },
-                  ],
+                      }-${date.getFullYear()}`
+                    }
+                  ]
                 },
                 {
                   type: 'TextBlock',
-                  text: text!=null ? text : '',
-                  wrap: true,
-                },
+                  text: text != null ? text : '',
+                  wrap: true
+                }
               ],
               actions: [
                 {
@@ -64,62 +64,68 @@ export async function post2Webhook(
                       {
                         type: 'TextBlock',
                         text: reportContent,
-                        wrap: true,
-                      },
+                        wrap: true
+                      }
                     ],
                     $schema:
-                      'http://adaptivecards.io/schemas/adaptive-card.json',
-                  },
-                },
-              ],
-            },
-          },
-        ],
+                      'http://adaptivecards.io/schemas/adaptive-card.json'
+                  }
+                }
+              ]
+            }
+          }
+        ]
       });
     // defaulting to Slack
     default:
-      return new SlackWebhook(url).send({
-        blocks: [
-          {
-            type: 'section',
-            fields: [
-              { type: 'mrkdwn', text: `*Type*: ${title}` },
-              {
-                type: 'mrkdwn',
-                text: `*Date*: ${date.getDate()}-${
-                  date.getMonth() + 1
-                }-${date.getFullYear()}`,
-              },
-            ],
-          },
-          {
-            type: 'divider',
-          },
-          {
-            type: 'context',
-            elements: [{ type: 'plain_text', text:  text!=null ? text : ''}],
-          },
-          {
-            type: 'divider',
-          },
-          {
-            type: 'context',
-            elements: [
-              {
-                type: 'mrkdwn',
-                text: `
+      // eslint-disable-next-line no-case-declarations
+      const blockEntries: Array<Block | ContextBlock | SectionBlock> = [
+        {
+          type: 'section',
+          fields: [
+            { type: 'mrkdwn', text: `*Type*: ${title}` },
+            {
+              type: 'mrkdwn',
+              text: `*Date*: ${date.getDate()}-${
+                date.getMonth() + 1
+              }-${date.getFullYear()}`
+            }
+          ]
+        },
+        {
+          type: 'divider'
+        }
+      ];
+      if (text != null) {
+        blockEntries.push({
+          type: 'context',
+          elements: [{ type: 'plain_text', text: text }]
+        });
+        blockEntries.push({
+          type: 'divider'
+        });
+      }
+      blockEntries.push(
+        {
+          type: 'context',
+          elements: [
+            {
+              type: 'mrkdwn',
+              text: `
 \`\`\`
 ${reportContent}
 \`\`\`
 `
-              },
-            ],
-          },
-          {
-            type: 'context',
-            elements: [{ type: 'plain_text', text: 'Raw report data' }],
-          },
-        ],
+            }
+          ]
+        },
+        {
+          type: 'context',
+          elements: [{ type: 'plain_text', text: 'Raw report data' }]
+        }
+      );
+      return new SlackWebhook(url).send({
+        blocks: blockEntries
       });
   }
 }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@continuoussecuritytooling/keycloak-reporter",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "Reporting Tools for Keycloak",
   "main": "dist/index.js",
   "bin": {
@@ -44,6 +44,8 @@
     "@typescript-eslint/eslint-plugin": "^5.59.6",
     "@typescript-eslint/parser": "^5.59.6",
     "eslint": "^8.40.0",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-plugin-prettier": "^5.0.0",
     "gunzip-maybe": "^1.4.2",
     "jest": "^29.5.0",
     "jest-extended": "^4.0.0",

package/renovate.json CHANGED Viewed

@@ -1,15 +1,23 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:base",":dependencyDashboard"
-  ],
-  "automerge": true,
+  "extends": ["config:base", ":rebaseStalePrs"],
   "platformAutomerge": true,
   "packageRules": [
     {
-      "description": "Automerge non-major updates",
-      "matchUpdateTypes": ["minor", "patch"],
-      "automerge": true
+      "description": "Automatically merge minor and patch-level updates",
+      "matchUpdateTypes": ["minor", "patch", "digest"],
+      "automerge": true,
+      "automergeType": "branch"
+    }
+  ],
+  "regexManagers": [
+    {
+      "description": "Update version entries in YAML files",
+      "fileMatch": [".*y[a]?ml$"],
+      "matchStrings": [
+        "# renovate: datasource=(?<datasource>[a-z-]+?)(?: lookupName=(?<lookupName>.+?))?(?: versioning=(?<versioning>[a-z-]+?))?\\sRUN install-[a-z]+? (?<depName>[a-z-]+?) (?<currentValue>.+?)\\s"
+      ],
+      "versioningTemplate": "{{#if versioning}}{{versioning}}{{else}}semver{{/if}}"
     }
   ],
   "prHourlyLimit": 10