@continuoussecuritytooling/keycloak-reporter 0.5.1 → 0.6.0

package/Dockerfile

@@ -8,6 +8,9 @@ COPY dist/ docker_entrypoint.sh package.json /app
 
 WORKDIR /app
 
-RUN cd /app && npm i
+RUN cd /app && npm install --omit=dev &&\
+    chown -R 1000:2000 /app
+
+USER 1000
 
 ENTRYPOINT ["/app/docker_entrypoint.sh"]

package/charts/keycloak-reporter/Chart.yaml

@@ -22,7 +22,7 @@ version: 1.0.0
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
 # renovate: datasource=github-tags depName=ContinuousSecurityTooling/keycloak-reporter
-appVersion: "0.5.0"
+appVersion: "0.6.0"
 maintainers:
   # Martin Reinhardt
   - name: hypery2k

package/charts/keycloak-reporter/README.md

@@ -1,6 +1,6 @@
 # keycloak-reporter
 
-![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)
+![Version: 1.0.0](https://img.shields.io/badge/Version-1.0.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
 
@@ -15,17 +15,12 @@ A Helm chart for Kubernetes
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | affinity | object | `{}` |  |
-| cronjobs[0].name | string | `"clients"` |  |
-| cronjobs[0].schedule | string | `"0 0 1 */3 *"` |  |
-| cronjobs[0].script | string | `"/app/index.js listClients"` |  |
-| cronjobs[1].name | string | `"users"` |  |
-| cronjobs[1].schedule | string | `"0 0 1 */3 *"` |  |
-| cronjobs[1].script | string | `"/app/index.js listUsers"` |  |
+| cronjobs.clients | string | `"0 0 1 */3 *"` |  |
+| cronjobs.users | string | `"0 0 1 */3 *"` |  |
 | env | object | `{}` |  |
 | fullnameOverride | string | `""` |  |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.repository | string | `"continuoussecuritytooling/keycloak-reporting-cli"` |  |
-| image.tag | string | `"latest"` |  |
 | imagePullSecrets | list | `[]` |  |
 | keycloak.config.clientId | string | `""` |  |
 | keycloak.config.clientSecret | string | `""` |  |
@@ -48,4 +43,4 @@ A Helm chart for Kubernetes
 | tolerations | list | `[]` |  |
 
 ----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)
