From fa8e6ff90074708ec19fcdcdfd79c1dce03cb128 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Tue, 27 Jan 2015 14:01:51 +0000
Subject: Add stub application services REST API.

---
 synapse/rest/appservice/__init__.py    | 14 ++++++++++
 synapse/rest/appservice/v1/__init__.py | 29 +++++++++++++++++++++
 synapse/rest/appservice/v1/base.py     | 47 ++++++++++++++++++++++++++++++++++
 synapse/rest/appservice/v1/register.py | 37 ++++++++++++++++++++++++++
 4 files changed, 127 insertions(+)
 create mode 100644 synapse/rest/appservice/__init__.py
 create mode 100644 synapse/rest/appservice/v1/__init__.py
 create mode 100644 synapse/rest/appservice/v1/base.py
 create mode 100644 synapse/rest/appservice/v1/register.py

(limited to 'synapse/rest/appservice')

diff --git a/synapse/rest/appservice/__init__.py b/synapse/rest/appservice/__init__.py
new file mode 100644
index 0000000000..1a84d94cd9
--- /dev/null
+++ b/synapse/rest/appservice/__init__.py
@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+# Copyright 2015 OpenMarket Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/synapse/rest/appservice/v1/__init__.py b/synapse/rest/appservice/v1/__init__.py
new file mode 100644
index 0000000000..bf243b6180
--- /dev/null
+++ b/synapse/rest/appservice/v1/__init__.py
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+# Copyright 2015 OpenMarket Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+from . import register
+
+from synapse.http.server import JsonResource
+
+
+class AppServiceRestResource(JsonResource):
+    """A resource for version 1 of the matrix application service API."""
+
+    def __init__(self, hs):
+        JsonResource.__init__(self)
+        self.register_servlets(self, hs)
+
+    @staticmethod
+    def register_servlets(appservice_resource, hs):
+        register.register_servlets(hs, appservice_resource)
\ No newline at end of file
diff --git a/synapse/rest/appservice/v1/base.py b/synapse/rest/appservice/v1/base.py
new file mode 100644
index 0000000000..46c9a444c0
--- /dev/null
+++ b/synapse/rest/appservice/v1/base.py
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+# Copyright 2015 OpenMarket Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""This module contains base REST classes for constructing client v1 servlets.
+"""
+
+from synapse.http.servlet import RestServlet
+from synapse.api.urls import APP_SERVICE_PREFIX
+import re
+
+import logging
+
+
+logger = logging.getLogger(__name__)
+
+
+def as_path_pattern(path_regex):
+    """Creates a regex compiled appservice path with the correct path
+    prefix.
+
+    Args:
+        path_regex (str): The regex string to match. This should NOT have a ^
+        as this will be prefixed.
+    Returns:
+        SRE_Pattern
+    """
+    return re.compile("^" + APP_SERVICE_PREFIX + path_regex)
+
+
+class AppServiceRestServlet(RestServlet):
+    """A base Synapse REST Servlet for the application services version 1 API.
+    """
+
+    def __init__(self, hs):
+        self.hs = hs
\ No newline at end of file
diff --git a/synapse/rest/appservice/v1/register.py b/synapse/rest/appservice/v1/register.py
new file mode 100644
index 0000000000..17b6dc5664
--- /dev/null
+++ b/synapse/rest/appservice/v1/register.py
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+# Copyright 2015 OpenMarket Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""This module contains REST servlets to do with registration: /register"""
+
+from base import AppServiceRestServlet, as_path_pattern
+from synapse.api.errors import CodeMessageException
+
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+class RegisterRestServlet(AppServiceRestServlet):
+    """Handles AS registration with the home server.
+    """
+
+    PATTERN = as_path_pattern("/register$")
+
+    def on_POST(self, request):
+        raise CodeMessageException(500, "Not implemented")
+
+
+def register_servlets(hs, http_server):
+    RegisterRestServlet(hs).register(http_server)
\ No newline at end of file
-- 
cgit 1.5.1


From 6efdc11cc811fedd5c989dc06df64fd334b4b033 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Tue, 27 Jan 2015 15:03:19 +0000
Subject: Parse /register and /unregister request JSON.

---
 synapse/rest/appservice/v1/register.py | 80 +++++++++++++++++++++++++++++++++-
 1 file changed, 78 insertions(+), 2 deletions(-)

(limited to 'synapse/rest/appservice')

diff --git a/synapse/rest/appservice/v1/register.py b/synapse/rest/appservice/v1/register.py
index 17b6dc5664..779447ac6a 100644
--- a/synapse/rest/appservice/v1/register.py
+++ b/synapse/rest/appservice/v1/register.py
@@ -16,8 +16,9 @@
 """This module contains REST servlets to do with registration: /register"""
 
 from base import AppServiceRestServlet, as_path_pattern
-from synapse.api.errors import CodeMessageException
+from synapse.api.errors import CodeMessageException, SynapseError
 
+import json
 import logging
 
 logger = logging.getLogger(__name__)
@@ -30,8 +31,83 @@ class RegisterRestServlet(AppServiceRestServlet):
     PATTERN = as_path_pattern("/register$")
 
     def on_POST(self, request):
