@continuoussecuritytooling/keycloak-reporter 0.2.0 → 0.5.0

package/dist/lib/output.js

@@ -5,7 +5,7 @@ var WebhookType;
     WebhookType["SLACK"] = "slack";
     WebhookType["TEAMS"] = "teams";
 })(WebhookType || (WebhookType = {}));
-export async function post2Webhook(type, url, title, reportContent) {
+export async function post2Webhook(type, url, title, reportContent, text) {
     //const title= 'Keycloak Reporting';
     const date = new Date();
     switch (type) {
@@ -25,14 +25,19 @@ export async function post2Webhook(type, url, title, reportContent) {
                                     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
+                                }
                             ],
                             actions: [
                                 {
@@ -44,52 +49,62 @@ export async function post2Webhook(type, url, title, reportContent) {
                                             {
                                                 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: [
+            // 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: 'section',
-                        fields: [
-                            { type: 'mrkdwn', text: `*Type*: ${title}` },
-                            {
-                                type: 'mrkdwn',
-                                text: `*Date*: ${date.getDate()}-${date.getMonth() + 1}-${date.getFullYear()}`,
-                            },
-                        ],
-                    },
-                    {
-                        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":"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;IAErB,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;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;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"}
+{"version":3,"file":"output.js","sourceRoot":"","sources":["../../lib/output.ts"],"names":[],"mappings":"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"}

package/e2e/spec/clients.js

@@ -23,11 +23,9 @@ test('Should list clients as JSON', { timeout: 3000 }, (t) => {
   cli.stdout.on('data', (chunk) => {
     console.log(chunk.toString())
     t.equal(JSON.parse(chunk.toString()).length, 24);
+    t.end();
   });
   cli.stderr.on('data', (msg) => {
     t.fail(msg)
   });
-  cli.stdout.on('end', () => {
-    t.end();
-  });
 });

package/e2e/spec/config.js

@@ -21,11 +21,9 @@ test('Should use config file', { timeout: 3000 }, (t) => {
   cli.stdout.on('data', (chunk) => {
     console.log(chunk.toString())
     t.equal(JSON.parse(chunk.toString()).length, 24);
+    t.end();
   });
   cli.stderr.on('data', (msg) => {
     t.fail(msg)
   });
-  cli.stdout.on('end', () => {
-    t.end();
-  });
 });

package/e2e/spec/users.js

@@ -23,11 +23,9 @@ test('Should list users as JSON', { timeout: 3000 }, (t) => {
   cli.stdout.on('data', (chunk) => {
     console.log(chunk.toString())
     t.equal(JSON.parse(chunk.toString()).length, 3);
+    t.end();
   });
   cli.stderr.on('data', (msg) => {
     t.fail(msg)
   });
-  cli.stdout.on('end', () => {
-    t.end();
-  });
 });

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: 3000 }, (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: 3000 }, (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())
+    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: 3000 }, (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,21 +84,52 @@ test('Should post message to Slack', { timeout: 3000 }, (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/jest.config.js

@@ -10,7 +10,6 @@ export default {
   collectCoverage: true,
   collectCoverageFrom: [
     'index.ts',
-    'src/**',
     'lib/**',
   ],
   setupFilesAfterEnv: [

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 {
@@ -16,7 +16,8 @@ export async function post2Webhook(
   type: string,
   url: string,
   title: string,
-  reportContent: string
+  reportContent: string,
+  text?: string
 ): Promise<unknown> {
   //const title= 'Keycloak Reporting';
   const date = new Date();
@@ -37,16 +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
+                }
               ],
               actions: [
                 {
@@ -58,55 +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: '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/lintconf.yaml

@@ -0,0 +1,42 @@
+---
+rules:
+  braces:
+    min-spaces-inside: 0
+    max-spaces-inside: 0
+    min-spaces-inside-empty: -1
+    max-spaces-inside-empty: -1
+  brackets:
+    min-spaces-inside: 0
+    max-spaces-inside: 0
+    min-spaces-inside-empty: -1
+    max-spaces-inside-empty: -1
+  colons:
+    max-spaces-before: 0
+    max-spaces-after: 1
+  commas:
+    max-spaces-before: 0
+    min-spaces-after: 1
+    max-spaces-after: 1
+  comments:
+    require-starting-space: true
+    min-spaces-from-content: 2
+  document-end: disable
+  document-start: disable           # No --- to start a file
+  empty-lines:
+    max: 2
+    max-start: 0
+    max-end: 0
+  hyphens:
+    max-spaces-after: 1
+  indentation:
+    spaces: consistent
+    indent-sequences: whatever      # - list indentation will handle both indentation and without
+    check-multi-line-strings: false
+  key-duplicates: enable
+  line-length: disable              # Lines can be any length
+  new-line-at-end-of-file: disable
+  new-lines:
+    type: unix
+  trailing-spaces: enable
+  truthy:
+    level: warning

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@continuoussecuritytooling/keycloak-reporter",
-  "version": "0.2.0",
+  "version": "0.5.0",
   "description": "Reporting Tools for Keycloak",
   "main": "dist/index.js",
   "bin": {
@@ -31,7 +31,7 @@
     "ajv": "^8.12.0",
     "install": "^0.13.0",
     "ms-teams-webhook": "^2.0.2",
-    "npm": "^9.6.7",
+    "npm": "^10.0.0",
     "openid-client": "^5.4.2",
     "ramda": "^0.29.0",
     "yargs": "^17.7.2"
@@ -44,13 +44,15 @@
     "@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": "^3.2.4",
+    "jest-extended": "^4.0.0",
     "node-fetch": "^3.3.1",
     "tap-xunit": "^2.4.1",
     "tape": "^5.6.3",
-    "tar-fs": "^2.1.1",
+    "tar-fs": "^3.0.0",
     "ts-jest": "^29.1.0",
     "typescript": "^5.0.4"
   }

package/renovate.json

@@ -1,14 +1,24 @@
 {
-    "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-    "extends": [
-      "config:base"
-    ],
-    "packageRules": [
-      {
-        "matchDatasources": ["npm"],
-        "matchUpdateTypes": ["patch"],
-        "automerge": true
-      }
-    ],
-    "prHourlyLimit": 10
-  }
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": ["config:base", ":rebaseStalePrs"],
+  "platformAutomerge": true,
+  "packageRules": [
+    {
+      "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
+}