Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
b2dec49
Make federated connection functions work with qualified IDs (#1819)
pcapriotti Oct 4, 2021
48f7747
Fix detail in stern online help (#1834)
fisx Oct 4, 2021
741fc51
Spar Polysemy: SAML2 effect (#1827)
isovector Oct 4, 2021
47ecffe
Spar Polysemy: Fully polysemize Spar (#1833)
isovector Oct 5, 2021
4d2ac4f
Use hs-certificate master (#1822)
pcapriotti Oct 6, 2021
f104007
Servantify legacy addMember endpoint (#1838)
pcapriotti Oct 6, 2021
0ba6b8f
Use helmfile's parallelism to speed up integration test setup time (#…
jschaul Oct 6, 2021
a486304
[Federation] Include Remote Connections in Listing All Connections (#…
Oct 7, 2021
fa25b09
Remove deprecated endpoint for listing convs (#1840)
pcapriotti Oct 7, 2021
e742a41
Federation: Allow connecting to remote users (#1824)
pcapriotti Oct 7, 2021
c4c6763
Fix more swagger validation errors (#1841)
pcapriotti Oct 7, 2021
78d7ca6
Various cleanups of Qualified and related types (#1839)
pcapriotti Oct 7, 2021
fda14dd
Create remote 1-1 conversations (#1825)
pcapriotti Oct 8, 2021
1087af0
Leave a note with a link to a Jira ticket about a flaky test (#1844)
Oct 8, 2021
5296623
Make non-collision test for 1-1 conv ids faster (#1846)
pcapriotti Oct 11, 2021
359d6bf
add comment to test for FUTUREWORK (#1848)
jschaul Oct 11, 2021
f9405a3
Fix error in member csv creation (SAML.UserRef decoding error) (#1828)
fisx Oct 11, 2021
4258f7b
Update One2One conversation when connection status changes (#1850)
smatting Oct 12, 2021
c6906f8
chore: [charts] Update webapp version (#1836)
zebot Oct 13, 2021
93febef
chore: [charts] Update team-settings version (#1835)
zebot Oct 13, 2021
46b02b1
update to latest SFT. (#1849)
julialongtin Oct 13, 2021
e8ce5fb
Upgrade webapp/team-settings: changelog entries for #1835 and #1836 (…
jschaul Oct 13, 2021
62c837e
Fix SFTD in umbrella chart (#1677)
arianvp Oct 13, 2021
99961a4
Move SFTD public IP docs to the top (#1672)
arianvp Oct 13, 2021
3497d6e
[charts:sftd] Introduce flag to enable TURN discovery (#1519)
lucendio Oct 13, 2021
1e2cd55
Check extended key usage of server certificates (#1855)
pcapriotti Oct 14, 2021
f10295c
Access updates affect remote users (#1854)
smatting Oct 14, 2021
b0e329a
Change tag (#1859)
smatting Oct 14, 2021
a64968b
Check connections when adding remote users to a conv (#1842)
akshaymankar Oct 15, 2021
e0b3556
Make conversation creator unqualified in on-conversation-created RPC …
pcapriotti Oct 18, 2021
50512f9
Parallelise RPCs (#1860)
pcapriotti Oct 18, 2021
7e02f4a
Close GRPC client after making a request to a remote federator (#1865)
pcapriotti Oct 19, 2021
78645cb
Allow using kind cluster with imagePullPolicy=Never (#1862)
jschaul Oct 19, 2021
852d8b7
disable flaky test in gundeck (#1867)
jschaul Oct 20, 2021
ab296be
Check connections when creating group and team convs with remote mem…
akshaymankar Oct 20, 2021
0aa86a7
minor Readme: document usage of helm charts (#1307)
jschaul Oct 20, 2021
edbf52c
Support deleting conversations with federated users (#1861)
smatting Oct 20, 2021
5632e0c
Remove a leftover TODO that was addressed (#1868)
Oct 20, 2021
af37dfc
In Conversation Endpoints Make the members.self ID Qualified (#1866)
Oct 21, 2021
48ff7da
Changelog script: skip empty sections (#1871)
pcapriotti Oct 21, 2021
a2c02fa
Replace shell.nix with a direnv + nixpkgs.buildEnv based setup (#1876)
akshaymankar Oct 21, 2021
4293d82
Correctly update PATH in .envrc (#1877)
akshaymankar Oct 21, 2021
992796e
Introduce 'make flake-PATTERN' (#1875)
jschaul Oct 21, 2021
6291a90
updatePhone deflake (#1874)
jschaul Oct 21, 2021
d586d0d
Include conv creator is only once in notifications sent to remotes (#…
akshaymankar Oct 25, 2021
8eb2048
Optimise remote user deletion (#1872)
pcapriotti Oct 26, 2021
e9d8d99
Set federator's default log level to Info (#1882)
akshaymankar Oct 26, 2021
3279146
Rename the two federation/on-user-deleted endpoints (#1883)
akshaymankar Oct 26, 2021
f38428c
Galley polysemy (1/5) - Introduce Sem and "access" effects (#1881)
pcapriotti Oct 27, 2021
14cac8b
Allow configuring nginz so it serves the deeplink for apps to discov…
akshaymankar Oct 27, 2021
698d5f6
upgrade webapp to federation-capable (not for production use!) versio…
julialongtin Oct 29, 2021
d6b9490
Release_2021_10_29 (#1893)
julialongtin Oct 29, 2021
5297219
Merge branch 'master' into develop
julialongtin Oct 29, 2021
8dbf8d9
[feature config] self-deleting messages (#1857)
fisx Oct 31, 2021
6149ae6
Merge branch 'develop' into polysemy-check-spar-2
fisx Oct 31, 2021
ac7ec27
Re-align with changes in Data.Id.
fisx Oct 31, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 5 additions & 0 deletions .envrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
env=$(nix-build --no-out-link "$PWD/direnv.nix")
PATH_add "${env}/bin"

# allow local .envrc overrides
[[ -f .envrc.local ]] && source_env .envrc.local
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ TAGS
.stack-docker-profile
.metadata
*.tix
*.pem
.DS_Store
services/nginz/src
services/.env
Expand Down Expand Up @@ -99,4 +98,4 @@ i.yaml
b.yaml
telepresence.log

/.ghci
/.ghci
62 changes: 62 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,67 @@
<!-- if you're not the release manager, do your edits to changelog under CHANGELOG.d/ -->

# [2021-10-29]

## Release notes

* Upgrade SFT to 2.1.15 (#1849)
* Upgrade team settings to Release: [v4.2.0](https://github.com/wireapp/wire-team-settings/releases/tag/v4.2.0) and image tag: 4.2.0-v0.28.28-1e2ef7 (#1856)
* Upgrade Webapp to image tag: 20021-10-28-federation-m1 (#1856)

## API changes

* Remove `POST /list-conversations` endpoint. (#1840)
* The member.self ID in conversation endpoints is qualified and available as
"qualified_id". The old unqualified "id" is still available. (#1866)

## Features

* Allow configuring nginz so it serve the deeplink for apps to discover the backend (#1889)
* SFT: allow using TURN discovery using 'turnDiscoveryEnabled' (#1519)

## Bug fixes and other updates

* Fix an issue related to installing the SFT helm chart as a sub chart to the wire-server chart. (#1677)
* SAML columns (Issuer, NameID) in CSV files with team members. (#1828)

## Internal changes

* Add a 'make flake-PATTERN' target to run a subset of tests multiple times to trigger a failure case in flaky tests (#1875)
* Avoid a flaky test to fail related to phone updates and improve failure output. (#1874)
* Brig: Delete deprecated `GET /i/users/connections-status` endpoint. (#1842)
* Replace shell.nix with direnv + nixpkgs.buildEnv based setup (#1876)
* Make connection DB functions work with Qualified IDs (#1819)
* Fix more Swagger validation errors. (#1841)
* Turn `Galley` into a polysemy monad stack. (#1881)
* Internal CI tooling improvement: decrease integration setup time by using helmfile. (#1805)
* Depend on hs-certificate master instead of our fork (#1822)
* Add internal endpoint to insert or update a 1-1 conversation. This is to be used by brig when updating the status of a connection. (#1825)
* Update helm to 3.6.3 in developer tooling (nix-shell) (#1862)
* Improve the `Qualified` abstraction and make local/remote tagging safer (#1839)
* Add some new Spar effects, completely isolating us from saml2-web-sso interface (#1827)
* Convert legacy POST conversations/:cnv/members endpoint to Servant (#1838)
* Simplify mock federator interface by removing unnecessary arguments. (#1870)
* Replace the `Spar` newtype, instead using `Sem` directly. (#1833)

## Federation changes

* Remove remote guests as well as local ones when "Guests and services" is disabled in a group conversation, and propagate removal to remote members. (#1854)
* Check connections when adding remote users to a local conversation and local users to remote conversations. (#1842)
* Check connections when creating group and team conversations with remote members. (#1870)
* Server certificates without the "serverAuth" extended usage flag are now rejected when connecting to a remote federator. (#1855)
* Close GRPC client after making a request to a remote federator. (#1865)
* Support deleting conversations with federated users (#1861)
* Ensure that the conversation creator is included only once in notifications sent to remote users (#1879)
* Allow connecting to remote users. One to one conversations are not created yet. (#1824)
* Make federator's default log level Info (#1882)
* The creator of a conversation now appears as a member when the conversation is fetched from a remote backend (#1842)
* Include remote connections in the response to `POST /list-connections` (#1826)
* When a user gets deleted, notify remotes about conversations and connections in chunks of 1000 (#1872, #1883)
* Make federated requests to multiple backends in parallel. (#1860)
* Make conversation ID of `RemoteConversation` unqualified and move it out of the metadata record. (#1839)
* Make the conversation creator field in the `on-conversation-created` RPC unqualified. (#1858)
* Update One2One conversation when connection status changes (#1850)

# [2021-10-01]

## Release notes
Expand Down
9 changes: 5 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ libzauth:
.PHONY: hie.yaml
hie.yaml: stack-dev.yaml
stack build implicit-hie
stack exec gen-hie | nix-shell --command 'yq "{cradle: {stack: {stackYaml: \"./stack-dev.yaml\", components: .cradle.stack}}}" > hie.yaml'
stack exec gen-hie | yq "{cradle: {stack: {stackYaml: \"./stack-dev.yaml\", components: .cradle.stack}}}" > hie.yaml

.PHONY: stack-dev.yaml
stack-dev.yaml:
Expand Down Expand Up @@ -311,7 +311,7 @@ release-chart-%:
.PHONY: guard-tag
guard-tag:
@if [ "${DOCKER_TAG}" = "${USER}" ]; then \
echo "Environment variable DOCKER_TAG not set to non-default value. Re-run with DOCKER_TAG=<something>. Try using 'make latest-brig-tag' for latest develop docker image tag";\
echo "Environment variable DOCKER_TAG not set to non-default value. Re-run with DOCKER_TAG=<something>. Try using 'make latest-tag' for latest develop docker image tag";\
exit 1; \
fi

Expand Down Expand Up @@ -403,6 +403,7 @@ kind-reset: kind-delete kind-cluster
.local/kind-kubeconfig:
mkdir -p $(CURDIR)/.local
kind get kubeconfig --name $(KIND_CLUSTER_NAME) > $(CURDIR)/.local/kind-kubeconfig
chmod 0600 $(CURDIR)/.local/kind-kubeconfig

# This guard is a fail-early way to save needing to debug nginz container not
# starting up in the second namespace of the kind cluster in some cases. Error
Expand All @@ -429,11 +430,11 @@ guard-inotify:

.PHONY: kind-integration-setup
kind-integration-setup: guard-inotify .local/kind-kubeconfig
ENABLE_KIND_VALUES="1" KUBECONFIG=$(CURDIR)/.local/kind-kubeconfig make kube-integration-setup
HELMFILE_ENV="kind" KUBECONFIG=$(CURDIR)/.local/kind-kubeconfig make kube-integration-setup

.PHONY: kind-integration-test
kind-integration-test: .local/kind-kubeconfig
ENABLE_KIND_VALUES="1" KUBECONFIG=$(CURDIR)/.local/kind-kubeconfig make kube-integration-test
HELMFILE_ENV="kind" KUBECONFIG=$(CURDIR)/.local/kind-kubeconfig make kube-integration-test

kind-integration-e2e: .local/kind-kubeconfig
cd services/brig && KUBECONFIG=$(CURDIR)/.local/kind-kubeconfig ./federation-tests.sh $(NAMESPACE)
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ It also contains
- **build**: Build scripts and Dockerfiles for some platforms
- **deploy**: (Work-in-progress) - how to run wire-server in an ephemeral, in-memory demo mode
- **doc**: Documentation
- **hack**: scripts and configuration for kubernetes helm chart development/releases mainly used by CI
- **charts**: kubernetes helm charts
- **hack**: scripts and configuration for kuberentes helm chart development/releases mainly used by CI
- **charts**: Kubernetes Helm charts. The charts are mirroed to S3 and can be used with `helm repo add wire https://s3-eu-west-1.amazonaws.com/public.wire.com/charts`. See the [Administrator's Guide](https://docs.wire.com) for more info.

## Architecture Overview

Expand Down
1 change: 1 addition & 0 deletions changelog.d/0-release-notes/pr-1857
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Deploy galley before brig.
1 change: 1 addition & 0 deletions changelog.d/0-release-notes/sft-2-1-15
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Upgrade SFT to 2.1.15
1 change: 1 addition & 0 deletions changelog.d/0-release-notes/team-settings-upgrade
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Upgrade team settings to Release: [v4.2.0](https://github.com/wireapp/wire-team-settings/releases/tag/v4.2.0) and image tag: 4.2.0-v0.28.28-1e2ef7
1 change: 1 addition & 0 deletions changelog.d/0-release-notes/webapp-upgrade
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Upgrade Webapp to image tag: 20021-10-28-federation-m1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Remove `POST /list-conversations` endpoint.
2 changes: 2 additions & 0 deletions changelog.d/1-api-changes/self-member-id-qualified
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
The member.self ID in conversation endpoints is qualified and available as
"qualified_id". The old unqualified "id" is still available.
1 change: 1 addition & 0 deletions changelog.d/2-features/nginz-deeplink
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Allow configuring nginz so it serve the deeplink for apps to discover the backend
1 change: 1 addition & 0 deletions changelog.d/2-features/pr-1519
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SFT: allow using TURN discovery using 'turnDiscoveryEnabled'
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
End-points for configuring self-deleting messages.
1 change: 1 addition & 0 deletions changelog.d/3-bug-fixes/pr-1677
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix an issue related to installing the SFT helm chart as a sub chart to the wire-server chart.
1 change: 1 addition & 0 deletions changelog.d/3-bug-fixes/pr-1828
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SAML columns (Issuer, NameID) in CSV files with team members.
1 change: 1 addition & 0 deletions changelog.d/5-internal/deflake-maketarget
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add a 'make flake-PATTERN' target to run a subset of tests multiple times to trigger a failure case in flaky tests
1 change: 1 addition & 0 deletions changelog.d/5-internal/deflake-phone
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Avoid a flaky test to fail related to phone updates and improve failure output.
1 change: 1 addition & 0 deletions changelog.d/5-internal/delete-internal-get-conn-status
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Brig: Delete deprecated `GET /i/users/connections-status` endpoint.
1 change: 1 addition & 0 deletions changelog.d/5-internal/direnv_buildEnv
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Replace shell.nix with direnv + nixpkgs.buildEnv based setup
1 change: 1 addition & 0 deletions changelog.d/5-internal/fed-connections-data
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Make connection DB functions work with Qualified IDs
1 change: 1 addition & 0 deletions changelog.d/5-internal/fix-swagger-errors
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix more Swagger validation errors.
1 change: 1 addition & 0 deletions changelog.d/5-internal/galley-polysemy
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Turn `Galley` into a polysemy monad stack.
1 change: 1 addition & 0 deletions changelog.d/5-internal/helmfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Internal CI tooling improvement: decrease integration setup time by using helmfile.
1 change: 1 addition & 0 deletions changelog.d/5-internal/hs-certificate-master
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Depend on hs-certificate master instead of our fork
1 change: 1 addition & 0 deletions changelog.d/5-internal/one2one-upsert
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add internal endpoint to insert or update a 1-1 conversation. This is to be used by brig when updating the status of a connection.
1 change: 1 addition & 0 deletions changelog.d/5-internal/reenable-kind
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update helm to 3.6.3 in developer tooling (nix-shell)
1 change: 1 addition & 0 deletions changelog.d/5-internal/refactor-tagged-qualified
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Improve the `Qualified` abstraction and make local/remote tagging safer
1 change: 1 addition & 0 deletions changelog.d/5-internal/saml2-effect
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add some new Spar effects, completely isolating us from saml2-web-sso interface
1 change: 1 addition & 0 deletions changelog.d/5-internal/servantify-add-member
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Convert legacy POST conversations/:cnv/members endpoint to Servant
1 change: 1 addition & 0 deletions changelog.d/5-internal/simplify-mock-federator
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Simplify mock federator interface by removing unnecessary arguments.
1 change: 1 addition & 0 deletions changelog.d/5-internal/spar-no-io-2
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Replace the `Spar` newtype, instead using `Sem` directly.
1 change: 1 addition & 0 deletions changelog.d/6-federation/access-update-remove-remotes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Remove remote guests as well as local ones when "Guests and services" is disabled in a group conversation, and propagate removal to remote members.
1 change: 1 addition & 0 deletions changelog.d/6-federation/check-connections
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Check connections when adding remote users to a local conversation and local users to remote conversations.
1 change: 1 addition & 0 deletions changelog.d/6-federation/check-connections-create
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Check connections when creating group and team conversations with remote members.
1 change: 1 addition & 0 deletions changelog.d/6-federation/check-server-cert-usage
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Server certificates without the "serverAuth" extended usage flag are now rejected when connecting to a remote federator.
1 change: 1 addition & 0 deletions changelog.d/6-federation/close-grpc-client
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Close GRPC client after making a request to a remote federator.
1 change: 1 addition & 0 deletions changelog.d/6-federation/delete-conversations
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Support deleting conversations with federated users
1 change: 1 addition & 0 deletions changelog.d/6-federation/ensure-one-creator-member
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Ensure that the conversation creator is included only once in notifications sent to remote users
1 change: 1 addition & 0 deletions changelog.d/6-federation/fed-connections
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Allow connecting to remote users. One to one conversations are not created yet.
1 change: 1 addition & 0 deletions changelog.d/6-federation/federator-log-level
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Make federator's default log level Info
1 change: 1 addition & 0 deletions changelog.d/6-federation/fix-remote-conv
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
The creator of a conversation now appears as a member when the conversation is fetched from a remote backend
1 change: 1 addition & 0 deletions changelog.d/6-federation/list-remote-connections
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Include remote connections in the response to `POST /list-connections`
1 change: 1 addition & 0 deletions changelog.d/6-federation/optimize-user-deletion
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
When a user gets deleted, notify remotes about conversations and connections in chunks of 1000 (#1872, #1883)
1 change: 1 addition & 0 deletions changelog.d/6-federation/parallel-rpcs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Make federated requests to multiple backends in parallel.
1 change: 1 addition & 0 deletions changelog.d/6-federation/unqualify-conv-id
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Make conversation ID of `RemoteConversation` unqualified and move it out of the metadata record.
1 change: 1 addition & 0 deletions changelog.d/6-federation/unqualify-creator-id
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Make the conversation creator field in the `on-conversation-created` RPC unqualified.
1 change: 1 addition & 0 deletions changelog.d/6-federation/update-one2ones
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update One2One conversation when connection status changes
6 changes: 5 additions & 1 deletion changelog.d/mk-changelog.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,14 @@ getPRNumber() {
for d in "$DIR"/*; do
if [[ ! -d "$d" ]]; then continue; fi

entries=("$d"/*[^~])

if [[ ${#entries[@]} -eq 0 ]]; then continue; fi

echo -n "## "
sed '$ a\' "$d/.title"
echo ""
for f in "$d"/*[^~]; do
for f in "${entries[@]}"; do
pr=$(getPRNumber $f)
sed -r '
# create a bullet point on the first line
Expand Down
2 changes: 2 additions & 0 deletions charts/fake-aws-s3/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ minio:
enabled: false
environment:
MINIO_BROWSER: "off"
defaultBucket:
name: dummy-bucket
buckets:
- name: dummy-bucket
purge: true
Expand Down
2 changes: 1 addition & 1 deletion charts/federator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ resources:
memory: "512Mi"
cpu: "500m"
config:
logLevel: Debug
logLevel: Info
logFormat: JSON
optSettings:
# Defaults to using system CA store in the federator image for making
Expand Down
15 changes: 15 additions & 0 deletions charts/nginz/templates/conf/_deeplink.html.tpl
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{{- define "nginz_deeplink.html" }}
{{/* See https://docs.wire.com/how-to/associate/deeplink.html
(or search for "deeplink" on docs.wire.com)
for details on use of the deeplink*/}}
<html>
<head></head>
<body>
{{- if hasKey .Values.nginx_conf "deeplink" }}
<a href="wire://access/?config={{ .Values.nginx_conf.deeplink.endpoints.backendURL }}/deeplink.json">Click here for access</a>
{{- else }}
No Deep Link.
{{- end }}
</body>
</html>
{{- end }}
24 changes: 24 additions & 0 deletions charts/nginz/templates/conf/_deeplink.json.tpl
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{{- define "nginz_deeplink.json" }}
{{- if hasKey .Values.nginx_conf "deeplink" }}
{{- with .Values.nginx_conf.deeplink }}
{{/* See https://docs.wire.com/how-to/associate/deeplink.html
(or search for "deeplink" on docs.wire.com)
for details on use of the deeplink*/}}
{
"endpoints" : {
{{- with .endpoints }}
"backendURL" : {{ .backendURL | quote }},
"backendWSURL": {{ .backendWSURL | quote }},
"blackListURL": {{ .blackListURL | quote }},
"teamsURL": {{ .teamsURL | quote }},
"accountsURL": {{ .accountsURL | quote }},
"websiteURL": {{ .websiteURL | quote }}
{{- end }}
},
"title" : {{ .title | quote }}
}
{{- end }}
{{- else }}
{}
{{- end }}
{{- end }}
19 changes: 19 additions & 0 deletions charts/nginz/templates/conf/_nginx.conf.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,25 @@ http {
image/png png;
}
}

{{- if hasKey .Values.nginx_conf "deeplink" }}
location ~* ^/deeplink.(json|html)$ {
zauth off;
root /etc/wire/nginz/conf/;
types {
application/json json;
text/html html;
}
if ($request_method = 'OPTIONS') {
add_header 'Access-Control-Allow-Methods' "GET, OPTIONS";
add_header 'Access-Control-Allow-Headers' "$http_access_control_request_headers, DNT,X-Mx-ReqToken,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type";
add_header 'Content-Type' 'text/plain; charset=UTF-8';
add_header 'Content-Length' 0;
return 204;
}
more_set_headers 'Access-Control-Allow-Origin: $http_origin';
}
{{- end }}
}
}
{{- end }}
4 changes: 4 additions & 0 deletions charts/nginz/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ data:
{{- include "nginz_upstreams.txt" . | indent 4 }}
zwagger-config.js: |2
{{- include "nginz_zwagger-config.js" . | indent 4 }}
deeplink.json: |2
{{- include "nginz_deeplink.json" . | indent 4 }}
deeplink.html: |2
{{- include "nginz_deeplink.html" . | indent 4 }}
{{ (.Files.Glob "conf/static/*").AsConfig | indent 2 }}
kind: ConfigMap
metadata:
Expand Down
12 changes: 9 additions & 3 deletions charts/nginz/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,15 @@ nginx_conf:
worker_rlimit_nofile: 131072
worker_connections: 65536
swagger_root: /var/www/swagger
# deeplink:
# endpoints:
# backendURL: "https://prod-nginz-https.wire.com"
# backendWSURL: "https://prod-nginz-ssl.wire.com"
# blackListURL: "https://clientblacklist.wire.com/prod"
# teamsURL: "https://teams.wire.com"
# accountsURL: "https://accounts.wire.com"
# websiteURL: "https://wire.com"
# title: "Production"
disabled_paths:
- /conversations/last-events
- ~* ^/conversations/([^/]*)/knock
Expand Down Expand Up @@ -304,9 +313,6 @@ nginx_conf:
envs:
- all
doc: true
- path: ~* ^/list-conversations$
envs:
- all
- path: ~* ^/teams$
envs:
- all
Expand Down
2 changes: 1 addition & 1 deletion charts/sftd/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ version: 0.0.42
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
appVersion: 2.0.127
appVersion: 2.1.15
Loading