+        params = _parse_json(request)
+
+        # sanity check required params
+        try:
+            as_token = params["as_token"]
+            as_url = params["url"]
+            if (not isinstance(as_token, basestring) or
+                    not isinstance(as_url, basestring)):
+                raise ValueError
+        except (KeyError, ValueError):
+            raise SynapseError(
+                400, "Missed required keys: as_token(str) / url(str)."
+            )
+
+        namespaces = {
+            "users": [],
+            "rooms": [],
+            "aliases": []
+        }
+
+        if "namespaces" in params:
+            self._parse_namespace(namespaces, params["namespaces"], "users")
+            self._parse_namespace(namespaces, params["namespaces"], "rooms")
+            self._parse_namespace(namespaces, params["namespaces"], "aliases")
+
+        # TODO: pass to the appservice handler
+
+        raise CodeMessageException(500, "Not implemented.")
+
+    def _parse_namespace(self, target_ns, origin_ns, ns):
+        if ns not in target_ns or ns not in origin_ns:
+            return  # nothing to parse / map through to.
+
+        possible_regex_list = origin_ns[ns]
+        if not type(possible_regex_list) == list:
+            raise SynapseError(400, "Namespace %s isn't an array." % ns)
+
+        for regex in possible_regex_list:
+            if not isinstance(regex, basestring):
+                raise SynapseError(
+                    400, "Regex '%s' isn't a string in namespace %s" %
+                    (regex, ns)
+                )
+
+        target_ns[ns] = origin_ns[ns]
+
+
+class UnregisterRestServlet(AppServiceRestServlet):
+    """Handles AS registration with the home server.
+    """
+
+    PATTERN = as_path_pattern("/unregister$")
+
+    def on_POST(self, request):
+        params = _parse_json(request)
+        try:
+            as_token = params["as_token"]
+            if not isinstance(as_token, basestring):
+                raise ValueError
+        except (KeyError, ValueError):
+            raise SynapseError(400, "Missing required key: as_token(str)")
+
+        # TODO: pass to the appservice handler
+
         raise CodeMessageException(500, "Not implemented")
 
 
+def _parse_json(request):
+    try:
+        content = json.loads(request.content.read())
+        if type(content) != dict:
+            raise SynapseError(400, "Content must be a JSON object.")
+        return content
+    except ValueError:
+        raise SynapseError(400, "Content not JSON.")
+
+
 def register_servlets(hs, http_server):
-    RegisterRestServlet(hs).register(http_server)
\ No newline at end of file
+    RegisterRestServlet(hs).register(http_server)
+    UnregisterRestServlet(hs).register(http_server)
-- 
cgit 1.5.1


From 51449e06654c4af7a645124dc64e1f0cc1678b24 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Tue, 27 Jan 2015 15:50:28 +0000
Subject: Add appservice handler and store. Glue together rest > handler >
 store.

---
 synapse/handlers/__init__.py           |  2 ++
 synapse/handlers/appservice.py         | 49 ++++++++++++++++++++++++++++++++++
 synapse/rest/appservice/v1/base.py     |  3 ++-
 synapse/rest/appservice/v1/register.py |  8 ++++--
 synapse/storage/__init__.py            |  5 ++--
 synapse/storage/appservice.py          | 45 +++++++++++++++++++++++++++++++
 6 files changed, 107 insertions(+), 5 deletions(-)
 create mode 100644 synapse/handlers/appservice.py
 create mode 100644 synapse/storage/appservice.py

(limited to 'synapse/rest/appservice')

diff --git a/synapse/handlers/__init__.py b/synapse/handlers/__init__.py
index fe071a4bc2..96a9b143ca 100644
--- a/synapse/handlers/__init__.py
+++ b/synapse/handlers/__init__.py
@@ -26,6 +26,7 @@ from .presence import PresenceHandler
 from .directory import DirectoryHandler
 from .typing import TypingNotificationHandler
 from .admin import AdminHandler
+from .appservice import ApplicationServicesHandler
 
 
 class Handlers(object):
@@ -51,3 +52,4 @@ class Handlers(object):
         self.directory_handler = DirectoryHandler(hs)
         self.typing_notification_handler = TypingNotificationHandler(hs)
         self.admin_handler = AdminHandler(hs)
