Skip to content

Backport #4224 #4237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stefanwire merged 4 commits into from
Sep 12, 2024
Merged

Backport #4224 #4237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7af8386
Backport: "Federation V1 test setup (#4125)" (#4237)
pcapriotti Jul 15, 2024
f1c0e68
Backport: "hack/bin/gen-certs.sh: Also gen certs for federation-v1 (#…
akshaymankar Sep 3, 2024
107a76c
Backport: "Return MLS public keys as part of getting a 1:1 conversati…
stefanwire Sep 9, 2024
50b53e6
Update generated swagger.json for client API v6
stefanwire Sep 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/1-api-changes/one2one
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
`GET /conversations/one2one/:domain/:uid` now returns `public_keys` along with the conversation containing all MLS public keys for the backend which will host this conversation (since v6).
1 change: 1 addition & 0 deletions changelog.d/5-internal/federation-v1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add federation-v1 environment for testing compatibility of the federation API with version 1
53 changes: 53 additions & 0 deletions charts/integration/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ metadata:
"helm.sh/hook": post-install
"helm.sh/hook-delete-policy": before-hook-creation
data:
{{- range $name, $dynamicBackend := .Values.config.dynamicBackends }}
{{ $name }}-mls-removal-key-ed25519.pem: {{ $dynamicBackend.mlsPrivateKeys.removal.ed25519 | quote }}
{{ $name }}-mls-removal-key-ecdsa_secp256r1_sha256.pem: {{ $dynamicBackend.mlsPrivateKeys.removal.ecdsa_secp256r1_sha256 | quote }}
{{ $name }}-mls-removal-key-ecdsa_secp384r1_sha384.pem: {{ $dynamicBackend.mlsPrivateKeys.removal.ecdsa_secp384r1_sha384 | quote }}
{{ $name }}-mls-removal-key-ecdsa_secp521r1_sha512.pem: {{ $dynamicBackend.mlsPrivateKeys.removal.ecdsa_secp521r1_sha512 | quote }}
{{- end }}
integration.yaml: |
brig:
host: brig.{{ .Release.Namespace }}.svc.cluster.local
Expand Down Expand Up @@ -118,6 +124,12 @@ data:
{{ $name }}:
domain: {{ $dynamicBackend.federatorExternalHostPrefix }}.{{ $.Release.Namespace }}.svc.cluster.local
federatorExternalPort: {{ $dynamicBackend.federatorExternalPort }}
mlsPrivateKeyPaths:
removal:
ed25519: "/etc/wire/integration/{{ $name }}-mls-removal-key-ed25519.pem"
ecdsa_secp256r1_sha256: "/etc/wire/integration/{{ $name }}-mls-removal-key-ecdsa_secp256r1_sha256.pem"
ecdsa_secp384r1_sha384: "/etc/wire/integration/{{ $name }}-mls-removal-key-ecdsa_secp384r1_sha384.pem"
ecdsa_secp521r1_sha512: "/etc/wire/integration/{{ $name }}-mls-removal-key-ecdsa_secp521r1_sha512.pem"
{{- end }}
cassandra:
host: {{ .Values.config.cassandra.host }}
Expand Down Expand Up @@ -164,3 +176,44 @@ data:
stern:
host: stern.wire-federation-v0.svc.cluster.local
port: 8080

federation-v1:
originDomain: federation-test-helper.wire-federation-v1.svc.cluster.local
brig:
host: brig.wire-federation-v1.svc.cluster.local
port: 8080
cannon:
host: cannon.wire-federation-v1.svc.cluster.local
port: 8080
cargohold:
host: cargohold.wire-federation-v1.svc.cluster.local
port: 8080
federatorInternal:
host: federator.wire-federation-v1.svc.cluster.local
port: 8080
federatorExternal:
host: federator.wire-federation-v1.svc.cluster.local
port: 8081
galley:
host: galley.wire-federation-v1.svc.cluster.local
port: 8080
gundeck:
host: gundeck.wire-federation-v1.svc.cluster.local
port: 8080
nginz:
host: nginz-integration-http.wire-federation-v1.svc.cluster.local
port: 8080
spar:
host: spar.wire-federation-v1.svc.cluster.local
port: 8080
proxy:
host: proxy.wire-federation-v1.svc.cluster.local
port: 8080
backgroundWorker:
host: backgroundWorker.wire-federation-v1.svc.cluster.local
port: 8080
stern:
host: stern.wire-federation-v1.svc.cluster.local
port: 8080

integrationTestHostName: integration-headless.{{ .Release.Namespace }}.svc.cluster.local
4 changes: 4 additions & 0 deletions charts/integration/templates/integration-integration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,3 +280,7 @@ spec:
key: uploadXmlAwsSecretAccessKey
{{- end }}
{{- end }}
- name: ENABLE_FEDERATION_V0
value: "1"
- name: ENABLE_FEDERATION_V1
value: "1"
85 changes: 84 additions & 1 deletion charts/integration/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,96 @@ config:
dynamic-backend-1:
federatorExternalHostPrefix: dynamic-backend-1
federatorExternalPort: 10098
mlsPrivateKeys:
removal:
ed25519: |
-----BEGIN PRIVATE KEY-----
MC4CAQAwBQYDK2VwBCIEIJrGRHzIwjc5byivY2l+/MqbH3ty1yetYG8d5p4GGHhk
-----END PRIVATE KEY-----
ecdsa_secp256r1_sha256: |
-----BEGIN PRIVATE KEY-----
MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgaeLidXfwi/RVvWZ4
OHoQhicePLIfyDZI7gMVsyXtec6hRANCAARM6EWywmjaCXtvsQ1M2edrbMescC+j
GSIhBrlE7igzhookThDBvOGAL67vf8xz+hw7tE8NqfzbdJQBL8NQik2L
-----END PRIVATE KEY-----
ecdsa_secp384r1_sha384: |
-----BEGIN PRIVATE KEY-----
MIG2AgEAMBAGByqGSM49AgEGBSuBBAAiBIGeMIGbAgEBBDD1rK50pFsZmOomBiNQ
QFRRwAmed8Ox+nFseYbKzjLIAgWH0sMQ5DU8SAK8ks+GROShZANiAATyX0XQ6x6A
pi+HKz+ReWV9iIUOttxJv9u2aTY5ZrQ42IJs3fV1AGz1BE52uDvhbILOD9WfqZ9d
6MqCjF6OqYT9nmnPkQ+CKC2XPzSVBpqJtuHXiMfFrc7n05E8CdIHOkI=
-----END PRIVATE KEY-----
ecdsa_secp521r1_sha512: |
-----BEGIN PRIVATE KEY-----
MIHuAgEAMBAGByqGSM49AgEGBSuBBAAjBIHWMIHTAgEBBEIAQnVcp85/mC6r91yB
XjhiHOp4j450UcThSmDBdva4Pj9ihXvAScEFabus7CeECvUT3auqXKY9iSR45vQq
JuFI/0uhgYkDgYYABAG1paU01rRuYG4K2PWaIIbB9RuiYg5GVsu5mu6VHjYEH+7c
1AGuCPEsUoM542cn3T1utv0EMtoj4yFPvf0xBs7AowHW04JsgMFzpWm8T1e/91n1
IEkT5xOnq8obn7p4je9Ui95ojEA/n49gsTKsuO1qv2n79PnStLfn2yT5lAtcTcva
6Q==
-----END PRIVATE KEY-----
dynamic-backend-2:
federatorExternalHostPrefix: dynamic-backend-2
federatorExternalPort: 11098
mlsPrivateKeys:
removal:
ed25519: |
-----BEGIN PRIVATE KEY-----
MC4CAQAwBQYDK2VwBCIEIDgG4Dhqfq6KRyGKtEFiPeP+Nq1DBsTY31q3f/tC/lnk
-----END PRIVATE KEY-----
ecdsa_secp256r1_sha256: |
-----BEGIN PRIVATE KEY-----
MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgz0IEyU4GYrpkVH2y
iR87BMD1VAfBgl69WedewvA/Vl+hRANCAASTYYD2BF2E1zqPKYZtpHW1quo+YBsv
SAeznMX1bOeoOLD8zyFDHEGb3I9S90iGjYKTUogY+QfbbiqAiBIuSig7
-----END PRIVATE KEY-----
ecdsa_secp384r1_sha384: |
-----BEGIN PRIVATE KEY-----
MIG2AgEAMBAGByqGSM49AgEGBSuBBAAiBIGeMIGbAgEBBDA43epgPhtj4s0G3aXQ
TPXjnQHhiQ7Hfze+K8HgDSUL+Ds31v+g+Ko/OZrAA7povdWhZANiAATXd/dKoFvA
wlISC4MAbBsDV6g2oezzZt0nXUq4uysANJ24s+BNey7tYpB36qAOUhqmCzJW5IFJ
22ttorUXSTaJeUIUdRiwD7xJ54z3NV5Wj8CUskvp0DIf/ILkOpbxdQY=
-----END PRIVATE KEY-----
ecdsa_secp521r1_sha512: |
-----BEGIN PRIVATE KEY-----
MIHuAgEAMBAGByqGSM49AgEGBSuBBAAjBIHWMIHTAgEBBEIAjGOdWinAUUopQCYW
6Ch4UuwdHhTERbUS90bQiQyoPdnTrTT8+NsYsB8DmPLltxls6h28q0IGCKUmO9ph
8gFT0l6hgYkDgYYABAD3l73lFiVckI4V8BhR2x83o44dhjZA26d8SVSUBt9iuRbR
Lh0vP+zghhDQZLFLpfcL0Fo0K9H4HdQwe2cMxbOyQwDUC76ot9BdZjfsjKiRK6+k
ZNlnHSWx15yg8gF0dpt2eVn1LBLB0JvRcauYVMfKNox1IU8DY0ZiuO4DJNXRDVEI
7w==
-----END PRIVATE KEY-----
dynamic-backend-3:
federatorExternalHostPrefix: dynamic-backend-3
federatorExternalPort: 12098

mlsPrivateKeys:
removal:
ed25519: |
-----BEGIN PRIVATE KEY-----
MC4CAQAwBQYDK2VwBCIEIB/Jddpef01pYWQXUEFmJ+k6dDQE7fVSKfk7/AyQaOnU
-----END PRIVATE KEY-----
ecdsa_secp256r1_sha256: |
-----BEGIN PRIVATE KEY-----
MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgIkeTuHoMtzsuaN3f
zug+mp/IlejrG1W4z/lOU9yGNqKhRANCAASLReHnUMJfSs0pDFxVYIgCOThRsiCD
Fq/6oKzWYnvX+taJgNUCVm7QND7Q9ll+Vy4ymZmE9YH1QuNW4FbVe1X6
-----END PRIVATE KEY-----
ecdsa_secp384r1_sha384: |
-----BEGIN PRIVATE KEY-----
MIG2AgEAMBAGByqGSM49AgEGBSuBBAAiBIGeMIGbAgEBBDB0dp/epJB3XhCeRcYJ
C76Ll50HHb/H2GR/UBFyAWYtQ8mbaXWis8NPjvYmqrqd5VWhZANiAARoOjIYWdAP
Y910LsLGcihvmnoFx7atJbOhaGTem57P/DOkYqcYohUcz6WaCuqzk/ZEj8NZtdvF
4AYt0mnxkl9L5pt2a6i2HWW+4puR+JMmWD9qj0lRc5AQeEtmbuohIfg=
-----END PRIVATE KEY-----
ecdsa_secp521r1_sha512: |
-----BEGIN PRIVATE KEY-----
MIHuAgEAMBAGByqGSM49AgEGBSuBBAAjBIHWMIHTAgEBBEIBfyz5LCeeA0seQo1O
jlQiUKxL4tWX23mD5G5Y5nra3Ju/7mNYp/sIX5BS81iWno5N6KfEdgUtgEffa4Xj
nuyF2QqhgYkDgYYABAF3eFOMjqpO7hDdVua9WgquGdFRRd3LWLhY0fyeyiQn/7yr
vLIb01f8dX9UVFKMxw77ZMMcfF+uW5Enxa8kadDcmwHIiIh/6jW0oGlFxkmwmecr
MwfpR6lZMbtQMD4rm8AwQAsFCBCRyPyK8bWanzMYusbnCdS/nBB5YB8x0ejjYFlU
RQ==
-----END PRIVATE KEY-----
cassandra:
host: cassandra-ephemeral
port: 9042
Expand Down
1 change: 1 addition & 0 deletions deploy/dockerephemeral/coredns-config/db.example.com
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ _wire-server-federator._tcp.d1 IN SRV 0 0 10443 localhost.
_wire-server-federator._tcp.d2 IN SRV 0 0 11443 localhost.
_wire-server-federator._tcp.d3 IN SRV 0 0 12443 localhost.
_wire-server-federator._tcp.federation-v0 IN SRV 0 0 21443 localhost.
_wire-server-federator._tcp.federation-v1 IN SRV 0 0 22443 localhost.
7 changes: 6 additions & 1 deletion deploy/dockerephemeral/docker/elasticmq.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,38 +43,43 @@ queues {
integration-brig-events4 = ${queues.default-queue-template}
integration-brig-events5 = ${queues.default-queue-template}
integration-brig-events-federation-v0 = ${queues.default-queue-template}
integration-brig-events-federation-v1 = ${queues.default-queue-template}

integration-brig-events-internal = ${queues.default-queue-template}
integration-brig-events-internal2 = ${queues.default-queue-template}
integration-brig-events-internal3 = ${queues.default-queue-template}
integration-brig-events-internal4 = ${queues.default-queue-template}
integration-brig-events-internal5 = ${queues.default-queue-template}
integration-brig-events-internal-federation-v0 = ${queues.default-queue-template}
integration-brig-events-internal-federation-v1 = ${queues.default-queue-template}

"integration-user-events.fifo" = ${queues.fifo-queue-template}
"integration-user-events2.fifo" = ${queues.fifo-queue-template}
"integration-user-events3.fifo" = ${queues.fifo-queue-template}
"integration-user-events4.fifo" = ${queues.fifo-queue-template}
"integration-user-events5.fifo" = ${queues.fifo-queue-template}
"integration-user-events-federation-v0.fifo" = ${queues.fifo-queue-template}
"integration-user-events-federation-v1.fifo" = ${queues.fifo-queue-template}

integration-gundeck-events = ${queues.default-queue-template}
integration-gundeck-events2 = ${queues.default-queue-template}
integration-gundeck-events3 = ${queues.default-queue-template}
integration-gundeck-events4 = ${queues.default-queue-template}
integration-gundeck-events5 = ${queues.default-queue-template}
integration-gundeck-events-federation-v0 = ${queues.default-queue-template}
integration-gundeck-events-federation-v1 = ${queues.default-queue-template}

"integration-team-events.fifo" = ${queues.fifo-queue-template}
"integration-team-events2.fifo" = ${queues.fifo-queue-template}
"integration-team-events3.fifo" = ${queues.fifo-queue-template}
"integration-team-events4.fifo" = ${queues.fifo-queue-template}
"integration-team-events5.fifo" = ${queues.fifo-queue-template}
"integration-team-events-federation-v0.fifo" = ${queues.fifo-queue-template}
"integration-team-events-federation-v1.fifo" = ${queues.fifo-queue-template}
}

# Region and accountId which will be included in resource ids
aws {
region = eu-west-1
accountId = 000000000000
}
}
Loading