diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py
index 15919eb580..1ebbeab2e7 100644
--- a/synapse/storage/__init__.py
+++ b/synapse/storage/__init__.py
@@ -63,7 +63,7 @@ SCHEMAS = [
# Remember to update this number every time an incompatible change is made to
# database schema files, so the users will be informed on server restarts.
-SCHEMA_VERSION = 4
+SCHEMA_VERSION = 5
class _RollbackButIsFineException(Exception):
@@ -294,6 +294,28 @@ class DataStore(RoomMemberStore, RoomStore,
defer.returnValue(self.min_token)
+ def insert_client_ip(self, user, access_token, device_id, ip, user_agent):
+ return self._simple_insert(
+ "user_ips",
+ {
+ "user": user.to_string(),
+ "access_token": access_token,
+ "device_id": device_id,
+ "ip": ip,
+ "user_agent": user_agent,
+ "last_seen": int(self._clock.time_msec()),
+ }
+ )
+
+ def get_user_ip_and_agents(self, user):
+ return self._simple_select_list(
+ table="user_ips",
+ keyvalues={"user": user.to_string()},
+ retcols=[
+ "device_id", "access_token", "ip", "user_agent", "last_seen"
+ ],
+ )
+
def snapshot_room(self, room_id, user_id, state_type=None, state_key=None):
"""Snapshot the room for an update by a user
Args:
diff --git a/synapse/storage/registration.py b/synapse/storage/registration.py
index db20b1daa0..719806f82b 100644
--- a/synapse/storage/registration.py
+++ b/synapse/storage/registration.py
@@ -88,27 +88,40 @@ class RegistrationStore(SQLBaseStore):
query, user_id
)
- @defer.inlineCallbacks
def get_user_by_token(self, token):
"""Get a user from the given access token.
Args:
token (str): The access token of a user.
Returns:
- str: The user ID of the user.
+ dict: Including the name (user_id), device_id and whether they are
+ an admin.
Raises:
StoreError if no user was found.
"""
- user_id = yield self.runInteraction(self._query_for_auth,
- token)
- defer.returnValue(user_id)
+ return self.runInteraction(
+ self._query_for_auth,
+ token
+ )
+
+ def is_server_admin(self, user):
+ return self._simple_select_one_onecol(
+ table="users",
+ keyvalues={"name": user.to_string()},
+ retcol="admin",
+ )
def _query_for_auth(self, txn, token):
- txn.execute("SELECT users.name FROM access_tokens LEFT JOIN users" +
- " ON users.id = access_tokens.user_id WHERE token = ?",
- [token])
- row = txn.fetchone()
- if row:
- return row[0]
+ sql = (
+ "SELECT users.name, users.admin, access_tokens.device_id "
+ "FROM users "
+ "INNER JOIN access_tokens on users.id = access_tokens.user_id "
+ "WHERE token = ?"
+ )
+
+ cursor = txn.execute(sql, (token,))
+ rows = self.cursor_to_dict(cursor)
+ if rows:
+ return rows[0]
raise StoreError(404, "Token not found.")
diff --git a/synapse/storage/schema/delta/v5.sql b/synapse/storage/schema/delta/v5.sql
new file mode 100644
index 0000000000..af9df11aa9
--- /dev/null
+++ b/synapse/storage/schema/delta/v5.sql
@@ -0,0 +1,16 @@
+
+CREATE TABLE IF NOT EXISTS user_ips (
+ user TEXT NOT NULL,
+ access_token TEXT NOT NULL,
+ device_id TEXT,
+ ip TEXT NOT NULL,
+ user_agent TEXT NOT NULL,
+ last_seen INTEGER NOT NULL,
+ CONSTRAINT user_ip UNIQUE (user, access_token, ip, user_agent) ON CONFLICT REPLACE
+);
+
+CREATE INDEX IF NOT EXISTS user_ips_user ON user_ips(user);
+
+ALTER TABLE users ADD COLUMN admin BOOL DEFAULT 0 NOT NULL;
+
+PRAGMA user_version = 5;
diff --git a/synapse/storage/schema/users.sql b/synapse/storage/schema/users.sql
index 2519702971..8244f733bd 100644
--- a/synapse/storage/schema/users.sql
+++ b/synapse/storage/schema/users.sql
@@ -17,6 +17,7 @@ CREATE TABLE IF NOT EXISTS users(
name TEXT,
password_hash TEXT,
creation_ts INTEGER,
+ admin BOOL DEFAULT 0 NOT NULL,
UNIQUE(name) ON CONFLICT ROLLBACK
);
@@ -29,3 +30,16 @@ CREATE TABLE IF NOT EXISTS access_tokens(
FOREIGN KEY(user_id) REFERENCES users(id),
UNIQUE(token) ON CONFLICT ROLLBACK
);
+
+CREATE TABLE IF NOT EXISTS user_ips (
+ user TEXT NOT NULL,
+ access_token TEXT NOT NULL,
+ device_id TEXT,
+ ip TEXT NOT NULL,
+ user_agent TEXT NOT NULL,
+ last_seen INTEGER NOT NULL,
+ CONSTRAINT user_ip UNIQUE (user, access_token, ip, user_agent) ON CONFLICT REPLACE
+);
+
+CREATE INDEX IF NOT EXISTS user_ips_user ON user_ips(user);
+
|