+        self.appservice_handler = ApplicationServicesHandler(hs)
diff --git a/synapse/handlers/appservice.py b/synapse/handlers/appservice.py
new file mode 100644
index 0000000000..55a653476f
--- /dev/null
+++ b/synapse/handlers/appservice.py
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+# Copyright 2015 OpenMarket Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from twisted.internet import defer
+
+from ._base import BaseHandler
+from synapse.api.errors import StoreError, SynapseError
+
+import logging
+
+
+logger = logging.getLogger(__name__)
+
+
+class ApplicationServicesHandler(BaseHandler):
+
+    def __init__(self, hs):
+        super(ApplicationServicesHandler, self).__init__(hs)
+
+    @defer.inlineCallbacks
+    def register(self, base_url, token, namespaces):
+        # check the token is recognised
+        try:
+            app_service = yield self.store.get_app_service(token)
+            if not app_service:
+                raise StoreError
+        except StoreError:
+            raise SynapseError(
+                403, "Unrecognised application services token. "
+                "Consult the home server admin."
+            )
+
+        # update AS entry with base URL
+
+        # store namespaces for this AS
+
+        defer.returnValue("not_implemented_yet")
diff --git a/synapse/rest/appservice/v1/base.py b/synapse/rest/appservice/v1/base.py
index 46c9a444c0..65d5bcf9be 100644
--- a/synapse/rest/appservice/v1/base.py
+++ b/synapse/rest/appservice/v1/base.py
@@ -44,4 +44,5 @@ class AppServiceRestServlet(RestServlet):
     """
 
     def __init__(self, hs):
-        self.hs = hs
\ No newline at end of file
+        self.hs = hs
+        self.handler = hs.get_handlers().appservice_handler
diff --git a/synapse/rest/appservice/v1/register.py b/synapse/rest/appservice/v1/register.py
index 779447ac6a..142f09a638 100644
--- a/synapse/rest/appservice/v1/register.py
+++ b/synapse/rest/appservice/v1/register.py
@@ -14,6 +14,7 @@
 # limitations under the License.
 
 """This module contains REST servlets to do with registration: /register"""
+from twisted.internet import defer
 
 from base import AppServiceRestServlet, as_path_pattern
 from synapse.api.errors import CodeMessageException, SynapseError
@@ -30,6 +31,7 @@ class RegisterRestServlet(AppServiceRestServlet):
 
     PATTERN = as_path_pattern("/register$")
 
+    @defer.inlineCallbacks
     def on_POST(self, request):
         params = _parse_json(request)
 
@@ -56,9 +58,11 @@ class RegisterRestServlet(AppServiceRestServlet):
             self._parse_namespace(namespaces, params["namespaces"], "rooms")
             self._parse_namespace(namespaces, params["namespaces"], "aliases")
 
-        # TODO: pass to the appservice handler
+        hs_token = yield self.handler.register(as_url, as_token, namespaces)
 
-        raise CodeMessageException(500, "Not implemented.")
+        defer.returnValue({
+          "hs_token": hs_token
+        })
 
     def _parse_namespace(self, target_ns, origin_ns, ns):
         if ns not in target_ns or ns not in origin_ns:
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py
index 4beb951b9f..9431c1a32d 100644
--- a/synapse/storage/__init__.py
+++ b/synapse/storage/__init__.py
@@ -18,6 +18,7 @@ from twisted.internet import defer
 from synapse.util.logutils import log_function
 from synapse.api.constants import EventTypes
 
+from .appservice import ApplicationServiceStore
 from .directory import DirectoryStore
 from .feedback import FeedbackStore
 from .presence import PresenceStore
@@ -80,8 +81,8 @@ class DataStore(RoomMemberStore, RoomStore,
                 RegistrationStore, StreamStore, ProfileStore, FeedbackStore,
                 PresenceStore, TransactionStore,
                 DirectoryStore, KeyStore, StateStore, SignatureStore,
-                EventFederationStore,
-                MediaRepositoryStore,
+                EventFederationStore, MediaRepositoryStore,
+                ApplicationServiceStore
                 ):
 
     def __init__(self, hs):
diff --git a/synapse/storage/appservice.py b/synapse/storage/appservice.py
new file mode 100644
index 0000000000..99f58b4c62
--- /dev/null
+++ b/synapse/storage/appservice.py
@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+# Copyright 2015 OpenMarket Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from twisted.internet import defer
+
+from synapse.api.errors import StoreError
+
+from ._base import SQLBaseStore
+
+
+class ApplicationServiceStore(SQLBaseStore):
+
+    def __init__(self, hs):
+        super(ApplicationServiceStore, self).__init__(hs)
+
+        self.clock = hs.get_clock()
+
+    @defer.inlineCallbacks
+    def get_app_service(self, as_token):
+        """Get the application service with the given token.
+
+        Args:
+            token (str): The application service token.
+        Raises:
+            StoreError if there was a problem retrieving this.
+        """
+        row = self._simple_select_one(
+            "application_services", {"token": as_token},
+            ["url", "token"]
+        )
+        if not row:
+            raise StoreError(400, "Bad application services token supplied.")
+        defer.returnValue(row)
-- 
cgit 1.5.1


From ec3719b583c6fbbc56dbd313b858054e535ae733 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Tue, 27 Jan 2015 17:15:06 +0000
Subject: Use ApplicationService when registering.

---
 synapse/handlers/appservice.py         | 13 +++++--------
 synapse/rest/appservice/v1/register.py |  8 ++++++--
 synapse/storage/appservice.py          | 16 ++++++----------
 3 files changed, 17 insertions(+), 20 deletions(-)

(limited to 'synapse/rest/appservice')

diff --git a/synapse/handlers/appservice.py b/synapse/handlers/appservice.py
index 25e1cece56..1890ca06aa 100644
--- a/synapse/handlers/appservice.py
+++ b/synapse/handlers/appservice.py
@@ -30,21 +30,18 @@ class ApplicationServicesHandler(BaseHandler):
         super(ApplicationServicesHandler, self).__init__(hs)
 
     @defer.inlineCallbacks
-    def register(self, base_url, token, namespaces):
+    def register(self, app_service):
         # check the token is recognised
         try:
-            app_service = yield self.store.get_app_service(token)
-            if not app_service:
-                raise StoreError
+            stored_service = yield self.store.get_app_service(app_service.token)
+            if not stored_service:
+                raise StoreError(404, "Not found")
         except StoreError:
             raise SynapseError(
                 403, "Unrecognised application services token. "
                 "Consult the home server admin."
             )
-
-        # store this AS
-
-        defer.returnValue("not_implemented_yet")
+        # TODO store this AS
 
     def unregister(self, token):
         yield self.store.unregister_app_service(token)
diff --git a/synapse/rest/appservice/v1/register.py b/synapse/rest/appservice/v1/register.py
index 142f09a638..5786cf873e 100644
--- a/synapse/rest/appservice/v1/register.py
+++ b/synapse/rest/appservice/v1/register.py
@@ -18,6 +18,7 @@ from twisted.internet import defer
 
 from base import AppServiceRestServlet, as_path_pattern
 from synapse.api.errors import CodeMessageException, SynapseError
+from synapse.storage.appservice import ApplicationService
 
 import json
 import logging
@@ -58,7 +59,10 @@ class RegisterRestServlet(AppServiceRestServlet):
             self._parse_namespace(namespaces, params["namespaces"], "rooms")
             self._parse_namespace(namespaces, params["namespaces"], "aliases")
 
-        hs_token = yield self.handler.register(as_url, as_token, namespaces)
+        app_service = ApplicationService(as_token, as_url, namespaces)
+
+        yield self.handler.register(app_service)
+        hs_token = "_not_implemented_yet"  # TODO: Pull this from self.hs?
 
         defer.returnValue({
           "hs_token": hs_token
@@ -97,7 +101,7 @@ class UnregisterRestServlet(AppServiceRestServlet):
         except (KeyError, ValueError):
             raise SynapseError(400, "Missing required key: as_token(str)")
 
-        # TODO: pass to the appservice handler
+        yield self.handler.unregister(as_token)
 
         raise CodeMessageException(500, "Not implemented")
 
diff --git a/synapse/storage/appservice.py b/synapse/storage/appservice.py
index fbad17cb9e..f84f026b7b 100644
--- a/synapse/storage/appservice.py
+++ b/synapse/storage/appservice.py
@@ -116,8 +116,7 @@ class ApplicationServiceStore(SQLBaseStore):
     def get_services_for_event(self, event):
         return self.cache.get_services_for_event(event)
 
-    @defer.inlineCallbacks
-    def get_app_service(self, as_token, from_cache=True):
+    def get_app_service(self, token, from_cache=True):
         """Get the application service with the given token.
 
         Args:
