@continuoussecuritytooling/keycloak-reporter 0.4.0 → 0.5.1

package/dist/cli.js

@@ -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) {
@@ -17,6 +17,7 @@ class ReportConfig {
 }
 async function convert(format, output, reports, config, json) {
     let outputContent;
+    console.log(output);
     switch (format) {
         case 'csv':
             outputContent = (await convertJSON2CSV(json)).toString();
@@ -35,8 +36,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 +60,71 @@ 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, {
+    await convert(config.format ? config.format : argv.format, config.output ? config.output : 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 ? argv.reports : config.reports
+    }, new WebhookConfig(config.webhookType
+        ? config.webhookType
+        : argv.webhookType, config.webhookUrl ? config.webhookUrl : 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, {
+    await convert(config.format ? config.format : argv.format, config.output ? config.output : 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 ? argv.reports : config.reports
+    }, new WebhookConfig(config.webhookType
+        ? config.webhookType
+        : argv.webhookType, config.webhookUrl ? config.webhookUrl : 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

@@ -1 +1 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../cli.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../cli.ts"],"names":[],"mappings":"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"}

package/dist/lib/output.js

@@ -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

@@ -1 +1 @@
-{"version":3,"file":"output.js","sourceRoot":"","sources":["../../lib/output.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"output.js","sourceRoot":"","sources":["../../lib/output.ts"],"names":[],"mappings":"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"}

package/e2e/spec/webhooks.js

@@ -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,66 @@ 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="' +
+          (process.env.WEBHOOK_ADDITIONAL_MESSAGE || '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 +86,54 @@ test('Should post message to Slack', { timeout: 10000 }, (t) => {
         '--output=webhook',
         '--webhookType=slack',
         '--webhookUrl=' + process.env.WEBHOOK_TESTING_SLACK,
+        '--webhookMessage="' +
+          (process.env.WEBHOOK_ADDITIONAL_MESSAGE || '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/k8s.yaml

@@ -0,0 +1,51 @@
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: test-job
+  namespace: kc-reporter
+spec:
+  suspend: false
+  template:
+    spec:
+      containers:
+      - command:
+        - /bin/sh
+        - -c
+        - |
+          while true; do sleep 30; done;
+        env:
+        - name: CONFIG_FILE
+          value: /app/config.json
+        image: continuoussecuritytooling/keycloak-reporting-cli:0.5.1
+        imagePullPolicy: IfNotPresent
+        name: users
+        resources: {}
+        terminationMessagePath: /dev/termination-log
+        terminationMessagePolicy: File
+        volumeMounts:
+        - mountPath: /app/config.json
+          name: config-file
+          readOnly: true
+          subPath: config.json
+      dnsPolicy: ClusterFirst
+      restartPolicy: OnFailure
+      schedulerName: default-scheduler
+      securityContext: {}
+      terminationGracePeriodSeconds: 30
+      volumes:
+      - name: config-file
+        secret:
+          defaultMode: 420
+          secretName: kc-reporter-test-keycloak-reporter
+status:
+  conditions:
+  - lastProbeTime: "2023-10-07T07:43:08Z"
+    lastTransitionTime: "2023-10-07T07:43:08Z"
+    message: Job has reached the specified backoff limit
+    reason: BackoffLimitExceeded
+    status: "True"
+    type: Failed
+  failed: 1
+  ready: 0
+  startTime: "2023-10-07T07:37:15Z"
+  uncountedTerminatedPods: {}

package/lib/output.ts

@@ -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
       });
   }
 }