+Autogenerated from chart metadata using [helm-docs v1.11.2](https://github.com/norwoodj/helm-docs/releases/v1.11.2)

package/charts/keycloak-reporter/templates/_helpers.tpl

@@ -66,18 +66,18 @@ Create the name of the service account to use
 {{/*
 Create the name of the service account to use
 */}}
-{{- define "keycloak-reporter.cronJobs" }}
-{{- $cronJobs := list -}}
+{{- define "keycloak-reporter.cronJobs" -}}
 {{- if .Values.cronjobs.users }}
-{{- $userCron := dict "name" "users" "script" "listUsers" "schedule" .Values.cronjobs.users }}
-{{-   $cronJobs = printf "%s" $userCron . | append $cronJobs -}}
+users: 
+  script: "listUsers"
+  schedule: {{ .Values.cronjobs.users }}
 {{- end }}
 {{- if .Values.cronjobs.clients }}
-{{- $clientCron := dict "name" "users" "script" "listClients" "schedule" .Values.cronjobs.clients }}
-{{-   $cronJobs = printf "%s" $clientCron . | append $cronJobs -}}
-{{- end }}
-{{ join "," $cronJobs }}
+clients: 
+  script: "listClients"
+  schedule: {{ .Values.cronjobs.clients }}
 {{- end }}
+{{- end -}}
 
 
 

package/charts/keycloak-reporter/templates/cronjob.yaml

@@ -1,38 +1,47 @@
 {{- $fullName := include "keycloak-reporter.fullname" . }}
-{{- range include "keycloak-reporter.cronJobs" $ | split "," }}
+{{- range $name, $config := include "keycloak-reporter.cronJobs" $ | fromYaml }}
 apiVersion: batch/v1
 kind: CronJob
 metadata:
-  name: {{ printf "%s-job-%s" $fullName .name }}
+  name: {{ printf "%s-job-%s" $fullName $name }}
 spec:
-  schedule: "{{ .schedule }}"
+  schedule: {{ $config.schedule }}
   jobTemplate:
     spec:
       template:
         {{- with $.Values.podAnnotations }}
         annotations:
-          {{- toYaml . | nindent 8 }}
+          {{- toYaml $ | nindent 10 }}
         {{- end }}
         spec:
           {{- with $.Values.imagePullSecrets }}
           imagePullSecrets:
-            {{- toYaml . | nindent 8 }}
+            {{- toYaml . | nindent 12 }}
           {{- end }}
+          # automountServiceAccountToken: false # fix KubernetesClustersShouldDisableAutomountingAPICredentialsMonitoringEffect OPA policy
+          serviceAccountName: {{ default "default" ($.Values.serviceAccount).name }}
+          securityContext:
+            {{- toYaml $.Values.podSecurityContext | nindent 12 }}
           containers:
-            - name: {{ .name }}
+            - name: {{ $name }}
               image: "{{ $.Values.image.repository }}:{{ $.Values.image.tag | default $.Chart.AppVersion }}"
               imagePullPolicy: {{ $.Values.image.pullPolicy }}
               command:
-                - /bin/sh
-                - -c
-                - |
-                  node /app/cli.js {{ .script }}
+                - node
+                - /app/cli.js 
+                - {{ $config.script }}
               env:
                 - name: CONFIG_FILE
                   value: "/app/config.json"
               {{- with $.Values.env }}
               {{- tpl (toYaml .) $  | nindent 12 }}
               {{- end }}
+              {{- if $.Values.resources }}
+              resources:
+                {{- toYaml $.Values.resources | nindent 16 }}
+              {{- end }}
+              securityContext:
+                {{- toYaml $.Values.securityContext | nindent 16 }}
               volumeMounts:
                 - name: config-file
                   mountPath: "/app/config.json"
@@ -43,17 +52,13 @@ spec:
                   mountPath: "/app/reports"
                 {{- end }}
           restartPolicy: OnFailure
-          {{- if $.Values.resources }}
-          resources:
-            {{ toYaml $.Values.resources }}
-          {{- end }}
           {{- if $.Values.nodeSelector }}
           nodeSelector:
-            {{ toYaml $.Values.nodeSelector | indent 12 }}
+            {{ toYaml $.Values.nodeSelector | nindent 12 }}
           {{- end }}
           {{- if $.Values.tolerations }}
           tolerations:
-            {{ toYaml $.Values.tolerations | indent 12 }}
+            {{ toYaml $.Values.tolerations | nindent 12 }}
           {{- end }}
           volumes:
           - name: config-file

package/charts/keycloak-reporter/templates/secret.yaml

@@ -4,11 +4,9 @@ kind: Secret
 metadata:
   name: {{ $fullName }}
 stringData:
-  {{- range $k, $v := .Values.keycloak.config }}
-  {{- if $v}}
-  {{ $k }}: {{ $v }}
-  {{- end }}
-  {{- end }}
-  {{- if (.Values.keycloak.config.volumes).reports }}
-  reports: /app/reports
-  {{- end }}
+  config.json: |
+    {{- $config:= .Values.keycloak.config }}
+    {{- if (.Values.keycloak.config.volumes).reports }}
+    $config := merge $config (dict "reports" "/app/reports")
+    {{- end }}
+    {{ $config | toJson  }}

package/charts/keycloak-reporter/values.yaml

@@ -11,8 +11,8 @@ image:
   #tag: "latest"
 
 imagePullSecrets: []
-nameOverride: ""
-fullnameOverride: ""
+nameOverride: ''
+fullnameOverride: ''
 
 serviceAccount:
   # Specifies whether a service account should be created
@@ -21,52 +21,54 @@ serviceAccount:
   annotations: {}
   # The name of the service account to use.
   # If not set and create is true, a name is generated using the fullname template
-  name: ""
+  name: ''
 
 podAnnotations: {}
-
-podSecurityContext: {}
-  # fsGroup: 2000
-
-securityContext: {}
-
+# @ignore, Configure pod security context
+podSecurityContext:
+  runAsNonRoot: true
+  runAsUser: 1000
+  fsGroup: 2000
+# @ignore, Configure security context
+securityContext:
+  runAsUser: 1000
+  runAsNonRoot: true
+  readOnlyRootFilesystem: true
+  allowPrivilegeEscalation: false
+  # Hardening
+  capabilities:
+    drop: ['ALL']
+  seccompProfile:
+    type: 'RuntimeDefault'
+# -- (map) additonal environment variables
 env: {}
-  # capabilities:
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
+# -- (map) Keycloak configuration
 keycloak:
   config:
-    url: ""
-    clientId: ""
-    clientSecret: ""
-    output: "webhook"
-    webhookType: ""
-    webhookUrl: ""
+    url: ''
+    clientId: ''
+    clientSecret: ''
+    output: 'webhook'
+    webhookType: ''
+    webhookUrl: ''
     # -- optional message for the webhook post
-    webhookMessage: ""
+    webhookMessage: ''
   volumes:
-    reports: ""
+    reports: ''
 
+# -- (map) Cron configuration
 cronjobs:
-  clients: "0 0 1 */3 *"
-  users: "0 0 1 */3 *"
-
-resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #   cpu: 100m
-  #   memory: 128Mi
-  # requests:
-  #   cpu: 100m
-  #   memory: 128Mi
+  clients: '0 0 1 */3 *'
+  users: '0 0 1 */3 *'
 
+# @ignore, Configure resource limits
+resources:
+  limits:
+    cpu: 200m
+    memory: 256Mi
+  requests:
+    cpu: 100m
+    memory: 128Mi
 
 nodeSelector: {}
 

package/cli.ts

@@ -62,6 +62,7 @@ async function convert(
   switch (output) {
     case 'webhook':
       try {
+        console.log(`Sending report via webhook to ${config.type} ....`);
         await post2Webhook(
           config.type,
           config.url,
@@ -69,6 +70,7 @@ async function convert(
           outputContent,
           config.message
         );
+        console.log('Done sending.');
       } catch (e) {
         switch (e.code || e.message) {
           case 'Request failed with status code 400':

package/dist/cli.js

@@ -17,7 +17,6 @@ class ReportConfig {
 }
 async function convert(format, output, reports, config, json) {
     let outputContent;
-    console.log(output);
     switch (format) {
         case 'csv':
             outputContent = (await convertJSON2CSV(json)).toString();
@@ -33,7 +32,9 @@ async function convert(format, output, reports, config, json) {
     switch (output) {
         case 'webhook':
             try {
+                console.log(`Sending report via webhook to ${config.type} ....`);
                 await post2Webhook(config.type, config.url, config.title, outputContent, config.message);
+                console.log('Done sending.');
             }
             catch (e) {
                 switch (e.code || e.message) {
@@ -59,39 +60,39 @@ yargs(hideBin(process.argv))
 // eslint-disable-next-line @typescript-eslint/no-empty-function
 () => { }, 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
+        clientId: config.clientId ? config.clientId : argv.clientId,
+        clientSecret: config.clientSecret
+            ? config.clientSecret
+            : argv.clientSecret,
+        rootUrl: config.url ? config.url : argv.url
     });
     await convert(config.format ? config.format : argv.format, config.output ? config.output : argv.output, {
         name: 'user_listing',
         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);
+        : argv.webhookType, config.webhookUrl ? config.webhookUrl : argv.webhookUrl, 'User Listing', config.webhookMessage
+        ? config.webhookMessage
+        : argv.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
+        clientId: config.clientId ? config.clientId : argv.clientId,
+        clientSecret: config.clientSecret
+            ? config.clientSecret
+            : argv.clientSecret,
+        rootUrl: config.url ? config.url : argv.url
     });
     await convert(config.format ? config.format : argv.format, config.output ? config.output : argv.output, {
         name: 'client_listing',
         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);
+        : argv.webhookType, config.webhookUrl ? config.webhookUrl : argv.webhookUrl, 'Client Listing', config.webhookMessage
+        ? config.webhookMessage
+        : argv.webhookMessage), clients);
 })
     .option('format', {
     alias: 'f',

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@continuoussecuritytooling/keycloak-reporter",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "description": "Reporting Tools for Keycloak",
   "main": "dist/index.js",
   "bin": {
@@ -27,7 +27,7 @@
   "dependencies": {
     "@json2csv/node": "^7.0.0",
     "@keycloak/keycloak-admin-client": "^22.0.0",
-    "@slack/webhook": "^6.1.0",
+    "@slack/webhook": "^7.0.0",
     "ajv": "^8.12.0",
     "install": "^0.13.0",
     "ms-teams-webhook": "^2.0.2",

package/config.json

@@ -1,9 +0,0 @@
-{ 
-    "url": "https://id.m13t.de",
-    "clientId": "admin-cli",
-    "clientSecret": "PWkJ98Atq36QFP5Z25YXJDWs4tvsGvkI",
-    "output": "webhook",
-    "webhookType": "teams",
-    "webhookUrl": "https://m13t4mgmt.webhook.office.com/webhookb2/02950819-c8ca-4c83-9751-808d801e8810@09f6f098-3af9-474c-a398-d17786fff1bf/IncomingWebhook/b06222e267a04255aaa32a341acb1749/a4f92b5b-01c7-40a8-91ff-0695e08d76ff",
-    "webhookMessage": "TEST"
-}

package/k8s.yaml

@@ -1,51 +0,0 @@
-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/test.values.yaml

@@ -1,8 +0,0 @@
-installCRDs: true
-keycloak:
-  config:
-    clientId: admin-cli
-    clientSecret: PWkJ98Atq36QFP5Z25YXJDWs4tvsGvkI
-    webhookType: teams
-    webhookUrl: https://m13t4mgmt.webhook.office.com/webhookb2/02950819-c8ca-4c83-9751-808d801e8810@09f6f098-3af9-474c-a398-d17786fff1bf/IncomingWebhook/b06222e267a04255aaa32a341acb1749/a4f92b5b-01c7-40a8-91ff-0695e08d76ff
-    webhookMessage: TEST