@@ -130,21 +129,18 @@ class ApplicationServiceStore(SQLBaseStore):
 
         if from_cache:
             for service in self.cache.services:
-                if service.token == as_token:
-                    defer.returnValue(service)
-                    return
-            defer.returnValue(None)
-            return
-
+                if service.token == token:
+                    return service
+            return None
 
         # TODO: This should be JOINed with the application_services_regex table.
         row = self._simple_select_one(
-            "application_services", {"token": as_token},
+            "application_services", {"token": token},
             ["url", "token"]
         )
         if not row:
             raise StoreError(400, "Bad application services token supplied.")
-        defer.returnValue(row)
+        return row
 
     def _populate_cache(self):
         """Populates the ApplicationServiceCache from the database."""
-- 
cgit 1.5.1


From 42876969b99b6bad146b44a734e8d4a1a14d6835 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Wed, 28 Jan 2015 11:59:38 +0000
Subject: Add basic application_services SQL, and hook up parts of the
 appservice store to read from it.

---
 synapse/handlers/appservice.py                  |  7 +-
 synapse/rest/appservice/v1/register.py          |  4 +-
 synapse/storage/__init__.py                     |  1 +
 synapse/storage/appservice.py                   | 89 ++++++++++++++++++++++---
 synapse/storage/schema/application_services.sql | 32 +++++++++
 5 files changed, 117 insertions(+), 16 deletions(-)
 create mode 100644 synapse/storage/schema/application_services.sql

(limited to 'synapse/rest/appservice')

diff --git a/synapse/handlers/appservice.py b/synapse/handlers/appservice.py
index c9f56c41eb..8bd475cbfd 100644
--- a/synapse/handlers/appservice.py
+++ b/synapse/handlers/appservice.py
@@ -16,7 +16,7 @@
 from twisted.internet import defer
 
 from ._base import BaseHandler
-from synapse.api.errors import StoreError, SynapseError
+from synapse.api.errors import Codes, StoreError, SynapseError
 
 import logging
 
@@ -36,11 +36,12 @@ class ApplicationServicesHandler(BaseHandler):
         try:
             stored_service = yield self.store.get_app_service(app_service.token)
             if not stored_service:
-                raise StoreError(404, "Not found")
+                raise StoreError(404, "Application Service Not found")
         except StoreError:
             raise SynapseError(
                 403, "Unrecognised application services token. "
-                "Consult the home server admin."
+                "Consult the home server admin.",
+                errcode=Codes.FORBIDDEN
             )
         # TODO store this AS
 
diff --git a/synapse/rest/appservice/v1/register.py b/synapse/rest/appservice/v1/register.py
index 5786cf873e..e374d538e7 100644
--- a/synapse/rest/appservice/v1/register.py
+++ b/synapse/rest/appservice/v1/register.py
@@ -64,9 +64,9 @@ class RegisterRestServlet(AppServiceRestServlet):
         yield self.handler.register(app_service)
         hs_token = "_not_implemented_yet"  # TODO: Pull this from self.hs?
 
-        defer.returnValue({
+        defer.returnValue((200, {
           "hs_token": hs_token
-        })
+        }))
 
     def _parse_namespace(self, target_ns, origin_ns, ns):
         if ns not in target_ns or ns not in origin_ns:
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py
index 9431c1a32d..e86b981b47 100644
--- a/synapse/storage/__init__.py
+++ b/synapse/storage/__init__.py
@@ -62,6 +62,7 @@ SCHEMAS = [
     "event_edges",
     "event_signatures",
     "media_repository",
+    "application_services"
 ]
 
 
diff --git a/synapse/storage/appservice.py b/synapse/storage/appservice.py
index 533fac4972..5a0e47e0d4 100644
--- a/synapse/storage/appservice.py
+++ b/synapse/storage/appservice.py
@@ -12,12 +12,15 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
-from synapse.api.errors import StoreError
+import logging
+from twisted.internet import defer
 
 from ._base import SQLBaseStore
 
 
+logger = logging.getLogger(__name__)
+
+
 # XXX: This feels like it should belong in a "models" module, not storage.
 class ApplicationService(object):
     """Defines an application service.
@@ -30,7 +33,22 @@ class ApplicationService(object):
         if url:
             self.url = url
         if namespaces:
-            self.namespaces = namespaces
+            self._set_namespaces(namespaces)
+
+    def _set_namespaces(self, namespaces):
+        # Sanity check that it is of the form:
+        # {
+        #   users: ["regex",...],
+        #   aliases: ["regex",...],
+        #   rooms: ["regex",...],
+        # }
+        for ns in ["users", "rooms", "aliases"]:
+            if type(namespaces[ns]) != list:
+                raise ValueError("Bad namespace value for '%s'", ns)
+            for regex in namespaces[ns]:
+                if not isinstance(regex, basestring):
+                    raise ValueError("Expected string regex for ns '%s'", ns)
+        self.namespaces = namespaces
 
     def is_interested(self, event):
         """Check if this service is interested in this event.
@@ -133,15 +151,64 @@ class ApplicationServiceStore(SQLBaseStore):
                     return service
             return None
 
+        # TODO: The from_cache=False impl
         # TODO: This should be JOINed with the application_services_regex table.
-        row = self._simple_select_one(
-            "application_services", {"token": token},
-            ["url", "token"]
-        )
-        if not row:
-            raise StoreError(400, "Bad application services token supplied.")
-        return row
 
+
+    @defer.inlineCallbacks
     def _populate_cache(self):
         """Populates the ApplicationServiceCache from the database."""
