Merge pull request #1010 from wireapp/release_2020-03-10

.gitignore

@@ -1,5 +1,5 @@
 target
-Cargo.lock
+./libs/libzauth/libzauth/Cargo.lock
 *.aux*
 *.chi
 *.chs.h
@@ -24,6 +24,7 @@ ID
 Setup.hs
 cabal.sandbox.config
 dist
+dist-newstyle
 gen-hs
 log
 tags
@@ -74,3 +75,13 @@ deploy/dockerephemeral/build/smtp/
 
 # Ignore cabal files; use package.yaml instead
 *.cabal
+
+# Avoid storing generated keys
+/deploy/services-demo/resources/turn/secret.txt
+
+# Avoid storing generated keys (privkeys.txt and pubkeys.txt are generated by demo.sh)
+/deploy/services-demo/resources/zauth/privkeys.txt
+/deploy/services-demo/resources/zauth/pubkeys.txt
+
+/libs/libzauth/bzauth-c/deb/usr
+

CHANGELOG.md

@@ -1,3 +1,40 @@
+# 2020-03-10
+
+## New features
+
+- Remove autoconnect functionality; deprecate end-point. (#1005)
+- Email visible to all users in same team (#999)
+
+## Bug fixes
+
+- fix nginx permissions in docker image (#985)
+
+## Significant internal changes
+
+- Update nginx to latest stable (#725)
+
+## Internal Changes
+
+- ormolu.sh: make queries for options more robust (#1009)
+- Run hscim azure tests (#941)
+- move FUTUREWORK(federation) comment to right place
+- stack snapshot 3.0. (#1004, works around 8697b57609b523905641f943d68bbbe18de110e8)
+- Fix .gitignore shenanigans in Nix (#1002)
+- Update types of some galley endpoints to be federation-aware (#1001)
+- Cleanup (#1000)
+- Compile nginx with libzauth using nix (#988)
+- Move and create federation-related types (#997)
+- Tweak ormolu script. (#998)
+- Give handlers in gundeck, cannon stronger types (#990)
+- Rename cassandra-schema.txt to cassandra-schema.cql (#992)
+- Ignore dist-newstyle (#991)
+- Refactor: separate HTTP handlers from app logic (galley) (#989)
+- Mock federator (#986)
+- Eliminate more CPP (#987)
+- Cleanup compiler warnings (#984)
+- Make ormolu available in builder (#983)
+
+
 # 2020-02-27
 
 ## Hotfix

Makefile

@@ -165,8 +165,8 @@ run-docker-builder:
 CASSANDRA_CONTAINER := $(shell docker ps | grep '/cassandra:' | perl -ne '/^(\S+)\s/ && print $$1')
 .PHONY: git-add-cassandra-schema
 git-add-cassandra-schema: db-reset
- ( echo '# automatically generated with `make git-add-cassandra-schema`' ; docker exec -i $(CASSANDRA_CONTAINER) /usr/bin/cqlsh -e "DESCRIBE schema;" ) > ./docs/reference/cassandra-schema.txt
- git add ./docs/reference/cassandra-schema.txt
+ ( echo '-- automatically generated with `make git-add-cassandra-schema`' ; docker exec -i $(CASSANDRA_CONTAINER) /usr/bin/cqlsh -e "DESCRIBE schema;" ) > ./docs/reference/cassandra-schema.cql
+ git add ./docs/reference/cassandra-schema.cql
 
 .PHONY: db-reset
 db-reset:

build/alpine/Dockerfile.builder

@@ -22,6 +22,7 @@ RUN set -x && \
  stack build --haddock --dependencies-only haskell-src-exts && \
  stack build --haddock --no-haddock-hyperlink-source haskell-src-exts && \
  stack build --pedantic --haddock --test --no-run-tests --bench --no-run-benchmarks --dependencies-only && \
+ stack install ormolu && \
  cd / && \
  # we run the build only to cache the built source in /root/.stack, we can remove the source code itself
  rm -rf /wire-server

deploy/services-demo/conf/nginz/nginx-docker.conf

@@ -106,8 +106,8 @@ http {
  listen 8080;
  listen 8081;
 
- zauth_keystore resources/zauth/pubkeys.txt;
- zauth_acl conf/nginz/zauth_acl.txt;
+ zauth_keystore /configs/resources/zauth/pubkeys.txt;
+ zauth_acl /configs/conf/nginz/zauth_acl.txt;
 
  location /status {
  zauth off;

docs/reference/cassandra-schema.txt → docs/reference/cassandra-schema.cql

@@ -1,4 +1,4 @@
-# automatically generated with `make git-add-cassandra-schema`
+-- automatically generated with `make git-add-cassandra-schema`
 
 CREATE KEYSPACE galley_test WITH replication = {'class': 'SimpleStrategy', 'replication_factor': '1'} AND durable_writes = true;
 
@@ -1380,6 +1380,26 @@ CREATE TABLE spar_test.idp (
  AND read_repair_chance = 0.0
  AND speculative_retry = '99PERCENTILE';
 
+CREATE TABLE spar_test.default_idp (
+ partition_key_always_default text,
+ idp uuid,
+ PRIMARY KEY (partition_key_always_default, idp)
+) WITH CLUSTERING ORDER BY (idp ASC)
+ AND bloom_filter_fp_chance = 0.1
+ AND caching = {'keys': 'ALL', 'rows_per_partition': 'NONE'}
+ AND comment = ''
+ AND compaction = {'class': 'org.apache.cassandra.db.compaction.LeveledCompactionStrategy'}
+ AND compression = {'chunk_length_in_kb': '64', 'class': 'org.apache.cassandra.io.compress.LZ4Compressor'}
+ AND crc_check_chance = 1.0
+ AND dclocal_read_repair_chance = 0.1
+ AND default_time_to_live = 0
+ AND gc_grace_seconds = 864000
+ AND max_index_interval = 2048
+ AND memtable_flush_period_in_ms = 0
+ AND min_index_interval = 128
+ AND read_repair_chance = 0.0
+ AND speculative_retry = '99PERCENTILE';
+
 CREATE TABLE spar_test.team_provisioning_by_team (
  team uuid,
  id uuid,

docs/reference/user/connection.md

@@ -12,8 +12,6 @@ Members of the same team are always considered connected, see [Connections betwe
 
 Internally, connection status is a _directed_ edge from one user to another that is attributed with a relation state and some meta information. If a user has a connection to another user, it can be in one of the six [connection states](#RefConnectionStates).
 
-TODO describe autoconnection and onboarding.
-
 ## Connection states {#RefConnectionStates}
 
 ### Sent {#RefConnectionSent}

libs/api-bot/src/Network/Wire/Bot/Crypto.hs

@@ -104,7 +104,8 @@ encrypt cl cnv val = fmap (OtrRecipients . UserClientMap)
  ciphertext <- do
  bs <- CBox.encrypt s val >>= unwrap >>= CBox.copyBytes
  return $! decodeUtf8 $! B64.encode bs
- return $ Map.insertWith Map.union u (Map.singleton c ciphertext) rcps
+ let userId = makeIdOpaque u
+ return $ Map.insertWith Map.union userId (Map.singleton c ciphertext) rcps
 
 -- | Decrypt an OTR message received from a given user and client.
 decrypt :: BotClient -> UserId -> ClientId -> ByteString -> BotSession ByteString

libs/api-client/src/Network/Wire/Client/API/Conversation.hs

@@ -47,7 +47,7 @@ postOtrMessage cnv msg = sessionRequest req rsc readBody
 -- will be thrown. It's not possible that some users will be added and
 -- others will not.
 addMembers :: (MonadSession m, MonadThrow m) => ConvId -> List1 UserId -> m (Maybe (ConvEvent SimpleMembers))
-addMembers cnv mems = do
+addMembers cnv (fmap makeIdOpaque -> mems) = do
  rs <- sessionRequest req rsc consumeBody
  case statusCode rs of
  200 -> Just <$> responseJsonThrow (ParseError . pack) rs
@@ -114,7 +114,7 @@ createConv ::
  -- | Conversation name
  Maybe Text ->
  m Conversation
-createConv users name = sessionRequest req rsc readBody
+createConv (fmap makeIdOpaque -> users) name = sessionRequest req rsc readBody
  where
  req =
  method POST

libs/brig-types/package.yaml

@@ -23,9 +23,12 @@ library:
  - base64-bytestring >=1.0
  - bytestring >=0.9
  - bytestring-conversion >=0.2
+ - case-insensitive
+ - cassandra-util
  - containers >=0.5
  - currency-codes >=2.0
  - errors >=1.4
+ - extra
  - galley-types >=0.45.7
  - hashable
  - iproute >=1.5
@@ -34,6 +37,9 @@ library:
  - lens-aeson
  - network-uri >=2.6
  - pem >=0.2
+ - QuickCheck >=2.9
+ - quickcheck-instances >=0.3.16
+ - random
  - safe >=0.3
  - scientific >=0.3.4
  - singletons >=2.0
@@ -42,21 +48,8 @@ library:
  - time >=1.1
  - types-common >=0.16
  - unordered-containers >=0.2
+ - uri-bytestring
  - uuid >=1.3
- - case-insensitive
- when:
- - condition: flag(cql)
- cpp-options: -DWITH_CQL
- dependencies:
- - cassandra-util
- - condition: flag(arbitrary)
- cpp-options: -DWITH_ARBITRARY
- dependencies:
- - extra
- - QuickCheck >=2.9
- - quickcheck-instances >=0.3.16
- - random
- - uri-bytestring
 tests:
  brig-types-tests:
  main: Main.hs
@@ -91,12 +84,3 @@ tests:
  - uuid
  - uri-bytestring
  - vector
-flags:
- cql:
- description: Enable cql instances
- manual: true
- default: false
- arbitrary:
- description: Enable quickcheck arbitrary instances
- manual: true
- default: true

libs/brig-types/src/Brig/Types.hs

@@ -1,7 +1,6 @@
 module Brig.Types (module M) where
 
 import Brig.Types.Activation as M
-import Brig.Types.AddressBook as M
 import Brig.Types.Client as M
 import Brig.Types.Connection as M
 import Brig.Types.Properties as M