Merge pull request #634 from wireapp/release/2019-02-18

Release/2019-02-18

.gitignore

@@ -39,7 +39,6 @@ services/nginz/src
 services/.env
 tools/api-simulations/mailboxes.json
 tools/api-simulations/reports
-.DS_Store
 brig-schema.yaml
 brig.yaml
 brig.integration-aws.yaml
@@ -61,6 +60,8 @@ spar.integration-aws.yaml
 integration-aws.yaml
 DOCKER_ID*
 swagger-ui
-services/spar/spar.cabal
 deploy/services-demo/resources/templates/*
 deploy/services-demo/conf/nginz/zwagger-ui/*
+
+# Ignore cabal files; use package.yaml instead
+*.cabal

CHANGELOG.md

@@ -1,3 +1,32 @@
+# 2019-02-18 #634
+
+## API changes
+
+  * Support for SCIM (#559, #608, #602, #613, #617, #614, #620, #621, #627)
+    - several new end-points under `/scim` (see hscim package or the standards for the details; no swagger docs).
+    - new end-point `put "/i/users/:uid/managed-by"` for marking scim-managed users (no swagger docs)
+  * Add support for excluding certain phone number prefixes (#593)
+    - several new end-points under `/i/users/phone-prefixes/` (no swagger docs)
+  * Fix SAML2.0 compatibility issues in Spar (#607, #623)
+
+## Bug fixes
+
+  * Update swagger docs (#598)
+
+## Internal changes
+
+  * Architecture independence, better use of make features, more docs. (#594)
+  * Fix nginz docker image building (#605)
+  * Enable journaling locally and fix integration tests (#606)
+  * Use network-2.7 for more informative "connection failed" errors (#586)
+  * Use custom snapshots (#597)
+  * Add module documentation for all Spar modules (#611)
+  * Change the bot port in integration tests to something less common (#618)
+  * Spar metrics (#604, #633)
+  * Extend the list of default language extensions (#619)
+  * Fix: do not have newlines in log messages. (#625)
+
+
 # 2019-01-27 #596
 
 ## API changes
@@ -31,20 +60,20 @@
 
   * `sigkeys` attribute on POST|PUT to `/clients` is now deprecated and ignored (clients can stop sending it)
   * `cancel_callback` parameter on GET `/notifications` is now deprecated and ignored (clients can stop sending it)
-  * deprecated `POST /push/fallback/<notif>/cancel` is removed
-  * deprecated `tokenFallback` field returned on `GET /push/tokens` is removed
+  * The deprecated `POST /push/fallback/<notif>/cancel` is now removed.
+  * The deprecated `tokenFallback` field returned on `GET /push/tokens` is now removed.
 
 ## Bug fixes
 
   * Size-restrict SSO subject identities (#557)
   * Propagate team deletions to spar (#519)
-  * allow using $arg_name in nginz (#538)
+  * Allow using `$arg_name` in nginz (#538)
 
 ## Internal changes
 
   * Version upgrades to GHC 8.4 (LTS-12), nginx 14.2, alpine 3.8 (#527, #540)
   * Code refactoring, consitency with Imports.hs (#543, #553, #552)
-  * improved test coverage on spar (#539)
+  * Improved test coverage on spar (#539)
   * Use yaml configuration in cannon (#555)
 
 ## Others
@@ -58,12 +87,12 @@
 
   * New API endpoint (`/properties-values`) to get all properties keys and values
 
-## Bug Fixes
+## Bug fixes
 
   * Proper JSON object encapsulation for `conversation.receipt-mode-update` events (#535)
   * Misc Makefile related changes to improve dev workflow
 
-## Internal Changes
+## Internal changes
 
   * Gundeck now pushes events asynchronously after writing to Cassandra (#530)
 
@@ -73,13 +102,13 @@
 
 # 2018-11-28 #527
 
-## Bug Fixes
+## Bug fixes
 
-  * spar now handles base64 input more leniently (#526)
+  * Spar now handles base64 input more leniently (#526)
 
   * More lenient IdP metadata parsing (#522)
 
-## Internal Changes
+## Internal changes
 
   * Refactor Haskell module imports (#524, #521, #520)
 
@@ -90,7 +119,7 @@
   * Fix: gundeck bulkpush option. (#511)
 
 
-# 2018-11-16  #515
+# 2018-11-16 #515
 
 ## Bug Fixes
 
@@ -113,7 +142,7 @@
   * update dependencies docs (#514)
 
 
-# 2018-10-25  #500
+# 2018-10-25 #500
 
 ## New Features
 
@@ -146,7 +175,7 @@
   * Allow easily running tests against AWS.  #482
 
 
-# 2018-10-04  #477
+# 2018-10-04 #477
 
 ## Highlights
 

libs/api-bot/package.yaml

@@ -0,0 +1,72 @@
+defaults: 
+  local: ../../package-defaults.yaml
+name: api-bot
+version: '0.4.2'
+synopsis: (Internal) API automation around wire-client
+description: (Internal) API automation around the wire-client.
+category: Network
+author: Wire Swiss GmbH
+maintainer: Wire Swiss GmbH <[email protected]>
+license: AGPL-3
+dependencies:
+- aeson >=0.11
+- HaskellNet >=0.5
+- HaskellNet-SSL >=0.3
+- ansi-terminal >=0.6
+- api-client
+- async >=2.0
+- attoparsec >=0.13
+- base >=4.6 && <5
+- base64-bytestring >=1.0
+- bilge >=0.21
+- bytestring >=0.10
+- bytestring-conversion >=0.2
+- cereal >=0.5
+- containers >=0.5
+- cryptobox-haskell >=0.1.1
+- cryptonite >=0.17
+- directory >=1.2
+- errors >=2.0
+- exceptions >=0.8
+- filepath >=1.3
+- http-client >=0.4
+- http-types >=0.8
+- imports
+- iso639 >=0.1
+- lens >=4.1
+- memory >=0.12
+- metrics-core >=0.1.17
+- mime >=0.4
+- monad-control >=1.0
+- mtl >=2.1
+- mwc-random >=0.13
+- optparse-applicative >=0.11
+- resource-pool >=0.2
+- scientific >=0.3
+- semigroups >=0.10
+- singletons >=0.10
+- stm >=2.4
+- text >=0.11
+- time >=1.5
+- tinylog >=0.14
+- transformers >=0.3
+- transformers-base >=0.4
+- types-common >=0.11
+- unliftio-core >=0.1
+- unordered-containers >=0.2
+- uuid >=1.3
+- vector >=0.10
+library:
+  source-dirs: src
+  exposed-modules:
+  - Network.Wire.Bot
+  - Network.Wire.Bot.Assert
+  - Network.Wire.Bot.Clients
+  - Network.Wire.Bot.Crypto
+  - Network.Wire.Bot.Email
+  - Network.Wire.Bot.Metrics
+  - Network.Wire.Bot.Monad
+  - Network.Wire.Bot.Report
+  - Network.Wire.Bot.Report.Text
+  - Network.Wire.Bot.Settings
+stability: experimental

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

@@ -74,6 +74,7 @@ toUser _ acc [i, e, p] = do
         , userHandle   = Nothing
         , userExpire   = Nothing
         , userTeam     = Nothing
+        , userManagedBy = ManagedByWire
         }
 toUser g acc entry = do
     warn g $ msg (val "invalid entry: " +++ show entry)

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

@@ -131,8 +131,8 @@ awaitMail :: Mailbox
           -> IO (NonEmpty MIMEValue)
 awaitMail mbox folders from to purpose = go 0
   where
-    sleep   = 5000000    -- every 5 seconds
-    timeout = sleep * 24 -- for up to 2 minutes
+    sleep   = 5000000 :: Int   -- every 5 seconds
+    timeout = sleep * 24   -- for up to 2 minutes
     go t = do
         msgs <- fetchMail mbox folders from to purpose -- TODO: Retry on (some?) exceptions
         case msgs of

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

@@ -887,6 +887,7 @@ randUser (Email loc dom) (BotTag tag) = do
         , newUserLabel          = Nothing
         , newUserLocale         = Nothing
         , newUserExpiresIn      = Nothing
+        , newUserManagedBy      = Nothing
         }, passw)
 
 randMailbox :: BotNet Mailbox