-        pass
+        sql = ("SELECT * FROM application_services LEFT JOIN "
+               "application_services_regex ON application_services.id = "
+               "application_services_regex.as_id")
+
+        namespace_enum = [
+            "users",    # 0
+            "aliases",  # 1
+            "rooms"   # 2
+        ]
+        # SQL results in the form:
+        # [
+        #   {
+        #     'regex': "something",
+        #     'url': "something",
+        #     'namespace': enum,
+        #     'as_id': 0,
+        #     'token': "something",
+        #     'id': 0
+        #   }
+        # ]
+        services = {}
+        results = yield self._execute_and_decode(sql)
+        for res in results:
+            as_token = res["token"]
+            if as_token not in services:
+                # add the service
+                services[as_token] = {
+                    "url": res["url"],
+                    "token": as_token,
+                    "namespaces": {
+                        "users": [],
+                        "aliases": [],
+                        "rooms": []
+                    }
+                }
+            # add the namespace regex if one exists
+            ns_int = res["namespace"]
+            if ns_int is None:
+                continue
+            try:
+                services[as_token]["namespaces"][namespace_enum[ns_int]].append(
+                    res["regex"]
+                )
+            except IndexError:
+                logger.error("Bad namespace enum '%s'. %s", ns_int, res)
+
+        for service in services.values():
+            logger.info("Found application service: %s", service)
+            self.cache.services.append(ApplicationService(
+                service["token"],
+                service["url"],
+                service["namespaces"]
+            ))
+
diff --git a/synapse/storage/schema/application_services.sql b/synapse/storage/schema/application_services.sql
new file mode 100644
index 0000000000..6d245fc807
--- /dev/null
+++ b/synapse/storage/schema/application_services.sql
@@ -0,0 +1,32 @@
+/* Copyright 2015 OpenMarket Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+CREATE TABLE IF NOT EXISTS application_services(
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
+    url TEXT,
+    token TEXT,
+    UNIQUE(token) ON CONFLICT ROLLBACK
+);
+
+CREATE TABLE IF NOT EXISTS application_services_regex(
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
+    as_id INTEGER NOT NULL,
+    namespace INTEGER,  /* enum[room_id|room_alias|user_id] */
+    regex TEXT,
+    FOREIGN KEY(as_id) REFERENCES application_services(id)
+);
+
+
+
-- 
cgit 1.5.1


From 27091f146a0ebdbfe1ae7c5cd30de51515cfbebc Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Thu, 5 Feb 2015 10:08:12 +0000
Subject: Add hs_token column and generate a different token f.e application
 service.

---
 synapse/appservice/__init__.py                  |  6 ++++--
 synapse/appservice/api.py                       |  8 ++++----
 synapse/handlers/appservice.py                  |  9 ++++++---
 synapse/rest/appservice/v1/register.py          |  4 ++--
 synapse/storage/appservice.py                   | 17 ++++++++++++-----
 synapse/storage/schema/application_services.sql |  1 +
 tests/storage/test_appservice.py                | 10 ++++++----
 7 files changed, 35 insertions(+), 20 deletions(-)

(limited to 'synapse/rest/appservice')

diff --git a/synapse/appservice/__init__.py b/synapse/appservice/__init__.py
index 0c7f58574e..f7baf578f0 100644
--- a/synapse/appservice/__init__.py
+++ b/synapse/appservice/__init__.py
@@ -34,11 +34,13 @@ class ApplicationService(object):
     # values.
     NS_LIST = [NS_USERS, NS_ALIASES, NS_ROOMS]
 
-    def __init__(self, token, url=None, namespaces=None, txn_id=None):
+    def __init__(self, token, url=None, namespaces=None, hs_token=None,
+                 txn_id=None):
         self.token = token
         self.url = url
+        self.hs_token = hs_token
         self.namespaces = self._check_namespaces(namespaces)
-        self.txn_id = None
+        self.txn_id = txn_id
 
     def _check_namespaces(self, namespaces):
         # Sanity check that it is of the form:
diff --git a/synapse/appservice/api.py b/synapse/appservice/api.py
index fbf4abc526..29bb35d61b 100644
--- a/synapse/appservice/api.py
+++ b/synapse/appservice/api.py
@@ -30,7 +30,6 @@ class ApplicationServiceApi(SimpleHttpClient):
 
     def __init__(self,  hs):
         super(ApplicationServiceApi, self).__init__(hs)
-        self.hs_token = "_hs_token_"  # TODO extract hs token
 
     @defer.inlineCallbacks
     def query_user(self, service, user_id):
@@ -38,7 +37,7 @@ class ApplicationServiceApi(SimpleHttpClient):
         response = None
         try:
             response = yield self.get_json(uri, {
-                "access_token": self.hs_token
+                "access_token": service.hs_token
             })
             if response:  # just an empty json object
                 defer.returnValue(True)
@@ -54,7 +53,7 @@ class ApplicationServiceApi(SimpleHttpClient):
         response = None
         try:
             response = yield self.get_json(uri, {
-                "access_token": self.hs_token
+                "access_token": service.hs_token
             })
             if response:  # just an empty json object
                 defer.returnValue(True)
@@ -76,9 +75,10 @@ class ApplicationServiceApi(SimpleHttpClient):
                     "events": events
                 },
                 {
-                    "access_token": self.hs_token
+                    "access_token": service.hs_token
                 })
             if response:  # just an empty json object
+                # TODO: Mark txn as sent successfully
                 defer.returnValue(True)
         except CodeMessageException as e:
             logger.warning("push_bulk to %s received %s", uri, e.code)
diff --git a/synapse/handlers/appservice.py b/synapse/handlers/appservice.py
index 2b2761682f..7b0599c71e 100644
--- a/synapse/handlers/appservice.py
+++ b/synapse/handlers/appservice.py
@@ -19,6 +19,7 @@ from ._base import BaseHandler
 from synapse.api.errors import Codes, StoreError, SynapseError
 from synapse.appservice import ApplicationService
 from synapse.appservice.api import ApplicationServiceApi
+import synapse.util.stringutils as stringutils
 
 import logging
 
