Add 3PIDs at registration

README.md

@@ -1,6 +1,6 @@
 mxisd - Federated Matrix Identity Server
 ----------------------------------------
-![Travis-CI build status](https://travis-ci.org/kamax-matrix/mxisd.svg?branch=master)  
+![Travis-CI build status](https://travis-ci.org/kamax-io/mxisd.svg?branch=master)  
 
 - [Overview](#overview)
 - [Features](#features)

application.example.yaml

@@ -1,6 +1,6 @@
 # Sample configuration file explaining the minimum required keys to be set to run mxisd
 #
-# For a complete list of options, see https://github.com/kamax-matrix/mxisd
+# For a complete list of options, see https://github.com/kamax-io/mxisd
 
 #######################
 # Matrix config items #
@@ -47,45 +47,30 @@ key.path: ''
 storage.provider.sqlite.database: '/path/to/mxisd.db'
 
 
-####################
-# Fallback servers #
-####################
-#
-# Root/Central servers to be used as final fallback when performing lookups.
-# By default, for privacy reasons, matrix.org servers are not enabled anymore.
-# See the following issue: https://github.com/kamax-matrix/mxisd/issues/76
-#
-# If you would like to use them and trade away your privacy for convenience, uncomment the following option:
-#
-#forward.servers: ['matrix-org']
-
-
 ################
 # LDAP Backend #
 ################
 # If you would like to integrate with your AD/Samba/LDAP server,
-# see https://github.com/kamax-matrix/mxisd/blob/master/docs/stores/ldap.md
+# see https://github.com/kamax-io/mxisd/blob/master/docs/backends/ldap.md
-
 
 ###############
 # SQL Backend #
 ###############
 # If you would like to integrate with a MySQL/MariaDB/PostgreQL/SQLite DB,
-# see https://github.com/kamax-matrix/mxisd/blob/master/docs/stores/sql.md
+# see https://github.com/kamax-io/mxisd/blob/master/docs/backends/sql.md
-
 
 ################
 # REST Backend #
 ################
 # If you would like to integrate with an existing web service/webapp,
-# see https://github.com/kamax-matrix/mxisd/blob/master/docs/stores/rest.md
+# see https://github.com/kamax-io/mxisd/blob/master/docs/backends/rest.md
 
 
 #################################################
 # Notifications for invites/addition to profile #
 #################################################
 # If you would like to change the content,
-# see https://github.com/kamax-matrix/mxisd/blob/master/docs/threepids/notification/template-generator.md
+# see https://github.com/kamax-io/mxisd/blob/master/docs/threepids/notifications/template-generator.md
 #
 #### E-mail invite sender
 #

build.gradle

@@ -1,8 +1,8 @@
 /*
  * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2017 Kamax Sarl
+ * Copyright (C) 2017 Maxime Dor
  *
- * https://www.kamax.io/
+ * https://max.kamax.io/
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -41,25 +41,17 @@ def debBuildDataPath = "${debBuildBasePath}${debDataPath}"
 def debBuildSystemdPath = "${debBuildBasePath}${debSystemdPath}"
 
 def dockerImageName = "kamax/mxisd"
-def dockerImageTag = "${dockerImageName}:${mxisdVersion()}"
+def dockerImageTag = "${dockerImageName}:${gitVersion()}"
-
-String mxisdVersion() {
-    def versionPattern = Pattern.compile("v(\\d+\\.)?(\\d+\\.)?(\\d+)(-.*)?")
-
-    String version = System.getenv('MXISD_BUILD_VERSION')
-    if (version == null || version.size() == 0) {
-        version = gitVersion()
-    }
-    return versionPattern.matcher(version).matches() ? version.substring(1) : version
-}
 
 String gitVersion() {
+    def versionPattern = Pattern.compile("v(\\d+\\.)?(\\d+\\.)?(\\d+)(-.*)?")
     ByteArrayOutputStream out = new ByteArrayOutputStream()
     exec {
         commandLine = ['git', 'describe', '--tags', '--always', '--dirty']
         standardOutput = out
     }
-    return out.toString().replace(System.lineSeparator(), '');
+    def v = out.toString().replace(System.lineSeparator(), '')
+    return versionPattern.matcher(v).matches() ? v.substring(1) : v
 }
 
 buildscript {
@@ -73,9 +65,9 @@ buildscript {
 }
 
 repositories {
-    mavenCentral()
     maven { url "https://kamax.io/maven/releases/" }
     maven { url "https://kamax.io/maven/snapshots/" }
+    mavenCentral()
 }
 
 dependencies {
@@ -89,7 +81,7 @@ dependencies {
     compile "org.springframework.boot:spring-boot-starter-thymeleaf:1.5.10.RELEASE"
 
     // Matrix Java SDK
-    compile 'io.kamax:matrix-java-sdk:0.0.14-8-g0e57ec6'
+    compile 'io.kamax:matrix-java-sdk:0.0.11'
 
     // ed25519 handling
     compile 'net.i2p.crypto:eddsa:0.1.0'
@@ -107,8 +99,11 @@ dependencies {
     compile 'com.googlecode.libphonenumber:libphonenumber:8.7.1'
 
     // E-mail sending
-    compile 'com.sun.mail:javax.mail:1.6.2'
+    compile 'com.sun.mail:javax.mail:1.5.6'
-    compile 'javax.mail:javax.mail-api:1.6.2'
+    compile 'javax.mail:javax.mail-api:1.5.6'
+
+    // Google Client APIs
+    compile 'com.google.api-client:google-api-client:1.23.0'
 
     // Google Firebase Authentication backend
     compile 'com.google.firebase:firebase-admin:5.3.0'
@@ -134,12 +129,8 @@ dependencies {
     // SendGrid SDK to send emails from GCE
     compile 'com.sendgrid:sendgrid-java:2.2.2'
 
-    // ZT-Exec for exec identity store
-    compile 'org.zeroturnaround:zt-exec:1.10'
-
     testCompile 'junit:junit:4.12'
     testCompile 'com.github.tomakehurst:wiremock:2.8.0'
-    testCompile 'com.unboundid:unboundid-ldapsdk:4.0.9'
 }
 
 springBoot {
@@ -163,7 +154,7 @@ processResources {
 
 task buildDeb(dependsOn: build) {
     doLast {
-        def v = mxisdVersion()
+        def v = gitVersion()
         println "Version for package: ${v}"
         mkdir distDir
         mkdir debBuildBasePath

docs/README.md

@@ -1,6 +1,4 @@
 # Table of Contents
-- [Identity Concepts in Matrix](concepts.md)
-- [Getting Started](getting-started.md)
 - [Build from sources](build.md) (Optional)
 - Installation
   - [Debian package](install/debian.md)
@@ -22,4 +20,3 @@
     - [SendGrid](threepids/notification/sendgrid-handler.md)
 - [Sessions](threepids/session/session.md)
   - [Views](threepids/session/session-views.md)
-- [FAQ](faq.md)

docs/architecture.md

@@ -18,9 +18,12 @@ TCP 443
           |   +-------------------+
  TCP 8090 +-> | mxisd             |
               |                   |
-              | - Profile's 3PIDs |
+              | - Profile's 3PIDs >----+
-              | - 3PID Invites    |
+              | - 3PID Invites    |    |             +--------------------------+
-              +-|-----------------+
+              +-|-----------------+    +>----------> | Central Identity service |
+                |                      |   TCP 443   | Matrix.org / Vector.im   |
+                |                      |             +--------------------------+
+                +>-------------------->+
                 |
              TCP 443
                 |  +------------------------+

docs/build.md

@@ -12,7 +12,7 @@
 
 ### Build
 ```bash
-git clone https://github.com/kamax-matrix/mxisd.git
+git clone https://github.com/kamax-io/mxisd.git
 cd mxisd
 ./gradlew build
 ```

docs/faq.md

@@ -5,7 +5,7 @@ Identity in Matrix is one of the most difficult topic, mainly as it has not rece
 
 We have tried our best to put together documentation that requires almost no knowledge of Matrix inner workings to get a
 first basic setup running which relies on you reading the documentation in the right order:
-- [The Concepts](concepts.md) in few words.
+- [The  Concepts](concepts.md) in few words.
 - [Getting Started](getting-started.md) step-by-step to a minimal working install.
 - [Identity stores](stores/README.md) you wish to fetch data from.
 - [Features](features) you are interested in that will use your Identity store(s) data.
@@ -19,9 +19,8 @@ started and answer questions you might have.
 ### Do I need to use mxisd if I run a Homeserver?
 No, but it is strongly recommended, even if you don't use any Identity store or integration.
 
-In its default configuration, mxisd uses other federated public servers when performing queries.  
+In its default configuration, mxisd will talk to the central Matrix Identity servers and use other federated public
-It can also [be configured](features/identity.md#lookups) to use the central matrix.org servers, giving you access to at
+servers when performing queries, giving you access to at least the same information as if you were not running it.
-least the same information as if you were not running it.
 
 It will also give your users a choice to make their 3PIDs available publicly, ensuring they are made aware of the
 privacy consequences, which is not the case with the central Matrix.org servers.
@@ -71,15 +70,18 @@ So really, you should go with mxisd.
 ### Will I loose access to the central Matrix.org/Vector.im Identity data if I use mxisd?
 No.
 
-In its default configuration, mxisd does not talk to the central Identity server matrix.org to avoid leaking your private
+In its default configuration, mxisd act as a proxy to Matrix.org/Vector.im. You will have access to the same data and
-data and those of people you might know.
+behaviour than if you were using them directly. There is no downside in using mxisd with the default configuration.
 
-mxisd [can be configured](features/identity.md#lookups) to talk to the central Identity servers if you wish.
+mxisd can also be configured not to talk to the central Identity servers if you wish.
 
 ### So mxisd is just a big hack! I don't want to use non-official features!
-mxisd primary concerns are your privacy and to always be compatible with the Matrix ecosystem and the Identity service API.  
+mxisd primary concern is to always be compatible with the Matrix ecosystem and the Identity service API.  
 Whenever the API will be updated and/or enhanced, mxisd will follow, remaining 100% compatible with the ecosystem.
 
+Therefore, using mxisd is a safe choice. It will be like using the central Matrix.org Identity servers, yet not closing
+the door to a growing list of enhancements and integrations.
+
 ### Should I use mxisd if I don't host my own Homeserver?
 No.
 

docs/features/authentication.md

@@ -74,15 +74,7 @@ See your Identity store [documentation](../stores/README.md) on how to enable th
 
 
 ## Advanced
-The Authentication feature allows users to:
+The Authentication feature allows users to login to their Homeserver by using their 3PIDs in a configured Identity store.
-- Rewrite usernames matching a pattern to be mapped to another username via a 3PID.
-- login to their Homeserver by using their 3PIDs in a configured Identity store.
-
-This feature also allows to work around the following issues:
-- Lowercase all usernames for synapse, allowing case-insensitive login
-- Unable to login on synapse if username is numerical
-- Any generic transformation of username prior to sending to synapse, bypassing the restriction that password providers
-cannot change the localpart being authenticated.
 
 ### Overview
 This is performed by intercepting the Homeserver endpoint `/_matrix/client/r0/login` as depicted below:
@@ -117,10 +109,10 @@ Steps of user authentication using a 3PID:
 4. The response from the Homeserver is sent back to the client, believing it was the HS which directly answered.
 
 ### Requirements
-- Compatible [Identity store](../stores/README.md)
 - [Basic Authentication configured and working](#basic)
-- Client and Homeserver using the [C2S API r0.4.x](https://matrix.org/docs/spec/client_server/r0.4.0.html) or later
 - Reverse proxy setup
+- Homeserver
+- Compatible [Identity store](../stores/README.md)
 
 ### Configuration
 #### Reverse Proxy
@@ -156,45 +148,7 @@ dns.overwrite.homeserver.client:
     value: 'http://localhost:8008'
 ```
 `name` must be the hostname of the URL that clients use when connecting to the Homeserver.
-You can use `${server.name}` to auto-populate the `value` using the `server.name` configuration option and avoid duplicating it.
+In case the hostname is the same as your Matrix domain, you can use `${matrix.domain}` to auto-populate the `value`
-In case the hostname is the same as your Matrix domain and `server.name` is not explicitely set in the config, `server.name` will default to
+using the `matrix.domain` configuration option and avoid duplicating it.
-`matrix.domain` and will still probably have the correct value.
 
 `value` is the base internal URL of the Homeserver, without any `/_matrix/..` or trailing `/`.
-
-#### Username rewrite
-In mxisd config:
-```yaml
-auth:
-  rewrite:
-    user:
-      rules:
-        - regex: <your regexp>
-          medium: 'your.custom.medium.type'
-```
-`rules` takes a list of rules. Rules have two properties:
-- `regexp`: The regex pattern to match. This **MUST** match the full string. See [Java regex](https://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html) for syntax.
-- `medium`: Custom 3PID type that will be used in the 3PID lookup. This can be anything you want and needs to be supported
-by your Identity store config and/or code.
-
-Rules are matched in listed order.
-
-Common regexp patterns:
-- Numerical usernames: `[0-9]+`
-
-##### LDAP Example
-If your users use their numerical employee IDs, which cannot be used with synapse, you can make it work with (relevant config only):
-```yaml
-auth:
-  rewrite:
-    user:
-      rules:
-        - regex: '[0-9]+'
-          medium: 'kmx.employee.id'
-          
-ldap:
-  attribute:
-    threepid:
-      kmx.employee.id:
-        - 'ldapAttributeForEmployeeId'
-```

docs/features/directory.md

@@ -138,12 +138,5 @@ the `matrix.domain` configuration option and avoid duplicating it.
 You can configure if the Homeserver should be queried at all when doing a directory search.  
 To disable Homeserver results, set the following in mxisd configuration file:
 ```yaml
-directory.exclude.homeserver: true
+directory.exclude.homeserever: true
-```
-
-### 3PID exclusion in search
-You can configure if the 3PID should also be included when doing a directory search.
-By default, a search is performed on the 3PIDs. If you would like to not include them:
-```yaml
-directory.exclude.threepid: true
 ```

docs/features/experimental/application-service.md

@@ -1,72 +0,0 @@
-# Integration as an Application Service
-**WARNING:** These features are currently highly experimental. They can be removed or modified without notice.  
-All the features requires a Homeserver capable of connecting Application Services.
-
-## Email notification for Room invites by Matrix ID
-This feature allows for users found in Identity stores to be instantly notified about Room Invites, regardless if their
-account was already provisioned on the Homeserver.
-
-### Requirements
-- [Identity store(s)](../../stores/README.md) supporting the Profile feature
-- At least one email entry in the identity store for each user that could be invited.
-
-### Configuration
-In your mxisd config file:
-```yaml
-matrix:
-  listener:
-    url:  '<URL TO THE CS API OF THE HOMESERVER>'
-    localpart: 'appservice-mxisd'
-    token:
-      hs: 'HS_TOKEN_CHANGE_ME'
-
-synapseSql:
-  enabled: false ## Do not use this line if Synapse is used as an Identity Store
-  type: '<DB TYPE>'
-  connection: '<DB CONNECTION URL>'
-```
-
-The `synapseSql` section is used to retrieve display names which are not directly accessible in this mode.
-For details about `type` and `connection`, see the [relevant documentation](../../stores/synapse.md).
-If you do not configure it, some placeholders will not be available in the notification, like the Room name.
-
-You can also change the default template of the notification using the `generic.matrixId` template option.  
-See [the Template generator documentation](../../threepids/notification/template-generator.md) for more info.
-
-### Homeserver integration
-#### Synapse
-Create a new appservice registration file. Futher config will assume it is in `/etc/matrix-synapse/appservice-mxisd.yaml`
-```yaml
-id: "appservice-mxisd"
-url: "http://127.0.0.1:8090"
-as_token: "AS_TOKEN_CHANGE_ME"
-hs_token: "HS_TOKEN_CHANGE_ME"
-sender_localpart: "appservice-mxisd"
-namespaces:
-  users:
-    - regex: "@*"
-      exclusive: false
-  aliases: []
-  rooms: []
-```
-`id`: An arbitrary unique string to identify the AS.  
-`url`: mxisd to reach mxisd. This ideally should be HTTP and not going through any reverse proxy.  
-`as_token`: Arbitrary value used by mxisd when talking to the HS. Not currently used.  
-`hs_token`: Arbitrary value used by synapse when talking to mxisd. Must match `token.hs` in mxisd config.
-`sender_localpart`: Username for the mxisd itself on the HS. Default configuration should be kept.  
-`namespaces`: To be kept as is.  
-
-Edit your `homeserver.yaml` and add a new entry to the appservice config file, which should look something like this:
-```yaml
-app_service_config_files:
-  - '/etc/matrix-synapse/appservice-mxisd.yaml'
-  - ...
-```
-
-Restart synapse when done to register mxisd.
-
-#### Others
-See your Homeserver documentation on how to integrate.
-
-### Test
-Invite a user which is part of your domain while an appropriate Identity store is used.

docs/features/experimental/profile.md

@@ -1,16 +0,0 @@
-# Profile
-**WARNING**: The following sub-features are considered experimental and not officially supported. Use at your own peril.
-
-## Public Profile enhancement
-This feature allows to enhance a public profile query with more info than just Matrix ID and Display name, allowing for
-custom applications to retrieve custom data not currently provided by synapse, per example.
-
-**WARNING**: This information can be queried without authentication as per the specification. Do not enable unless in a
-controlled environment.
-
-### Configuration
-#### Reverse proxy
-##### Apache
-```apache
-ProxyPassMatch "^/_matrix/client/r0/profile/([^/]+)$" "http://127.0.0.1:8090/_matrix/client/r0/profile/$1"
-```

docs/features/federation.md

@@ -5,8 +5,8 @@ Federated Identity server using the DNS domain part of the 3PID.
 Emails are the best candidate for this kind of resolution which are DNS domain based already.  
 On the other hand, Phone numbers cannot be resolved this way.
 
-For 3PIDs which are not compatible with the DNS system, mxisd can be configured to talk to fallback Identity servers like
+For 3PIDs which are not compatible with the DNS system, mxisd will talk to the central Identity server of matrix.org by
-the central matrix.org one. See the [Identity feature](identity.md#lookups) for instructions on how to enable it.
+default.
 
 Outbound federation is enabled by default while inbound federation is opt-in and require a specific DNS record.
 
@@ -17,14 +17,16 @@ Outbound federation is enabled by default while inbound federation is opt-in and
               |                   |   |      +------> +----------+
               |                   |   |      |
               | Invites / Lookups |   |      |
- Federated    | +--------+        |   |      |
+ Federated    | +--------+        |   |      |        +-------------------+
- Identity  ---->| Remote |>-----------+      |
+ Identity  ---->| Remote |>-----------+      +------> | Remote Federated  |
- Server       | +--------+        |          |
+ Server       | +--------+        |          |        | mxisd servers     |
-              |                   |          |
+              |                   |          |        +-------------------+
-              | +--------+        |          |        +-------------------+
+              | +--------+        |          |
- Homeserver --->| Local  |>------------------+------> | Remote Federated  |
+ Homeserver --->| Local  |>------------------+
- and clients  | +--------+        |                   | mxisd servers     |
+ and clients  | +--------+        |          |        +--------------------------+ 
-              +-------------------+                   +-------------------+
+              +-------------------+          +------> | Central Identity service |
+                                                      | Matrix.org / Vector.im   |
+                                                      +--------------------------+
 ```
 
 ## Inbound

docs/features/identity.md

@@ -3,16 +3,6 @@
 
 Implementation of the [Unofficial Matrix Identity Service API](https://kamax.io/matrix/api/identity_service/unstable.html).
 
-## Lookups
-If you would like to use the central matrix.org Identity server to ensure maximum discovery at the cost of potentially
-leaking all your contacts information, add the following to your configuration:
-```yaml
-forward.servers:
-  - 'matrix-org'
-```
-**NOTE:** You should carefully consider enabling this option, which is discouraged.  
-For more info, see the [relevant issue](https://github.com/kamax-matrix/mxisd/issues/76).
-
 ## Room Invitations
 Resolution can be customized using the following configuration:
 

docs/features/profile.md

@@ -1,10 +1,9 @@
-# Profile
+# Profile enhancement
-The profile feature does not do anything on its own and acts as a support feature for others, allowing to retrieve
+**WARNING**: Alpha feature not officially supported. Do not use.
-information about a user based on its Matrix ID by querying enabled [Identity stores](../stores/README.md).
 
-Currently supported:
+## Configuration
-- Display name
+### Reverse proxy
-- 3PIDs
+#### Apache
-- Roles/Groups
+```apache
-
+ProxyPassMatch "^/_matrix/client/r0/profile/([^/]+)$" "http://127.0.0.1:8090/_matrix/client/r0/profile/$1"
-Experimental sub-features are also available. See [the dedicated document](experimental/profile.md).
+```

docs/getting-started.md

@@ -12,7 +12,7 @@ This will be a good ground work for further integration with features and your e
 
 ## Preparation
 You will need:
-- Working Homeserver, ideally with working federation
+- Homeserver
 - Reverse proxy with regular TLS/SSL certificate (Let's encrypt) for your mxisd domain
 
 As synapse requires an HTTPS connection when talking to an Identity service, **a reverse proxy is required** as mxisd does
@@ -20,7 +20,7 @@ not support HTTPS listener at this time.
 
 For maximum integration, it is best to have your Homeserver and mxisd reachable via the same hostname.
 
-Be aware of a [NAT/Reverse proxy gotcha](https://github.com/kamax-matrix/mxisd/wiki/Gotchas#nating) if you use the same
+Be aware of a [NAT/Reverse proxy gotcha](https://github.com/kamax-io/mxisd/wiki/Gotchas#nating) if you use the same
 hostname.
 
 The following Quick Start guide assumes you will host the Homeserver and mxisd under the same hostname.  
@@ -29,13 +29,11 @@ If you would like a high-level view of the infrastructure and how each feature i
 
 ## Install
 Install via:
-- [Docker image](install/docker.md)
 - [Debian package](install/debian.md)
-- [ArchLinux](install/archlinux.md)
+- [Docker image](install/docker.md)
-- [NixOS](install/nixos.md)
 - [Sources](build.md)
 
-See the [Latest release](https://github.com/kamax-matrix/mxisd/releases/latest) for links to each.
+See the [Latest release](https://github.com/kamax-io/mxisd/releases/latest) for links to each.
 
 ## Configure
 **NOTE**: please view the install instruction for your platform, as this step might be optional or already handled for you.
@@ -120,15 +118,10 @@ It is recommended to remove `matrix.org` and `vector.im` (or any other default e
 your own Identity server is authoritative for your HS.
 
 ## Validate
-**NOTE:** In case your homeserver has no working federation, step 5 will not happen. If step 4 took place, consider
+Log in using your Matrix client and set `https://example.org` as your Identity server URL, replacing `example.org` by
-your installation validated.
-
-1. Log in using your Matrix client and set `https://example.org` as your Identity server URL, replacing `example.org` by
 the relevant hostname which you configured in your reverse proxy.  
-2. Create a new empty room. All further actions will take place in this room.
+Invite `mxisd-federation-test@kamax.io` to a room, which should be turned into a Matrix invite to `@mxisd-lookup-test:kamax.io`.
-3. Invite `mxisd-federation-test@kamax.io`
+At this point, the test user will join the room, send a congratulation message and leave.  
-4. The 3PID invite should be turned into a Matrix invite to `@mxisd-lookup-test:kamax.io`.
-5. The invited test user will join the room, send a congratulation message and leave.
 **NOTE:** You might not see a suggestion for the e-mail address, which is normal. Still proceed with the invite.
   
 If it worked, it means you are up and running and can enjoy mxisd in its basic mode! Congratulations!  

docs/install/debian.md

@@ -1,9 +1,6 @@
 # Debian package
-## Requirements
-- Any distribution that supports Java 8
-
 ## Install
-1. Download the [latest release](https://github.com/kamax-matrix/mxisd/releases/latest)
+1. Download the [latest release](https://github.com/kamax-io/mxisd/releases/latest)
 2. Run:
 ```bash
 dpkg -i /path/to/downloaded/mxisd.deb

docs/install/nixos.md

@@ -1,8 +0,0 @@
-# NixOS package
-mxisd is available as a NixOS package in the official repos.
-
-It is maintained by [maximilian](https://matrix.to/#/@maximilian:transformierende-gesellschaft.org), a community member.  
-
-Related resources:
-- [NixOS](https://nixos.org/)
-- [The module definition](https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/services/networking/mxisd.nix)

docs/stores/README.md

@@ -1,8 +1,7 @@
 # Identity Stores
-- [Synapse](synapse.md) - Turn your SynapseDB into a self-contained Identity store
+- [Synapse](synapse.md)
-- [LDAP-based](ldap.md) - Any LDAP-based product like Active Directory, Samba, NetIQ, OpenLDAP
+- [LDAP-based](ldap.md)
-- [SQL Databases](sql.md) - Most common databases like MariaDB, MySQL, PostgreSQL, SQLite
+- [SQL Databases](sql.md)
-- [Website / Web service / Web app](rest.md) - Arbitrary REST endpoints
+- [Website / Web service / Web app](rest.md)
-- [Executables](exec.md) - Run arbitrary executables with configurable stdin, arguments, environment and stdout
+- [Google Firebase](firebase.md)
-- [Wordpress](wordpress.md) - Connect your Wordpress-powered website DB
+- [Wordpress](wordpress.md)
-- [Google Firebase](firebase.md) - Use your Firebase users (with experimental SSO support!)

docs/stores/exec.md

@@ -1,470 +0,0 @@
-# Exec Identity Store
-- [Features](#features)
-- [Overview](#overview)
-- [Configuration](#configuration)
-  - [Global](#global)
-    - [Tokens](#tokens)
-  - [Executable](#executable)
-    - [Input](#input)
-    - [Output](#output)
-  - [Examples](#examples)
-  - [Per-Feature](#per-feature)
-- [Authentication](#authentication)
-  - [Tokens](#tokens-1)
-  - [Input](#input-1)
-  - [Output](#output-1)
-- [Directory](#directory)
-  - [Tokens](#tokens-2)
-  - [Input](#input-2)
-  - [Output](#output-2)
-- [Identity](#identity)
-  - [Single Lookup](#single-lookup)
-    - [Tokens](#tokens-3)
-    - [Input](#input-3)
-    - [Output](#output-3)
-  - [Bulk Lookup](#bulk-lookup)
-    - [Tokens](#tokens-4)
-    - [Input](#input-4)
-    - [Output](#output-4)
-- [Profile](#profile)
-  - [Tokens](#tokens-5)
-  - [Input](#input-5)
-  - [Output](#output-5)
-  
----
-
-## Features
-|                       Name                      | Supported |
-|-------------------------------------------------|-----------|
-| [Authentication](../features/authentication.md) | Yes       |
-| [Directory](../features/directory.md)           | Yes       |
-| [Identity](../features/identity.md)             | Yes       |
-| [Profile](#profile)                             | Yes       |
-
-This Identity Store lets you run arbitrary commands to handle the various requests in each support feature.  
-It is the most versatile Identity store of mxisd, allowing you to connect any kind of logic with any executable/script.
-
-## Overview
-Each request can be mapping to a fully customizable command configuration.  
-The various parameters can be provided via any combination of:
-- [Standard Input](https://en.wikipedia.org/wiki/Standard_streams#Standard_input_(stdin))
-- [Command-line arguments](https://en.wikipedia.org/wiki/Command-line_interface#Arguments)
-- [Environment variables](https://en.wikipedia.org/wiki/Environment_variable)
-
-Each of those supports a set of customizable token which will be replaced prior to running the command, allowing to
-provide the input values in any number of ways.
-
-Success and data will be provided via any combination of:
-- [Exit status](https://en.wikipedia.org/wiki/Exit_status)
-- [Standard Output](https://en.wikipedia.org/wiki/Standard_streams#Standard_output_(stdout))
-
-Each of those supports a set of configuration item to decide how to process the value and/or in which format.
-
-All values, inputs and outputs are UTF-8 encoded.
-
-## Configuration
-Each feature comes with a set of possible lookup/action which is mapped to a generic configuration item block.  
-We will use the term `Executable` for each lookup/action and `Processor` for each configuration block.
-
-### Global
-```yaml
-exec.enabled: <boolean>
-```
-Enable/disable the Identity store at a global/default level. Each feature can still be individually enabled/disabled.
-
-#### Tokens
-The following options allow to globally set tokens for value replacement across all features and processors config.  
-Not all features use all tokens, and each feature might also have its own specific tokens. See each feature documentation.
-  
-They can be set within the following scope:
-
-```yaml
-exec.token.<token>: '<value>'
-```
-
----
-
-The following tokens and default values are available:
-```yaml
-localpart: '{localpart}'
-```
-Localpart of Matrix User IDs
-
-```yaml
-domain: '{domain}'
-```
-Domain of Matrix User IDs
-
-```yaml
-mxid: '{mxid}'
-```
-Full representation of Matrix User IDs
-
-```yaml
-medium: '{medium}'
-```
-Medium of 3PIDs
-
-```yaml
-address: '{address}'
-```
-Address of 3PIDs
-
-```yaml
-type: '{type}'
-```
-Type of query
-
-```yaml
-query: '{query}'
-```
-Query value
-
-### Executable
-*Executable*s have the following options:
-```yaml
-command: '/path/to/executableOrScript'
-
-```
-Set the executable (relative or absolute) path to be executed. If no command is given, the action will return a "neutral"
-result if possible or be skipped altogether.
-
----
-
-Command line arguments can be given via a list via both YAML formats:
-```yaml
-args:
- - '-t'
- - '{token}'
- - '-v'
- - 'value'
-```
-or
-```yaml
-args: ['-t', '{token}', '-v', 'value]
-```
-Each argument will be processed for token replacement.
-
----
-
-Environment variables can be given as key/value pairs:
-```yaml
-env:
-  ENV_VAR_1: 'value'
-  ENV_VAR_2: '{token}'
-``` 
-Each variable value will be processed for token replacement.
-
-#### Input
-Standard input can be configured in the namespaces `input` with:
-- `type`: The format to use
-- `template`: The full or partial template with tokens to be used when generating the input
-
-Not all features and *Executable*s allow for a template to be provided.  
-Templates for listed-based input are not supported at this time.  
-Default templates may be provided per *Executable*.
-
-The following types are available:
-- `json`: Use JSON format, shared with the [REST Identity Store](rest.md)
-- `plain`: Use a custom multi-lines, optionally tab-separated input
-
-#### Output
-Standard output can be configured in the namespaces `output` with:
-- `type`: The format to use
-- `template`: The full or partial template with tokens to be used when processing the output
-
-Not all features and *Executable*s allow for a template to be provided.  
-Templates for listed-based output are not supported at this time.  
-Default templates may be provided per *Executable*.
-
-The following types are available:
-- `json`: Use JSON format, shared with the [REST Identity Store](rest.md)
-- `plain`: Use a custom multi-lines, optionally tab-separated output
-
-### Examples
-#### Basic
-```yaml
-exec.auth.enabled: true
-exec.auth.command: '/opt/mxisd-exec/auth.sh'
-exec.auth.args: ['{localpart}']
-exec.auth.input.type: 'plain'
-exec.auth.input.template: '{password}'
-exec.auth.env:
-  DOMAIN: '{domain}'
-```
-With Authentication enabled, run `/opt/mxisd-exec/auth.sh` when validating credentials, providing:
-- A single command-line argument to provide the `localoart` as username 
-- A plain text string with the password token for standard input, which will be replaced by the password to check
-- A single environment variable `DOMAIN` containing Matrix ID domain, if given
-
-The command will use the default values for:
-- Success exit status of `0`
-- Failure exit status of `1`
-- Any other exit status considered as error
-- The standard output processing as not processed
-
-#### Advanced
-Given the fictional `placeholder` feature:
-```yaml
-exec.enabled: true
-exec.token.mxid: '{matrixId}'
-
-exec.placeholder.token.localpart: '{username}'
-exec.placeholder.command: '/path/to/executable'
-exec.placeholder.args:
-  - '-u'
-  - '{username}'
-exec.placeholder.env:
-  MATRIX_DOMAIN: '{domain}'
-  MATRIX_USER_ID: '{matrixId}'
-  
-exec.placeholder.output.type: 'json'
-exec.placeholder.exit.success: [0, 128]
-exec.placeholder.exit.failure: [1, 129]
-```
-With:
-- The Identity store enabled for all features
-- A global specific token `{matrixId}` for Matrix User IDs, replacing the default `{mxid}`
-
-Running `/path/to/executable` providing:
-- A custom token for localpart, `{username}`, used as a 2nd command-line argument
-- An extracted Matrix User ID `localpart` provided as the second command line argument, the first one being `-u` 
-- A password, the extracted Matrix `domain` and the full User ID as arbitrary environment variables, respectively
-  `PASSWORD`, `MATRIX_DOMAIN` and `MATRIX_USER_ID`
-
-After execution:
-- Process stdout as [JSON](https://en.wikipedia.org/wiki/JSON)
-- Consider exit status `0` and `128` as success and try to process the stdout for data
-- Consider exit status `1` and `129` as failure and try to process the stdout for error code and message
-
-### Per Feature
-See each dedicated [Feature](#features) section.
-
-## Authentication
-The Authentication feature can be enabled/disabled using:
-```yaml
-exec.auth.enabled: <true/false>
-```
-
----
-
-This feature provides a single *Executable* under the namespace:
-```yaml
-exec.auth:
-  ...
-```
-
-### Tokens
-The following tokens/default values are specific to this feature:
-```yaml
-password: '{password}'
-```
-The provided password
-
-### Input
-Supported input types and default templates:
-
-#### JSON (`json`)
-Same as the [REST Identity Store](rest.md);
-
-#### Plain (`plain`)
-Default template:
-```
-{localpart}
-{domain}
-{mxid}
-{password}
-```
-
-### Output
-Supported output types and default templates:
-
-#### JSON (`json`)
-Same as the [REST Identity Store](rest.md);
-
-#### Plain (`plain`)
-**NOTE:** This has limited support. Use the JSON type for full support.
-
-Default template:
-```
-[success status, true or 1 are interpreted as success]
-[display name of the user]
-```
-
-## Directory
-The Directory feature can be enabled/disabled using:
-```yaml
-exec.directory.enabled: <true/false>
-```
-
----
-
-Two search types configuration namespace are available, using the same input/output formats and templates:
-
-By name:
-```yaml
-exec.directory.search.byName:
-  ...
-```
-By 3PID:
-```yaml
-exec.directory.search.byThreepid:
-  ...
-```
-
-#### Tokens
-No specific tokens are available.
-
-#### Input
-Supported input types and default templates:
-
-##### JSON (`json`)
-Same as the [REST Identity Store](rest.md);
-
-##### Plain (`plain`)
-Default template:
-```
-[type of search, following the REST Identity store format]
-[query string]
-```
-
-#### Output
-Supported output types and default templates:
-
-##### JSON (`json`)
-Same as the [REST Identity Store](rest.md);
-
-##### Plain (`plain`)
-**Not supported at this time.** Use the JSON type.
-
-## Identity
-The Identity feature can be enabled/disabled using:
-```yaml
-exec.identity.enabled: <true/false>
-```
-
-### Single lookup
-Configuration namespace:
-```yaml
-exec.identity.lookup.single:
-  ...
-```
-
-#### Tokens
-No specific tokens are available.
-
-#### Input
-Supported input types and default templates:
-
-##### JSON (`json`)
-Same as the [REST Identity Store](rest.md);
-
-##### Plain (`plain`)
-Default template:
-```
-{medium}
-{address}
-```
-
-#### Output
-Supported output types and default templates:
-
-##### JSON (`json`)
-Same as the [REST Identity Store](rest.md);
-
-##### Plain (`plain`)
-Default template:
-```
-[User ID type, as documented in the REST Identity Store]
-[User ID value]
-```
-
-The User ID type will default to `localpart` if:
-- Only one line is returned
-- The first line is empty
-
-### Bulk lookup
-Configuration namespace:
-```yaml
-exec.identity.lookup.bulk:
-  ...
-```
-
-#### Tokens
-No specific tokens are available.
-
-#### Input
-Supported input types and default templates:
-
-##### JSON (`json`)
-**NOTE:** Custom Templates are not supported.
-
-Same as the [REST Identity Store](rest.md).
-
-##### Plain (`plain`)
-**Not supported at this time.** Use the JSON type.
-
-#### Output
-Supported output types and default templates:
-
-##### JSON (`json`)
-**NOTE:** Custom Templates are not supported.
-
-Same as the [REST Identity Store](rest.md).
-
-##### Plain (`plain`)
-**Not supported at this time.** Use the JSON type.
-
-## Profile
-The Profile feature can be enabled/disabled using:
-```yaml
-exec.profile.enabled: <true/false>
-```
-
----
-
-The following *Executable*s namespace are available, share the same input/output formats and templates:
-
-Get Display name:
-```yaml
-exec.profile.displayName:
-  ...
-```
-
-Get 3PIDs:
-```yaml
-exec.profile.threePid:
-  ...
-```
-
-Get Roles:
-```yaml
-exec.profile.role:
-  ...
-```
-
-
-### Tokens
-No specific tokens are available.
-
-### Input
-Supported input types and default templates:
-
-#### JSON (`json`)
-Same as the [REST Identity Store](rest.md);
-
-#### Plain (`plain`)
-Default template:
-```
-{localpart}
-{domain}
-{mxid}
-```
-### Output
-Supported output types and default templates:
-
-#### JSON (`json`)
-Same as the [REST Identity Store](rest.md);
-
-#### Plain (`plain`)
-**Not supported at this time.** Use the JSON type.

docs/stores/firebase.md

@@ -7,7 +7,6 @@ https://firebase.google.com/
 | Authentication | Yes        |
 | Directory      | No         |
 | Identity       | Yes        |
-| Profile        | No         |
 
 ## Requirements
 This backend requires a suitable Matrix client capable of performing Firebase authentication and passing the following

docs/stores/ldap.md

@@ -13,7 +13,6 @@ For NetIQ, replace all the `ldap` prefix in the configuration by `netiq`.
 | Authentication | Yes        |
 | Directory      | Yes        |
 | Identity       | Yes        |
-| Profile        | Yes        |
 
 ## Getting started
 ### Base
@@ -24,13 +23,10 @@ ldap.connection.host: 'ldapHostnameOrIp'
 ldap.connection.port: 389
 ldap.connection.bindDn: 'CN=My Mxisd User,OU=Users,DC=example,DC=org'
 ldap.connection.bindPassword: 'TheUserPassword'
-ldap.connection.baseDNs:
+ldap.connection.baseDn: 'OU=Users,DC=example,DC=org'
-  - 'OU=Users,DC=example,DC=org'
 ```
 These are standard LDAP connection configuration. mxisd will try to connect on port default port 389 without encryption.
 
-If you would like to use several Base DNs, simply add more entries under `baseDNs`.
-
 ### TLS/SSL connection
 If you would like to use a TLS/SSL connection, use the following configuration options (STARTLS not supported):
 ```yaml

docs/stores/rest.md

@@ -3,45 +3,37 @@ The REST backend allows you to query identity data in existing webapps, like:
 - Forums (phpBB, Discourse, etc.)
 - Custom Identity stores (Keycloak, ...)
 - CRMs (Wordpress, ...)
-- Self-hosted clouds (Nextcloud, ownCloud, ...)
+- self-hosted clouds (Nextcloud, ownCloud, ...)
 
-To integrate this backend with your webapp, you will need to implement the REST endpoints described below.
+To integrate this backend with your webapp, you will need to implement three specific REST endpoints detailed below.
 
 ## Features
-| Name                                            | Supported? |
+|      Name      | Supported? |
-|-------------------------------------------------|------------|
+|----------------|------------|
-| [Authentication](../features/authentication.md) | Yes        |
+| Authentication | Yes        |
-| [Directory](../features/directory.md)           | Yes        |
+| Directory      | Yes        |
-| [Identity](../features/identity.md)             | Yes        |
+| Identity       | Yes        |
-| [Profile](../features/profile.md)               | Yes        |
 
 ## Configuration
-| Key                                  | Default                                        | Description                                          |
+| Key                              | Default                                        | Description                                          |
-|--------------------------------------|------------------------------------------------|------------------------------------------------------|
+|----------------------------------|------------------------------------------------|------------------------------------------------------|
-| `rest.enabled`                       | `false`                                        | Globally enable/disable the REST backend             |
+| `rest.enabled`                   | `false`                                        | Globally enable/disable the REST backend             |
-| `rest.host`                          | *None*                                         | Default base URL to use for the different endpoints. |
+| `rest.host`                      | *None*                                        | Default base URL to use for the different endpoints. |
-| `rest.endpoints.auth`                | `/_mxisd/backend/api/v1/auth/login`            | Validate credentials and get user profile            |
+| `rest.endpoints.auth`            | `/_mxisd/backend/api/v1/auth/login`            | Validate credentials and get user profile            |
-| `rest.endpoints.directory`           | `/_mxisd/backend/api/v1/directory/user/search` | Search for users by arbitrary input                  |
+| `rest.endpoints.directory`       | `/_mxisd/backend/api/v1/directory/user/search` | Search for users by arbitrary input                  |
-| `rest.endpoints.identity.single`     | `/_mxisd/backend/api/v1/identity/single`       | Endpoint to query a single 3PID                      |
+| `rest.endpoints.identity.single` | `/_mxisd/backend/api/v1/identity/single`       | Endpoint to query a single 3PID                      |
-| `rest.endpoints.identity.bulk`       | `/_mxisd/backend/api/v1/identity/bulk`         | Endpoint to query a list of 3PID                     |
+| `rest.endpoints.identity.bulk`   | `/_mxisd/backend/api/v1/identity/bulk`         | Endpoint to query a list of 3PID                     |
-| `rest.endpoints.profile.displayName` | `/_mxisd/backend/api/v1/profile/displayName`   | Query the display name for a Matrix ID
-| `rest.endpoints.profile.threepids`   | `/_mxisd/backend/api/v1/profile/threepids`     | Query the 3PIDs for a Matrix ID
-| `rest.endpoints.profile.roles`       | `/_mxisd/backend/api/v1/profile/roles`         | Query the Roles for a Matrix ID
 
 Endpoint values can handle two formats:
 - URL Path starting with `/` that gets happened to the `rest.host`
 - Full URL, if you want each endpoint to go to a specific server/protocol/port
 
-If an endpoint value is configured as an empty string, it will disable that specific feature, essentially bypassing the
-Identity store for that specific query.
-
 `rest.host` is mandatory if at least one endpoint is not a full URL.
 
 ## Endpoints
 ### Authentication
-- Method: `POST`
+HTTP method: `POST`  
-- Content-Type: `application/json` (JSON)
+Content-type: JSON UTF-8
-- Encoding: `UTF8`
   
 #### Request Body
 ```json
@@ -94,9 +86,8 @@ If the authentication succeed:
 ```
 
 ### Directory
-- Method: `POST`
+HTTP method: `POST`
-- Content-Type: `application/json` (JSON)
+Content-type: JSON UTF-8
-- Encoding: `UTF8`
 
 #### Request Body
 ```json
@@ -121,7 +112,7 @@ If users found:
       "user_id": "UserIdLocalpart"
     },
     {
-      "...": "..."
+      ...
     }
   ]
 }
@@ -137,11 +128,10 @@ If no user found:
 
 ### Identity
 #### Single 3PID lookup
-- Method: `POST`
+HTTP method: `POST`  
-- Content-Type: `application/json` (JSON)
+Content-type: JSON UTF-8  
-- Encoding: `UTF8`
   
-##### Request Body
+#### Request Body
 ```json
 {
   "lookup": {
@@ -151,7 +141,7 @@ If no user found:
 }
 ```
 
-##### Response Body
+#### Response Body
 If a match was found:
 - `lookup.id.type` supported values: `localpart`, `mxid`
 ```json
@@ -173,11 +163,10 @@ If no match was found:
 ```
 
 #### Bulk 3PID lookup
-- Method: `POST`
+HTTP method: `POST`  
-- Content-Type: `application/json` (JSON)
+Content-type: JSON UTF-8  
-- Encoding: `UTF8`
   
-##### Request Body
+#### Request Body
 ```json
 {
   "lookup": [
@@ -193,7 +182,7 @@ If no match was found:
 }
 ```
 
-##### Response Body
+#### Response Body
 For all entries where a match was found:
 - `lookup[].id.type` supported values: `localpart`, `mxid`
 ```json
@@ -225,46 +214,3 @@ If no match was found:
   "lookup": []
 }
 ```
-
-### Profile
-#### Request Body
-For all requests, the values are the same:
-- Method: `POST`
-- Content-Type: `application/json` (JSON)
-- Encoding: `UTF8`
-
-With body (example values):
-##### Request Body
-```json
-{
-    "mxid": "@john.doe:example.org",
-    "localpart": "john.doe",
-    "domain": "example.org"
-}
-```
-#### Response Body
-For all responses, the same object structure will be parsed, making the non-relevant fields as optional.
-
-Structure with example values:
-```json
-{
-  "profile": {
-    "display_name": "John Doe",
-    "threepids": [
-      {
-        "medium": "email",
-        "address": "john.doe@example.org"
-      },
-      {
-        "...": "..."
-      }
-    ],
-    "roles": [
-      "DomainUsers",
-      "SalesOrg",
-      "..."
-    ]
-  }
-}
-```
-The base `profile` key is mandatory. `display_name`, `threepids` and `roles` are only to be returned on the relevant request.

docs/stores/sql.md

@@ -11,7 +11,6 @@
 | Authentication | No         |
 | Directory      | Yes        |
 | Identity       | Yes        |
-| Profile        | Yes        |
 
 Due to the implementation complexity of supporting arbitrary hashing/encoding mechanisms or auth flow, Authentication
 will be out of scope of SQL Identity stores and should be done via one of the other identity stores, typically
@@ -45,7 +44,7 @@ Example: `/path/to/sqlite/file.db`
 
 #### Others
 ```yaml
-sql.connection: //<HOST[:PORT]/DB?user=USER&password=PASS
+sql.connection: //<HOST[:PORT]/DB?username=USER&password=PASS
 ```
 Set the connection info for the database by replacing the following values:
 - `HOST`: Hostname of the SQL server

docs/stores/synapse.md

@@ -7,7 +7,6 @@ Synapse's Database itself can be used as an Identity store.
 | Authentication | No         |
 | Directory      | Yes        |
 | Identity       | Yes        |
-| Profile        | Yes        |
 
 Authentication is done by Synapse itself.
 
@@ -36,7 +35,7 @@ Example: `/path/to/synapse/sqliteFile.db`
 
 ### PostgreSQL
 ```yaml
-synapseSql.connection: //<HOST[:PORT]/DB?user=USER&password=PASS
+synapseSql.connection: //<HOST[:PORT]/DB?username=USER&password=PASS
 ```
 Set the connection info for the database by replacing the following values:
 - `HOST`: Hostname of the SQL server

docs/stores/wordpress.md

@@ -10,7 +10,6 @@ Two types of connections are required for full support:
 | Authentication | Yes        |
 | Directory      | Yes        |
 | Identity       | Yes        |
-| Profile        | No         |
 
 ## Requirements
 - [Wordpress](https://wordpress.org/download/) >= 4.4
@@ -56,11 +55,3 @@ With possible values:
 - `mariadb`
 - `postgresql`
 - `sqlite`
-
----
-
-To configure the tables prefix for default queries, in case a custom value was set during Wordpress install:
-```yaml
-wordpress.sql.tablePrefix: <string>
-```
-By default, the value is set to `wp_`.

docs/threepids/notification/sendgrid-handler.md

@@ -1,5 +1,5 @@
 # SendGrid Notification handler
-To be completed. See [raw possible configuration items](https://github.com/kamax-matrix/mxisd/blob/master/src/main/resources/application.yaml#L172).
+To be completed. See [raw possible configuration items](https://github.com/kamax-io/mxisd/blob/master/src/main/resources/application.yaml#L172).
 
 Enabled with:
 ```yaml

docs/threepids/notification/template-generator.md

@@ -19,8 +19,6 @@ threepid.medium.<YOUR 3PID MEDIUM HERE>:
         validation:
           local: '/path/to/validate-local-template.eml'
           remote: 'path/to/validate-remote-template.eml'
-      generic:
-        matrixId: '/path/to/mxid-invite-template.eml'
 ```
 The `template` generator is usually the default, so no further configuration is needed.
 

docs/threepids/session/session.md

@@ -18,62 +18,48 @@
 
 ## Overview
 When adding an email, a phone number or any other kind of 3PID (Third-Party Identifier) in a Matrix client, 
-the identity server is contacted to validate the 3PID.
+the identity server is called to validate the 3PID.
-
-To validate the 3PID the identity server sends a message to the 3PID (e.g. an
-email) with a hyperlink back to a web-page managed by the identity server to
-confirm ownership of the 3PID.
 
 Once this 3PID is validated, the Homeserver will publish the user Matrix ID on the Identity Server and
 add this 3PID to the Matrix account which initiated the request.
 
+## Purpose
 This serves two purposes:
 - Add the 3PID as an administrative/login info for the Homeserver directly
 - Publish, or *Bind*, the 3PID so it can be queried from Homeservers and clients when inviting someone in a room
 by a 3PID, allowing it to be resolved to a Matrix ID.
 
 ## Federation
-In a federated set up, identity servers must cooperate to find the Matrix ID associated with a 3PID.
+Federation is based on the principle that one can get a domain name and serve services and information within that
+domain namespace in a way which can be discovered following a specific protocol or specification.
 
-Federation is based on the principle that each server is responsible for its own (dns) domain.
+In the Matrix eco-system, some 3PID can be federated (e.g. emails) while some others cannot (phone numbers).
-Therefore only those 3PID can be federated that can be distinguished by their
+Also, Matrix users might add 3PIDs that would not point to the Identity server that actually holds the 3PID binding.  
-domain such as email addresses.
-
-Example: a user from Homeserver `example.org` adds an email `john@example.com`.  
-Federated identity servers would try to find the identity server at `example.com` and ask it for the Matrix ID of associated with `john@example.com`.
-
-Nevertheless, Matrix users might add 3PIDs that are not associated to a domain, for example telephone numbers.
-Or they might even add 3PIDs associated to a different domain (such as an email address hosted by gmail).
-Such 3PIDs cannot be resolved in a federated way.
 
 Example: a user from Homeserver `example.org` adds an email `john@gmail.com`.  
 If a federated lookup was performed, Identity servers would try to find the 3PID bind at the `gmail.com` server, and
 not `example.org`.
 
-In order to resolve such 3PIDs, i.e. 3PIDs that cannot be resolved in a Federated way, an identity server can be configured such that
+To allow global publishing of 3PID bindings to be found anywhere within the current protocol specification, one would
-- 3PIDs that cannot be resolved locally or using federation, are fowarded to another global identity server.
+perform a *Remote session* and *Remote bind*, effectively starting a new 3PID session with another Identity server on
-- registration of new 3PIDs that cannot be looked up in a federated fashion, is forwarded to another global identity server.
-
-By forwarding a 3PIDs registration the identity creates a *Remote session* and *Remote bind*, effectively starting a new 3PID session with another Identity server on
 behalf of the user.  
-
 To ensure lookup works consistency within the current Matrix network, the central Matrix.org Identity Server should be
 used to store *remote* sessions and binds.
 
-However, at the time of writing, the Matrix specification and the central Matrix.org servers do not allow to remote a 3PID bind.
+On the flip side, at the time of writing, the Matrix specification and the central Matrix.org servers do not allow to
-This means that once a 3PID is published (email, phone number, etc.), it cannot be easily removed
+remote a 3PID bind. This means that once a 3PID is published (email, phone number, etc.), it cannot be easily removed
 and would require contacting the Matrix.org administrators for each bind individually.  
 This poses a privacy, control and security concern, especially for groups/corporations that want to keep a tight control
 on where such identifiers can be made publicly visible.
 
-To ensure full control, validation management relies on two concepts:
+To ensure full control, validation management rely on two concepts:
 - The scope of 3PID being validated
 - The scope of 3PID sessions that should be possible/offered
 
 ### 3PID scope
 3PID can either be scoped as local or remote.
 
-Local means that they can be looked up using federation and that such a federation call would end up on the local
+Local means that they can looked up using federation and that such federation call would end up on the local
 Identity Server.  
 Remote means that they cannot be lookup using federation or that a federation call would not end up on the local
 Identity Server.
@@ -131,7 +117,6 @@ The following example of configuration (incomplete extract) shows which items ar
 **IMPORTANT:** Most configuration items shown have default values and should not be included in your own configuration
 file unless you want to specifically overwrite them.
 ```yaml
-# CONFIGURATION EXAMPLE
 # DO NOT COPY/PASTE THIS IN YOUR CONFIGURATION
 session.policy.validation.enabled: true
 session.policy.validation.forLocal:
@@ -147,20 +132,19 @@ session.policy.validation.forRemote:
     enabled: true
     server: 'configExample'  # Not to be included in config! Already present in default config!
 # DO NOT COPY/PASTE THIS IN YOUR CONFIGURATION
-# CONFIGURATION EXAMPLE
 ```
 
 `session.policy.validation` is the core configuration to control what users configured to use your Identity server
 are allowed to do in terms of 3PID sessions.
 
-The policy has a global on/off switch for 3PID sessions using `.enabled`  
+The policy is divided contains a global on/off switch for 3PID sessions using `.enabled`  
 It is also divided into two sections: `forLocal` and `forRemote` which refers to the 3PID scopes.  
 
 Each scope is divided into three parts:
 - global on/off switch for 3PID sessions using `.enabled`
 - `toLocal` allowing or not local 3PID session validations
 - `toRemote` allowing or not remote 3PID session validations and to which server such sessions should be sent. 
-  `.server` takes a Matrix Identity server list label. Only the first server in the list is currently used.
+`.server` takes a Matrix Identity server list label. Only the first server in the list is currently used.
 
 If both `toLocal` and `toRemote` are enabled, the user will be offered to initiate a remote session once their 3PID
 locally validated.

src/debian/control

@@ -1,6 +1,6 @@
 Package: mxisd
 Maintainer: Kamax.io <foss@kamax.io>
-Homepage: https://github.com/kamax-matrix/mxisd
+Homepage: https://github.com/kamax-io/mxisd
 Description: Federated Matrix Identity Server
 Architecture: all
 Depends: openjdk-8-jre | openjdk-8-jre-headless | openjdk-8-jdk | openjdk-8-jdk-headless

src/main/java/io/kamax/mxisd/MatrixIdentityServerApplication.java

@@ -1,8 +1,8 @@
 /*
  * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2017 Kamax Sarl
+ * Copyright (C) 2017 Maxime Dor
  *
- * https://www.kamax.io/
+ * https://max.kamax.io/
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as

src/main/java/io/kamax/mxisd/UserID.java

@@ -1,8 +1,8 @@
 /*
  * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2017 Kamax Sarl
+ * Copyright (C) 2017 Maxime Dor
  *
- * https://www.kamax.io/
+ * https://max.kamax.io/
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -30,10 +30,6 @@ public class UserID {
         // stub for (de)serialization
     }
 
-    public UserID(UserIdType type, String value) {
-        this(type.getId(), value);
-    }
-
     public UserID(String type, String value) {
         this.type = type;
         this.value = value;

src/main/java/io/kamax/mxisd/UserIdType.java

@@ -1,8 +1,8 @@
 /*
  * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2017 Kamax Sarl
+ * Copyright (C) 2017 Maxime Dor
  *
- * https://www.kamax.io/
+ * https://max.kamax.io/
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as

src/main/java/io/kamax/mxisd/as/AppServiceHandler.java

@@ -1,211 +0,0 @@
-/*
- * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2018 Kamax Sarl
- *
- * https://www.kamax.io/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package io.kamax.mxisd.as;
-
-import com.google.gson.JsonObject;
-import io.kamax.matrix.MatrixID;
-import io.kamax.matrix.ThreePidMedium;
-import io.kamax.matrix._MatrixID;
-import io.kamax.matrix._ThreePid;
-import io.kamax.matrix.event.EventKey;
-import io.kamax.matrix.json.GsonUtil;
-import io.kamax.mxisd.backend.sql.synapse.Synapse;
-import io.kamax.mxisd.config.ListenerConfig;
-import io.kamax.mxisd.config.MatrixConfig;
-import io.kamax.mxisd.notification.NotificationManager;
-import io.kamax.mxisd.profile.ProfileManager;
-import io.kamax.mxisd.storage.IStorage;
-import io.kamax.mxisd.storage.ormlite.dao.ASTransactionDao;
-import io.kamax.mxisd.util.GsonParser;
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.io.InputStream;
-import java.time.Instant;
-import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
-
-@Component
-public class AppServiceHandler {
-
-    private final Logger log = LoggerFactory.getLogger(AppServiceHandler.class);
-
-    private final GsonParser parser;
-
-    private String localpart;
-    private MatrixConfig cfg;
-    private IStorage store;
-    private ProfileManager profiler;
-    private NotificationManager notif;
-    private Synapse synapse;
-
-    private Map<String, CompletableFuture<String>> transactionsInProgress;
-
-    @Autowired
-    public AppServiceHandler(ListenerConfig lCfg, MatrixConfig cfg, IStorage store, ProfileManager profiler, NotificationManager notif, Synapse synapse) {
-        this.cfg = cfg;
-        this.store = store;
-        this.profiler = profiler;
-        this.notif = notif;
-        this.synapse = synapse;
-
-        localpart = lCfg.getLocalpart();
-        parser = new GsonParser();
-        transactionsInProgress = new ConcurrentHashMap<>();
-    }
-
-    public CompletableFuture<String> processTransaction(String txnId, InputStream is) {
-        synchronized (this) {
-            Optional<ASTransactionDao> dao = store.getTransactionResult(localpart, txnId);
-            if (dao.isPresent()) {
-                log.info("AS Transaction {} already processed - returning computed result", txnId);
-                return CompletableFuture.completedFuture(dao.get().getResult());
-            }
-
-            CompletableFuture<String> f = transactionsInProgress.get(txnId);
-            if (Objects.nonNull(f)) {
-                log.info("Returning future for transaction {}", txnId);
-                return f;
-            }
-
-            transactionsInProgress.put(txnId, new CompletableFuture<>());
-        }
-
-        CompletableFuture<String> future = transactionsInProgress.get(txnId);
-
-        Instant start = Instant.now();
-        log.info("Processing AS Transaction {}: start", txnId);
-        try {
-            List<JsonObject> events = GsonUtil.asList(GsonUtil.getArray(parser.parse(is), "events"), JsonObject.class);
-            is.close();
-            log.debug("{} event(s) parsed", events.size());
-
-            processTransaction(events);
-            Instant end = Instant.now();
-            log.info("Processed AS transaction {} in {} ms", txnId, (Instant.now().toEpochMilli() - start.toEpochMilli()));
-
-            String result = "{}";
-
-            try {
-                log.info("Saving transaction details to store");
-                store.insertTransactionResult(localpart, txnId, end, result);
-            } finally {
-                log.debug("Removing CompletedFuture from transaction map");
-                transactionsInProgress.remove(txnId);
-            }
-
-            future.complete(result);
-        } catch (Exception e) {
-            log.error("Unable to properly process transaction {}", txnId, e);
-            future.completeExceptionally(e);
-        }
-
-        log.info("Processing AS Transaction {}: end", txnId);
-        return future;
-    }
-
-    public void processTransaction(List<JsonObject> eventsJson) {
-        log.info("Processing transaction events: start");
-
-        eventsJson.forEach(ev -> {
-            String evId = EventKey.Id.getStringOrNull(ev);
-            if (StringUtils.isBlank(evId)) {
-                log.warn("Event has no ID, skipping");
-                log.debug("Event:\n{}", GsonUtil.getPrettyForLog(ev));
-                return;
-            }
-            log.debug("Event {}: processing start", evId);
-
-            String roomId = EventKey.RoomId.getStringOrNull(ev);
-            if (StringUtils.isBlank(roomId)) {
-                log.debug("Event has no room ID, skipping");
-                return;
-            }
-
-            String senderId = EventKey.Sender.getStringOrNull(ev);
-            if (StringUtils.isBlank(senderId)) {
-                log.debug("Event has no sender ID, skipping");
-                return;
-            }
-            _MatrixID sender = MatrixID.asAcceptable(senderId);
-            log.debug("Sender: {}", senderId);
-
-            if (!StringUtils.equals("m.room.member", GsonUtil.getStringOrNull(ev, "type"))) {
-                log.debug("This is not a room membership event, skipping");
-                return;
-            }
-
-            if (!StringUtils.equals("invite", GsonUtil.getStringOrNull(ev, "membership"))) {
-                log.debug("This is not an invite event, skipping");
-                return;
-            }
-
-            String inviteeId = EventKey.StateKey.getStringOrNull(ev);
-            if (StringUtils.isBlank(inviteeId)) {
-                log.warn("Invalid event: No invitee ID, skipping");
-                return;
-            }
-
-            _MatrixID invitee = MatrixID.asAcceptable(inviteeId);
-            if (!StringUtils.equals(invitee.getDomain(), cfg.getDomain())) {
-                log.debug("Ignoring invite for {}: not a local user");
-                return;
-            }
-
-            log.info("Got invite from {} to {}", senderId, inviteeId);
-
-            boolean wasSent = false;
-            List<_ThreePid> tpids = profiler.getThreepids(invitee).stream()
-                    .filter(tpid -> ThreePidMedium.Email.is(tpid.getMedium()))
-                    .collect(Collectors.toList());
-            log.info("Found {} email(s) in identity store for {}", tpids.size(), inviteeId);
-
-            for (_ThreePid tpid : tpids) {
-                log.info("Found Email to notify about room invitation: {}", tpid.getAddress());
-                Map<String, String> properties = new HashMap<>();
-                profiler.getDisplayName(sender).ifPresent(name -> properties.put("sender_display_name", name));
-                try {
-                    synapse.getRoomName(roomId).ifPresent(name -> properties.put("room_name", name));
-                } catch (RuntimeException e) {
-                    log.warn("Could not fetch room name", e);
-                    log.info("Unable to fetch room name: Did you integrate your Homeserver as documented?");
-                }
-
-                IMatrixIdInvite inv = new MatrixIdInvite(roomId, sender, invitee, tpid.getMedium(), tpid.getAddress(), properties);
-                notif.sendForInvite(inv);
-                log.info("Notification for invite of {} sent to {}", inviteeId, tpid.getAddress());
-                wasSent = true;
-            }
-
-            log.info("Was notification sent? {}", wasSent);
-
-            log.debug("Event {}: processing end", evId);
-        });
-
-        log.info("Processing transaction events: end");
-    }
-
-}

src/main/java/io/kamax/mxisd/as/MatrixIdInvite.java

@@ -1,77 +0,0 @@
-/*
- * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2018 Kamax Sarl
- *
- * https://www.kamax.io/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package io.kamax.mxisd.as;
-
-import io.kamax.matrix._MatrixID;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
-public class MatrixIdInvite implements IMatrixIdInvite {
-
-    private String roomId;
-    private _MatrixID sender;
-    private _MatrixID invitee;
-    private String medium;
-    private String address;
-    private Map<String, String> properties;
-
-    public MatrixIdInvite(String roomId, _MatrixID sender, _MatrixID invitee, String medium, String address, Map<String, String> properties) {
-        this.roomId = Objects.requireNonNull(roomId);
-        this.sender = Objects.requireNonNull(sender);
-        this.invitee = Objects.requireNonNull(invitee);
-        this.medium = Objects.requireNonNull(medium);
-        this.address = Objects.requireNonNull(address);
-        this.properties = new HashMap<>(Objects.requireNonNull(properties));
-    }
-
-    @Override
-    public _MatrixID getSender() {
-        return sender;
-    }
-
-    @Override
-    public String getMedium() {
-        return medium;
-    }
-
-    @Override
-    public String getAddress() {
-        return address;
-    }
-
-    @Override
-    public _MatrixID getInvitee() {
-        return invitee;
-    }
-
-    @Override
-    public String getRoomId() {
-        return roomId;
-    }
-
-    @Override
-    public Map<String, String> getProperties() {
-        return properties;
-    }
-
-}

src/main/java/io/kamax/mxisd/auth/AuthManager.java

@@ -1,8 +1,8 @@
 /*
  * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2017 Kamax Sarl
+ * Copyright (C) 2017 Maxime Dor
  *
- * https://www.kamax.io/
+ * https://max.kamax.io/
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -20,95 +20,39 @@
 
 package io.kamax.mxisd.auth;
 
-import com.google.gson.Gson;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import com.google.gson.JsonSyntaxException;
-import com.google.i18n.phonenumbers.NumberParseException;
-import com.google.i18n.phonenumbers.PhoneNumberUtil;
-import com.google.i18n.phonenumbers.Phonenumber;
 import io.kamax.matrix.MatrixID;
 import io.kamax.matrix.ThreePid;
 import io.kamax.matrix._MatrixID;
 import io.kamax.matrix._ThreePid;
-import io.kamax.matrix.json.GsonUtil;
 import io.kamax.mxisd.UserIdType;
 import io.kamax.mxisd.auth.provider.AuthenticatorProvider;
 import io.kamax.mxisd.auth.provider.BackendAuthResult;
-import io.kamax.mxisd.config.AuthenticationConfig;
 import io.kamax.mxisd.config.MatrixConfig;
-import io.kamax.mxisd.dns.ClientDnsOverwrite;
-import io.kamax.mxisd.exception.RemoteLoginException;
 import io.kamax.mxisd.invitation.InvitationManager;
 import io.kamax.mxisd.lookup.ThreePidMapping;
-import io.kamax.mxisd.lookup.strategy.LookupStrategy;
-import io.kamax.mxisd.util.RestClientUtils;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.http.HttpEntity;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.util.EntityUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.io.IOException;
-import java.net.URI;
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 
 @Service
 public class AuthManager {
 
-    private static final String TypeKey = "type";
+    private Logger log = LoggerFactory.getLogger(AuthManager.class);
-    private static final String UserKey = "user";
-    private static final String IdentifierKey = "identifier";
-    private static final String ThreepidMediumKey = "medium";
-    private static final String ThreepidAddressKey = "address";
-    private static final String UserIdTypeValue = "m.id.user";
-    private static final String ThreepidTypeValue = "m.id.thirdparty";
-
-    private final Logger log = LoggerFactory.getLogger(AuthManager.class);
-    private final Gson gson = GsonUtil.get();
 
     private List<AuthenticatorProvider> providers;
-    private MatrixConfig mxCfg;
-    private AuthenticationConfig cfg;
-    private InvitationManager invMgr;
-    private ClientDnsOverwrite dns;
-    private LookupStrategy strategy;
-    private CloseableHttpClient client;
 
     @Autowired
-    public AuthManager(
+    private MatrixConfig mxCfg;
-            AuthenticationConfig cfg,
-            MatrixConfig mxCfg,
-            List<AuthenticatorProvider> providers,
-            LookupStrategy strategy,
-            InvitationManager invMgr,
-            ClientDnsOverwrite dns,
-            CloseableHttpClient client
-    ) {
-        this.cfg = cfg;
-        this.mxCfg = mxCfg;
-        this.providers = new ArrayList<>(providers);
-        this.strategy = strategy;
-        this.invMgr = invMgr;
-        this.dns = dns;
-        this.client = client;
-    }
 
-    public String resolveProxyUrl(URI target) {
+    @Autowired
-        URIBuilder builder = dns.transform(target);
+    private InvitationManager invMgr;
-        String urlToLogin = builder.toString();
+
-        log.info("Proxy resolution: {} to {}", target.toString(), urlToLogin);
+    public AuthManager(List<AuthenticatorProvider> providers) {
-        return urlToLogin;
+        this.providers = new ArrayList<>(providers);
     }
 
     public UserAuthResult authenticate(String id, String password) {
@@ -118,10 +62,10 @@ public class AuthManager {
                 continue;
             }
 
-            log.info("Attempting authentication with store {}", provider.getClass().getSimpleName());
+            log.info("Attempting auth with " + provider.getClass().getSimpleName());
-
             BackendAuthResult result = provider.authenticate(mxid, password);
             if (result.isSuccess()) {
+
                 String mxId;
                 if (UserIdType.Localpart.is(result.getId().getType())) {
                     mxId = MatrixID.from(result.getId().getValue(), mxCfg.getDomain()).acceptable().getId();
@@ -151,128 +95,4 @@ public class AuthManager {
         return new UserAuthResult().failure();
     }
 
-    public String proxyLogin(URI target, String body) {
-        JsonObject reqJsonObject = io.kamax.matrix.json.GsonUtil.parseObj(body);
-
-        GsonUtil.findObj(reqJsonObject, IdentifierKey).ifPresent(obj -> {
-            GsonUtil.findString(obj, TypeKey).ifPresent(type -> {
-                if (StringUtils.equals(type, UserIdTypeValue)) {
-                    log.info("Login request is User ID type");
-
-                    if (cfg.getRewrite().getUser().getRules().isEmpty()) {
-                        log.info("No User ID rewrite rules to apply");
-                    } else {
-                        log.info("User ID rewrite rules: checking for a match");
-
-                        String userId = GsonUtil.getStringOrThrow(obj, UserKey);
-                        for (AuthenticationConfig.Rule m : cfg.getRewrite().getUser().getRules()) {
-                            if (m.getPattern().matcher(userId).matches()) {
-                                log.info("Found matching pattern, resolving to 3PID with medium {}", m.getMedium());
-
-                                // Remove deprecated login info on the top object if exists to avoid duplication
-                                reqJsonObject.remove(UserKey);
-                                obj.addProperty(TypeKey, ThreepidTypeValue);
-                                obj.addProperty(ThreepidMediumKey, m.getMedium());
-                                obj.addProperty(ThreepidAddressKey, userId);
-
-                                log.info("Rewrite to 3PID done");
-                            }
-                        }
-
-                        log.info("User ID rewrite rules: done checking rules");
-                    }
-                }
-            });
-        });
-
-        GsonUtil.findObj(reqJsonObject, IdentifierKey).ifPresent(obj -> {
-            GsonUtil.findString(obj, TypeKey).ifPresent(type -> {
-                if (StringUtils.equals(type, ThreepidTypeValue)) {
-                    // Remove deprecated login info if exists to avoid duplication
-                    reqJsonObject.remove(ThreepidMediumKey);
-                    reqJsonObject.remove(ThreepidAddressKey);
-
-                    GsonUtil.findPrimitive(obj, ThreepidMediumKey).ifPresent(medium -> {
-                        GsonUtil.findPrimitive(obj, ThreepidAddressKey).ifPresent(address -> {
-                            log.info("Login request with medium '{}' and address '{}'", medium.getAsString(), address.getAsString());
-                            strategy.findLocal(medium.getAsString(), address.getAsString()).ifPresent(lookupDataOpt -> {
-                                obj.remove(ThreepidMediumKey);
-                                obj.remove(ThreepidAddressKey);
-                                obj.addProperty(TypeKey, UserIdTypeValue);
-                                obj.addProperty(UserKey, lookupDataOpt.getMxid().getLocalPart());
-                            });
-                        });
-                    });
-                }
-
-                if (StringUtils.equals(type, "m.id.phone")) {
-                    // Remove deprecated login info if exists to avoid duplication
-                    reqJsonObject.remove(ThreepidMediumKey);
-                    reqJsonObject.remove(ThreepidAddressKey);
-
-                    GsonUtil.findPrimitive(obj, "number").ifPresent(number -> {
-                        GsonUtil.findPrimitive(obj, "country").ifPresent(country -> {
-                            log.info("Login request with phone '{}'-'{}'", country.getAsString(), number.getAsString());
-                            try {
-                                PhoneNumberUtil phoneUtil = PhoneNumberUtil.getInstance();
-                                Phonenumber.PhoneNumber phoneNumber = phoneUtil.parse(number.getAsString(), country.getAsString());
-                                String msisdn = phoneUtil.format(phoneNumber, PhoneNumberUtil.PhoneNumberFormat.E164).replace("+", "");
-                                String medium = "msisdn";
-                                strategy.findLocal(medium, msisdn).ifPresent(lookupDataOpt -> {
-                                    obj.remove("country");
-                                    obj.remove("number");
-                                    obj.addProperty(TypeKey, UserIdTypeValue);
-                                    obj.addProperty(UserKey, lookupDataOpt.getMxid().getLocalPart());
-                                });
-                            } catch (NumberParseException e) {
-                                log.error("Not a valid phone number");
-                                throw new RuntimeException(e);
-                            }
-                        });
-                    });
-                }
-            });
-        });
-
-        // invoke 'login' on homeserver
-        HttpPost httpPost = RestClientUtils.post(resolveProxyUrl(target), gson, reqJsonObject);
-        try (CloseableHttpResponse httpResponse = client.execute(httpPost)) {
-            // check http status
-            int status = httpResponse.getStatusLine().getStatusCode();
-            log.info("http status = {}", status);
-            if (status != 200) {
-                // try to get possible json error message from response
-                // otherwise just get returned plain error message
-                String errcode = String.valueOf(httpResponse.getStatusLine().getStatusCode());
-                String error = EntityUtils.toString(httpResponse.getEntity());
-                if (httpResponse.getEntity() != null) {
-                    try {
-                        JsonObject bodyJson = new JsonParser().parse(error).getAsJsonObject();
-                        if (bodyJson.has("errcode")) {
-                            errcode = bodyJson.get("errcode").getAsString();
-                        }
-                        if (bodyJson.has("error")) {
-                            error = bodyJson.get("error").getAsString();
-                        }
-                        throw new RemoteLoginException(status, errcode, error, bodyJson);
-                    } catch (JsonSyntaxException e) {
-                        log.warn("Response body is not JSON");
-                    }
-                }
-                throw new RemoteLoginException(status, errcode, error);
-            }
-
-            // return response
-            HttpEntity entity = httpResponse.getEntity();
-            if (Objects.isNull(entity)) {
-                log.warn("Expected HS to return data but got nothing");
-                return "";
-            } else {
-                return IOUtils.toString(httpResponse.getEntity().getContent(), StandardCharsets.UTF_8);
-            }
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
 }

src/main/java/io/kamax/mxisd/auth/UserAuthResult.java

@@ -1,8 +1,8 @@
 /*
  * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2017 Kamax Sarl
+ * Copyright (C) 2017 Maxime Dor
  *
- * https://www.kamax.io/
+ * https://max.kamax.io/
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as

src/main/java/io/kamax/mxisd/auth/provider/AuthenticatorProvider.java

@@ -1,8 +1,8 @@
 /*
  * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2017 Kamax Sarl
+ * Copyright (C) 2017 Maxime Dor
  *
- * https://www.kamax.io/
+ * https://max.kamax.io/
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as

src/main/java/io/kamax/mxisd/auth/provider/BackendAuthResult.java

@@ -1,8 +1,8 @@
 /*
  * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2017 Kamax Sarl
+ * Copyright (C) 2017 Maxime Dor
  *
- * https://www.kamax.io/
+ * https://max.kamax.io/
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -38,10 +38,6 @@ public class BackendAuthResult {
             return displayName;
         }
 
-        public void setDisplayName(String displayName) {
-            this.displayName = displayName;
-        }
-
         public Set<ThreePid> getThreePids() {
             return threePids;
         }
@@ -53,8 +49,9 @@ public class BackendAuthResult {
         return r;
     }
 
-    public void fail() {
+    public BackendAuthResult fail() {
         success = false;
+        return this;
     }
 
     public static BackendAuthResult success(String id, UserIdType type, String displayName) {
@@ -67,20 +64,17 @@ public class BackendAuthResult {
         return r;
     }
 
-    public void succeed(String id, String type, String displayName) {
+    public BackendAuthResult succeed(String id, String type, String displayName) {
         this.success = true;
         this.id = new UserID(type, id);
         this.profile.displayName = displayName;
+        return this;
     }
 
     private Boolean success;
     private UserID id;
     private BackendAuthProfile profile = new BackendAuthProfile();
 
-    public void setSuccess(boolean success) {
-        this.success = success;
-    }
-
     public Boolean isSuccess() {
         return success;
     }
@@ -89,10 +83,6 @@ public class BackendAuthResult {
         return id;
     }
 
-    public void setId(UserID id) {
-        this.id = id;
-    }
-
     public BackendAuthProfile getProfile() {
         return profile;
     }

src/main/java/io/kamax/mxisd/backend/exec/ExecAuthResult.java

@@ -1,37 +0,0 @@
-/*
- * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2018 Kamax Sarl
- *
- * https://www.kamax.io/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package io.kamax.mxisd.backend.exec;
-
-import io.kamax.mxisd.auth.provider.BackendAuthResult;
-
-public class ExecAuthResult extends BackendAuthResult {
-
-    private int exitStatus;
-
-    public int getExitStatus() {
-        return exitStatus;
-    }
-
-    public void setExitStatus(int exitStatus) {
-        this.exitStatus = exitStatus;
-    }
-
-}

src/main/java/io/kamax/mxisd/backend/exec/ExecAuthStore.java

@@ -1,129 +0,0 @@
-/*
- * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2018 Kamax Sarl
- *
- * https://www.kamax.io/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package io.kamax.mxisd.backend.exec;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonPrimitive;
-import io.kamax.matrix._MatrixID;
-import io.kamax.matrix.json.GsonUtil;
-import io.kamax.mxisd.UserID;
-import io.kamax.mxisd.UserIdType;
-import io.kamax.mxisd.auth.provider.AuthenticatorProvider;
-import io.kamax.mxisd.backend.rest.RestAuthRequestJson;
-import io.kamax.mxisd.config.ExecConfig;
-import io.kamax.mxisd.exception.InternalServerError;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.Objects;
-import java.util.Optional;
-
-@Component
-public class ExecAuthStore extends ExecStore implements AuthenticatorProvider {
-
-    private final Logger log = LoggerFactory.getLogger(ExecAuthStore.class);
-
-    private ExecConfig.Auth cfg;
-
-    @Autowired
-    public ExecAuthStore(ExecConfig cfg) {
-        this.cfg = Objects.requireNonNull(cfg.getAuth());
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return cfg.isEnabled();
-    }
-
-    @Override
-    public ExecAuthResult authenticate(_MatrixID uId, String password) {
-        Objects.requireNonNull(uId);
-        Objects.requireNonNull(password);
-
-        log.info("Performing authentication for {}", uId.getId());
-
-        ExecAuthResult result = new ExecAuthResult();
-        result.setId(new UserID(UserIdType.Localpart, uId.getLocalPart()));
-
-        Processor<ExecAuthResult> p = new Processor<>(cfg);
-
-        p.addTokenMapper(cfg.getToken().getLocalpart(), uId::getLocalPart);
-        p.addTokenMapper(cfg.getToken().getDomain(), uId::getDomain);
-        p.addTokenMapper(cfg.getToken().getMxid(), uId::getId);
-        p.addTokenMapper(cfg.getToken().getPassword(), () -> password);
-
-        p.addJsonInputTemplate(tokens -> {
-            RestAuthRequestJson json = new RestAuthRequestJson();
-            json.setLocalpart(tokens.getLocalpart());
-            json.setDomain(tokens.getDomain());
-            json.setMxid(tokens.getMxid());
-            json.setPassword(tokens.getPassword());
-            return json;
-        });
-        p.addInputTemplate(PlainType, tokens -> tokens.getLocalpart() + System.lineSeparator() +
-                tokens.getDomain() + System.lineSeparator() +
-                tokens.getMxid() + System.lineSeparator() +
-                tokens.getPassword() + System.lineSeparator()
-        );
-
-        p.withExitHandler(pr -> result.setExitStatus(pr.getExitValue()));
-
-        p.withSuccessHandler(pr -> result.setSuccess(true));
-        p.withSuccessDefault(o -> result);
-        p.addSuccessMapper(JsonType, output -> {
-            JsonObject data = GsonUtil.getObj(GsonUtil.parseObj(output), "auth");
-            GsonUtil.findPrimitive(data, "success")
-                    .map(JsonPrimitive::getAsBoolean)
-                    .ifPresent(result::setSuccess);
-            GsonUtil.findObj(data, "profile")
-                    .flatMap(profile -> GsonUtil.findString(profile, "display_name"))
-                    .ifPresent(v -> result.getProfile().setDisplayName(v));
-
-            return result;
-        });
-        p.addSuccessMapper(PlainType, output -> {
-            String[] lines = output.split("\\R");
-            if (lines.length > 2) {
-                throw new InternalServerError("Exec auth command returned more than 2 lines (" + lines.length + ")");
-            }
-
-            result.setSuccess(Optional.ofNullable(StringUtils.isEmpty(lines[0]) ? null : lines[0])
-                    .map(v -> StringUtils.equalsAnyIgnoreCase(v, "true", "1"))
-                    .orElse(result.isSuccess()));
-
-            if (lines.length == 2) {
-                Optional.ofNullable(StringUtils.isEmpty(lines[1]) ? null : lines[1])
-                        .ifPresent(v -> result.getProfile().setDisplayName(v));
-            }
-
-            return result;
-        });
-
-        p.withFailureHandler(pr -> result.setSuccess(false));
-        p.withFailureDefault(o -> result);
-
-        return p.execute();
-    }
-
-}

src/main/java/io/kamax/mxisd/backend/exec/ExecDirectoryStore.java

@@ -1,94 +0,0 @@
-/*
- * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2018 Kamax Sarl
- *
- * https://www.kamax.io/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package io.kamax.mxisd.backend.exec;
-
-import io.kamax.matrix.MatrixID;
-import io.kamax.matrix.json.GsonUtil;
-import io.kamax.mxisd.config.ExecConfig;
-import io.kamax.mxisd.config.MatrixConfig;
-import io.kamax.mxisd.controller.directory.v1.io.UserDirectorySearchRequest;
-import io.kamax.mxisd.controller.directory.v1.io.UserDirectorySearchResult;
-import io.kamax.mxisd.directory.IDirectoryProvider;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-@Component
-public class ExecDirectoryStore extends ExecStore implements IDirectoryProvider {
-
-    private ExecConfig.Directory cfg;
-    private MatrixConfig mxCfg;
-
-    @Autowired
-    public ExecDirectoryStore(ExecConfig cfg, MatrixConfig mxCfg) {
-        this(cfg.getDirectory(), mxCfg);
-    }
-
-    public ExecDirectoryStore(ExecConfig.Directory cfg, MatrixConfig mxCfg) {
-        this.cfg = cfg;
-        this.mxCfg = mxCfg;
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return cfg.isEnabled();
-    }
-
-    private UserDirectorySearchResult search(ExecConfig.Process cfg, UserDirectorySearchRequest request) {
-        if (StringUtils.isEmpty(cfg.getCommand())) {
-            return UserDirectorySearchResult.empty();
-        }
-
-        Processor<UserDirectorySearchResult> p = new Processor<>(cfg);
-
-        p.addJsonInputTemplate(tokens -> new UserDirectorySearchRequest(tokens.getType(), tokens.getQuery()));
-        p.addInputTemplate(PlainType, tokens -> tokens.getType() + System.lineSeparator() + tokens.getQuery());
-
-        p.addTokenMapper(cfg.getToken().getType(), request::getBy);
-        p.addTokenMapper(cfg.getToken().getQuery(), request::getSearchTerm);
-
-        p.addSuccessMapper(JsonType, output -> {
-            if (StringUtils.isBlank(output)) {
-                return UserDirectorySearchResult.empty();
-            }
-
-            UserDirectorySearchResult response = GsonUtil.get().fromJson(output, UserDirectorySearchResult.class);
-            for (UserDirectorySearchResult.Result result : response.getResults()) {
-                result.setUserId(MatrixID.asAcceptable(result.getUserId(), mxCfg.getDomain()).getId());
-            }
-            return response;
-        });
-        p.withFailureDefault(output -> new UserDirectorySearchResult());
-
-        return p.execute();
-    }
-
-    @Override
-    public UserDirectorySearchResult searchByDisplayName(String query) {
-        return search(cfg.getSearch().getByName(), new UserDirectorySearchRequest("name", query));
-    }
-
-    @Override
-    public UserDirectorySearchResult searchBy3pid(String query) {
-        return search(cfg.getSearch().getByName(), new UserDirectorySearchRequest("threepid", query));
-    }
-
-}

src/main/java/io/kamax/mxisd/backend/exec/ExecIdentityStore.java

@@ -1,209 +0,0 @@
-/*
- * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2018 Kamax Sarl
- *
- * https://www.kamax.io/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package io.kamax.mxisd.backend.exec;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonParseException;
-import io.kamax.matrix.MatrixID;
-import io.kamax.matrix.ThreePid;
-import io.kamax.matrix._MatrixID;
-import io.kamax.matrix.json.GsonUtil;
-import io.kamax.mxisd.UserID;
-import io.kamax.mxisd.UserIdType;
-import io.kamax.mxisd.backend.rest.LookupBulkResponseJson;
-import io.kamax.mxisd.backend.rest.LookupSingleResponseJson;
-import io.kamax.mxisd.config.ExecConfig;
-import io.kamax.mxisd.config.MatrixConfig;
-import io.kamax.mxisd.exception.InternalServerError;
-import io.kamax.mxisd.lookup.SingleLookupReply;
-import io.kamax.mxisd.lookup.SingleLookupRequest;
-import io.kamax.mxisd.lookup.ThreePidMapping;
-import io.kamax.mxisd.lookup.provider.IThreePidProvider;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-@Component
-public class ExecIdentityStore extends ExecStore implements IThreePidProvider {
-
-    private final Logger log = LoggerFactory.getLogger(ExecIdentityStore.class);
-
-    private final ExecConfig.Identity cfg;
-    private final MatrixConfig mxCfg;
-
-    @Autowired
-    public ExecIdentityStore(ExecConfig cfg, MatrixConfig mxCfg) {
-        this(cfg.getIdentity(), mxCfg);
-    }
-
-    public ExecIdentityStore(ExecConfig.Identity cfg, MatrixConfig mxCfg) {
-        this.cfg = cfg;
-        this.mxCfg = mxCfg;
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return cfg.isEnabled();
-    }
-
-    @Override
-    public boolean isLocal() {
-        return true;
-    }
-
-    @Override
-    public int getPriority() {
-        return cfg.getPriority();
-    }
-
-    private ExecConfig.Process getSingleCfg() {
-        return cfg.getLookup().getSingle();
-    }
-
-    private _MatrixID getUserId(UserID id) {
-        if (Objects.isNull(id)) {
-            throw new JsonParseException("User id key is not present");
-        }
-
-        if (UserIdType.Localpart.is(id.getType())) {
-            return MatrixID.asAcceptable(id.getValue(), mxCfg.getDomain());
-        }
-
-        if (UserIdType.MatrixID.is(id.getType())) {
-            return MatrixID.asAcceptable(id.getValue());
-        }
-
-        throw new InternalServerError("Unknown user type: " + id.getType());
-    }
-
-    @Override
-    public Optional<SingleLookupReply> find(SingleLookupRequest request) {
-        Processor<Optional<SingleLookupReply>> p = new Processor<>();
-        p.withConfig(cfg.getLookup().getSingle());
-
-        p.addTokenMapper(getSingleCfg().getToken().getMedium(), request::getType);
-        p.addTokenMapper(getSingleCfg().getToken().getAddress(), request::getThreePid);
-
-        p.addJsonInputTemplate(tokens -> new ThreePid(tokens.getMedium(), tokens.getAddress()));
-        p.addInputTemplate(PlainType, tokens -> tokens.getMedium()
-                + System.lineSeparator()
-                + tokens.getAddress()
-        );
-
-        p.addSuccessMapper(JsonType, output -> {
-            if (StringUtils.isBlank(output)) {
-                return Optional.empty();
-            }
-
-            return GsonUtil.findObj(GsonUtil.parseObj(output), "lookup")
-                    .filter(obj -> !obj.entrySet().isEmpty())
-                    .map(json -> GsonUtil.get().fromJson(json, LookupSingleResponseJson.class))
-                    .map(lookup -> getUserId(lookup.getId()))
-                    .map(mxId -> new SingleLookupReply(request, mxId));
-        });
-
-        p.addSuccessMapper(PlainType, output -> {
-            String[] lines = output.split("\\R");
-            if (lines.length > 2) {
-                throw new InternalServerError("Exec auth command returned more than 2 lines (" + lines.length + ")");
-            }
-
-            if (lines.length == 1 && StringUtils.isBlank(lines[0])) {
-                return Optional.empty();
-            }
-
-            String type = StringUtils.trimToEmpty(lines.length == 1 ? UserIdType.Localpart.getId() : lines[0]);
-            String value = StringUtils.trimToEmpty(lines.length == 2 ? lines[1] : lines[0]);
-
-            if (UserIdType.Localpart.is(type)) {
-                return Optional.of(new SingleLookupReply(request, MatrixID.asAcceptable(value, mxCfg.getDomain())));
-            }
-
-            if (UserIdType.MatrixID.is(type)) {
-                return Optional.of(new SingleLookupReply(request, MatrixID.asAcceptable(value)));
-            }
-
-            throw new InternalServerError("Invalid user type: " + type);
-        });
-
-        p.withFailureDefault(o -> Optional.empty());
-
-        return p.execute();
-    }
-
-    @Override
-    public List<ThreePidMapping> populate(List<ThreePidMapping> mappings) {
-        Processor<List<ThreePidMapping>> p = new Processor<>();
-        p.withConfig(cfg.getLookup().getBulk());
-
-        p.addInput(JsonType, () -> {
-            JsonArray tpids = GsonUtil.asArray(mappings.stream()
-                    .map(mapping -> GsonUtil.get().toJsonTree(new ThreePid(mapping.getMedium(), mapping.getValue())))
-                    .collect(Collectors.toList()));
-            return GsonUtil.get().toJson(GsonUtil.makeObj("lookup", tpids));
-        });
-        p.addInput(PlainType, () -> {
-            StringBuilder input = new StringBuilder();
-            for (ThreePidMapping mapping : mappings) {
-                input.append(mapping.getMedium()).append("\t").append(mapping.getValue()).append(System.lineSeparator());
-            }
-            return input.toString();
-        });
-
-        p.addSuccessMapper(JsonType, output -> {
-            if (StringUtils.isBlank(output)) {
-                return Collections.emptyList();
-            }
-
-            LookupBulkResponseJson response = GsonUtil.get().fromJson(output, LookupBulkResponseJson.class);
-            return response.getLookup().stream().map(item -> {
-                ThreePidMapping mapping = new ThreePidMapping();
-                mapping.setMedium(item.getMedium());
-                mapping.setValue(item.getAddress());
-
-                if (UserIdType.Localpart.is(item.getId().getType())) {
-                    mapping.setValue(MatrixID.asAcceptable(item.getId().getValue(), mxCfg.getDomain()).getId());
-                    return mapping;
-                }
-
-                if (UserIdType.MatrixID.is(item.getId().getType())) {
-                    mapping.setValue(MatrixID.asAcceptable(item.getId().getValue()).getId());
-                    return mapping;
-                }
-
-                throw new InternalServerError("Invalid user type: " + item.getId().getType());
-            }).collect(Collectors.toList());
-        });
-
-        p.withFailureDefault(output -> Collections.emptyList());
-
-        return p.execute();
-    }
-
-}

src/main/java/io/kamax/mxisd/backend/exec/ExecProfileStore.java

@@ -1,103 +0,0 @@
-/*
- * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2018 Kamax Sarl
- *
- * https://www.kamax.io/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package io.kamax.mxisd.backend.exec;
-
-import io.kamax.matrix._MatrixID;
-import io.kamax.matrix._ThreePid;
-import io.kamax.matrix.json.GsonUtil;
-import io.kamax.mxisd.config.ExecConfig;
-import io.kamax.mxisd.profile.JsonProfileRequest;
-import io.kamax.mxisd.profile.JsonProfileResult;
-import io.kamax.mxisd.profile.ProfileProvider;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-
-@Component
-public class ExecProfileStore extends ExecStore implements ProfileProvider {
-
-    private ExecConfig.Profile cfg;
-
-    @Autowired
-    public ExecProfileStore(ExecConfig cfg) {
-        this(cfg.getProfile());
-    }
-
-    public ExecProfileStore(ExecConfig.Profile cfg) {
-        this.cfg = cfg;
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return cfg.isEnabled();
-    }
-
-    private Optional<JsonProfileResult> getFull(_MatrixID userId, ExecConfig.Process cfg) {
-        Processor<Optional<JsonProfileResult>> p = new Processor<>(cfg);
-
-        p.addJsonInputTemplate(tokens -> new JsonProfileRequest(tokens.getLocalpart(), tokens.getDomain(), tokens.getMxid()));
-        p.addInputTemplate(PlainType, tokens -> tokens.getLocalpart() + System.lineSeparator()
-                + tokens.getDomain() + System.lineSeparator()
-                + tokens.getMxid() + System.lineSeparator()
-        );
-
-        p.addTokenMapper(cfg.getToken().getLocalpart(), userId::getLocalPart);
-        p.addTokenMapper(cfg.getToken().getDomain(), userId::getDomain);
-        p.addTokenMapper(cfg.getToken().getMxid(), userId::getId);
-
-        p.withFailureDefault(v -> Optional.empty());
-
-        p.addSuccessMapper(JsonType, output -> {
-            if (StringUtils.isBlank(output)) {
-                return Optional.empty();
-            }
-
-            return GsonUtil.findObj(GsonUtil.parseObj(output), "profile")
-                    .map(obj -> GsonUtil.get().fromJson(obj, JsonProfileResult.class));
-        });
-
-        return p.execute();
-    }
-
-    @Override
-    public Optional<String> getDisplayName(_MatrixID userId) {
-        return getFull(userId, cfg.getDisplayName()).map(JsonProfileResult::getDisplayName);
-    }
-
-    @Override
-    public List<_ThreePid> getThreepids(_MatrixID userId) {
-        return getFull(userId, cfg.getThreePid())
-                .map(p -> Collections.<_ThreePid>unmodifiableList(p.getThreepids()))
-                .orElseGet(Collections::emptyList);
-    }
-
-    @Override
-    public List<String> getRoles(_MatrixID userId) {
-        return getFull(userId, cfg.getRole())
-                .map(JsonProfileResult::getRoles)
-                .orElseGet(Collections::emptyList);
-    }
-
-}

src/main/java/io/kamax/mxisd/backend/exec/ExecStore.java

@@ -1,252 +0,0 @@
-/*
- * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2018 Kamax Sarl
- *
- * https://www.kamax.io/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package io.kamax.mxisd.backend.exec;
-
-import io.kamax.matrix.json.GsonUtil;
-import io.kamax.mxisd.config.ExecConfig;
-import io.kamax.mxisd.exception.InternalServerError;
-import org.apache.commons.io.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.zeroturnaround.exec.ProcessExecutor;
-import org.zeroturnaround.exec.ProcessResult;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.*;
-import java.util.concurrent.TimeoutException;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-public class ExecStore {
-
-    public static final String JsonType = "json";
-    public static final String PlainType = "plain";
-
-    protected static String toJson(Object o) {
-        return GsonUtil.get().toJson(o);
-    }
-
-    private final Logger log = LoggerFactory.getLogger(ExecStore.class);
-
-    private Supplier<ProcessExecutor> executorSupplier = () -> new ProcessExecutor().readOutput(true);
-
-    public void setExecutorSupplier(Supplier<ProcessExecutor> supplier) {
-        executorSupplier = supplier;
-    }
-
-    public class Processor<V> {
-
-        private ExecConfig.Process cfg;
-
-        private Supplier<Optional<String>> inputSupplier;
-        private Function<String, String> inputTypeMapper;
-        private Function<String, String> inputUnknownTypeMapper;
-        private Map<String, Supplier<String>> inputTypeSuppliers;
-
-        private Map<String, Function<ExecConfig.TokenOverride, String>> inputTypeTemplates;
-        private Supplier<String> inputTypeNoTemplateHandler;
-        private Map<String, Supplier<String>> tokenMappers;
-        private Function<String, String> tokenHandler;
-
-        private Consumer<ProcessResult> onExitHandler;
-        private Consumer<ProcessResult> successHandler;
-        private Map<String, Function<String, V>> successMappers;
-        private Function<String, V> successDefault;
-        private Consumer<ProcessResult> failureHandler;
-        private Map<String, Function<String, V>> failureMappers;
-        private Function<String, V> failureDefault;
-        private Consumer<ProcessResult> unknownHandler;
-        private Map<String, Function<String, V>> unknownMappers;
-        private Function<String, V> unknownDefault;
-
-        public Processor(ExecConfig.Process cfg) {
-            this();
-            withConfig(cfg);
-        }
-
-        public Processor() {
-            tokenMappers = new HashMap<>();
-            inputTypeSuppliers = new HashMap<>();
-            inputTypeTemplates = new HashMap<>();
-
-            withTokenHandler(tokenHandler = input -> {
-                for (Map.Entry<String, Supplier<String>> entry : tokenMappers.entrySet()) {
-                    input = input.replace(entry.getKey(), entry.getValue().get());
-                }
-                return input;
-            });
-
-            inputTypeNoTemplateHandler = () -> cfg.getInput().getType()
-                    .map(type -> inputTypeTemplates.get(type).apply(cfg.getToken()))
-                    .orElse("");
-
-            inputUnknownTypeMapper = type -> tokenHandler.apply(cfg.getInput().getTemplate().orElseGet(inputTypeNoTemplateHandler));
-
-            inputTypeMapper = type -> {
-                if (!inputTypeSuppliers.containsKey(type)) {
-                    return inputUnknownTypeMapper.apply(type);
-                }
-
-                return inputTypeSuppliers.get(type).get();
-            };
-
-            inputSupplier = () -> cfg.getInput().getType().map(type -> inputTypeMapper.apply(type));
-
-            withExitHandler(pr -> {
-            });
-
-            successHandler = pr -> {
-            };
-            successMappers = new HashMap<>();
-            successDefault = output -> {
-                log.info("{} stdout: {}{}", cfg.getCommand(), System.lineSeparator(), output);
-                throw new InternalServerError("Exec command has no success handler configured. This is a bug. Please report.");
-            };
-
-            failureHandler = pr -> {
-            };
-            failureMappers = new HashMap<>();
-            failureDefault = output -> {
-                log.info("{} stdout: {}{}", cfg.getCommand(), System.lineSeparator(), output);
-                throw new InternalServerError("Exec command has no failure handler configured. This is a bug. Please report.");
-            };
-
-            unknownHandler = pr -> log.warn("Unexpected exit status: {}", pr.getExitValue());
-            unknownMappers = new HashMap<>();
-            withUnknownDefault(output -> {
-                log.error("{} stdout:{}{}", cfg.getCommand(), System.lineSeparator(), output);
-                throw new InternalServerError("Exec command returned with unexpected exit status");
-            });
-        }
-
-        public void withConfig(ExecConfig.Process cfg) {
-            this.cfg = cfg;
-        }
-
-        public void addTokenMapper(String token, Supplier<String> data) {
-            tokenMappers.put(token, data);
-        }
-
-        public void withTokenHandler(Function<String, String> handler) {
-            tokenHandler = handler;
-        }
-
-        public void addInput(String type, Supplier<String> handler) {
-            inputTypeSuppliers.put(type, handler);
-        }
-
-        protected void addInputTemplate(String type, Function<ExecConfig.TokenOverride, String> template) {
-            inputTypeTemplates.put(type, template);
-        }
-
-        public void addJsonInputTemplate(Function<ExecConfig.TokenOverride, Object> template) {
-            inputTypeTemplates.put(JsonType, token -> GsonUtil.get().toJson(template.apply(token)));
-        }
-
-        public void withExitHandler(Consumer<ProcessResult> handler) {
-            onExitHandler = handler;
-        }
-
-        public void withSuccessHandler(Consumer<ProcessResult> handler) {
-            successHandler = handler;
-        }
-
-        public void addSuccessMapper(String type, Function<String, V> mapper) {
-            successMappers.put(type, mapper);
-        }
-
-        public void withSuccessDefault(Function<String, V> mapper) {
-            successDefault = mapper;
-        }
-
-        public void withFailureHandler(Consumer<ProcessResult> handler) {
-            failureHandler = handler;
-        }
-
-        public void addFailureMapper(String type, Function<String, V> mapper) {
-            failureMappers.put(type, mapper);
-        }
-
-        public void withFailureDefault(Function<String, V> mapper) {
-            failureDefault = mapper;
-        }
-
-        public void addUnknownMapper(String type, Function<String, V> mapper) {
-            unknownMappers.put(type, mapper);
-        }
-
-        public void withUnknownDefault(Function<String, V> mapper) {
-            unknownDefault = mapper;
-        }
-
-        public V execute() {
-            log.info("Executing {}", cfg.getCommand());
-
-            try {
-                ProcessExecutor psExec = executorSupplier.get();
-
-                List<String> args = new ArrayList<>();
-                args.add(tokenHandler.apply(cfg.getCommand()));
-                args.addAll(cfg.getArgs().stream().map(arg -> tokenHandler.apply(arg)).collect(Collectors.toList()));
-                psExec.command(args);
-
-                psExec.environment(new HashMap<>(cfg.getEnv()).entrySet().stream()
-                        .peek(e -> e.setValue(tokenHandler.apply(e.getValue())))
-                        .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)));
-
-                inputSupplier.get().ifPresent(input -> psExec.redirectInput(IOUtils.toInputStream(input, StandardCharsets.UTF_8)));
-
-                ProcessResult psResult = psExec.execute();
-                String output = psResult.outputUTF8();
-                onExitHandler.accept(psResult);
-
-                if (cfg.getExit().getSuccess().contains(psResult.getExitValue())) {
-                    successHandler.accept(psResult);
-
-                    return cfg.getOutput().getType()
-                            .map(type -> successMappers.getOrDefault(type, successDefault).apply(output))
-                            .orElseGet(() -> successDefault.apply(output));
-                } else if (cfg.getExit().getFailure().contains(psResult.getExitValue())) {
-                    failureHandler.accept(psResult);
-
-                    return cfg.getOutput().getType()
-                            .map(type -> failureMappers.getOrDefault(type, failureDefault).apply(output))
-                            .orElseGet(() -> failureDefault.apply(output));
-                } else {
-                    unknownHandler.accept(psResult);
-
-                    return cfg.getOutput().getType()
-                            .map(type -> unknownMappers.getOrDefault(type, unknownDefault).apply(output))
-                            .orElseGet(() -> unknownDefault.apply(output));
-                }
-            } catch (RuntimeException | IOException | InterruptedException | TimeoutException e) {
-                log.error("Failed to execute {}", cfg.getCommand());
-                log.debug("Internal exception:", e);
-                throw new InternalServerError(e);
-            }
-        }
-
-    }
-
-}

src/main/java/io/kamax/mxisd/backend/firebase/GoogleFirebaseAuthenticator.java

@@ -1,8 +1,8 @@
 /*
  * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2017 Kamax Sarl
+ * Copyright (C) 2017 Maxime Dor
  *
- * https://www.kamax.io/
+ * https://max.kamax.io/
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as

src/main/java/io/kamax/mxisd/backend/firebase/GoogleFirebaseBackend.java

@@ -1,8 +1,8 @@
 /*
  * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2017 Kamax Sarl
+ * Copyright (C) 2017 Maxime Dor
  *
- * https://www.kamax.io/
+ * https://max.kamax.io/
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as

src/main/java/io/kamax/mxisd/backend/firebase/GoogleFirebaseProvider.java

@@ -1,8 +1,8 @@
 /*
  * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2017 Kamax Sarl
+ * Copyright (C) 2017 Maxime Dor
  *
- * https://www.kamax.io/
+ * https://max.kamax.io/
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -49,7 +49,7 @@ public class GoogleFirebaseProvider extends GoogleFirebaseBackend implements ITh
     }
 
     private String getMxid(UserRecord record) {
-        return MatrixID.asAcceptable(record.getUid(), domain).getId();
+        return new MatrixID(record.getUid(), domain).getId();
     }
 
     @Override

src/main/java/io/kamax/mxisd/backend/google/GoogleProviderBackend.java

@@ -0,0 +1,134 @@
+/*
+ * mxisd - Matrix Identity Server Daemon
+ * Copyright (C) 2018 Kamax Sàrl
+ *
+ * https://www.kamax.io/
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package io.kamax.mxisd.backend.google;
+
+import com.google.api.client.googleapis.auth.oauth2.GoogleIdToken;
+import com.google.api.client.googleapis.auth.oauth2.GoogleIdTokenVerifier;
+import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport;
+import com.google.api.client.http.HttpTransport;
+import com.google.api.client.json.JsonFactory;
+import com.google.api.client.json.jackson2.JacksonFactory;
+import io.kamax.matrix._MatrixID;
+import io.kamax.matrix.ThreePid;
+import io.kamax.mxisd.UserIdType;
+import io.kamax.mxisd.auth.provider.AuthenticatorProvider;
+import io.kamax.mxisd.auth.provider.BackendAuthResult;
+import io.kamax.mxisd.config.GoogleConfig;
+import io.kamax.mxisd.lookup.strategy.LookupStrategy;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+@Component
+public class GoogleProviderBackend implements AuthenticatorProvider {
+
+    private final Logger log = LoggerFactory.getLogger(GoogleProviderBackend.class);
+    private final GoogleConfig cfg;
+    private final LookupStrategy lookup;
+
+    private GoogleIdTokenVerifier verifier;
+
+    public Optional<GoogleIdToken> extractToken(String data) throws GeneralSecurityException, IOException {
+        return Optional.ofNullable(verifier.verify(data));
+    }
+
+    public List<ThreePid> extractThreepids(GoogleIdToken token) {
+        List<ThreePid> tpids = new ArrayList<>();
+        tpids.add(new ThreePid("io.kamax.google.id", token.getPayload().getSubject()));
+        if (token.getPayload().getEmailVerified()) {
+            tpids.add(new ThreePid("email", token.getPayload().getEmail()));
+        }
+        return tpids;
+    }
+
+    @Autowired
+    public GoogleProviderBackend(GoogleConfig cfg, LookupStrategy lookup) {
+        this.cfg = cfg;
+        this.lookup = lookup;
+
+        if (isEnabled()) {
+            try {
+                HttpTransport transport = GoogleNetHttpTransport.newTrustedTransport();
+                JsonFactory jsonFactory = JacksonFactory.getDefaultInstance();
+
+                verifier = new GoogleIdTokenVerifier.Builder(transport, jsonFactory)
+                        .setAudience(Collections.singletonList(cfg.getClient().getId()))
+                        .build();
+            } catch (IOException | GeneralSecurityException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return cfg.isEnabled();
+    }
+
+    @Override
+    public BackendAuthResult authenticate(_MatrixID mxid, String password) {
+        BackendAuthResult result = new BackendAuthResult();
+
+        try {
+            return extractToken(password).map(idToken -> {
+                GoogleIdToken.Payload payload = idToken.getPayload();
+                if (!payload.getEmailVerified()) { // We only want users who validated their email
+                    return BackendAuthResult.failure();
+                }
+
+                // Get user identifier
+                String userId = payload.getSubject();
+
+                // We validate that the user who authenticated has his Google account associated already
+                return lookup.find("io.kamax.google.id", userId, false).map(r -> {
+
+                    if (!r.getMxid().equals(mxid)) {
+                        return result.fail();
+                    }
+
+                    // Get profile information from payload
+                    extractThreepids(idToken).forEach(result::withThreePid);
+                    String name = (String) payload.get("name");
+
+                    payload.getUnknownKeys().keySet().forEach(key -> {
+                        log.info("Unknown key in Google profile: {} -> ", key, payload.get(key));
+                    });
+
+                    return result.succeed(mxid.getId(), UserIdType.MatrixID.getId(), name);
+                }).orElse(BackendAuthResult.failure());
+            }).orElse(BackendAuthResult.failure());
+        } catch (GeneralSecurityException e) {
+            throw new RuntimeException(e);
+        } catch (IOException e) {
+            log.error("Unable to authenticate via Google due to network error", e);
+            return result.fail();
+        }
+    }
+
+}

src/main/java/io/kamax/mxisd/backend/ldap/LdapAuthProvider.java

@@ -1,8 +1,8 @@
 /*
  * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2017 Kamax Sarl
+ * Copyright (C) 2017 Maxime Dor
  *
- * https://www.kamax.io/
+ * https://max.kamax.io/
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -30,7 +30,6 @@ import io.kamax.mxisd.auth.provider.AuthenticatorProvider;
 import io.kamax.mxisd.auth.provider.BackendAuthResult;
 import io.kamax.mxisd.config.MatrixConfig;
 import io.kamax.mxisd.config.ldap.LdapConfig;
-import io.kamax.mxisd.exception.InternalServerError;
 import io.kamax.mxisd.util.GsonUtil;
 import org.apache.commons.lang.StringUtils;
 import org.apache.directory.api.ldap.model.cursor.CursorException;
@@ -88,6 +87,7 @@ public class LdapAuthProvider extends LdapBackend implements AuthenticatorProvid
     public BackendAuthResult authenticate(_MatrixID mxid, String password) {
         log.info("Performing auth for {}", mxid);
 
+
         try (LdapConnection conn = getConn()) {
             bind(conn);
 
@@ -108,65 +108,62 @@ public class LdapAuthProvider extends LdapBackend implements AuthenticatorProvid
             String[] attArray = new String[attributes.size()];
             attributes.toArray(attArray);
 
+            log.debug("Base DN: {}", getBaseDn());
             log.debug("Query: {}", userFilter);
             log.debug("Attributes: {}", GsonUtil.build().toJson(attArray));
 
-            for (String baseDN : getBaseDNs()) {
+            try (EntryCursor cursor = conn.search(getBaseDn(), userFilter, SearchScope.SUBTREE, attArray)) {
-                log.debug("Base DN: {}", baseDN);
+                while (cursor.next()) {
+                    Entry entry = cursor.get();
+                    String dn = entry.getDn().getName();
+                    log.info("Checking possible match, DN: {}", dn);
 
-                try (EntryCursor cursor = conn.search(baseDN, userFilter, SearchScope.SUBTREE, attArray)) {
+                    if (!getAttribute(entry, getUidAtt()).isPresent()) {
-                    while (cursor.next()) {
+                        continue;
-                        Entry entry = cursor.get();
+                    }
-                        String dn = entry.getDn().getName();
-                        log.info("Checking possible match, DN: {}", dn);
 
-                        if (!getAttribute(entry, getUidAtt()).isPresent()) {
+                    log.info("Attempting authentication on LDAP for {}", dn);
-                            continue;
+                    try {
-                        }
+                        conn.bind(entry.getDn(), password);
+                    } catch (LdapException e) {
+                        log.info("Unable to bind using {} because {}", entry.getDn().getName(), e.getMessage());
+                        return BackendAuthResult.failure();
+                    }
 
-                        log.info("Attempting authentication on LDAP for {}", dn);
+                    Attribute nameAttribute = entry.get(getAt().getName());
-                        try {
+                    String name = nameAttribute != null ? nameAttribute.get().toString() : null;
-                            conn.bind(entry.getDn(), password);
-                        } catch (LdapException e) {
-                            log.info("Unable to bind using {} because {}", entry.getDn().getName(), e.getMessage());
-                            return BackendAuthResult.failure();
-                        }
 
-                        Attribute nameAttribute = entry.get(getAt().getName());
+                    log.info("Authentication successful for {}", entry.getDn().getName());
-                        String name = nameAttribute != null ? nameAttribute.get().toString() : null;
+                    log.info("DN {} is a valid match", dn);
 
-                        log.info("Authentication successful for {}", entry.getDn().getName());
+                    // TODO should we canonicalize the MXID?
-                        log.info("DN {} is a valid match", dn);
+                    BackendAuthResult result = BackendAuthResult.success(mxid.getId(), UserIdType.MatrixID, name);
-
+                    log.info("Processing 3PIDs for profile");
-                        // TODO should we canonicalize the MXID?
+                    getAt().getThreepid().forEach((k, v) -> {
-                        BackendAuthResult result = BackendAuthResult.success(mxid.getId(), UserIdType.MatrixID, name);
+                        log.info("Processing 3PID type {}", k);
-                        log.info("Processing 3PIDs for profile");
+                        v.forEach(attId -> {
-                        getAt().getThreepid().forEach((k, v) -> {
+                            List<String> values = getAttributes(entry, attId);
-                            log.info("Processing 3PID type {}", k);
+                            log.info("\tAttribute {} has {} value(s)", attId, values.size());
-                            v.forEach(attId -> {
+                            getAttributes(entry, attId).forEach(tpidValue -> {
-                                List<String> values = getAttributes(entry, attId);
+                                if (ThreePidMedium.PhoneNumber.is(k)) {
-                                log.info("\tAttribute {} has {} value(s)", attId, values.size());
+                                    tpidValue = getMsisdn(tpidValue).orElse(tpidValue);
-                                getAttributes(entry, attId).forEach(tpidValue -> {
+                                }
-                                    if (ThreePidMedium.PhoneNumber.is(k)) {
+                                result.withThreePid(new ThreePid(k, tpidValue));
-                                        tpidValue = getMsisdn(tpidValue).orElse(tpidValue);
-                                    }
-                                    result.withThreePid(new ThreePid(k, tpidValue));
-                                });
                             });
                         });
+                    });
 
-                        log.info("Found {} 3PIDs", result.getProfile().getThreePids().size());
+                    log.info("Found {} 3PIDs", result.getProfile().getThreePids().size());
-                        return result;
+                    return result;
-                    }
-                } catch (CursorLdapReferralException e) {
-                    log.warn("Entity for {} is only available via referral, skipping", mxid);
                 }
+            } catch (CursorLdapReferralException e) {
+                log.warn("Entity for {} is only available via referral, skipping", mxid);
             }
 
             log.info("No match were found for {}", mxid);
             return BackendAuthResult.failure();
         } catch (LdapException | IOException | CursorException e) {
-            throw new InternalServerError(e);
+            throw new RuntimeException(e);
         }
     }
 

src/main/java/io/kamax/mxisd/backend/ldap/LdapBackend.java

@@ -1,8 +1,8 @@
 /*
  * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2017 Kamax Sarl
+ * Copyright (C) 2017 Maxime Dor
  *
- * https://www.kamax.io/
+ * https://max.kamax.io/
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -20,7 +20,6 @@
 
 package io.kamax.mxisd.backend.ldap;
 
-import io.kamax.matrix._MatrixID;
 import io.kamax.mxisd.config.MatrixConfig;
 import io.kamax.mxisd.config.ldap.LdapConfig;
 import org.apache.commons.lang.StringUtils;
@@ -59,8 +58,8 @@ public abstract class LdapBackend {
         return cfg;
     }
 
-    protected List<String> getBaseDNs() {
+    protected String getBaseDn() {
-        return cfg.getConnection().getBaseDNs();
+        return cfg.getConnection().getBaseDn();
     }
 
     protected LdapConfig.Attribute getAt() {
@@ -71,7 +70,7 @@ public abstract class LdapBackend {
         return getAt().getUid().getValue();
     }
 
-    protected synchronized LdapConnection getConn() {
+    protected synchronized LdapConnection getConn() throws LdapException {
         return new LdapNetworkConnection(cfg.getConnection().getHost(), cfg.getConnection().getPort(), cfg.getConnection().isTls());
     }
 
@@ -125,17 +124,6 @@ public abstract class LdapBackend {
         }
     }
 
-    public String buildUidFromMatrixId(_MatrixID mxId) {
-        String uidType = getCfg().getAttribute().getUid().getType();
-        if (StringUtils.equals(UID, uidType)) {
-            return mxId.getLocalPart();
-        } else if (StringUtils.equals(MATRIX_ID, uidType)) {
-            return mxId.getId();
-        } else {
-            throw new IllegalArgumentException("Bind type " + uidType + " is not supported");
-        }
-    }
-
     public Optional<String> getAttribute(Entry entry, String attName) {
         Attribute attribute = entry.get(attName);
         if (attribute == null) {

src/main/java/io/kamax/mxisd/backend/ldap/LdapDirectoryProvider.java

@@ -1,8 +1,8 @@
 /*
  * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2017 Kamax Sarl
+ * Copyright (C) 2017 Maxime Dor
  *
- * https://www.kamax.io/
+ * https://max.kamax.io/
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -65,37 +65,34 @@ public class LdapDirectoryProvider extends LdapBackend implements IDirectoryProv
             bind(conn);
 
             LdapConfig.Attribute atCfg = getCfg().getAttribute();
+
             attributes = new ArrayList<>(attributes);
             attributes.add(getUidAtt());
             String[] attArray = new String[attributes.size()];
             attributes.toArray(attArray);
             String searchQuery = buildOrQueryWithFilter(getCfg().getDirectory().getFilter(), "*" + query + "*", attArray);
 
+            log.debug("Base DN: {}", getBaseDn());
             log.debug("Query: {}", searchQuery);
             log.debug("Attributes: {}", GsonUtil.build().toJson(attArray));
 
-            for (String baseDN : getBaseDNs()) {
+            try (EntryCursor cursor = conn.search(getBaseDn(), searchQuery, SearchScope.SUBTREE, attArray)) {
-                log.debug("Base DN: {}", baseDN);
+                while (cursor.next()) {
-
+                    Entry entry = cursor.get();
-                try (EntryCursor cursor = conn.search(baseDN, searchQuery, SearchScope.SUBTREE, attArray)) {
+                    log.info("Found possible match, DN: {}", entry.getDn().getName());
-                    while (cursor.next()) {
+                    getAttribute(entry, getUidAtt()).ifPresent(uid -> {
-                        Entry entry = cursor.get();
+                        log.info("DN {} is a valid match", entry.getDn().getName());
-                        log.info("Found possible match, DN: {}", entry.getDn().getName());
+                        try {
-                        getAttribute(entry, getUidAtt()).ifPresent(uid -> {
+                            UserDirectorySearchResult.Result entryResult = new UserDirectorySearchResult.Result();
-                            log.info("DN {} is a valid match", entry.getDn().getName());
+                            entryResult.setUserId(buildMatrixIdFromUid(uid));
-                            try {
+                            getAttribute(entry, atCfg.getName()).ifPresent(entryResult::setDisplayName);
-                                UserDirectorySearchResult.Result entryResult = new UserDirectorySearchResult.Result();
+                            result.addResult(entryResult);
-                                entryResult.setUserId(buildMatrixIdFromUid(uid));
+                        } catch (IllegalArgumentException e) {
-                                getAttribute(entry, atCfg.getName()).ifPresent(entryResult::setDisplayName);
+                            log.warn("Bind was found but type {} is not supported", atCfg.getUid().getType());
-                                result.addResult(entryResult);
+                        }
-                            } catch (IllegalArgumentException e) {
+                    });
-                                log.warn("Bind was found but type {} is not supported", atCfg.getUid().getType());
-                            }
-                        });
-                    }
                 }
             }
-
         } catch (CursorLdapReferralException e) {
             log.warn("An entry is only available via referral, skipping");
         } catch (IOException | LdapException | CursorException e) {

src/main/java/io/kamax/mxisd/backend/ldap/LdapProfileProvider.java

@@ -1,159 +0,0 @@
-/*
- * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2018 Kamax Sarl
- *
- * https://www.kamax.io/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package io.kamax.mxisd.backend.ldap;
-
-import io.kamax.matrix.ThreePid;
-import io.kamax.matrix._MatrixID;
-import io.kamax.matrix._ThreePid;
-import io.kamax.mxisd.config.MatrixConfig;
-import io.kamax.mxisd.config.ldap.LdapConfig;
-import io.kamax.mxisd.exception.InternalServerError;
-import io.kamax.mxisd.profile.ProfileProvider;
-import org.apache.directory.api.ldap.model.cursor.CursorException;
-import org.apache.directory.api.ldap.model.cursor.CursorLdapReferralException;
-import org.apache.directory.api.ldap.model.cursor.EntryCursor;
-import org.apache.directory.api.ldap.model.entry.Entry;
-import org.apache.directory.api.ldap.model.exception.LdapException;
-import org.apache.directory.api.ldap.model.message.SearchScope;
-import org.apache.directory.ldap.client.api.LdapConnection;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-
-@Component
-public class LdapProfileProvider extends LdapBackend implements ProfileProvider {
-
-    private transient Logger log = LoggerFactory.getLogger(LdapProfileProvider.class);
-
-    @Autowired
-    public LdapProfileProvider(LdapConfig cfg, MatrixConfig mxCfg) {
-        super(cfg, mxCfg);
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return getCfg().isEnabled();
-    }
-
-    @Override
-    public Optional<String> getDisplayName(_MatrixID userId) {
-        String uid = buildUidFromMatrixId(userId);
-        log.info("Searching for display name of {}:", uid);
-
-        try (LdapConnection conn = getConn()) {
-            bind(conn);
-
-            String searchQuery = buildOrQueryWithFilter(getCfg().getProfile().getFilter(), uid, getUidAtt());
-            log.debug("Query: {}", searchQuery);
-
-            for (String baseDN : getBaseDNs()) {
-                log.debug("Base DN: {}", baseDN);
-                try (EntryCursor cursor = conn.search(baseDN, searchQuery, SearchScope.SUBTREE, getAt().getName())) {
-                    while (cursor.next()) {
-                        Entry entry = cursor.get();
-                        log.info("Found possible match, DN: {}", entry.getDn().getName());
-                        Optional<String> v = getAttribute(entry, getAt().getName()).flatMap(id -> {
-                            log.info("DN {} is a valid match", entry.getDn().getName());
-                            try {
-                                return getAttribute(entry, getAt().getName());
-                            } catch (IllegalArgumentException e) {
-                                log.warn("Bind was found but type {} is not supported", getAt().getUid().getType());
-                                return Optional.empty();
-                            }
-                        });
-
-                        if (v.isPresent()) {
-                            log.info("DN {} is the final match", entry.getDn().getName());
-                            return v;
-                        }
-                    }
-                } catch (CursorLdapReferralException e) {
-                    log.warn("An entry is only available via referral, skipping");
-                }
-            }
-        } catch (IOException | LdapException | CursorException e) {
-            throw new InternalServerError(e);
-        }
-
-        return Optional.empty();
-    }
-
-    @Override
-    public List<_ThreePid> getThreepids(_MatrixID userId) {
-        String uid = buildUidFromMatrixId(userId);
-        log.info("Searching for 3PIDs of {}:", uid);
-
-        List<_ThreePid> threePids = new ArrayList<>();
-        try (LdapConnection conn = getConn()) {
-            bind(conn);
-
-            getCfg().getAttribute().getThreepid().forEach((medium, attributes) -> {
-                String[] attArray = new String[attributes.size()];
-                attributes.toArray(attArray);
-
-                String searchQuery = buildOrQueryWithFilter(getCfg().getProfile().getFilter(), uid, getUidAtt());
-
-                log.debug("Query for 3PID {}: {}", medium, searchQuery);
-
-                for (String baseDN : getBaseDNs()) {
-                    log.debug("Base DN: {}", baseDN);
-                    try (EntryCursor cursor = conn.search(baseDN, searchQuery, SearchScope.SUBTREE, attArray)) {
-                        while (cursor.next()) {
-                            Entry entry = cursor.get();
-                            log.info("Found possible match, DN: {}", entry.getDn().getName());
-                            try {
-                                attributes.stream()
-                                        .flatMap(at -> getAttributes(entry, at).stream())
-                                        .forEach(address -> {
-                                            log.info("Found 3PID: {} - {}", medium, address);
-                                            threePids.add(new ThreePid(medium, address));
-                                        });
-                            } catch (IllegalArgumentException e) {
-                                log.warn("Bind was found but type {} is not supported", getAt().getUid().getType());
-                            }
-                        }
-                    } catch (CursorLdapReferralException e) {
-                        log.warn("An entry is only available via referral, skipping");
-                    } catch (LdapException | IOException | CursorException e) {
-                        throw new InternalServerError(e);
-                    }
-                }
-            });
-        } catch (IOException | LdapException e) {
-            throw new InternalServerError(e);
-        }
-
-        return threePids;
-    }
-
-    @Override
-    public List<String> getRoles(_MatrixID userId) {
-        return Collections.emptyList();
-    }
-
-}

src/main/java/io/kamax/mxisd/backend/ldap/LdapThreePidProvider.java

@@ -1,8 +1,8 @@
 /*
  * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2017 Kamax Sarl
+ * Copyright (C) 2017 Maxime Dor
  *
- * https://www.kamax.io/
+ * https://max.kamax.io/
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -78,30 +78,28 @@ public class LdapThreePidProvider extends LdapBackend implements IThreePidProvid
         // we merge 3PID specific query with global/specific filter, if one exists.
         String tPidQuery = tPidQueryOpt.get().replaceAll(getCfg().getIdentity().getToken(), value);
         String searchQuery = buildWithFilter(tPidQuery, getCfg().getIdentity().getFilter());
+
+        log.debug("Base DN: {}", getBaseDn());
         log.debug("Query: {}", searchQuery);
         log.debug("Attributes: {}", GsonUtil.build().toJson(getUidAtt()));
 
-        for (String baseDN : getBaseDNs()) {
+        try (EntryCursor cursor = conn.search(getBaseDn(), searchQuery, SearchScope.SUBTREE, getUidAtt())) {
-            log.debug("Base DN: {}", baseDN);
+            while (cursor.next()) {
+                Entry entry = cursor.get();
+                log.info("Found possible match, DN: {}", entry.getDn().getName());
 
-            try (EntryCursor cursor = conn.search(baseDN, searchQuery, SearchScope.SUBTREE, getUidAtt())) {
+                Optional<String> data = getAttribute(entry, getUidAtt());
-                while (cursor.next()) {
+                if (!data.isPresent()) {
-                    Entry entry = cursor.get();
+                    continue;
-                    log.info("Found possible match, DN: {}", entry.getDn().getName());
-
-                    Optional<String> data = getAttribute(entry, getUidAtt());
-                    if (!data.isPresent()) {
-                        continue;
-                    }
-
-                    log.info("DN {} is a valid match", entry.getDn().getName());
-                    return Optional.of(buildMatrixIdFromUid(data.get()));
                 }
-            } catch (CursorLdapReferralException e) {
+
-                log.warn("3PID {} is only available via referral, skipping", value);
+                log.info("DN {} is a valid match", entry.getDn().getName());
-            } catch (IOException | LdapException | CursorException e) {
+                return Optional.of(buildMatrixIdFromUid(data.get()));
-                throw new InternalServerError(e);
             }
+        } catch (CursorLdapReferralException e) {
+            log.warn("3PID {} is only available via referral, skipping", value);
+        } catch (IOException | LdapException | CursorException e) {
+            throw new InternalServerError(e);
         }
 
         return Optional.empty();

src/main/java/io/kamax/mxisd/backend/ldap/netiq/NetIqLdapProfileProvider.java

@@ -1,50 +0,0 @@
-/*
- * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2018 Kamax Sarl
- *
- * https://www.kamax.io/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package io.kamax.mxisd.backend.ldap.netiq;
-
-import io.kamax.matrix._MatrixID;
-import io.kamax.mxisd.backend.ldap.LdapProfileProvider;
-import io.kamax.mxisd.config.MatrixConfig;
-import io.kamax.mxisd.config.ldap.netiq.NetIqLdapConfig;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-@Component
-public class NetIqLdapProfileProvider extends LdapProfileProvider {
-
-    @Autowired
-    public NetIqLdapProfileProvider(NetIqLdapConfig cfg, MatrixConfig mxCfg) {
-        super(cfg, mxCfg);
-    }
-
-    // FIXME this is duplicated in the other NetIQ classes, due to the Matrix ID generation code that was not abstracted
-    @Override
-    public String buildMatrixIdFromUid(String uid) {
-        return super.buildMatrixIdFromUid(uid).toLowerCase();
-    }
-
-    // FIXME this is duplicated in the other NetIQ classes, due to the Matrix ID generation code that was not abstracted
-    @Override
-    public String buildUidFromMatrixId(_MatrixID mxid) {
-        return super.buildUidFromMatrixId(mxid).toLowerCase();
-    }
-
-}

src/main/java/io/kamax/mxisd/backend/memory/MemoryIdentityStore.java

@@ -1,6 +1,6 @@
 /*
  * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2018 Kamax Sarl
+ * Copyright (C) 2018 Maxime Dor
  *
  * https://www.kamax.io/
  *
@@ -76,11 +76,6 @@ public class MemoryIdentityStore implements AuthenticatorProvider, IDirectoryPro
         return cfg.isEnabled();
     }
 
-    @Override
-    public Optional<String> getDisplayName(_MatrixID mxid) {
-        return findByUsername(mxid.getLocalPart()).map(MemoryIdentityConfig::getDisplayName);
-    }
-
     private UserDirectorySearchResult search(
             Predicate<MemoryIdentityConfig> predicate,
             Function<MemoryIdentityConfig, UserDirectorySearchResult.Result> mapper
@@ -148,7 +143,7 @@ public class MemoryIdentityStore implements AuthenticatorProvider, IDirectoryPro
         for (MemoryIdentityConfig id : cfg.getIdentities()) {
             for (MemoryThreePid threepid : id.getThreepids()) {
                 if (req.equals(new ThreePid(threepid.getMedium(), threepid.getAddress()))) {
-                    return Optional.of(new SingleLookupReply(request, MatrixID.asAcceptable(id.getUsername(), mxCfg.getDomain())));
+                    return Optional.of(new SingleLookupReply(request, new MatrixID(id.getUsername(), mxCfg.getDomain())));
                 }
             }
         }

src/main/java/io/kamax/mxisd/backend/rest/LookupBulkResponseJson.java

@@ -1,8 +1,8 @@
 /*
  * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2017 Kamax Sarl
+ * Copyright (C) 2017 Maxime Dor
  *
- * https://www.kamax.io/
+ * https://max.kamax.io/
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as

src/main/java/io/kamax/mxisd/backend/rest/LookupSingleRequestJson.java

@@ -1,8 +1,8 @@
 /*
  * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2017 Kamax Sarl
+ * Copyright (C) 2017 Maxime Dor
  *
- * https://www.kamax.io/
+ * https://max.kamax.io/
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as

src/main/java/io/kamax/mxisd/backend/rest/LookupSingleResponseJson.java

@@ -1,8 +1,8 @@
 /*
  * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2017 Kamax Sarl
+ * Copyright (C) 2017 Maxime Dor
  *
- * https://www.kamax.io/
+ * https://max.kamax.io/
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -20,7 +20,6 @@
 
 package io.kamax.mxisd.backend.rest;
 
-import io.kamax.matrix.ThreePidMedium;
 import io.kamax.mxisd.UserID;
 
 public class LookupSingleResponseJson {
@@ -33,28 +32,12 @@ public class LookupSingleResponseJson {
         return medium;
     }
 
-    public void setMedium(String medium) {
-        this.medium = medium;
-    }
-
-    public void setMedium(ThreePidMedium medium) {
-        setMedium(medium.getId());
-    }
-
     public String getAddress() {
         return address;
     }
 
-    public void setAddress(String address) {
-        this.address = address;
-    }
-
     public UserID getId() {
         return id;
     }
 
-    public void setId(UserID id) {
-        this.id = id;
-    }
-
 }

src/main/java/io/kamax/mxisd/backend/rest/RestAuthProvider.java

@@ -1,8 +1,8 @@
 /*
  * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2017 Kamax Sarl
+ * Copyright (C) 2017 Maxime Dor
  *
- * https://www.kamax.io/
+ * https://max.kamax.io/
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as

src/main/java/io/kamax/mxisd/backend/rest/RestAuthRequestJson.java

@@ -1,8 +1,8 @@
 /*
  * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2017 Kamax Sarl
+ * Copyright (C) 2017 Maxime Dor
  *
- * https://www.kamax.io/
+ * https://max.kamax.io/
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as

src/main/java/io/kamax/mxisd/backend/rest/RestDirectoryProvider.java

@@ -1,8 +1,8 @@
 /*
  * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2017 Kamax Sarl
+ * Copyright (C) 2017 Maxime Dor
  *
- * https://www.kamax.io/
+ * https://max.kamax.io/
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -62,7 +62,7 @@ public class RestDirectoryProvider extends RestProvider implements IDirectoryPro
 
             UserDirectorySearchResult response = parser.parse(httpResponse, UserDirectorySearchResult.class);
             for (UserDirectorySearchResult.Result result : response.getResults()) {
-                result.setUserId(MatrixID.asAcceptable(result.getUserId(), mxCfg.getDomain()).getId());
+                result.setUserId(new MatrixID(result.getUserId(), mxCfg.getDomain()).getId());
             }
 
             return response;

src/main/java/io/kamax/mxisd/backend/rest/RestProfileProvider.java

@@ -1,147 +0,0 @@
-/*
- * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2018 Kamax Sarl
- *
- * https://www.kamax.io/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package io.kamax.mxisd.backend.rest;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonSyntaxException;
-import io.kamax.matrix._MatrixID;
-import io.kamax.matrix._ThreePid;
-import io.kamax.matrix.json.GsonUtil;
-import io.kamax.matrix.json.InvalidJsonException;
-import io.kamax.mxisd.config.rest.RestBackendConfig;
-import io.kamax.mxisd.exception.InternalServerError;
-import io.kamax.mxisd.profile.JsonProfileRequest;
-import io.kamax.mxisd.profile.JsonProfileResult;
-import io.kamax.mxisd.profile.ProfileProvider;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.http.entity.ContentType;
-import org.apache.http.entity.StringEntity;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.nio.charset.StandardCharsets;
-import java.util.*;
-import java.util.function.Function;
-
-@Component
-public class RestProfileProvider extends RestProvider implements ProfileProvider {
-
-    private final Logger log = LoggerFactory.getLogger(RestProfileProvider.class);
-
-    public RestProfileProvider(RestBackendConfig cfg) {
-        super(cfg);
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return cfg.isEnabled() && cfg.getEndpoints().getProfile().isPresent();
-    }
-
-    private <T> Optional<T> doRequest(
-            _MatrixID userId,
-            Function<RestBackendConfig.ProfileEndpoints, Optional<String>> endpoint,
-            Function<JsonProfileResult, Optional<T>> value
-    ) {
-        return cfg.getEndpoints().getProfile()
-                // We get the endpoint
-                .flatMap(endpoint)
-                // We only continue if there is a value
-                .filter(StringUtils::isNotBlank)
-                // We use the endpoint
-                .flatMap(url -> {
-                    try {
-                        URIBuilder builder = new URIBuilder(url);
-                        HttpPost req = new HttpPost(builder.build());
-                        req.setEntity(new StringEntity(GsonUtil.get().toJson(new JsonProfileRequest(userId)), ContentType.APPLICATION_JSON));
-                        try (CloseableHttpResponse res = client.execute(req)) {
-                            int sc = res.getStatusLine().getStatusCode();
-                            if (sc == 404) {
-                                log.info("Got 404 - No result found");
-                                return Optional.empty();
-                            }
-
-                            if (sc != 200) {
-                                throw new InternalServerError("Unexpected backed status code: " + sc);
-                            }
-
-                            String body = IOUtils.toString(res.getEntity().getContent(), StandardCharsets.UTF_8);
-                            if (StringUtils.isBlank(body)) {
-                                log.warn("Backend response body is empty/blank, expected JSON object with profile key");
-                                return Optional.empty();
-                            }
-
-                            Optional<JsonObject> pJson = GsonUtil.findObj(GsonUtil.parseObj(body), "profile");
-                            if (!pJson.isPresent()) {
-                                log.warn("Backend response body is invalid, expected JSON object with profile key");
-                                return Optional.empty();
-                            }
-
-                            JsonProfileResult profile = gson.fromJson(pJson.get(), JsonProfileResult.class);
-                            return value.apply(profile);
-                        }
-                    } catch (JsonSyntaxException | InvalidJsonException e) {
-                        log.error("Unable to parse backend response as JSON", e);
-                        throw new InternalServerError(e);
-                    } catch (URISyntaxException e) {
-                        log.error("Unable to build a valid request URL", e);
-                        throw new InternalServerError(e);
-                    } catch (IOException e) {
-                        log.error("I/O Error during backend request", e);
-                        throw new InternalServerError();
-                    }
-                });
-    }
-
-    @Override
-    public Optional<String> getDisplayName(_MatrixID userId) {
-        return doRequest(userId, p -> Optional.ofNullable(p.getDisplayName()), profile -> Optional.ofNullable(profile.getDisplayName()));
-    }
-
-    @Override
-    public List<_ThreePid> getThreepids(_MatrixID userId) {
-        return doRequest(userId, p -> Optional.ofNullable(p.getThreepids()), profile -> {
-            List<_ThreePid> t = new ArrayList<>();
-            if (Objects.nonNull(profile.getThreepids())) {
-                t.addAll(profile.getThreepids());
-            }
-            return Optional.of(t);
-        }).orElseGet(Collections::emptyList);
-    }
-
-    @Override
-    public List<String> getRoles(_MatrixID userId) {
-        return doRequest(userId, p -> Optional.ofNullable(p.getRoles()), profile -> {
-            List<String> t = new ArrayList<>();
-            if (Objects.nonNull(profile.getRoles())) {
-                t.addAll(profile.getRoles());
-            }
-            return Optional.of(t);
-        }).orElseGet(Collections::emptyList);
-    }
-
-}

src/main/java/io/kamax/mxisd/backend/rest/RestProvider.java

@@ -1,8 +1,8 @@
 /*
  * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2017 Kamax Sarl
+ * Copyright (C) 2017 Maxime Dor
  *
- * https://www.kamax.io/
+ * https://max.kamax.io/
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as

src/main/java/io/kamax/mxisd/backend/rest/RestThreePidProvider.java

@@ -1,8 +1,8 @@
 /*
  * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2017 Kamax Sarl
+ * Copyright (C) 2017 Maxime Dor
  *
- * https://www.kamax.io/
+ * https://max.kamax.io/
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -60,9 +60,9 @@ public class RestThreePidProvider extends RestProvider implements IThreePidProvi
     // TODO refactor in lookup manager with above FIXME
     private _MatrixID getMxId(UserID id) {
         if (UserIdType.Localpart.is(id.getType())) {
-            return MatrixID.asAcceptable(id.getValue(), mxCfg.getDomain());
+            return new MatrixID(id.getValue(), mxCfg.getDomain());
         } else {
-            return MatrixID.asAcceptable(id.getValue());
+            return new MatrixID(id.getValue());
         }
     }
 

src/main/java/io/kamax/mxisd/backend/sql/GenericSqlAuthProvider.java

@@ -1,8 +1,8 @@
 /*
  * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2017 Kamax Sarl
+ * Copyright (C) 2017 Maxime Dor
  *
- * https://www.kamax.io/
+ * https://max.kamax.io/
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -18,12 +18,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.kamax.mxisd.backend.sql.generic;
+package io.kamax.mxisd.backend.sql;
 
 import io.kamax.matrix._MatrixID;
 import io.kamax.mxisd.auth.provider.AuthenticatorProvider;
 import io.kamax.mxisd.auth.provider.BackendAuthResult;
-import io.kamax.mxisd.config.sql.generic.GenericSqlProviderConfig;
+import io.kamax.mxisd.config.ServerConfig;
+import io.kamax.mxisd.config.sql.GenericSqlProviderConfig;
 import io.kamax.mxisd.invitation.InvitationManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -35,6 +36,9 @@ public class GenericSqlAuthProvider implements AuthenticatorProvider {
 
     private Logger log = LoggerFactory.getLogger(GenericSqlAuthProvider.class);
 
+    @Autowired
+    private ServerConfig srvCfg;
+
     @Autowired
     private GenericSqlProviderConfig cfg;
 
@@ -43,7 +47,7 @@ public class GenericSqlAuthProvider implements AuthenticatorProvider {
 
     @Override
     public boolean isEnabled() {
-        return cfg.getAuth().isEnabled();
+        return cfg.isEnabled();
     }
 
     @Override

src/main/java/io/kamax/mxisd/backend/sql/GenericSqlDirectoryProvider.java

@@ -1,8 +1,8 @@
 /*
  * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2017 Kamax Sarl
+ * Copyright (C) 2017 Maxime Dor
  *
- * https://www.kamax.io/
+ * https://max.kamax.io/
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -18,13 +18,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.kamax.mxisd.backend.sql.generic;
+package io.kamax.mxisd.backend.sql;
 
 import io.kamax.matrix.MatrixID;
-import io.kamax.mxisd.backend.sql.SqlConnectionPool;
 import io.kamax.mxisd.config.MatrixConfig;
+import io.kamax.mxisd.config.sql.GenericSqlProviderConfig;
 import io.kamax.mxisd.config.sql.SqlConfig;
-import io.kamax.mxisd.config.sql.generic.GenericSqlProviderConfig;
 import io.kamax.mxisd.controller.directory.v1.io.UserDirectorySearchResult;
 import io.kamax.mxisd.directory.IDirectoryProvider;
 import io.kamax.mxisd.exception.InternalServerError;
@@ -45,7 +44,7 @@ public abstract class GenericSqlDirectoryProvider implements IDirectoryProvider
     private Logger log = LoggerFactory.getLogger(GenericSqlDirectoryProvider.class);
 
     protected SqlConfig cfg;
-    protected MatrixConfig mxCfg;
+    private MatrixConfig mxCfg;
 
     private SqlConnectionPool pool;
 
@@ -57,7 +56,7 @@ public abstract class GenericSqlDirectoryProvider implements IDirectoryProvider
 
     @Override
     public boolean isEnabled() {
-        return cfg.getDirectory().isEnabled();
+        return cfg.isEnabled();
     }
 
     protected void setParameters(PreparedStatement stmt, String searchTerm) throws SQLException {
@@ -86,7 +85,7 @@ public abstract class GenericSqlDirectoryProvider implements IDirectoryProvider
                     while (rSet.next()) {
                         processRow(rSet).ifPresent(e -> {
                             if (StringUtils.equalsIgnoreCase("localpart", query.getType())) {
-                                e.setUserId(MatrixID.asAcceptable(e.getUserId(), mxCfg.getDomain()).getId());
+                                e.setUserId(new MatrixID(e.getUserId(), mxCfg.getDomain()).getId());
                             }
                             result.addResult(e);
                         });

src/main/java/io/kamax/mxisd/backend/sql/GenericSqlThreePidProvider.java

@@ -1,8 +1,8 @@
 /*
  * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2017 Kamax Sarl
+ * Copyright (C) 2017 Maxime Dor
  *
- * https://www.kamax.io/
+ * https://max.kamax.io/
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -18,11 +18,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.kamax.mxisd.backend.sql.generic;
+package io.kamax.mxisd.backend.sql;
 
-import io.kamax.mxisd.backend.sql.SqlThreePidProvider;
 import io.kamax.mxisd.config.MatrixConfig;
-import io.kamax.mxisd.config.sql.generic.GenericSqlProviderConfig;
+import io.kamax.mxisd.config.sql.GenericSqlProviderConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

src/main/java/io/kamax/mxisd/backend/sql/SqlConnectionPool.java

@@ -1,8 +1,8 @@
 /*
  * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2017 Kamax Sarl
+ * Copyright (C) 2017 Maxime Dor
  *
- * https://www.kamax.io/
+ * https://max.kamax.io/
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -28,12 +28,6 @@ import java.sql.SQLException;
 
 public class SqlConnectionPool {
 
-    public interface SqlFunction<T, R> {
-
-        R run(T connection) throws SQLException;
-
-    }
-
     private ComboPooledDataSource ds;
 
     public SqlConnectionPool(SqlConfig cfg) {
@@ -48,12 +42,4 @@ public class SqlConnectionPool {
         return ds.getConnection();
     }
 
-    public <T> T withConnFunction(SqlFunction<Connection, T> function) {
-        try (Connection conn = get()) {
-            return function.run(conn);
-        } catch (SQLException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
 }

src/main/java/io/kamax/mxisd/backend/sql/SqlProfileProvider.java

@@ -1,105 +0,0 @@
-/*
- * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2018 Kamax Sarl
- *
- * https://www.kamax.io/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package io.kamax.mxisd.backend.sql;
-
-import io.kamax.matrix.ThreePid;
-import io.kamax.matrix._MatrixID;
-import io.kamax.matrix._ThreePid;
-import io.kamax.mxisd.config.sql.SqlConfig;
-import io.kamax.mxisd.profile.ProfileProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-
-public abstract class SqlProfileProvider implements ProfileProvider {
-
-    private Logger log = LoggerFactory.getLogger(SqlProfileProvider.class);
-
-    private SqlConfig.Profile cfg;
-
-    private SqlConnectionPool pool;
-
-    public SqlProfileProvider(SqlConfig cfg) {
-        this.cfg = cfg.getProfile();
-        this.pool = new SqlConnectionPool(cfg);
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return cfg.isEnabled();
-    }
-
-    @Override
-    public Optional<String> getDisplayName(_MatrixID user) {
-        String stmtSql = cfg.getDisplayName().getQuery();
-        try (Connection conn = pool.get()) {
-            try (PreparedStatement stmt = conn.prepareStatement(stmtSql)) {
-                stmt.setString(1, user.getId());
-
-                try (ResultSet rSet = stmt.executeQuery()) {
-                    if (!rSet.next()) {
-                        return Optional.empty();
-                    }
-
-                    return Optional.ofNullable(rSet.getString(1));
-                }
-            }
-        } catch (SQLException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Override
-    public List<_ThreePid> getThreepids(_MatrixID user) {
-        List<_ThreePid> threepids = new ArrayList<>();
-
-        String stmtSql = cfg.getThreepid().getQuery();
-        try (Connection conn = pool.get()) {
-            PreparedStatement stmt = conn.prepareStatement(stmtSql);
-            stmt.setString(1, user.getId());
-
-            ResultSet rSet = stmt.executeQuery();
-            while (rSet.next()) {
-                String medium = rSet.getString(1);
-                String address = rSet.getString(2);
-                threepids.add(new ThreePid(medium, address));
-            }
-
-            return threepids;
-        } catch (SQLException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Override
-    public List<String> getRoles(_MatrixID user) {
-        return Collections.emptyList();
-    }
-
-}

src/main/java/io/kamax/mxisd/backend/sql/SqlThreePidProvider.java

@@ -1,8 +1,8 @@
 /*
  * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2017 Kamax Sarl
+ * Copyright (C) 2017 Maxime Dor
  *
- * https://www.kamax.io/
+ * https://max.kamax.io/
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -21,12 +21,16 @@
 package io.kamax.mxisd.backend.sql;
 
 import io.kamax.matrix.MatrixID;
+import io.kamax.matrix.ThreePid;
+import io.kamax.matrix._MatrixID;
+import io.kamax.matrix._ThreePid;
 import io.kamax.mxisd.config.MatrixConfig;
 import io.kamax.mxisd.config.sql.SqlConfig;
 import io.kamax.mxisd.lookup.SingleLookupReply;
 import io.kamax.mxisd.lookup.SingleLookupRequest;
 import io.kamax.mxisd.lookup.ThreePidMapping;
 import io.kamax.mxisd.lookup.provider.IThreePidProvider;
+import io.kamax.mxisd.profile.ProfileProvider;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -36,10 +40,11 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
-public abstract class SqlThreePidProvider implements IThreePidProvider {
+public abstract class SqlThreePidProvider implements IThreePidProvider, ProfileProvider {
 
     private Logger log = LoggerFactory.getLogger(SqlThreePidProvider.class);
 
@@ -54,6 +59,10 @@ public abstract class SqlThreePidProvider implements IThreePidProvider {
         this.mxCfg = mxCfg;
     }
 
+    protected Connection getConnection() throws SQLException {
+        return pool.get();
+    }
+
     @Override
     public boolean isEnabled() {
         return cfg.isEnabled();
@@ -85,11 +94,11 @@ public abstract class SqlThreePidProvider implements IThreePidProvider {
                         log.info("Found match: {}", uid);
                         if (StringUtils.equals("uid", cfg.getIdentity().getType())) {
                             log.info("Resolving as localpart");
-                            return Optional.of(new SingleLookupReply(request, MatrixID.asAcceptable(uid, mxCfg.getDomain())));
+                            return Optional.of(new SingleLookupReply(request, new MatrixID(uid, mxCfg.getDomain())));
                         }
                         if (StringUtils.equals("mxid", cfg.getIdentity().getType())) {
                             log.info("Resolving as MXID");
-                            return Optional.of(new SingleLookupReply(request, MatrixID.asAcceptable(uid)));
+                            return Optional.of(new SingleLookupReply(request, new MatrixID(uid)));
                         }
 
                         log.info("Identity type is unknown, skipping");
@@ -109,4 +118,31 @@ public abstract class SqlThreePidProvider implements IThreePidProvider {
         return new ArrayList<>();
     }
 
+    @Override
+    public List<_ThreePid> getThreepids(_MatrixID mxid) {
+        List<_ThreePid> threepids = new ArrayList<>();
+
+        String stmtSql = cfg.getProfile().getThreepid().getQuery();
+        try (Connection conn = getConnection()) {
+            PreparedStatement stmt = conn.prepareStatement(stmtSql);
+            stmt.setString(1, mxid.getId());
+
+            ResultSet rSet = stmt.executeQuery();
+            while (rSet.next()) {
+                String medium = rSet.getString("medium");
+                String address = rSet.getString("address");
+                threepids.add(new ThreePid(medium, address));
+            }
+
+            return threepids;
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public List<String> getRoles(_MatrixID mxid) {
+        return Collections.emptyList();
+    }
+
 }

src/main/java/io/kamax/mxisd/backend/sql/SynapseSqlDirectoryProvider.java

@@ -0,0 +1,69 @@
+/*
+ * mxisd - Matrix Identity Server Daemon
+ * Copyright (C) 2017 Maxime Dor
+ *
+ * https://max.kamax.io/
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package io.kamax.mxisd.backend.sql;
+
+import io.kamax.mxisd.config.MatrixConfig;
+import io.kamax.mxisd.config.sql.GenericSqlProviderConfig;
+import io.kamax.mxisd.config.sql.synapse.SynapseSqlProviderConfig;
+import io.kamax.mxisd.exception.ConfigurationException;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+
+@Component
+public class SynapseSqlDirectoryProvider extends GenericSqlDirectoryProvider {
+
+    @Autowired
+    public SynapseSqlDirectoryProvider(SynapseSqlProviderConfig cfg, MatrixConfig mxCfg) {
+        super(cfg, mxCfg);
+
+        if (StringUtils.equals("sqlite", cfg.getType())) {
+            String userId = "'@' || p.user_id || ':" + mxCfg.getDomain() + "'";
+            GenericSqlProviderConfig.Type queries = cfg.getDirectory().getQuery();
+            queries.getName().setValue(
+                    "select " + userId + ", displayname from profiles p where displayname like ?");
+            queries.getThreepid().setValue(
+                    "select t.user_id, p.displayname " +
+                            "from user_threepids t JOIN profiles p on t.user_id = " + userId + " " +
+                            "where t.address like ?");
+        } else if (StringUtils.equals("postgresql", cfg.getType())) {
+            String userId = "concat('@',p.user_id,':" + mxCfg.getDomain() + "')";
+            GenericSqlProviderConfig.Type queries = cfg.getDirectory().getQuery();
+            queries.getName().setValue(
+                    "select " + userId + ", displayname from profiles p where displayname ilike ?");
+            queries.getThreepid().setValue(
+                    "select t.user_id, p.displayname " +
+                            "from user_threepids t JOIN profiles p on t.user_id = " + userId + " " +
+                            "where t.address ilike ?");
+        } else {
+            throw new ConfigurationException("Invalid SQL type");
+        }
+    }
+
+    @Override
+    protected void setParameters(PreparedStatement stmt, String searchTerm) throws SQLException {
+        stmt.setString(1, "%" + searchTerm + "%");
+    }
+
+}

src/main/java/io/kamax/mxisd/backend/sql/SynapseSqlThreePidProvider.java

@@ -0,0 +1,69 @@
+/*
+ * mxisd - Matrix Identity Server Daemon
+ * Copyright (C) 2017 Maxime Dor
+ *
+ * https://max.kamax.io/
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package io.kamax.mxisd.backend.sql;
+
+import io.kamax.matrix.ThreePid;
+import io.kamax.matrix._MatrixID;
+import io.kamax.mxisd.config.MatrixConfig;
+import io.kamax.mxisd.config.sql.synapse.SynapseSqlProviderConfig;
+import io.kamax.mxisd.profile.ProfileWriter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.time.Instant;
+
+@Component
+public class SynapseSqlThreePidProvider extends SqlThreePidProvider implements ProfileWriter {
+
+    private final Logger log = LoggerFactory.getLogger(SynapseSqlThreePidProvider.class);
+
+    @Autowired
+    public SynapseSqlThreePidProvider(SynapseSqlProviderConfig cfg, MatrixConfig mxCfg) {
+        super(cfg, mxCfg);
+    }
+
+    @Override
+    public boolean addThreepid(_MatrixID mxid, ThreePid tpid) {
+        try (Connection conn = getConnection()) {
+            PreparedStatement stmt = conn.prepareStatement("INSERT INTO user_threepids (user_id, medium, address, validated_at, added_at) values (?,?,?,?,?)");
+            stmt.setString(1, mxid.getId());
+            stmt.setString(2, tpid.getMedium());
+            stmt.setString(3, tpid.getAddress());
+            stmt.setLong(4, Instant.now().toEpochMilli());
+            stmt.setLong(5, Instant.now().toEpochMilli());
+
+            int rows = stmt.executeUpdate();
+            if (rows != 1) {
+                log.error("Unable to update 3PID info. Modified row(s): {}", rows);
+            }
+
+            return true;
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+}

src/main/java/io/kamax/mxisd/backend/sql/generic/GenericSqlProfileProvider.java

@@ -1,34 +0,0 @@
-/*
- * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2018 Kamax Sarl
- *
- * https://www.kamax.io/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package io.kamax.mxisd.backend.sql.generic;
-
-import io.kamax.mxisd.backend.sql.SqlProfileProvider;
-import io.kamax.mxisd.config.sql.generic.GenericSqlProviderConfig;
-import org.springframework.stereotype.Component;
-
-@Component
-public class GenericSqlProfileProvider extends SqlProfileProvider {
-
-    public GenericSqlProfileProvider(GenericSqlProviderConfig cfg) {
-        super(cfg);
-    }
-
-}

src/main/java/io/kamax/mxisd/backend/sql/synapse/Synapse.java

@@ -1,55 +0,0 @@
-/*
- * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2018 Kamax Sarl
- *
- * https://www.kamax.io/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package io.kamax.mxisd.backend.sql.synapse;
-
-import io.kamax.mxisd.backend.sql.SqlConnectionPool;
-import io.kamax.mxisd.config.sql.synapse.SynapseSqlProviderConfig;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.util.Optional;
-
-@Component
-public class Synapse {
-
-    private SqlConnectionPool pool;
-
-    @Autowired
-    public Synapse(SynapseSqlProviderConfig sqlCfg) {
-        this.pool = new SqlConnectionPool(sqlCfg);
-    }
-
-    public Optional<String> getRoomName(String id) {
-        return pool.withConnFunction(conn -> {
-            PreparedStatement stmt = conn.prepareStatement(SynapseQueries.getRoomName());
-            stmt.setString(1, id);
-            ResultSet rSet = stmt.executeQuery();
-            if (!rSet.next()) {
-                return Optional.empty();
-            }
-
-            return Optional.ofNullable(rSet.getString(1));
-        });
-    }
-
-}

src/main/java/io/kamax/mxisd/backend/sql/synapse/SynapseQueries.java

@@ -1,74 +0,0 @@
-/*
- * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2018 Kamax Sarl
- *
- * https://www.kamax.io/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package io.kamax.mxisd.backend.sql.synapse;
-
-import io.kamax.mxisd.exception.ConfigurationException;
-import org.apache.commons.lang.StringUtils;
-
-public class SynapseQueries {
-
-    public static String getUserId(String type, String domain) {
-        if (StringUtils.equals("sqlite", type)) {
-            return "'@' || p.user_id || ':" + domain + "'";
-        } else if (StringUtils.equals("postgresql", type)) {
-            return "concat('@',p.user_id,':" + domain + "')";
-        } else {
-            throw new ConfigurationException("Invalid Synapse SQL type: " + type);
-        }
-    }
-
-    public static String getDisplayName() {
-        return "SELECT displayname FROM profiles WHERE user_id = ?";
-    }
-
-    public static String getThreepids() {
-        return "SELECT medium, address FROM user_threepids WHERE user_id = ?";
-    }
-
-    public static String findByDisplayName(String type, String domain) {
-        if (StringUtils.equals("sqlite", type)) {
-            return "select " + getUserId(type, domain) + ", displayname from profiles p where displayname like ?";
-        } else if (StringUtils.equals("postgresql", type)) {
-            return "select " + getUserId(type, domain) + ", displayname from profiles p where displayname ilike ?";
-        } else {
-            throw new ConfigurationException("Invalid Synapse SQL type: " + type);
-        }
-    }
-
-    public static String findByThreePidAddress(String type, String domain) {
-        if (StringUtils.equals("sqlite", type)) {
-            return "select t.user_id, p.displayname " +
-                    "from user_threepids t JOIN profiles p on t.user_id = " + getUserId(type, domain) + " " +
-                    "where t.address like ?";
-        } else if (StringUtils.equals("postgresql", type)) {
-            return "select t.user_id, p.displayname " +
-                    "from user_threepids t JOIN profiles p on t.user_id = " + getUserId(type, domain) + " " +
-                    "where t.address ilike ?";
-        } else {
-            throw new ConfigurationException("Invalid Synapse SQL type: " + type);
-        }
-    }
-
-    public static String getRoomName() {
-        return "select r.name from room_names r, events e, (select r1.room_id,max(e1.origin_server_ts) ts from room_names r1, events e1 where r1.event_id = e1.event_id group by r1.room_id) rle where e.origin_server_ts = rle.ts and r.event_id = e.event_id and r.room_id = ?";
-    }
-
-}

src/main/java/io/kamax/mxisd/backend/sql/synapse/SynapseSqlDirectoryProvider.java

@@ -1,63 +0,0 @@
-/*
- * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2017 Kamax Sarl
- *
- * https://www.kamax.io/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package io.kamax.mxisd.backend.sql.synapse;
-
-import io.kamax.mxisd.backend.sql.generic.GenericSqlDirectoryProvider;
-import io.kamax.mxisd.config.MatrixConfig;
-import io.kamax.mxisd.config.sql.generic.GenericSqlProviderConfig;
-import io.kamax.mxisd.config.sql.synapse.SynapseSqlProviderConfig;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.PostConstruct;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.util.Objects;
-
-@Component
-public class SynapseSqlDirectoryProvider extends GenericSqlDirectoryProvider {
-
-    @Autowired
-    public SynapseSqlDirectoryProvider(SynapseSqlProviderConfig cfg, MatrixConfig mxCfg) {
-        super(cfg, mxCfg);
-    }
-
-    @Override
-    protected void setParameters(PreparedStatement stmt, String searchTerm) throws SQLException {
-        stmt.setString(1, "%" + searchTerm + "%");
-    }
-
-    @PostConstruct
-    public void build() {
-        if (!isEnabled()) {
-            return;
-        }
-
-        GenericSqlProviderConfig.Type queries = cfg.getDirectory().getQuery();
-        if (Objects.isNull(queries.getName().getValue())) {
-            queries.getName().setValue(SynapseQueries.findByDisplayName(cfg.getType(), mxCfg.getDomain()));
-        }
-        if (Objects.isNull(queries.getThreepid().getValue())) {
-            queries.getThreepid().setValue(SynapseQueries.findByThreePidAddress(cfg.getType(), mxCfg.getDomain()));
-        }
-    }
-
-}

src/main/java/io/kamax/mxisd/backend/sql/synapse/SynapseSqlProfileProvider.java

@@ -1,36 +0,0 @@
-/*
- * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2018 Kamax Sarl
- *
- * https://www.kamax.io/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package io.kamax.mxisd.backend.sql.synapse;
-
-import io.kamax.mxisd.backend.sql.SqlProfileProvider;
-import io.kamax.mxisd.config.sql.synapse.SynapseSqlProviderConfig;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-@Component
-public class SynapseSqlProfileProvider extends SqlProfileProvider {
-
-    @Autowired
-    public SynapseSqlProfileProvider(SynapseSqlProviderConfig cfg) {
-        super(cfg);
-    }
-
-}

src/main/java/io/kamax/mxisd/backend/sql/synapse/SynapseSqlThreePidProvider.java

@@ -1,37 +0,0 @@
-/*
- * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2017 Kamax Sarl
- *
- * https://www.kamax.io/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package io.kamax.mxisd.backend.sql.synapse;
-
-import io.kamax.mxisd.backend.sql.SqlThreePidProvider;
-import io.kamax.mxisd.config.MatrixConfig;
-import io.kamax.mxisd.config.sql.synapse.SynapseSqlProviderConfig;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-@Component
-public class SynapseSqlThreePidProvider extends SqlThreePidProvider {
-
-    @Autowired
-    public SynapseSqlThreePidProvider(SynapseSqlProviderConfig cfg, MatrixConfig mxCfg) {
-        super(cfg, mxCfg);
-    }
-
-}

src/main/java/io/kamax/mxisd/config/AsyncConfig.java

@@ -1,36 +0,0 @@
-/*
- * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2018 Kamax Sarl
- *
- * https://www.kamax.io/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package io.kamax.mxisd.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.AsyncSupportConfigurer;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
-
-@Configuration
-public class AsyncConfig extends WebMvcConfigurerAdapter {
-
-    @Override
-    public void configureAsyncSupport(AsyncSupportConfigurer configurer) {
-        configurer.setDefaultTimeout(60 * 60 * 1000); // 1h in milliseconds
-        super.configureAsyncSupport(configurer);
-    }
-
-}

src/main/java/io/kamax/mxisd/config/AuthenticationConfig.java

@@ -1,110 +0,0 @@
-/*
- * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2018 Kamax Sarl
- *
- * https://www.kamax.io/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package io.kamax.mxisd.config;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-
-import javax.annotation.PostConstruct;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Pattern;
-
-@Configuration
-@ConfigurationProperties(prefix = "auth")
-public class AuthenticationConfig {
-
-    public static class Rule {
-
-        private String regex;
-        private transient Pattern pattern;
-        private String medium;
-
-        public String getRegex() {
-            return regex;
-        }
-
-        public void setRegex(String regex) {
-            this.regex = regex;
-        }
-
-        public Pattern getPattern() {
-            return pattern;
-        }
-
-        public void setPattern(Pattern pattern) {
-            this.pattern = pattern;
-        }
-
-        public String getMedium() {
-            return medium;
-        }
-
-        public void setMedium(String medium) {
-            this.medium = medium;
-        }
-
-    }
-
-    public static class User {
-
-        private List<Rule> rules = new ArrayList<>();
-
-        public List<Rule> getRules() {
-            return rules;
-        }
-
-        public void setRules(List<Rule> mappings) {
-            this.rules = mappings;
-        }
-
-    }
-
-    public static class Rewrite {
-
-        private User user = new User();
-
-        public User getUser() {
-            return user;
-        }
-
-        public void setUser(User user) {
-            this.user = user;
-        }
-
-    }
-
-    private Rewrite rewrite = new Rewrite();
-
-    public Rewrite getRewrite() {
-        return rewrite;
-    }
-
-    public void setRewrite(Rewrite rewrite) {
-        this.rewrite = rewrite;
-    }
-
-    @PostConstruct
-    public void build() {
-        getRewrite().getUser().getRules().forEach(mapping -> mapping.setPattern(Pattern.compile(mapping.getRegex())));
-    }
-
-}

src/main/java/io/kamax/mxisd/config/BulkLookupConfig.java

@@ -1,51 +0,0 @@
-/*
- * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2018 Kamax Sarl
- *
- * https://www.kamax.io/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package io.kamax.mxisd.config;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-
-import javax.annotation.PostConstruct;
-import java.util.Objects;
-
-@Configuration
-@ConfigurationProperties(prefix = "lookup.bulk")
-public class BulkLookupConfig {
-
-    private Boolean enabled;
-
-    public Boolean getEnabled() {
-        return enabled;
-    }
-
-    public void setEnabled(Boolean enabled) {
-        this.enabled = enabled;
-    }
-
-    @PostConstruct
-    public void build() {
-        if (Objects.isNull(enabled)) {
-            enabled = true;
-        }
-
-    }
-
-}

src/main/java/io/kamax/mxisd/config/DirectoryConfig.java

@@ -1,8 +1,8 @@
 /*
  * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2017 Kamax Sarl
+ * Copyright (C) 2017 Maxime Dor
  *
- * https://www.kamax.io/
+ * https://max.kamax.io/
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -25,8 +25,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 
-import javax.annotation.PostConstruct;
-
 @Configuration
 @ConfigurationProperties("directory")
 public class DirectoryConfig {
@@ -36,7 +34,6 @@ public class DirectoryConfig {
     public static class Exclude {
 
         private boolean homeserver;
-        private boolean threepid;
 
         public boolean getHomeserver() {
             return homeserver;
@@ -47,14 +44,6 @@ public class DirectoryConfig {
             return this;
         }
 
-        public boolean getThreepid() {
-            return threepid;
-        }
-
-        public void setThreepid(boolean threepid) {
-            this.threepid = threepid;
-        }
-
     }
 
     private Exclude exclude = new Exclude();
@@ -67,12 +56,4 @@ public class DirectoryConfig {
         this.exclude = exclude;
     }
 
-    @PostConstruct
-    public void buid() {
-        log.info("--- Directory config ---");
-        log.info("Exclude:");
-        log.info("\tHomeserver: {}", getExclude().getHomeserver());
-        log.info("\t3PID: {}", getExclude().getThreepid());
-    }
-
 }

src/main/java/io/kamax/mxisd/config/DnsOverwriteConfig.java

@@ -1,8 +1,8 @@
 /*
  * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2017 Kamax Sarl
+ * Copyright (C) 2017 Maxime Dor
  *
- * https://www.kamax.io/
+ * https://max.kamax.io/
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as

src/main/java/io/kamax/mxisd/config/ExecConfig.java

@@ -1,540 +0,0 @@
-/*
- * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2018 Kamax Sarl
- *
- * https://www.kamax.io/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package io.kamax.mxisd.config;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-
-import javax.annotation.PostConstruct;
-import java.util.*;
-
-@Configuration
-@ConfigurationProperties("exec")
-public class ExecConfig {
-
-    public class IO {
-
-        private String type;
-        private String template;
-
-        public Optional<String> getType() {
-            return Optional.ofNullable(type);
-        }
-
-        public void setType(String type) {
-            this.type = type;
-        }
-
-        public Optional<String> getTemplate() {
-            return Optional.ofNullable(template);
-        }
-
-        public void setTemplate(String template) {
-            this.template = template;
-        }
-
-    }
-
-    public class Exit {
-
-        private List<Integer> success = Collections.singletonList(0);
-        private List<Integer> failure = Collections.singletonList(1);
-
-        public List<Integer> getSuccess() {
-            return success;
-        }
-
-        public void setSuccess(List<Integer> success) {
-            this.success = success;
-        }
-
-        public List<Integer> getFailure() {
-            return failure;
-        }
-
-        public void setFailure(List<Integer> failure) {
-            this.failure = failure;
-        }
-
-    }
-
-    public class TokenOverride {
-
-        private String localpart;
-        private String domain;
-        private String mxid;
-        private String password;
-        private String medium;
-        private String address;
-        private String type;
-        private String query;
-
-        public String getLocalpart() {
-            return StringUtils.defaultIfEmpty(localpart, getToken().getLocalpart());
-        }
-
-        public void setLocalpart(String localpart) {
-            this.localpart = localpart;
-        }
-
-        public String getDomain() {
-            return StringUtils.defaultIfEmpty(domain, getToken().getDomain());
-        }
-
-        public void setDomain(String domain) {
-            this.domain = domain;
-        }
-
-        public String getMxid() {
-            return StringUtils.defaultIfEmpty(mxid, getToken().getMxid());
-        }
-
-        public void setMxid(String mxid) {
-            this.mxid = mxid;
-        }
-
-        public String getPassword() {
-            return StringUtils.defaultIfEmpty(password, getToken().getPassword());
-        }
-
-        public void setPassword(String password) {
-            this.password = password;
-        }
-
-        public String getMedium() {
-            return StringUtils.defaultIfEmpty(medium, getToken().getMedium());
-        }
-
-        public void setMedium(String medium) {
-            this.medium = medium;
-        }
-
-        public String getAddress() {
-            return StringUtils.defaultIfEmpty(address, getToken().getAddress());
-        }
-
-        public void setAddress(String address) {
-            this.address = address;
-        }
-
-        public String getType() {
-            return StringUtils.defaultIfEmpty(type, getToken().getType());
-        }
-
-        public void setType(String type) {
-            this.type = type;
-        }
-
-        public String getQuery() {
-            return StringUtils.defaultIfEmpty(query, getToken().getQuery());
-        }
-
-        public void setQuery(String query) {
-            this.query = query;
-        }
-
-    }
-
-    public class Token {
-
-        private String localpart = "{localpart}";
-        private String domain = "{domain}";
-        private String mxid = "{mxid}";
-        private String password = "{password}";
-        private String medium = "{medium}";
-        private String address = "{address}";
-        private String type = "{type}";
-        private String query = "{query}";
-
-        public String getLocalpart() {
-            return localpart;
-        }
-
-        public void setLocalpart(String localpart) {
-            this.localpart = localpart;
-        }
-
-        public String getDomain() {
-            return domain;
-        }
-
-        public void setDomain(String domain) {
-            this.domain = domain;
-        }
-
-        public String getMxid() {
-            return mxid;
-        }
-
-        public void setMxid(String mxid) {
-            this.mxid = mxid;
-        }
-
-        public String getPassword() {
-            return password;
-        }
-
-        public void setPassword(String password) {
-            this.password = password;
-        }
-
-        public String getMedium() {
-            return medium;
-        }
-
-        public void setMedium(String medium) {
-            this.medium = medium;
-        }
-
-        public String getAddress() {
-            return address;
-        }
-
-        public void setAddress(String address) {
-            this.address = address;
-        }
-
-        public String getType() {
-            return type;
-        }
-
-        public void setType(String type) {
-            this.type = type;
-        }
-
-        public String getQuery() {
-            return query;
-        }
-
-        public void setQuery(String query) {
-            this.query = query;
-        }
-
-    }
-
-    public class Process {
-
-        private TokenOverride token = new TokenOverride();
-        private String command;
-
-        private List<String> args = new ArrayList<>();
-        private Map<String, String> env = new HashMap<>();
-        private IO input = new IO();
-
-        private Exit exit = new Exit();
-        private IO output = new IO();
-
-        public TokenOverride getToken() {
-            return token;
-        }
-
-        public void setToken(TokenOverride token) {
-            this.token = token;
-        }
-
-        public String getCommand() {
-            return command;
-        }
-
-        public void setCommand(String command) {
-            this.command = command;
-        }
-
-        public List<String> getArgs() {
-            return args;
-        }
-
-        public void setArgs(List<String> args) {
-            this.args = args;
-        }
-
-        public Map<String, String> getEnv() {
-            return env;
-        }
-
-        public void setEnv(Map<String, String> env) {
-            this.env = env;
-        }
-
-        public void addEnv(String key, String value) {
-            this.env.put(key, value);
-        }
-
-        public IO getInput() {
-            return input;
-        }
-
-        public void setInput(IO input) {
-            this.input = input;
-        }
-
-        public Exit getExit() {
-            return exit;
-        }
-
-        public void setExit(Exit exit) {
-            this.exit = exit;
-        }
-
-        public IO getOutput() {
-            return output;
-        }
-
-        public void setOutput(IO output) {
-            this.output = output;
-        }
-
-    }
-
-    public class Auth extends Process {
-
-        private Boolean enabled;
-
-        public Boolean isEnabled() {
-            return enabled;
-        }
-
-        public void setEnabled(Boolean enabled) {
-            this.enabled = enabled;
-        }
-
-    }
-
-    public class Directory {
-
-        public class Search {
-
-            private Process byName = new Process();
-            private Process byThreepid = new Process();
-
-            public Process getByName() {
-                return byName;
-            }
-
-            public void setByName(Process byName) {
-                this.byName = byName;
-            }
-
-            public Process getByThreepid() {
-                return byThreepid;
-            }
-
-            public void setByThreepid(Process byThreepid) {
-                this.byThreepid = byThreepid;
-            }
-
-        }
-
-        private Boolean enabled;
-        private Search search = new Search();
-
-        public Boolean isEnabled() {
-            return enabled;
-        }
-
-        public void setEnabled(Boolean enabled) {
-            this.enabled = enabled;
-        }
-
-        public Search getSearch() {
-            return search;
-        }
-
-        public void setSearch(Search search) {
-            this.search = search;
-        }
-
-    }
-
-    public class Lookup {
-
-        private Process single = new Process();
-        private Process bulk = new Process();
-
-        public Process getSingle() {
-            return single;
-        }
-
-        public void setSingle(Process single) {
-            this.single = single;
-        }
-
-        public Process getBulk() {
-            return bulk;
-        }
-
-        public void setBulk(Process bulk) {
-            this.bulk = bulk;
-        }
-
-    }
-
-    public class Identity {
-
-        private Boolean enabled;
-        private int priority;
-        private Lookup lookup = new Lookup();
-
-        public Boolean isEnabled() {
-            return enabled;
-        }
-
-        public void setEnabled(Boolean enabled) {
-            this.enabled = enabled;
-        }
-
-        public int getPriority() {
-            return priority;
-        }
-
-        public void setPriority(int priority) {
-            this.priority = priority;
-        }
-
-        public Lookup getLookup() {
-            return lookup;
-        }
-
-        public void setLookup(Lookup lookup) {
-            this.lookup = lookup;
-        }
-
-    }
-
-    public class Profile {
-
-        private Boolean enabled;
-        private Process displayName = new Process();
-        private Process threePid = new Process();
-        private Process role = new Process();
-
-        public Boolean isEnabled() {
-            return enabled;
-        }
-
-        public void setEnabled(Boolean enabled) {
-            this.enabled = enabled;
-        }
-
-        public Process getDisplayName() {
-            return displayName;
-        }
-
-        public void setDisplayName(Process displayName) {
-            this.displayName = displayName;
-        }
-
-        public Process getThreePid() {
-            return threePid;
-        }
-
-        public void setThreePid(Process threePid) {
-            this.threePid = threePid;
-        }
-
-        public Process getRole() {
-            return role;
-        }
-
-        public void setRoles(Process role) {
-            this.role = role;
-        }
-
-    }
-
-    private boolean enabled;
-    private Token token = new Token();
-    private Auth auth = new Auth();
-    private Directory directory = new Directory();
-    private Identity identity = new Identity();
-    private Profile profile = new Profile();
-
-    public boolean isEnabled() {
-        return enabled;
-    }
-
-    public void setEnabled(boolean enabled) {
-        this.enabled = enabled;
-    }
-
-    public Token getToken() {
-        return token;
-    }
-
-    public void setToken(Token token) {
-        this.token = token;
-    }
-
-    public Auth getAuth() {
-        return auth;
-    }
-
-    public void setAuth(Auth auth) {
-        this.auth = auth;
-    }
-
-    public Directory getDirectory() {
-        return directory;
-    }
-
-    public void setDirectory(Directory directory) {
-        this.directory = directory;
-    }
-
-    public Identity getIdentity() {
-        return identity;
-    }
-
-    public void setIdentity(Identity identity) {
-        this.identity = identity;
-    }
-
-    public Profile getProfile() {
-        return profile;
-    }
-
-    public void setProfile(Profile profile) {
-        this.profile = profile;
-    }
-
-    @PostConstruct
-    public ExecConfig compute() {
-        if (Objects.isNull(getAuth().isEnabled())) {
-            getAuth().setEnabled(isEnabled());
-        }
-
-        if (Objects.isNull(getDirectory().isEnabled())) {
-            getDirectory().setEnabled(isEnabled());
-        }
-
-        if (Objects.isNull(getIdentity().isEnabled())) {
-            getIdentity().setEnabled(isEnabled());
-        }
-
-        if (Objects.isNull(getProfile().isEnabled())) {
-            getProfile().setEnabled(isEnabled());
-        }
-
-        return this;
-    }
-
-}

src/main/java/io/kamax/mxisd/config/FirebaseConfig.java

@@ -1,8 +1,8 @@
 /*
  * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2017 Kamax Sarl
+ * Copyright (C) 2017 Maxime Dor
  *
- * https://www.kamax.io/
+ * https://max.kamax.io/
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as

src/main/java/io/kamax/mxisd/config/ForwardConfig.java

@@ -1,8 +1,8 @@
 /*
  * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2017 Kamax Sarl
+ * Copyright (C) 2017 Maxime Dor
  *
- * https://www.kamax.io/
+ * https://max.kamax.io/
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as

src/main/java/io/kamax/mxisd/config/GoogleConfig.java

@@ -0,0 +1,107 @@
+/*
+ * mxisd - Matrix Identity Server Daemon
+ * Copyright (C) 2018 Kamax Sàrl
+ *
+ * https://www.kamax.io/
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package io.kamax.mxisd.config;
+
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+import javax.annotation.PostConstruct;
+
+@Configuration
+@ConfigurationProperties("google")
+public class GoogleConfig {
+
+    public static class Client {
+
+        private String id;
+        private String secret;
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public String getSecret() {
+            return secret;
+        }
+
+        public void setSecret(String secret) {
+            this.secret = secret;
+        }
+
+    }
+
+    private final Logger log = LoggerFactory.getLogger(GoogleConfig.class);
+
+    private boolean enabled;
+    private Client client = new Client();
+    private String medium = "io.kamax.google.id";
+    private String prefix = "google_";
+
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    public void setEnabled(boolean enabled) {
+        this.enabled = enabled;
+    }
+
+    public Client getClient() {
+        return client;
+    }
+
+    public void setClient(Client client) {
+        this.client = client;
+    }
+
+    public String getMedium() {
+        return medium;
+    }
+
+    public void setMedium(String medium) {
+        this.medium = medium;
+    }
+
+    public String getPrefix() {
+        return prefix;
+    }
+
+    public void setPrefix(String prefix) {
+        this.prefix = prefix;
+    }
+
+    @PostConstruct
+    public void build() {
+        log.info("--- Google config ---");
+        log.info("Enabled: {}", isEnabled());
+        log.info("Client ID: {}", getClient().getId());
+        log.info("Client secret set? {}", StringUtils.isNotBlank(getClient().getSecret()));
+        log.info("3PID medium: {}", getMedium());
+        log.info("MXID prefix: {}", getPrefix());
+    }
+
+}

src/main/java/io/kamax/mxisd/config/KeyConfig.java

@@ -1,8 +1,8 @@
 /*
  * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2017 Kamax Sarl
+ * Copyright (C) 2017 Maxime Dor
  *
- * https://www.kamax.io/
+ * https://max.kamax.io/
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as

src/main/java/io/kamax/mxisd/config/ListenerConfig.java

@@ -1,108 +0,0 @@
-/*
- * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2018 Kamax Sarl
- *
- * https://www.kamax.io/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package io.kamax.mxisd.config;
-
-import org.apache.commons.lang.StringUtils;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-
-import javax.annotation.PostConstruct;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-@Configuration
-@ConfigurationProperties("matrix.listener")
-public class ListenerConfig {
-
-    public static class Token {
-
-        private String as;
-        private String hs;
-
-        public String getAs() {
-            return as;
-        }
-
-        public void setAs(String as) {
-            this.as = as;
-        }
-
-        public String getHs() {
-            return hs;
-        }
-
-        public void setHs(String hs) {
-            this.hs = hs;
-        }
-
-    }
-
-    private transient URL csUrl;
-    private String url;
-    private String localpart;
-    private Token token = new Token();
-
-    public URL getUrl() {
-        return csUrl;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    public String getLocalpart() {
-        return localpart;
-    }
-
-    public void setLocalpart(String localpart) {
-        this.localpart = localpart;
-    }
-
-    public Token getToken() {
-        return token;
-    }
-
-    public void setToken(Token token) {
-        this.token = token;
-    }
-
-    @PostConstruct
-    public void build() throws MalformedURLException {
-        if (StringUtils.isBlank(url)) {
-            return;
-        }
-
-        csUrl = new URL(url);
-
-        if (StringUtils.isBlank(getLocalpart())) {
-            throw new IllegalArgumentException("localpart for matrix listener is not set");
-        }
-
-        if (StringUtils.isBlank(getToken().getAs())) {
-            throw new IllegalArgumentException("AS token is not set");
-        }
-
-        if (StringUtils.isBlank(getToken().getHs())) {
-            throw new IllegalArgumentException("HS token is not set");
-        }
-    }
-
-}

src/main/java/io/kamax/mxisd/config/MatrixConfig.java

@@ -1,8 +1,8 @@
 /*
  * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2017 Kamax Sarl
+ * Copyright (C) 2017 Maxime Dor
  *
- * https://www.kamax.io/
+ * https://max.kamax.io/
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as

src/main/java/io/kamax/mxisd/config/RecursiveLookupBridgeConfig.java

@@ -1,8 +1,8 @@
 /*
  * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2017 Kamax Sarl
+ * Copyright (C) 2017 Maxime Dor
  *
- * https://www.kamax.io/
+ * https://max.kamax.io/
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as

src/main/java/io/kamax/mxisd/config/RecursiveLookupConfig.java

@@ -1,8 +1,8 @@
 /*
  * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2017 Kamax Sarl
+ * Copyright (C) 2017 Maxime Dor
  *
- * https://www.kamax.io/
+ * https://max.kamax.io/
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as

src/main/java/io/kamax/mxisd/config/SQLiteStorageConfig.java

@@ -1,8 +1,8 @@
 /*
  * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2017 Kamax Sarl
+ * Copyright (C) 2017 Maxime Dor
  *
- * https://www.kamax.io/
+ * https://max.kamax.io/
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as

src/main/java/io/kamax/mxisd/config/ServerConfig.java

@@ -1,8 +1,8 @@
 /*
  * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2017 Kamax Sarl
+ * Copyright (C) 2017 Maxime Dor
  *
- * https://www.kamax.io/
+ * https://max.kamax.io/
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as

src/main/java/io/kamax/mxisd/config/SessionConfig.java

@@ -1,8 +1,8 @@
 /*
  * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2017 Kamax Sarl
+ * Copyright (C) 2017 Maxime Dor
  *
- * https://www.kamax.io/
+ * https://max.kamax.io/
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as

src/main/java/io/kamax/mxisd/config/StorageConfig.java

@@ -1,8 +1,8 @@
 /*
  * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2017 Kamax Sarl
+ * Copyright (C) 2017 Maxime Dor
  *
- * https://www.kamax.io/
+ * https://max.kamax.io/
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as

src/main/java/io/kamax/mxisd/config/ThymeleafConfig.java

@@ -1,8 +1,8 @@
 /*
  * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2017 Kamax Sarl
+ * Copyright (C) 2017 Maxime Dor
  *
- * https://www.kamax.io/
+ * https://max.kamax.io/
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as

src/main/java/io/kamax/mxisd/config/ViewConfig.java

@@ -1,8 +1,8 @@
 /*
  * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2017 Kamax Sarl
+ * Copyright (C) 2017 Maxime Dor
  *
- * https://www.kamax.io/
+ * https://max.kamax.io/
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as

src/main/java/io/kamax/mxisd/config/ldap/LdapConfig.java

@@ -1,8 +1,8 @@
 /*
  * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2017 Kamax Sarl
+ * Copyright (C) 2017 Maxime Dor
  *
- * https://www.kamax.io/
+ * https://max.kamax.io/
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -110,7 +110,6 @@ public abstract class LdapConfig {
         private String bindDn;
         private String bindPassword;
         private String baseDn;
-        private List<String> baseDNs = new ArrayList<>();
 
         public boolean isTls() {
             return tls;
@@ -152,24 +151,14 @@ public abstract class LdapConfig {
             this.bindPassword = bindPassword;
         }
 
-        @Deprecated
         public String getBaseDn() {
             return baseDn;
         }
 
-        @Deprecated
         public void setBaseDn(String baseDn) {
             this.baseDn = baseDn;
         }
 
-        public List<String> getBaseDNs() {
-            return baseDNs;
-        }
-
-        public void setBaseDNs(List<String> baseDNs) {
-            this.baseDNs = baseDNs;
-        }
-
     }
 
     public static class Directory {
@@ -245,31 +234,17 @@ public abstract class LdapConfig {
 
     }
 
-    public static class Profile {
-
-        private String filter;
-
-        public String getFilter() {
-            return filter;
-        }
-
-        public void setFilter(String filter) {
-            this.filter = filter;
-        }
-
-    }
 
     private Logger log = LoggerFactory.getLogger(LdapConfig.class);
 
     private boolean enabled;
     private String filter;
 
-    private Connection connection = new Connection();
+    private Connection connection;
-    private Attribute attribute = new Attribute();
+    private Attribute attribute;
-    private Auth auth = new Auth();
+    private Auth auth;
-    private Directory directory = new Directory();
+    private Directory directory;
-    private Identity identity = new Identity();
+    private Identity identity;
-    private Profile profile = new Profile();
 
     protected abstract String getConfigName();
 
@@ -329,14 +304,6 @@ public abstract class LdapConfig {
         this.identity = identity;
     }
 
-    public Profile getProfile() {
-        return profile;
-    }
-
-    public void setProfile(Profile profile) {
-        this.profile = profile;
-    }
-
     @PostConstruct
     public void build() {
         log.info("--- " + getConfigName() + " Config ---");
@@ -354,14 +321,8 @@ public abstract class LdapConfig {
             throw new IllegalStateException("LDAP port is not valid");
         }
 
-        // Backward compatibility with the old option
+        if (StringUtils.isBlank(connection.getBaseDn())) {
-        if (!StringUtils.isBlank(connection.baseDn)) {
+            throw new ConfigurationException("ldap.connection.baseDn");
-            connection.getBaseDNs().add(connection.baseDn);
-        }
-
-        if (connection.getBaseDNs().isEmpty()) {
-            throw new ConfigurationException("ldap.connection.baseDNs",
-                    "You must specify at least one Base DN via the singular or plural config option");
         }
 
         if (StringUtils.isBlank(attribute.getUid().getType())) {
@@ -395,24 +356,16 @@ public abstract class LdapConfig {
         getAuth().setFilter(StringUtils.defaultIfBlank(getAuth().getFilter(), getFilter()));
         getDirectory().setFilter(StringUtils.defaultIfBlank(getDirectory().getFilter(), getFilter()));
         getIdentity().setFilter(StringUtils.defaultIfBlank(getIdentity().getFilter(), getFilter()));
-        if (StringUtils.isBlank(getProfile().getFilter())) {
-            getProfile().setFilter(getFilter());
-        }
 
         log.info("Host: {}", connection.getHost());
         log.info("Port: {}", connection.getPort());
-        log.info("TLS: {}", connection.isTls());
         log.info("Bind DN: {}", connection.getBindDn());
-        log.info("Base DNs: {}");
+        log.info("Base DN: {}", connection.getBaseDn());
-        for (String baseDN : connection.getBaseDNs()) {
-            log.info("\t- {}", baseDN);
-        }
 
         log.info("Attribute: {}", GsonUtil.get().toJson(attribute));
         log.info("Auth: {}", GsonUtil.get().toJson(auth));
         log.info("Directory: {}", GsonUtil.get().toJson(directory));
         log.info("Identity: {}", GsonUtil.get().toJson(identity));
-        log.info("Profile: {}", GsonUtil.get().toJson(profile));
     }
 
 }

src/main/java/io/kamax/mxisd/config/memory/MemoryIdentityConfig.java

@@ -1,6 +1,6 @@
 /*
  * mxisd - Matrix Identity Server Daemon
- * Copyright (C) 2018 Kamax Sarl
+ * Copyright (C) 2018 Maxime Dor
  *
  * https://www.kamax.io/
  *
@@ -30,7 +30,6 @@ public class MemoryIdentityConfig {
 
     private String username;
     private String password;
-    private String displayName;
     private List<MemoryThreePid> threepids = new ArrayList<>();
     private List<String> roles = new ArrayList<>();
 
@@ -50,14 +49,6 @@ public class MemoryIdentityConfig {
         this.password = password;
     }
 
-    public String getDisplayName() {
-        return displayName;
-    }
-
-    public void setDisplayName(String displayName) {
-        this.displayName = displayName;
-    }
-
     public List<MemoryThreePid> getThreepids() {
         return threepids;
     }