Skip to content

Commit 2c88db9

Browse files
committed
WPB-20207 add audit logging and metadata storage to asset upload (#4782)
1 parent c71074e commit 2c88db9

File tree

28 files changed

+557
-361
lines changed

28 files changed

+557
-361
lines changed

changelog.d/2-features/WPB-20207

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cargohold: add asset audit logging on upload

charts/cargohold/templates/configmap.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ data:
5555
{{- if .downloadLinkTTL }}
5656
downloadLinkTTL: {{ .downloadLinkTTL }}
5757
{{- end }}
58+
assetAuditLogEnabled: {{ .assetAuditLogEnabled }}
5859
federationDomain: {{ .federationDomain }}
5960
disabledAPIVersions: {{ toJson .disabledAPIVersions }}
6061
{{- end }}

charts/cargohold/values.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ config:
3030
settings:
3131
maxTotalBytes: 104857632 # limit to 100 MiB + 32 bytes
3232
downloadLinkTTL: 300 # Seconds
33+
assetAuditLogEnabled: false
3334
# Disable one ore more API versions. Please make sure the configuration value is the same in all these charts:
3435
# brig, cannon, cargohold, galley, gundeck, proxy, spar.
3536
disabledAPIVersions: [ development ]

docs/src/developer/reference/config-options.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1231,6 +1231,10 @@ Link to diagram:
12311231
https://mermaid.live/edit#pako:eNrdVbFu2zAQ_ZUDJ7ewDdhtUkBDgBRB0CHIYCNL4eVEnmWiMk8lKbttkH8vJbsW5dCOUXSqBkHiPT6-e3yinoVkRSITEC5H32syku40FhbXCwP7C6VnC1hqSQNL6l1XeWRPwBuKqxk8OXKwpRyrahxGxvQD11VJY8mvSHPOB4UlMknSrtonbcfStBVar6Wu0HjQJgCdGwUNKfaonMGMax8WeH9acIq5FXKOuwVE7BcqN4U2v9IlibbgFZcqXZ5_ABeMxYK6uiXpwRb5YHp1NYTJ9FN7ixw3jW6ri5UHXva28rZ5BsVbUzIqB-gc-WgTD9DRzU3Pz7v9FChZYnk8L4KGiW23Gdyz3aJVQW7IoYvQbT3gDq2_wsIIbpWCr6MvHF5WhIpsL2p6g6HFhHePvdajFR6Yv0Fd7ZTDquF9mj3AMoR2t0zHcZg1CiJj92akdGP-OLBJ9JpDFOa73YGNxnRAFZ3Te9rxey5L3gZHdmueMrsLyBnHDwpScerGQr_9dn1tzfFeR_2k2MioRFIn15MhTD82Sb0-ndT4fPjM-emcdsDItf23eVlSW_D_ltXYv0uzenTknU_rOd_fzOsfy_9xYvtN_21ixVCsya5Rq_D3fG6KC-FXtKaFyMKjoiXWpV-IhXkJUKw9z38aKTJvaxqKulKBff-jFdkSS0cvvwHKl250
12321232
-->
12331233

1234+
Audit logging
1235+
1236+
- `settings.assetAuditLogEnabled` (boolean): enables asset upload/download audit logging and metadata collection on the backend. Intended for enterprise/on‑prem deployments; should remain disabled on cloud. Default: `false`.
1237+
12341238
### Galley
12351239

12361240
For conversation invite links to be correct in a multi-ingress setup `settings.multiIngress` needs to be configured as map from `Z-Host` to the conversation URI prefix. This setting is a `Z-Host` depended version of `settings.conversationCodeURI`. In fact `settings.multiIngress` and `settings.conversationCodeURI` are mutually exclusive.

hack/helm_vars/wire-federation-v0/values.yaml.gotmpl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ cargohold:
152152
enableFederation: true # keep in sync with brig.config.enableFederation, galley.config.enableFederation and tags.federator!
153153
settings:
154154
federationDomain: federation-test-helper.wire-federation-v0.svc.cluster.local
155+
assetAuditLogEnabled: false
155156
secrets:
156157
awsKeyId: dummykey
157158
awsSecretKey: dummysecret

hack/helm_vars/wire-server/values.yaml.gotmpl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,7 @@ cargohold:
252252
settings:
253253
# See helmfile for the real value
254254
federationDomain: integration.example.com
255+
assetAuditLogEnabled: false
255256
disabledAPIVersions: []
256257
secrets:
257258
awsKeyId: dummykey

integration/integration.cabal

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ library
118118
Test.Brig
119119
Test.Cargohold.API
120120
Test.Cargohold.API.Federation
121-
Test.Cargohold.API.Util
122121
Test.Cargohold.API.V3
123122
Test.Cargohold.Metrics
124123
Test.Cells

0 commit comments

Comments
 (0)