Move controllers into appropriate version package

src/main/groovy/io/kamax/mxisd/controller/v1/InvitationController.groovy

@@ -0,0 +1,37 @@
+/*
+ * 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.controller.v1
+
+import io.kamax.mxisd.exception.NotImplementedException
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+import static org.springframework.web.bind.annotation.RequestMethod.POST
+
+@RestController
+class InvitationController {
+
+    @RequestMapping(value = "/_matrix/identity/api/v1/store-invite", method = POST)
+    String store() {
+        throw new NotImplementedException()
+    }
+
+}

src/main/groovy/io/kamax/mxisd/controller/v1/KeyController.groovy

@@ -0,0 +1,61 @@
+/*
+ * 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.controller.v1
+
+import groovy.json.JsonOutput
+import io.kamax.mxisd.exception.BadRequestException
+import io.kamax.mxisd.exception.NotImplementedException
+import io.kamax.mxisd.key.KeyManager
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.web.bind.annotation.PathVariable
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+import static org.springframework.web.bind.annotation.RequestMethod.GET
+
+@RestController
+class KeyController {
+
+    @Autowired
+    private KeyManager keyMgr
+
+    @RequestMapping(value = "/_matrix/identity/api/v1/pubkey/{keyType}:{keyId}", method = GET)
+    String getKey(@PathVariable String keyType, @PathVariable int keyId) {
+        if (!"ed25519".contentEquals(keyType)) {
+            throw new BadRequestException("Invalid algorithm: " + keyType)
+        }
+
+        return JsonOutput.toJson([
+                public_key: keyMgr.getPublicKeyBase64(keyId)
+        ])
+    }
+
+    @RequestMapping(value = "/_matrix/identity/api/v1/pubkey/ephemeral/isvalid", method = GET)
+    String checkEphemeralKeyValidity() {
+        throw new NotImplementedException()
+    }
+
+    @RequestMapping(value = "/_matrix/identity/api/v1/pubkey/isvalid", method = GET)
+    String checkKeyValidity() {
+        throw new NotImplementedException()
+    }
+
+}

src/main/groovy/io/kamax/mxisd/controller/v1/MappingController.groovy

@@ -0,0 +1,89 @@
+/*
+ * 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.controller.v1
+
+import groovy.json.JsonOutput
+import io.kamax.mxisd.config.LdapConfig
+import io.kamax.mxisd.exception.BadRequestException
+import io.kamax.mxisd.signature.SignatureManager
+import org.apache.directory.api.ldap.model.cursor.EntryCursor
+import org.apache.directory.api.ldap.model.entry.Attribute
+import org.apache.directory.api.ldap.model.message.SearchScope
+import org.apache.directory.ldap.client.api.LdapConnection
+import org.apache.directory.ldap.client.api.LdapNetworkConnection
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RequestParam
+import org.springframework.web.bind.annotation.RestController
+
+import static org.springframework.web.bind.annotation.RequestMethod.GET
+
+@RestController
+class MappingController {
+
+    @Autowired
+    private LdapConfig ldapCfg
+
+    @Autowired
+    private SignatureManager signMgr
+
+    @RequestMapping(value = "/_matrix/identity/api/v1/lookup", method = GET)
+    String lookup(@RequestParam String medium, @RequestParam String address) {
+        if (!"email".contentEquals(medium)) {
+            throw new BadRequestException("Invalid medium type")
+        }
+
+        LdapConnection conn = new LdapNetworkConnection(ldapCfg.getHost(), ldapCfg.getPort())
+        try {
+            conn.bind(ldapCfg.getBindDn(), ldapCfg.getBindPassword())
+
+            String searchQuery = ldapCfg.getQuery().replaceAll("%3pid", address)
+            EntryCursor cursor = conn.search(ldapCfg.getBaseDn(), searchQuery, SearchScope.SUBTREE, ldapCfg.getAttribute())
+            try {
+                if (!cursor.next()) {
+                    return JsonOutput.toJson([])
+                }
+
+                Attribute attribute = cursor.get().get(ldapCfg.getAttribute())
+                if (attribute == null) {
+                    return JsonOutput.toJson([])
+                }
+
+                def data = new LinkedHashMap([
+                        address   : address,
+                        medium    : medium,
+                        mxid      : attribute.get().toString(),
+                        not_before: 0,
+                        not_after : 9223372036854775807,
+                        ts        : 0
+                ])
+
+                data['signatures'] = signMgr.signMessage(JsonOutput.toJson(data))
+                return JsonOutput.toJson(data)
+            } finally {
+                cursor.close()
+            }
+        } finally {
+            conn.close()
+        }
+    }
+
+}

src/main/groovy/io/kamax/mxisd/controller/v1/SessionController.groovy

@@ -0,0 +1,53 @@
+/*
+ * 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.controller.v1
+
+import io.kamax.mxisd.exception.NotImplementedException
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+import static org.springframework.web.bind.annotation.RequestMethod.GET
+import static org.springframework.web.bind.annotation.RequestMethod.POST
+
+@RestController
+class SessionController {
+
+    @RequestMapping(value = "/_matrix/identity/api/v1/validate/email/requestToken", method = POST)
+    String init() {
+        throw new NotImplementedException()
+    }
+
+    @RequestMapping(value = "/_matrix/identity/api/v1/validate/email/submitToken", method = [GET, POST])
+    String validate() {
+        throw new NotImplementedException()
+    }
+
+    @RequestMapping(value = "/_matrix/identity/api/v1/3pid/getValidated3pid", method = POST)
+    String check() {
+        throw new NotImplementedException()
+    }
+
+    @RequestMapping(value = "/_matrix/identity/api/v1/3pid/bind", method = POST)
+    String bind() {
+        throw new NotImplementedException()
+    }
+
+}