Merge pull request #28 from maykinmedia/2fa-openinwoner-openforms

♻️ 2fa openinwoner and openforms
maykinmedia · Apr 6, 2023 · 62b5887 · 62b5887
2 parents 3716d28 + 3132fbf
commit 62b5887
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 12 deletions.
diff --git a/charts/openforms/Chart.yaml b/charts/openforms/Chart.yaml
@@ -3,7 +3,7 @@ name: openforms
 description: Snel en eenvoudig slimme formulieren bouwen en publiceren
 
 type: application
-version: 1.0.6
+version: 1.0.7
 appVersion: 2.0.5
 
 dependencies:

diff --git a/charts/openforms/README.md b/charts/openforms/README.md
@@ -1,6 +1,6 @@
 # openforms
 
-![Version: 1.0.6](https://img.shields.io/badge/Version-1.0.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.5](https://img.shields.io/badge/AppVersion-2.0.5-informational?style=flat-square)
+![Version: 1.0.7](https://img.shields.io/badge/Version-1.0.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.5](https://img.shields.io/badge/AppVersion-2.0.5-informational?style=flat-square)
 
 Snel en eenvoudig slimme formulieren bouwen en publiceren
 
@@ -10,6 +10,7 @@ Snel en eenvoudig slimme formulieren bouwen en publiceren
 helm repo add my-repo https://maykinmedia.github.io/charts/
 helm install my-release my-repo/openforms
 ```
+
 ## Requirements
 
 | Repository | Name | Version |
@@ -172,7 +173,8 @@ helm install my-release my-repo/openforms
 | settings.throttling.rateAnonymous | string | `""` |  |
 | settings.throttling.ratePolling | string | `""` |  |
 | settings.throttling.rateUser | string | `""` |  |
-| settings.twoFactorAuthentication | bool | `true` |  |
+| settings.twoFactorAuthentication.forceOtpAdmin | bool | `true` | Enforce 2 Factor Authentication in the admin or not. Default True. You'll probably want to disable this when using OIDC. |
+| settings.twoFactorAuthentication.patchAdmin | bool | `true` | Whether to use the 2 Factor Authentication login flow for the admin or not. Default True. You'll probably want to disable this when using OIDC. |
 | settings.useXForwardedHost | bool | `false` |  |
 | settings.uwsgi.harakiri | string | `""` |  |
 | settings.uwsgi.master | bool | `false` |  |

diff --git a/charts/openforms/templates/configmap.yaml b/charts/openforms/templates/configmap.yaml
@@ -69,8 +69,8 @@ data:
   {{- if .Values.settings.elasticapm.url }}
   ELASTIC_APM_SERVICE_NAME: {{ .Values.settings.elasticapm.serviceName | toString |  quote }}
   {{- end }}
-  TWO_FACTOR_FORCE_OTP_ADMIN: {{ if .Values.settings.twoFactorAuthentication }}"True"{{ else }}"False"{{ end }}
-  TWO_FACTOR_PATCH_ADMIN: {{ if .Values.settings.twoFactorAuthentication }}"True"{{ else }}"False"{{ end }}
+  TWO_FACTOR_FORCE_OTP_ADMIN: {{ if .Values.settings.twoFactorAuthentication.forceOtpAdmin }}"True"{{ else }}"False"{{ end }}
+  TWO_FACTOR_PATCH_ADMIN: {{ if .Values.settings.twoFactorAuthentication.patchAdmin }}"True"{{ else }}"False"{{ end }}
   CELERY_WORKER_CONCURRENCY: {{ .Values.worker.concurrency | toString | quote }}
   MAX_FILE_UPLOAD_SIZE: {{ .Values.settings.maxFileUpload | toString | quote }}
   ENABLE_THROTTLING: {{ if .Values.settings.throttling.enable }}"True"{{ else }}"False"{{ end }}

diff --git a/charts/openforms/values.yaml b/charts/openforms/values.yaml
@@ -219,7 +219,11 @@ settings:
 
   debug: false
 
-  twoFactorAuthentication: true
+  twoFactorAuthentication:
+      # -- Enforce 2 Factor Authentication in the admin or not. Default True. You'll probably want to disable this when using OIDC.
+      forceOtpAdmin: true
+      # -- Whether to use the 2 Factor Authentication login flow for the admin or not. Default True. You'll probably want to disable this when using OIDC.
+      patchAdmin: true
 
   # -- Configure the maximum allowed file upload size
   maxFileUpload: 50M

diff --git a/charts/openinwoner/Chart.yaml b/charts/openinwoner/Chart.yaml
@@ -3,7 +3,7 @@ name: openinwoner
 description: Platform voor gemeenten en overheden om producten inzichtelijker en toegankelijker te maken voor inwoners.
 
 type: application
-version: 0.9.4
+version: 0.9.5
 appVersion: "1.3"
 
 dependencies:

diff --git a/charts/openinwoner/README.md b/charts/openinwoner/README.md
@@ -1,6 +1,6 @@
 # openinwoner
 
-![Version: 0.9.4](https://img.shields.io/badge/Version-0.9.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.3](https://img.shields.io/badge/AppVersion-1.3-informational?style=flat-square)
+![Version: 0.9.5](https://img.shields.io/badge/Version-0.9.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.3](https://img.shields.io/badge/AppVersion-1.3-informational?style=flat-square)
 
 Platform voor gemeenten en overheden om producten inzichtelijker en toegankelijker te maken voor inwoners.
 
@@ -10,6 +10,7 @@ Platform voor gemeenten en overheden om producten inzichtelijker en toegankelijk
 helm repo add my-repo https://maykinmedia.github.io/charts/
 helm install my-release my-repo/openinwoner
 ```
+
 ## Requirements
 
 | Repository | Name | Version |
@@ -135,7 +136,8 @@ helm install my-release my-repo/openinwoner
 | settings.loadFixtures | bool | `false` | Will load all fixtures in /app/src/open_inwoner/conf/fixtures/*.json |
 | settings.secretKey | string | `""` | Generate secret key at https://djecrety.ir/ |
 | settings.sentry.dsn | string | `""` |  |
-| settings.twoFactorAuthentication | bool | `true` |  |
+| settings.twoFactorAuthentication.forceOtpAdmin | bool | `true` | Enforce 2 Factor Authentication in the admin or not. Default True. You'll probably want to disable this when using OIDC. |
+| settings.twoFactorAuthentication.patchAdmin | bool | `true` | Whether to use the 2 Factor Authentication login flow for the admin or not. Default True. You'll probably want to disable this when using OIDC. |
 | settings.useXForwardedHost | bool | `true` |  |
 | settings.uwsgi.harakiri | string | `""` |  |
 | settings.uwsgi.master | bool | `false` |  |

diff --git a/charts/openinwoner/templates/configmap.yaml b/charts/openinwoner/templates/configmap.yaml
@@ -42,8 +42,8 @@ data:
   {{- if .Values.settings.elasticapm.url }}
   ELASTIC_APM_SERVICE_NAME: {{ .Values.settings.elasticapm.serviceName | toString |  quote }}
   {{- end }}
-  TWO_FACTOR_FORCE_OTP_ADMIN: {{ if .Values.settings.twoFactorAuthentication }}"True"{{ else }}"False"{{ end }}
-  TWO_FACTOR_PATCH_ADMIN: {{ if .Values.settings.twoFactorAuthentication }}"True"{{ else }}"False"{{ end }}
+  TWO_FACTOR_FORCE_OTP_ADMIN: {{ if .Values.settings.twoFactorAuthentication.forceOtpAdmin }}"True"{{ else }}"False"{{ end }}
+  TWO_FACTOR_PATCH_ADMIN: {{ if .Values.settings.twoFactorAuthentication.patchAdmin }}"True"{{ else }}"False"{{ end }}
   {{- if .Values.settings.uwsgi.master }}
   UWSGI_MASTER:  {{ if .Values.settings.uwsgi.master }}"1"{{ else }}"0"{{ end }}
   {{- end }}

diff --git a/charts/openinwoner/values.yaml b/charts/openinwoner/values.yaml
@@ -176,7 +176,11 @@ settings:
 
   debug: false
 
-  twoFactorAuthentication: true
+  twoFactorAuthentication:
+      # -- Enforce 2 Factor Authentication in the admin or not. Default True. You'll probably want to disable this when using OIDC.
+      forceOtpAdmin: true
+      # -- Whether to use the 2 Factor Authentication login flow for the admin or not. Default True. You'll probably want to disable this when using OIDC.
+      patchAdmin: true
 
   uwsgi:
     master: false