invenio: better secret key and salts management

* Adds missing salts to harden security. * Deprecates plain keys and forces to use secrets for them. * Automatically generates secret key and salts if no secret is provided.
inveniosoftware · Dec 16, 2024 · ba16db7 · ba16db7
1 parent c6d4708
commit ba16db7
Show file tree

Hide file tree

Showing 8 changed files with 60 additions and 4 deletions.
diff --git a/charts/invenio/templates/NOTES.txt b/charts/invenio/templates/NOTES.txt
@@ -26,3 +26,21 @@ DEPRECATION WARNING:
     `invenio.sentry.existingSecret` will be removed in a future release.
 
 {{- end }}
+
+{{- if or .Values.invenio.secret_key .Values.invenio.security_login_salt .Values.invenio.csrf_secret_salt }}
+
+DEPRECATION WARNING:
+    `invenio.secret_key`, `invenio.security_login_salt`, and `invenio.csrf_secret_salt`
+     have been deprecated and will be removed in future releases. Please use
+     `invenio.existingSecret` to set their values or let the chart generate random ones
+     for you.
+
+{{- end }}
+
+{{- if .Values.invenio.existing_secret}}
+
+DEPRECATION WARNING:
+    `invenio.existing_secret` has been removed in favor of
+    `invenio.existingSecret` and it will be removed in a future release.
+
+{{- end }}
diff --git a/charts/invenio/templates/_helpers.tpl b/charts/invenio/templates/_helpers.tpl
@@ -299,3 +299,14 @@ Add sentry environmental variables
       key: {{ .Values.invenio.sentry.secretKeys.dsnKey }}
 {{- end }}
 {{- end -}}
+
+{{/*
+Get the invenio general secret name
+*/}}
+{{- define "invenio.secretName" -}}
+{{- if .Values.invenio.existingSecret -}}
+  {{- print (tpl .Values.invenio.sentry.existingSecret .) -}}
+{{- else -}}
+  {{- "invenio-secretes" -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/invenio/templates/install-init-job.yaml b/charts/invenio/templates/install-init-job.yaml
@@ -33,6 +33,8 @@ spec:
         envFrom:
         - configMapRef:
             name: invenio-config
+         - secretKeyRef:
+            name: {{ include "invenio.secretName" . }}
         env:
         - name: TZ
           value: {{ required "Missing .Values.global.timezone" .Values.global.timezone }}

diff --git a/charts/invenio/templates/secret.yaml b/charts/invenio/templates/secret.yaml
@@ -1,4 +1,4 @@
-{{- if not (.Values.invenio.existing_secret) }}
+{{- if or (not .Values.invenio.existing_secret) (not .Values.invenio.existingSecret) }}
 ---
 apiVersion: v1
 kind: Secret
@@ -11,7 +11,12 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
 data:
-  INVENIO_SECRET_KEY: {{ required "Missing .Values.invenio.secret_key" .Values.invenio.secret_key | b64enc }}
-  INVENIO_SECURITY_LOGIN_SALT: {{ required ".Values.invenio.security_login_salt " .Values.invenio.security_login_salt | b64enc }}
-  INVENIO_CSRF_SECRET_SALT: {{ required ".Values.invenio.csrf_secret_salt " .Values.invenio.csrf_secret_salt | b64enc }}
+  INVENIO_SECRET_KEY: {{ randAlphaNum 128 | b64enc | quote }}
+  INVENIO_SECURITY_LOGIN_SALT: {{ randAlphaNum 128 | b64enc | quote }}
+  INVENIO_SECURITY_PASSWORD_SALT: {{ randAlphaNum 128 | b64enc | quote }}
+  INVENIO_SECURITY_CONFIRM_SALT: {{ randAlphaNum 128 | b64enc | quote }}
+  INVENIO_SECURITY_RESET_SALT: {{ randAlphaNum 128 | b64enc | quote }}
+  INVENIO_SECURITY_CHANGE_SALT: {{ randAlphaNum 128 | b64enc | quote }}
+  INVENIO_SECURITY_REMEMBER_SALT: {{ randAlphaNum 128 | b64enc | quote }}
+  INVENIO_CSRF_SECRET_SALT: {{ randAlphaNum 128 | b64enc | quote }}
 {{- end -}}
diff --git a/charts/invenio/templates/web-deployment.yaml b/charts/invenio/templates/web-deployment.yaml
@@ -30,6 +30,8 @@ spec:
         envFrom:
         - configMapRef:
             name: invenio-config
+        - secretKeyRef:
+            name: {{ include "invenio.secretName" . }}
         env:
         - name: TZ
           value: {{ required "Missing .Values.global.timezone" .Values.global.timezone }}

diff --git a/charts/invenio/templates/worker-beat-deployment.yaml b/charts/invenio/templates/worker-beat-deployment.yaml
@@ -43,6 +43,8 @@ spec:
         envFrom:
         - configMapRef:
             name: invenio-config
+        - secretKeyRef:
+            name: {{ include "invenio.secretName" . }}
         env:
         - name: TZ
           value: {{ required "Missing .Values.global.timezone" .Values.global.timezone }}

diff --git a/charts/invenio/templates/worker-deployment.yaml b/charts/invenio/templates/worker-deployment.yaml
@@ -34,6 +34,8 @@ spec:
           envFrom:
             - configMapRef:
                 name: invenio-config
+            - secretKeyRef:
+                name: {{ include "invenio.secretName" . }}
           env:
           - name: TZ
             value: {{ required "Missing .Values.global.timezone" .Values.global.timezone }}

diff --git a/charts/invenio/values.yaml b/charts/invenio/values.yaml
@@ -11,10 +11,24 @@ ingress:
 
 invenio:
   hostname: ""
+  ## @param invenio.secret_key DEPRECATED: this is automatically generated now, or set by custom secret using invenio.existingSecret
+  ##
   secret_key: ""
+  ## @param invenio.security_login_salt DEPRECATED: this is automatically generated now, or set by custom secret using invenio.existingSecret
+  ##
   security_login_salt: ""
+  ## @param invenio.csrf_secret_salt DEPRECATED: this is automatically generated now, or set by custom secret using invenio.existingSecret
+  ##
   csrf_secret_salt: ""
+  ## @param invenio.existing_secret DEPRECATED: this is automatically generated now, or set by custom secret using invenio.existingSecret
+  ##
   existing_secret: false
+
+  ## @param invenio.existingSecret General existing secret name for, at least, secret key and salts
+  ## If not set a new secret will be generated automatically with random values
+  ## ref: https://inveniordm.docs.cern.ch/customize/authentication/#security
+  ##
+  existingSecret: ""
   init: false
   default_users: []  # Requires invenio.init=true
   demo_data: false  # Setting invenio.demo_data=true requires also setting default_users!