From bbccf5439139b744796ba177721603dd2df9f110 Mon Sep 17 00:00:00 2001 From: Pascal Bleser Date: Wed, 8 Jul 2026 14:42:24 +0200 Subject: [PATCH] groupware: introduce support for OC_INSECURE * also look into the OC_INSECURE environment variable to allow accepting insecure TLS certificates * rename GROUPWARE_ALLOW_INSECURE_TLS to GROUPWARE_TLS_INSECURE to align with the nomenclature used by other backend services --- .vscode/launch.json | 2 +- devtools/deployments/opencloud_full/opencloud.yml | 1 + services/groupware/pkg/config/http.go | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 7019c38cf9..a8508494a4 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -147,7 +147,7 @@ "GROUPWARE_JMAP_MASTER_USERNAME": "admin@example.org", "GROUPWARE_JMAP_MASTER_PASSWORD": "admin", "GROUPWARE_SEND_DURATIONS_RESPONSE": "true", - "GROUPWARE_ALLOW_INSECURE_TLS": "true", + "GROUPWARE_TLS_INSECURE": "true", "GROUPWARE_ENABLE_MOCK_DATA": "true", "GROUPWARE_DEBUG_ADDR": "0.0.0.0:9203", diff --git a/devtools/deployments/opencloud_full/opencloud.yml b/devtools/deployments/opencloud_full/opencloud.yml index c328342ec0..4cd486804f 100644 --- a/devtools/deployments/opencloud_full/opencloud.yml +++ b/devtools/deployments/opencloud_full/opencloud.yml @@ -69,6 +69,7 @@ services: GROUPWARE_JMAP_BASE_URL: https://${STALWART_DOMAIN:-stalwart.opencloud.test} GROUPWARE_JMAP_MASTER_USERNAME: "admin@example.org" GROUPWARE_JMAP_MASTER_PASSWORD: "admin" + GROUPWARE_TLS_INSECURE: "true" volumes: - ./config/opencloud/app-registry.yaml:/etc/opencloud/app-registry.yaml - ./config/opencloud/csp.yaml:/etc/opencloud/csp.yaml diff --git a/services/groupware/pkg/config/http.go b/services/groupware/pkg/config/http.go index 4f4a507459..282bd6c731 100644 --- a/services/groupware/pkg/config/http.go +++ b/services/groupware/pkg/config/http.go @@ -19,7 +19,7 @@ type HTTP struct { CORS CORS `yaml:"cors"` OpenCloudPublicURL string `yaml:"opencloud_public_url" env:"OC_URL;OC_PUBLIC_URL;GROUPWARE_PUBLIC_URL"` SendDurationsResponse bool `yaml:"send_durations_response" env:"GROUPWARE_SEND_DURATIONS_RESPONSE"` - Insecure bool `yaml:"insecure" env:"GROUPWARE_ALLOW_INSECURE_TLS"` + Insecure bool `yaml:"tls_insecure" env:"OC_INSECURE;GROUPWARE_TLS_INSECURE" desc:"Whether to verify the server TLS certificates." introductionVersion:"1.0.0"` TraceRequests bool `yaml:"trace_requests" env:"GROUPWARE_HTTP_TRACE_REQUESTS"` TraceMaxRequestBodySize int64 `yaml:"trace_max_request_body_size" env:"GROUPWARE_HTTP_TRACE_MAX_REQUEST_BODY_SIZE"` TraceResponses bool `yaml:"trace_responses" env:"GROUPWARE_HTTP_TRACE_RESPONSES"`