Skip to content

Commit

Permalink
Merge branch 'wireapp:develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
offsoc authored Feb 11, 2025
2 parents c0e9f2c + 0f0b45f commit 49d1245
Show file tree
Hide file tree
Showing 17 changed files with 70 additions and 42 deletions.
67 changes: 67 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,70 @@
# [2025-02-07] (Chart Release 5.11.0)

## API changes


* New endpoints for domain registration and verification (#4389, #4422, #4433, #4434, #4438)
- POST /domain-verification/:domain/team
- POST /domain-verification/:domain/backend
- POST /domain-verification/:domain/challenges
- POST /domain-verification/:domain/challenges/:challengeId
- POST /domain-verification/:domain/authorize-team
- POST /get-domain-registration
- GET /teams/:tid/registered-domains
- DELETE /teams/:tid/registered-domains/:domain

* Deprecated API endpoints were removed from API version V8. (#4407)

* Add a flag to the response body of `POST /get-domain-registration` to indicate
whether `domain_redirect` is set to `none` due to the existence of a registered
account. This makes it possible for clients to let a user log in with an
existing cloud account even if a redirection to an on-prem backend is set up
for their domain. (#4441)


## Features


* Team feature config for domain registration (#4429)


## Bug fixes and other updates


* Fix 503 on user registration when the enterprise service is disabled (#4421)

* Fix 503 on team invitation when wire-server-enterprise is disabled (#4439)

* Fix bug in nginz: `/consent/<foo>` requests not correctly forwarded to `galeb`. (#4376)

* MLS: when recreating external (backend) proposals, these are now propagated to
the clients only after the corresponding external commit has been forwarded to
the clients. (#4412)

* MLS group info is now saved with the commit lock held. This prevents a bug where group info on a later commit was overwritten by an earlier group info, leading to out-of-sync MLS state between backends and clients. (#4436)


## Internal changes


* Internal spar endpoint to retrieve the team's identity providers (#4417)

* Adjust existing onboarding flow to new domain registration constraints.

Endpoints:

- POST /teams/{id}/invitations
- POST /register (#4409)

* federator: Install signal handlers for SIGINT and SIGTERM, close sockets when receiving these signals (#4398)

* /i/index/refresh now uses the correct URL for additional indices. Thus, the
refreshed indices can reside on different ElasticSearch instances. This
endpoint is exclusively called from tests. (#4413)

* Test single consumer behaviour of notifications (#4443)


# [2025-01-28] (Chart Release 5.10.0)

## Release notes
Expand Down
9 changes: 0 additions & 9 deletions changelog.d/1-api-changes/WPB-14307

This file was deleted.

1 change: 0 additions & 1 deletion changelog.d/1-api-changes/WPB-15030

This file was deleted.

5 changes: 0 additions & 5 deletions changelog.d/1-api-changes/WPB-15933

This file was deleted.

1 change: 0 additions & 1 deletion changelog.d/2-features/WPB-15551

This file was deleted.

1 change: 0 additions & 1 deletion changelog.d/3-bug-fixes/WPB-14307-quickfix-503

This file was deleted.

1 change: 0 additions & 1 deletion changelog.d/3-bug-fixes/WPB-14310-fix-503

This file was deleted.

1 change: 0 additions & 1 deletion changelog.d/3-bug-fixes/WPB-14613

This file was deleted.

3 changes: 0 additions & 3 deletions changelog.d/3-bug-fixes/WPB-15400

This file was deleted.

1 change: 0 additions & 1 deletion changelog.d/3-bug-fixes/mls-group-info-lock

This file was deleted.

1 change: 0 additions & 1 deletion changelog.d/5-internal/WPB-14307

This file was deleted.

This file was deleted.

1 change: 1 addition & 0 deletions changelog.d/5-internal/docker-compose_es6
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Use ElasticSearch 6.8.23 in our local dev setups (`docker-compose`.) This is the version we use on CI, staging and prod.
1 change: 0 additions & 1 deletion changelog.d/5-internal/federator-signal-handling

This file was deleted.

3 changes: 0 additions & 3 deletions changelog.d/5-internal/refreshIndex-correct-url

This file was deleted.

1 change: 0 additions & 1 deletion changelog.d/5-internal/single-consumer-test

This file was deleted.

9 changes: 2 additions & 7 deletions deploy/dockerephemeral/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -208,13 +208,7 @@ services:

elasticsearch:
container_name: demo_wire_elasticsearch
build:
context: .
dockerfile_inline: |
FROM quay.io/wire/elasticsearch:0.0.9-amd64
RUN /usr/share/elasticsearch/bin/elasticsearch-plugin install x-pack -b
# this seems to be necessary to run X-Pack on Alpine (https://discuss.elastic.co/t/elasticsearch-failing-to-start-due-to-x-pack/85125/7)
RUN rm -rf /usr/share/elasticsearch/plugins/x-pack/platform/linux-x86_64
image: elasticsearch:6.8.23
ulimits:
nofile:
soft: 65536
Expand All @@ -231,6 +225,7 @@ services:
- "bootstrap.system_call_filter=false"
- "JVM_OPTIONS_ES=-Xmx512m -Xms512m"
- "discovery.type=single-node"
- "ELASTIC_PASSWORD=changeme"
volumes:
- ./docker/elasticsearch-cert.pem:/usr/share/elasticsearch/config/certs/elasticsearch-cert.pem
- ./docker/elasticsearch-key.pem:/usr/share/elasticsearch/config/certs/elasticsearch-key.pem
Expand Down

0 comments on commit 49d1245

Please sign in to comment.