@@ -53,10 +54,9 @@ class ApplicationServicesHandler(object):
                 errcode=Codes.FORBIDDEN
             )
         logger.info("Updating application service info...")
+        app_service.hs_token = self._generate_hs_token()
         yield self.store.update_app_service(app_service)
-
-        logger.info("Sending ping to %s...", app_service.url)
-        yield self.appservice_api.push(app_service, "pinger")
+        defer.returnValue(app_service)
 
     def unregister(self, token):
         logger.info("Unregister as_token=%s", token)
@@ -136,3 +136,6 @@ class ApplicationServicesHandler(object):
         # Fork off pushes to these services - XXX First cut, best effort
         for service in services:
             self.appservice_api.push(service, event)
+
+    def _generate_hs_token(self):
+        return stringutils.random_string(18)
diff --git a/synapse/rest/appservice/v1/register.py b/synapse/rest/appservice/v1/register.py
index e374d538e7..d3d5aef220 100644
--- a/synapse/rest/appservice/v1/register.py
+++ b/synapse/rest/appservice/v1/register.py
@@ -61,8 +61,8 @@ class RegisterRestServlet(AppServiceRestServlet):
 
         app_service = ApplicationService(as_token, as_url, namespaces)
 
-        yield self.handler.register(app_service)
-        hs_token = "_not_implemented_yet"  # TODO: Pull this from self.hs?
+        app_service = yield self.handler.register(app_service)
+        hs_token = app_service.hs_token
 
         defer.returnValue((200, {
           "hs_token": hs_token
diff --git a/synapse/storage/appservice.py b/synapse/storage/appservice.py
index b64416de28..3c8bf9ad0d 100644
--- a/synapse/storage/appservice.py
+++ b/synapse/storage/appservice.py
@@ -60,6 +60,7 @@ class ApplicationServiceStore(SQLBaseStore):
             if service.token == token:
                 service.url = None
                 service.namespaces = None
+                service.hs_token = None
 
     def _unregister_app_service_txn(self, txn, token):
         # kill the url to prevent pushes
@@ -100,6 +101,9 @@ class ApplicationServiceStore(SQLBaseStore):
         if not service.token or not service.url:
             raise StoreError(400, "Token and url must be specified.")
 
+        if not service.hs_token:
+            raise StoreError(500, "No HS token")
+
         yield self.runInteraction(
             "update_app_service",
             self._update_app_service_txn,
@@ -126,8 +130,8 @@ class ApplicationServiceStore(SQLBaseStore):
             return False
 
         txn.execute(
-            "UPDATE application_services SET url=? WHERE id=?",
-            (service.url, as_id,)
+            "UPDATE application_services SET url=?, hs_token=? WHERE id=?",
+            (service.url, service.hs_token, as_id,)
         )
         # cleanup regex
         txn.execute(
@@ -196,6 +200,7 @@ class ApplicationServiceStore(SQLBaseStore):
         #     'namespace': enum,
         #     'as_id': 0,
         #     'token': "something",
+        #     'hs_token': "otherthing",
         #     'id': 0
         #   }
         # ]
@@ -208,6 +213,7 @@ class ApplicationServiceStore(SQLBaseStore):
                 services[as_token] = {
                     "url": res["url"],
                     "token": as_token,
+                    "hs_token": res["hs_token"],
                     "namespaces": {
                         ApplicationService.NS_USERS: [],
                         ApplicationService.NS_ALIASES: [],
@@ -230,8 +236,9 @@ class ApplicationServiceStore(SQLBaseStore):
         for service in services.values():
             logger.info("Found application service: %s", service)
             self.cache.services.append(ApplicationService(
-                service["token"],
-                service["url"],
-                service["namespaces"]
+                token=service["token"],
+                url=service["url"],
+                namespaces=service["namespaces"],
+                hs_token=service["hs_token"]
             ))
 
diff --git a/synapse/storage/schema/application_services.sql b/synapse/storage/schema/application_services.sql
index 6d245fc807..03b5a10c8a 100644
--- a/synapse/storage/schema/application_services.sql
+++ b/synapse/storage/schema/application_services.sql
@@ -17,6 +17,7 @@ CREATE TABLE IF NOT EXISTS application_services(
     id INTEGER PRIMARY KEY AUTOINCREMENT,
     url TEXT,
     token TEXT,
+    hs_token TEXT,
     UNIQUE(token) ON CONFLICT ROLLBACK
 );
 
diff --git a/tests/storage/test_appservice.py b/tests/storage/test_appservice.py
index 56fdda377c..b9ecfb3384 100644
--- a/tests/storage/test_appservice.py
+++ b/tests/storage/test_appservice.py
@@ -46,13 +46,15 @@ class ApplicationServiceStoreTestCase(unittest.TestCase):
     @defer.inlineCallbacks
     def test_update_and_retrieval_of_service(self):
         url = "https://matrix.org/appservices/foobar"
+        hs_token = "hstok"
         user_regex = ["@foobar_.*:matrix.org"]
         alias_regex = ["#foobar_.*:matrix.org"]
         room_regex = []
-        service = ApplicationService(url=url, token=self.as_token, namespaces={
-            ApplicationService.NS_USERS: user_regex,
-            ApplicationService.NS_ALIASES: alias_regex,
-            ApplicationService.NS_ROOMS: room_regex
+        service = ApplicationService(
+            url=url, hs_token=hs_token, token=self.as_token, namespaces={
+                ApplicationService.NS_USERS: user_regex,
+                ApplicationService.NS_ALIASES: alias_regex,
+                ApplicationService.NS_ROOMS: room_regex
         })
         yield self.store.update_app_service(service)
 
-- 
cgit 1.5.1


From c7783d6feec9b69c24f3303cbb51cce3e6b8ffb3 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Wed, 11 Feb 2015 10:36:08 +0000
Subject: Notify ASes for events sent by other users in a room which an AS user
 is a part of.

---
 synapse/appservice/__init__.py         | 17 +++++++++++++----
 synapse/handlers/appservice.py         | 21 ++++++++++++++++-----
 synapse/rest/appservice/v1/__init__.py |  4 ++--
 tests/appservice/test_appservice.py    | 25 +++++++++++++++++++++++++
 4 files changed, 56 insertions(+), 11 deletions(-)

(limited to 'synapse/rest/appservice')

diff --git a/synapse/appservice/__init__.py b/synapse/appservice/__init__.py
index fb9bfffe5d..381b4cfc4a 100644
--- a/synapse/appservice/__init__.py
+++ b/synapse/appservice/__init__.py
@@ -74,7 +74,7 @@ class ApplicationService(object):
                 return True
         return False
 
-    def _matches_user(self, event):
+    def _matches_user(self, event, member_list):
         if (hasattr(event, "sender") and
                 self.is_interested_in_user(event.sender)):
             return True
@@ -83,6 +83,10 @@ class ApplicationService(object):
                 and hasattr(event, "state_key")
                 and self.is_interested_in_user(event.state_key)):
             return True
+        # check joined member events
+        for member in member_list:
+            if self.is_interested_in_user(member.state_key):
+                return True
         return False
 
     def _matches_room_id(self, event):
@@ -96,7 +100,8 @@ class ApplicationService(object):
                 return True
         return False
 
-    def is_interested(self, event, restrict_to=None, aliases_for_event=None):
+    def is_interested(self, event, restrict_to=None, aliases_for_event=None,
+                      member_list=None):
         """Check if this service is interested in this event.
 
         Args:
@@ -104,18 +109,22 @@ class ApplicationService(object):
             restrict_to(str): The namespace to restrict regex tests to.
             aliases_for_event(list): A list of all the known room aliases for
             this event.
+            member_list(list): A list of all joined room members in this room.
         Returns:
             bool: True if this service would like to know about this event.
         """
         if aliases_for_event is None:
             aliases_for_event = []
+        if member_list is None:
+            member_list = []
+
         if restrict_to and restrict_to not in ApplicationService.NS_LIST:
             # this is a programming error, so fail early and raise a general
             # exception
             raise Exception("Unexpected restrict_to value: %s". restrict_to)
 
         if not restrict_to:
-            return (self._matches_user(event)
+            return (self._matches_user(event, member_list)
                     or self._matches_aliases(event, aliases_for_event)
                     or self._matches_room_id(event))
         elif restrict_to == ApplicationService.NS_ALIASES:
@@ -123,7 +132,7 @@ class ApplicationService(object):
         elif restrict_to == ApplicationService.NS_ROOMS:
             return self._matches_room_id(event)
         elif restrict_to == ApplicationService.NS_USERS:
-            return self._matches_user(event)
+            return self._matches_user(event, member_list)
 
     def is_interested_in_user(self, user_id):
         return self._matches_regex(user_id, ApplicationService.NS_USERS)
diff --git a/synapse/handlers/appservice.py b/synapse/handlers/appservice.py
index 8591a77bf3..2c488a46f6 100644
--- a/synapse/handlers/appservice.py
+++ b/synapse/handlers/appservice.py
@@ -15,7 +15,7 @@
 
 from twisted.internet import defer
 
-from synapse.api.constants import EventTypes
+from synapse.api.constants import EventTypes, Membership
 from synapse.api.errors import Codes, StoreError, SynapseError
 from synapse.appservice import ApplicationService
 from synapse.types import UserID
@@ -154,14 +154,25 @@ class ApplicationServicesHandler(object):
             list<ApplicationService>: A list of services interested in this
             event based on the service regex.
         """
-        # We need to know the aliases associated with this event.room_id, if any
-        if not alias_list:
-            alias_list = yield self.store.get_aliases_for_room(event.room_id)
+        member_list = None
+        if hasattr(event, "room_id"):
+            # We need to know the aliases associated with this event.room_id,
+            # if any.
+            if not alias_list:
+                alias_list = yield self.store.get_aliases_for_room(
+                    event.room_id
+                )
+            # We need to know the members associated with this event.room_id,
+            # if any.
+            member_list = yield self.store.get_room_members(
+                room_id=event.room_id,
+                membership=Membership.JOIN
+            )
 
         services = yield self.store.get_app_services()
         interested_list = [
             s for s in services if (
-                s.is_interested(event, restrict_to, alias_list)
+                s.is_interested(event, restrict_to, alias_list, member_list)
             )
         ]
         defer.returnValue(interested_list)
diff --git a/synapse/rest/appservice/v1/__init__.py b/synapse/rest/appservice/v1/__init__.py
index bf243b6180..a7877609ad 100644
--- a/synapse/rest/appservice/v1/__init__.py
+++ b/synapse/rest/appservice/v1/__init__.py
@@ -21,9 +21,9 @@ class AppServiceRestResource(JsonResource):
     """A resource for version 1 of the matrix application service API."""
 
     def __init__(self, hs):
-        JsonResource.__init__(self)
+        JsonResource.__init__(self, hs)
         self.register_servlets(self, hs)
 
     @staticmethod
     def register_servlets(appservice_resource, hs):
-        register.register_servlets(hs, appservice_resource)
\ No newline at end of file
+        register.register_servlets(hs, appservice_resource)
diff --git a/tests/appservice/test_appservice.py b/tests/appservice/test_appservice.py
index c0aaf12785..d12e4f2644 100644
--- a/tests/appservice/test_appservice.py
+++ b/tests/appservice/test_appservice.py
@@ -143,3 +143,28 @@ class ApplicationServiceTestCase(unittest.TestCase):
             restrict_to=ApplicationService.NS_USERS,
             aliases_for_event=["#xmpp_barfoo:matrix.org"]
         ))
+
+    def test_member_list_match(self):
+        self.service.namespaces[ApplicationService.NS_USERS].append(
+            "@irc_.*"
+        )
+        join_list = [
+            Mock(
+                type="m.room.member", room_id="!foo:bar", sender="@alice:here",
+                state_key="@alice:here"
+            ),
+            Mock(
+                type="m.room.member", room_id="!foo:bar", sender="@irc_fo:here",
+                state_key="@irc_fo:here"  # AS user
+            ),
+            Mock(
+                type="m.room.member", room_id="!foo:bar", sender="@bob:here",
+                state_key="@bob:here"
+            )
+        ]
+
+        self.event.sender = "@xmpp_foobar:matrix.org"
+        self.assertTrue(self.service.is_interested(
+            event=self.event,
+            member_list=join_list
+        ))
-- 
cgit 1.5.1


From 8beb61391609d8dd55022a14e1ef11bf353c1fdc Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Wed, 11 Feb 2015 10:36:48 +0000
Subject: Add newline to EOF

---
 synapse/rest/appservice/v1/__init__.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'synapse/rest/appservice')

diff --git a/synapse/rest/appservice/v1/__init__.py b/synapse/rest/appservice/v1/__init__.py
index a7877609ad..a9d6d72566 100644
--- a/synapse/rest/appservice/v1/__init__.py
+++ b/synapse/rest/appservice/v1/__init__.py
@@ -27,3 +27,4 @@ class AppServiceRestResource(JsonResource):
     @staticmethod
     def register_servlets(appservice_resource, hs):
         register.register_servlets(hs, appservice_resource)
+
-- 
cgit 1.5.1


From fd40d992adfb8b63f6e925dad030c63498501408 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Wed, 11 Feb 2015 10:41:33 +0000
Subject: PEP8-ify

---
 synapse/appservice/api.py              | 2 --
 synapse/handlers/directory.py          | 3 ---
 synapse/rest/appservice/v1/register.py | 2 +-
 synapse/storage/appservice.py          | 3 ---
 4 files changed, 1 insertion(+), 9 deletions(-)

(limited to 'synapse/rest/appservice')

diff --git a/synapse/appservice/api.py b/synapse/appservice/api.py
index 15ac1e27fc..6192813c03 100644
--- a/synapse/appservice/api.py
+++ b/synapse/appservice/api.py
@@ -71,7 +71,6 @@ class ApplicationServiceApi(SimpleHttpClient):
             logger.warning("query_alias to %s threw exception %s", uri, ex)
         defer.returnValue(False)
 
-
     @defer.inlineCallbacks
     def push_bulk(self, service, events):
         events = self._serialize(events)
@@ -107,4 +106,3 @@ class ApplicationServiceApi(SimpleHttpClient):
         return [
             serialize_event(e, time_now, as_client_event=True) for e in events
         ]
-
diff --git a/synapse/handlers/directory.py b/synapse/handlers/directory.py
index 87bc12c983..20ab9e269c 100644
--- a/synapse/handlers/directory.py
+++ b/synapse/handlers/directory.py
@@ -58,7 +58,6 @@ class DirectoryHandler(BaseHandler):
             servers
         )
 
-
     @defer.inlineCallbacks
     def create_association(self, user_id, room_alias, room_id, servers=None):
         # association creation for human users
@@ -75,7 +74,6 @@ class DirectoryHandler(BaseHandler):
             )
         yield self._create_association(room_alias, room_id, servers)
 
-
     @defer.inlineCallbacks
     def create_appservice_association(self, service, room_alias, room_id,
                                       servers=None):
@@ -127,7 +125,6 @@ class DirectoryHandler(BaseHandler):
         # if room_id:
         #    yield self._update_room_alias_events(user_id, room_id)
 
-
     @defer.inlineCallbacks
     def get_association(self, room_alias):
         room_id = None
diff --git a/synapse/rest/appservice/v1/register.py b/synapse/rest/appservice/v1/register.py
index d3d5aef220..3bd0c1220c 100644
--- a/synapse/rest/appservice/v1/register.py
+++ b/synapse/rest/appservice/v1/register.py
@@ -65,7 +65,7 @@ class RegisterRestServlet(AppServiceRestServlet):
         hs_token = app_service.hs_token
 
         defer.returnValue((200, {
-          "hs_token": hs_token
+            "hs_token": hs_token
         }))
 
     def _parse_namespace(self, target_ns, origin_ns, ns):
diff --git a/synapse/storage/appservice.py b/synapse/storage/appservice.py
index ba31c68595..d941b1f387 100644
--- a/synapse/storage/appservice.py
+++ b/synapse/storage/appservice.py
@@ -97,7 +97,6 @@ class ApplicationServiceStore(SQLBaseStore):
         # allocate new ASes. It relies on the server admin inserting the AS
         # token into the database manually.
 
-
         if not service.token or not service.url:
             raise StoreError(400, "Token and url must be specified.")
 
@@ -186,7 +185,6 @@ class ApplicationServiceStore(SQLBaseStore):
         # TODO: The from_cache=False impl
         # TODO: This should be JOINed with the application_services_regex table.
 
-
     @defer.inlineCallbacks
     def _populate_cache(self):
         """Populates the ApplicationServiceCache from the database."""
@@ -244,4 +242,3 @@ class ApplicationServiceStore(SQLBaseStore):
                 hs_token=service["hs_token"],
                 sender=service["sender"]
             ))
-
-- 
cgit 1.5.1


From 14d413752bc7f656e9df5363a8aa29bae404d10a Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Wed, 11 Feb 2015 10:53:47 +0000
Subject: Fix newline on __init__

---
 synapse/rest/appservice/v1/__init__.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'synapse/rest/appservice')

diff --git a/synapse/rest/appservice/v1/__init__.py b/synapse/rest/appservice/v1/__init__.py
index a9d6d72566..a7877609ad 100644
--- a/synapse/rest/appservice/v1/__init__.py
+++ b/synapse/rest/appservice/v1/__init__.py
@@ -27,4 +27,3 @@ class AppServiceRestResource(JsonResource):
     @staticmethod
     def register_servlets(appservice_resource, hs):
         register.register_servlets(hs, appservice_resource)
-
-- 
cgit 1.5.1