2016-06-03 07:42:35 -06:00
|
|
|
# -*- coding: utf-8 -*-
|
|
|
|
# Copyright 2016 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.
|
|
|
|
|
2016-07-20 09:34:00 -06:00
|
|
|
import logging
|
|
|
|
|
2018-07-09 00:09:20 -06:00
|
|
|
from six import iteritems
|
2016-06-03 07:42:35 -06:00
|
|
|
|
2018-07-09 00:09:20 -06:00
|
|
|
from twisted.internet import defer
|
2016-07-22 06:14:03 -06:00
|
|
|
|
2018-07-18 07:35:24 -06:00
|
|
|
from synapse.metrics.background_process_metrics import run_as_background_process
|
2017-07-04 02:56:44 -06:00
|
|
|
from synapse.util.caches import CACHE_SIZE_FACTOR
|
|
|
|
|
2018-07-09 00:09:20 -06:00
|
|
|
from . import background_updates
|
|
|
|
from ._base import Cache
|
2017-06-07 03:18:44 -06:00
|
|
|
|
2016-07-20 09:34:00 -06:00
|
|
|
logger = logging.getLogger(__name__)
|
2016-06-03 07:42:35 -06:00
|
|
|
|
|
|
|
# Number of msec of granularity to store the user IP 'last seen' time. Smaller
|
|
|
|
# times give more inserts into the database even for readonly API hits
|
|
|
|
# 120 seconds == 2 minutes
|
|
|
|
LAST_SEEN_GRANULARITY = 120 * 1000
|
|
|
|
|
|
|
|
|
2016-07-22 06:14:03 -06:00
|
|
|
class ClientIpStore(background_updates.BackgroundUpdateStore):
|
2017-11-09 11:51:27 -07:00
|
|
|
def __init__(self, db_conn, hs):
|
2018-08-02 06:47:19 -06:00
|
|
|
|
2016-06-03 07:42:35 -06:00
|
|
|
self.client_ip_last_seen = Cache(
|
|
|
|
name="client_ip_last_seen",
|
|
|
|
keylen=4,
|
2017-06-07 03:18:44 -06:00
|
|
|
max_entries=50000 * CACHE_SIZE_FACTOR,
|
2016-06-03 07:42:35 -06:00
|
|
|
)
|
|
|
|
|
2017-11-09 11:51:27 -07:00
|
|
|
super(ClientIpStore, self).__init__(db_conn, hs)
|
2016-06-03 07:42:35 -06:00
|
|
|
|
2016-07-22 06:14:03 -06:00
|
|
|
self.register_background_index_update(
|
|
|
|
"user_ips_device_index",
|
|
|
|
index_name="user_ips_device_id",
|
|
|
|
table="user_ips",
|
|
|
|
columns=["user_id", "device_id", "last_seen"],
|
|
|
|
)
|
|
|
|
|
2018-03-28 05:03:13 -06:00
|
|
|
self.register_background_index_update(
|
|
|
|
"user_ips_last_seen_index",
|
|
|
|
index_name="user_ips_last_seen",
|
|
|
|
table="user_ips",
|
|
|
|
columns=["user_id", "last_seen"],
|
|
|
|
)
|
|
|
|
|
2018-04-25 10:37:29 -06:00
|
|
|
self.register_background_index_update(
|
|
|
|
"user_ips_last_seen_only_index",
|
|
|
|
index_name="user_ips_last_seen_only",
|
|
|
|
table="user_ips",
|
|
|
|
columns=["last_seen"],
|
|
|
|
)
|
|
|
|
|
2019-02-12 04:55:27 -07:00
|
|
|
self.register_background_update_handler(
|
|
|
|
"user_ips_analyze",
|
|
|
|
self._analyze_user_ip,
|
|
|
|
)
|
|
|
|
|
2019-01-11 12:21:50 -07:00
|
|
|
self.register_background_update_handler(
|
|
|
|
"user_ips_remove_dupes",
|
|
|
|
self._remove_user_ip_dupes,
|
|
|
|
)
|
|
|
|
|
|
|
|
# Register a unique index
|
|
|
|
self.register_background_index_update(
|
|
|
|
"user_ips_device_unique_index",
|
|
|
|
index_name="user_ips_user_token_ip_unique_index",
|
|
|
|
table="user_ips",
|
|
|
|
columns=["user_id", "access_token", "ip"],
|
|
|
|
unique=True,
|
|
|
|
)
|
|
|
|
|
|
|
|
# Drop the old non-unique index
|
|
|
|
self.register_background_update_handler(
|
|
|
|
"user_ips_drop_nonunique_index",
|
|
|
|
self._remove_user_ip_nonunique,
|
|
|
|
)
|
|
|
|
|
|
|
|
# (user_id, access_token, ip,) -> (user_agent, device_id, last_seen)
|
2017-06-27 06:37:04 -06:00
|
|
|
self._batch_row_update = {}
|
|
|
|
|
|
|
|
self._client_ip_looper = self._clock.looping_call(
|
|
|
|
self._update_client_ips_batch, 5 * 1000
|
|
|
|
)
|
2018-06-22 02:37:10 -06:00
|
|
|
self.hs.get_reactor().addSystemEventTrigger(
|
|
|
|
"before", "shutdown", self._update_client_ips_batch
|
|
|
|
)
|
2017-06-27 06:37:04 -06:00
|
|
|
|
2019-01-11 12:21:50 -07:00
|
|
|
@defer.inlineCallbacks
|
|
|
|
def _remove_user_ip_nonunique(self, progress, batch_size):
|
|
|
|
def f(conn):
|
|
|
|
txn = conn.cursor()
|
|
|
|
txn.execute(
|
|
|
|
"DROP INDEX IF EXISTS user_ips_user_ip"
|
|
|
|
)
|
|
|
|
txn.close()
|
|
|
|
|
|
|
|
yield self.runWithConnection(f)
|
|
|
|
yield self._end_background_update("user_ips_drop_nonunique_index")
|
|
|
|
defer.returnValue(1)
|
|
|
|
|
2019-02-12 04:55:27 -07:00
|
|
|
@defer.inlineCallbacks
|
|
|
|
def _analyze_user_ip(self, progress, batch_size):
|
|
|
|
# Background update to analyze user_ips table before we run the
|
|
|
|
# deduplication background update. The table may not have been analyzed
|
|
|
|
# for ages due to the table locks.
|
|
|
|
#
|
|
|
|
# This will lock out the naive upserts to user_ips while it happens, but
|
|
|
|
# the analyze should be quick (28GB table takes ~10s)
|
|
|
|
def user_ips_analyze(txn):
|
|
|
|
txn.execute("ANALYZE user_ips")
|
|
|
|
|
2019-02-12 05:40:42 -07:00
|
|
|
yield self.runInteraction(
|
2019-02-12 04:55:27 -07:00
|
|
|
"user_ips_analyze", user_ips_analyze
|
|
|
|
)
|
|
|
|
|
|
|
|
yield self._end_background_update("user_ips_analyze")
|
|
|
|
|
|
|
|
defer.returnValue(1)
|
|
|
|
|
2019-01-11 12:21:50 -07:00
|
|
|
@defer.inlineCallbacks
|
|
|
|
def _remove_user_ip_dupes(self, progress, batch_size):
|
2019-01-22 04:55:53 -07:00
|
|
|
# This works function works by scanning the user_ips table in batches
|
|
|
|
# based on `last_seen`. For each row in a batch it searches the rest of
|
|
|
|
# the table to see if there are any duplicates, if there are then they
|
|
|
|
# are removed and replaced with a suitable row.
|
2019-01-11 12:21:50 -07:00
|
|
|
|
2019-01-22 04:55:53 -07:00
|
|
|
# Fetch the start of the batch
|
|
|
|
begin_last_seen = progress.get("last_seen", 0)
|
2019-01-11 12:21:50 -07:00
|
|
|
|
|
|
|
def get_last_seen(txn):
|
|
|
|
txn.execute(
|
|
|
|
"""
|
|
|
|
SELECT last_seen FROM user_ips
|
|
|
|
WHERE last_seen > ?
|
|
|
|
ORDER BY last_seen
|
|
|
|
LIMIT 1
|
|
|
|
OFFSET ?
|
|
|
|
""",
|
2019-01-22 04:55:53 -07:00
|
|
|
(begin_last_seen, batch_size)
|
2019-01-11 12:21:50 -07:00
|
|
|
)
|
2019-01-22 04:55:53 -07:00
|
|
|
row = txn.fetchone()
|
|
|
|
if row:
|
|
|
|
return row[0]
|
|
|
|
else:
|
|
|
|
return None
|
|
|
|
|
|
|
|
# Get a last seen that has roughly `batch_size` since `begin_last_seen`
|
|
|
|
end_last_seen = yield self.runInteraction(
|
2019-01-11 12:21:50 -07:00
|
|
|
"user_ips_dups_get_last_seen", get_last_seen
|
|
|
|
)
|
|
|
|
|
2019-01-22 09:31:05 -07:00
|
|
|
# If it returns None, then we're processing the last batch
|
|
|
|
last = end_last_seen is None
|
2019-01-11 12:21:50 -07:00
|
|
|
|
2019-01-23 01:45:18 -07:00
|
|
|
logger.info(
|
|
|
|
"Scanning for duplicate 'user_ips' rows in range: %s <= last_seen < %s",
|
|
|
|
begin_last_seen, end_last_seen,
|
|
|
|
)
|
|
|
|
|
2019-01-22 09:20:33 -07:00
|
|
|
def remove(txn):
|
2019-01-11 12:21:50 -07:00
|
|
|
# This works by looking at all entries in the given time span, and
|
|
|
|
# then for each (user_id, access_token, ip) tuple in that range
|
|
|
|
# checking for any duplicates in the rest of the table (via a join).
|
|
|
|
# It then only returns entries which have duplicates, and the max
|
|
|
|
# last_seen across all duplicates, which can the be used to delete
|
|
|
|
# all other duplicates.
|
|
|
|
# It is efficient due to the existence of (user_id, access_token,
|
|
|
|
# ip) and (last_seen) indices.
|
2019-01-22 09:31:05 -07:00
|
|
|
|
|
|
|
# Define the search space, which requires handling the last batch in
|
|
|
|
# a different way
|
|
|
|
if last:
|
|
|
|
clause = "? <= last_seen"
|
|
|
|
args = (begin_last_seen,)
|
|
|
|
else:
|
|
|
|
clause = "? <= last_seen AND last_seen < ?"
|
|
|
|
args = (begin_last_seen, end_last_seen)
|
|
|
|
|
2019-02-12 04:28:08 -07:00
|
|
|
# (Note: The DISTINCT in the inner query is important to ensure that
|
|
|
|
# the COUNT(*) is accurate, otherwise double counting may happen due
|
|
|
|
# to the join effectively being a cross product)
|
2019-01-11 12:21:50 -07:00
|
|
|
txn.execute(
|
|
|
|
"""
|
|
|
|
SELECT user_id, access_token, ip,
|
2019-02-12 04:28:08 -07:00
|
|
|
MAX(device_id), MAX(user_agent), MAX(last_seen),
|
|
|
|
COUNT(*)
|
2019-01-11 12:21:50 -07:00
|
|
|
FROM (
|
2019-02-12 04:28:08 -07:00
|
|
|
SELECT DISTINCT user_id, access_token, ip
|
2019-01-11 12:21:50 -07:00
|
|
|
FROM user_ips
|
2019-01-22 09:31:05 -07:00
|
|
|
WHERE {}
|
2019-01-11 12:21:50 -07:00
|
|
|
) c
|
|
|
|
INNER JOIN user_ips USING (user_id, access_token, ip)
|
|
|
|
GROUP BY user_id, access_token, ip
|
2019-01-22 09:31:05 -07:00
|
|
|
HAVING count(*) > 1
|
|
|
|
""".format(clause),
|
|
|
|
args
|
2019-01-11 12:21:50 -07:00
|
|
|
)
|
|
|
|
res = txn.fetchall()
|
|
|
|
|
|
|
|
# We've got some duplicates
|
|
|
|
for i in res:
|
2019-02-12 04:28:08 -07:00
|
|
|
user_id, access_token, ip, device_id, user_agent, last_seen, count = i
|
|
|
|
|
|
|
|
# We want to delete the duplicates so we end up with only a
|
|
|
|
# single row.
|
|
|
|
#
|
|
|
|
# The naive way of doing this would be just to delete all rows
|
|
|
|
# and reinsert a constructed row. However, if there are a lot of
|
|
|
|
# duplicate rows this can cause the table to grow a lot, which
|
|
|
|
# can be problematic in two ways:
|
|
|
|
# 1. If user_ips is already large then this can cause the
|
|
|
|
# table to rapidly grow, potentially filling the disk.
|
|
|
|
# 2. Reinserting a lot of rows can confuse the table
|
|
|
|
# statistics for postgres, causing it to not use the
|
|
|
|
# correct indices for the query above, resulting in a full
|
|
|
|
# table scan. This is incredibly slow for large tables and
|
|
|
|
# can kill database performance. (This seems to mainly
|
|
|
|
# happen for the last query where the clause is simply `? <
|
|
|
|
# last_seen`)
|
|
|
|
#
|
|
|
|
# So instead we want to delete all but *one* of the duplicate
|
|
|
|
# rows. That is hard to do reliably, so we cheat and do a two
|
|
|
|
# step process:
|
|
|
|
# 1. Delete all rows with a last_seen strictly less than the
|
|
|
|
# max last_seen. This hopefully results in deleting all but
|
|
|
|
# one row the majority of the time, but there may be
|
|
|
|
# duplicate last_seen
|
|
|
|
# 2. If multiple rows remain, we fall back to the naive method
|
|
|
|
# and simply delete all rows and reinsert.
|
|
|
|
#
|
|
|
|
# Note that this relies on no new duplicate rows being inserted,
|
|
|
|
# but if that is happening then this entire process is futile
|
|
|
|
# anyway.
|
|
|
|
|
|
|
|
# Do step 1:
|
|
|
|
|
|
|
|
txn.execute(
|
|
|
|
"""
|
|
|
|
DELETE FROM user_ips
|
|
|
|
WHERE user_id = ? AND access_token = ? AND ip = ? AND last_seen < ?
|
|
|
|
""",
|
|
|
|
(user_id, access_token, ip, last_seen)
|
|
|
|
)
|
|
|
|
if txn.rowcount == count - 1:
|
|
|
|
# We deleted all but one of the duplicate rows, i.e. there
|
|
|
|
# is exactly one remaining and so there is nothing left to
|
|
|
|
# do.
|
|
|
|
continue
|
|
|
|
elif txn.rowcount >= count:
|
|
|
|
raise Exception(
|
|
|
|
"We deleted more duplicate rows from 'user_ips' than expected",
|
|
|
|
)
|
|
|
|
|
|
|
|
# The previous step didn't delete enough rows, so we fallback to
|
|
|
|
# step 2:
|
2019-01-11 12:21:50 -07:00
|
|
|
|
|
|
|
# Drop all the duplicates
|
|
|
|
txn.execute(
|
|
|
|
"""
|
|
|
|
DELETE FROM user_ips
|
|
|
|
WHERE user_id = ? AND access_token = ? AND ip = ?
|
|
|
|
""",
|
|
|
|
(user_id, access_token, ip)
|
|
|
|
)
|
|
|
|
|
|
|
|
# Add in one to be the last_seen
|
|
|
|
txn.execute(
|
|
|
|
"""
|
|
|
|
INSERT INTO user_ips
|
|
|
|
(user_id, access_token, ip, device_id, user_agent, last_seen)
|
|
|
|
VALUES (?, ?, ?, ?, ?, ?)
|
|
|
|
""",
|
|
|
|
(user_id, access_token, ip, device_id, user_agent, last_seen)
|
|
|
|
)
|
|
|
|
|
|
|
|
self._background_update_progress_txn(
|
2019-01-22 04:55:53 -07:00
|
|
|
txn, "user_ips_remove_dupes", {"last_seen": end_last_seen}
|
2019-01-11 12:21:50 -07:00
|
|
|
)
|
|
|
|
|
2019-01-22 09:20:33 -07:00
|
|
|
yield self.runInteraction("user_ips_dups_remove", remove)
|
|
|
|
|
2019-01-11 12:21:50 -07:00
|
|
|
if last:
|
|
|
|
yield self._end_background_update("user_ips_remove_dupes")
|
|
|
|
|
|
|
|
defer.returnValue(batch_size)
|
|
|
|
|
2018-08-02 06:47:19 -06:00
|
|
|
@defer.inlineCallbacks
|
2017-06-27 08:53:45 -06:00
|
|
|
def insert_client_ip(self, user_id, access_token, ip, user_agent, device_id,
|
|
|
|
now=None):
|
|
|
|
if not now:
|
|
|
|
now = int(self._clock.time_msec())
|
|
|
|
key = (user_id, access_token, ip)
|
2016-06-03 07:42:35 -06:00
|
|
|
|
|
|
|
try:
|
|
|
|
last_seen = self.client_ip_last_seen.get(key)
|
|
|
|
except KeyError:
|
|
|
|
last_seen = None
|
2018-08-03 10:55:50 -06:00
|
|
|
yield self.populate_monthly_active_users(user_id)
|
2016-06-03 07:42:35 -06:00
|
|
|
# Rate-limited inserts
|
|
|
|
if last_seen is not None and (now - last_seen) < LAST_SEEN_GRANULARITY:
|
2017-06-27 06:37:04 -06:00
|
|
|
return
|
2016-06-03 07:42:35 -06:00
|
|
|
|
|
|
|
self.client_ip_last_seen.prefill(key, now)
|
|
|
|
|
2017-06-27 06:37:04 -06:00
|
|
|
self._batch_row_update[key] = (user_agent, device_id, now)
|
|
|
|
|
|
|
|
def _update_client_ips_batch(self):
|
2018-08-13 00:47:46 -06:00
|
|
|
|
|
|
|
# If the DB pool has already terminated, don't try updating
|
|
|
|
if not self.hs.get_db_pool().running:
|
|
|
|
return
|
|
|
|
|
2018-07-18 07:35:24 -06:00
|
|
|
def update():
|
|
|
|
to_update = self._batch_row_update
|
|
|
|
self._batch_row_update = {}
|
|
|
|
return self.runInteraction(
|
|
|
|
"_update_client_ips_batch", self._update_client_ips_batch_txn,
|
|
|
|
to_update,
|
|
|
|
)
|
|
|
|
|
2018-07-26 04:44:26 -06:00
|
|
|
return run_as_background_process(
|
2018-07-18 07:35:24 -06:00
|
|
|
"update_client_ips", update,
|
2016-06-03 07:42:35 -06:00
|
|
|
)
|
2016-07-20 09:34:00 -06:00
|
|
|
|
2017-06-27 06:37:04 -06:00
|
|
|
def _update_client_ips_batch_txn(self, txn, to_update):
|
2019-01-24 03:31:54 -07:00
|
|
|
if "user_ips" in self._unsafe_to_upsert_tables or (
|
|
|
|
not self.database_engine.can_native_upsert
|
|
|
|
):
|
|
|
|
self.database_engine.lock_table(txn, "user_ips")
|
2017-06-27 06:37:04 -06:00
|
|
|
|
2018-04-28 05:19:12 -06:00
|
|
|
for entry in iteritems(to_update):
|
2017-06-27 06:37:04 -06:00
|
|
|
(user_id, access_token, ip), (user_agent, device_id, last_seen) = entry
|
|
|
|
|
2018-09-20 04:14:34 -06:00
|
|
|
try:
|
|
|
|
self._simple_upsert_txn(
|
|
|
|
txn,
|
|
|
|
table="user_ips",
|
|
|
|
keyvalues={
|
|
|
|
"user_id": user_id,
|
|
|
|
"access_token": access_token,
|
|
|
|
"ip": ip,
|
|
|
|
},
|
|
|
|
values={
|
2019-01-11 12:21:50 -07:00
|
|
|
"user_agent": user_agent,
|
|
|
|
"device_id": device_id,
|
2018-09-20 04:14:34 -06:00
|
|
|
"last_seen": last_seen,
|
|
|
|
},
|
|
|
|
lock=False,
|
|
|
|
)
|
|
|
|
except Exception as e:
|
|
|
|
# Failed to upsert, log and continue
|
|
|
|
logger.error("Failed to insert client IP %r: %r", entry, e)
|
2017-06-27 06:37:04 -06:00
|
|
|
|
2016-07-20 09:34:00 -06:00
|
|
|
@defer.inlineCallbacks
|
2017-06-27 07:46:12 -06:00
|
|
|
def get_last_client_ip_by_device(self, user_id, device_id):
|
2016-07-20 09:34:00 -06:00
|
|
|
"""For each device_id listed, give the user_ip it was last seen on
|
|
|
|
|
|
|
|
Args:
|
2017-06-27 07:46:12 -06:00
|
|
|
user_id (str)
|
|
|
|
device_id (str): If None fetches all devices for the user
|
2016-07-20 09:34:00 -06:00
|
|
|
|
|
|
|
Returns:
|
|
|
|
defer.Deferred: resolves to a dict, where the keys
|
|
|
|
are (user_id, device_id) tuples. The values are also dicts, with
|
|
|
|
keys giving the column names
|
|
|
|
"""
|
2017-04-11 09:24:31 -06:00
|
|
|
|
2016-07-20 09:34:00 -06:00
|
|
|
res = yield self.runInteraction(
|
|
|
|
"get_last_client_ip_by_device",
|
|
|
|
self._get_last_client_ip_by_device_txn,
|
2017-06-27 07:46:12 -06:00
|
|
|
user_id, device_id,
|
2016-07-20 09:34:00 -06:00
|
|
|
retcols=(
|
|
|
|
"user_id",
|
|
|
|
"access_token",
|
|
|
|
"ip",
|
|
|
|
"user_agent",
|
|
|
|
"device_id",
|
|
|
|
"last_seen",
|
|
|
|
),
|
|
|
|
)
|
|
|
|
|
|
|
|
ret = {(d["user_id"], d["device_id"]): d for d in res}
|
2017-06-27 07:46:12 -06:00
|
|
|
for key in self._batch_row_update:
|
|
|
|
uid, access_token, ip = key
|
|
|
|
if uid == user_id:
|
|
|
|
user_agent, did, last_seen = self._batch_row_update[key]
|
|
|
|
if not device_id or did == device_id:
|
|
|
|
ret[(user_id, device_id)] = {
|
|
|
|
"user_id": user_id,
|
|
|
|
"access_token": access_token,
|
|
|
|
"ip": ip,
|
|
|
|
"user_agent": user_agent,
|
|
|
|
"device_id": did,
|
|
|
|
"last_seen": last_seen,
|
|
|
|
}
|
2016-07-20 09:34:00 -06:00
|
|
|
defer.returnValue(ret)
|
|
|
|
|
|
|
|
@classmethod
|
2017-06-27 07:46:12 -06:00
|
|
|
def _get_last_client_ip_by_device_txn(cls, txn, user_id, device_id, retcols):
|
2016-07-20 09:34:00 -06:00
|
|
|
where_clauses = []
|
|
|
|
bindings = []
|
2017-06-27 07:46:12 -06:00
|
|
|
if device_id is None:
|
|
|
|
where_clauses.append("user_id = ?")
|
|
|
|
bindings.extend((user_id, ))
|
|
|
|
else:
|
|
|
|
where_clauses.append("(user_id = ? AND device_id = ?)")
|
|
|
|
bindings.extend((user_id, device_id))
|
2016-07-20 09:34:00 -06:00
|
|
|
|
2017-04-11 09:24:31 -06:00
|
|
|
if not where_clauses:
|
|
|
|
return []
|
|
|
|
|
2016-07-20 09:34:00 -06:00
|
|
|
inner_select = (
|
|
|
|
"SELECT MAX(last_seen) mls, user_id, device_id FROM user_ips "
|
|
|
|
"WHERE %(where)s "
|
|
|
|
"GROUP BY user_id, device_id"
|
|
|
|
) % {
|
|
|
|
"where": " OR ".join(where_clauses),
|
|
|
|
}
|
|
|
|
|
|
|
|
sql = (
|
|
|
|
"SELECT %(retcols)s FROM user_ips "
|
|
|
|
"JOIN (%(inner_select)s) ips ON"
|
|
|
|
" user_ips.last_seen = ips.mls AND"
|
|
|
|
" user_ips.user_id = ips.user_id AND"
|
|
|
|
" (user_ips.device_id = ips.device_id OR"
|
|
|
|
" (user_ips.device_id IS NULL AND ips.device_id IS NULL)"
|
|
|
|
" )"
|
|
|
|
) % {
|
|
|
|
"retcols": ",".join("user_ips." + c for c in retcols),
|
|
|
|
"inner_select": inner_select,
|
|
|
|
}
|
|
|
|
|
|
|
|
txn.execute(sql, bindings)
|
|
|
|
return cls.cursor_to_dict(txn)
|
2017-06-27 07:46:12 -06:00
|
|
|
|
|
|
|
@defer.inlineCallbacks
|
|
|
|
def get_user_ip_and_agents(self, user):
|
|
|
|
user_id = user.to_string()
|
|
|
|
results = {}
|
|
|
|
|
|
|
|
for key in self._batch_row_update:
|
2019-01-11 12:21:50 -07:00
|
|
|
uid, access_token, ip, = key
|
2017-06-27 07:46:12 -06:00
|
|
|
if uid == user_id:
|
|
|
|
user_agent, _, last_seen = self._batch_row_update[key]
|
|
|
|
results[(access_token, ip)] = (user_agent, last_seen)
|
|
|
|
|
|
|
|
rows = yield self._simple_select_list(
|
|
|
|
table="user_ips",
|
|
|
|
keyvalues={"user_id": user_id},
|
|
|
|
retcols=[
|
|
|
|
"access_token", "ip", "user_agent", "last_seen"
|
|
|
|
],
|
|
|
|
desc="get_user_ip_and_agents",
|
|
|
|
)
|
|
|
|
|
|
|
|
results.update(
|
|
|
|
((row["access_token"], row["ip"]), (row["user_agent"], row["last_seen"]))
|
|
|
|
for row in rows
|
|
|
|
)
|
|
|
|
defer.returnValue(list(
|
|
|
|
{
|
|
|
|
"access_token": access_token,
|
|
|
|
"ip": ip,
|
|
|
|
"user_agent": user_agent,
|
|
|
|
"last_seen": last_seen,
|
|
|
|
}
|
2018-04-28 05:19:12 -06:00
|
|
|
for (access_token, ip), (user_agent, last_seen) in iteritems(results)
|
2017-06-27 07:46:12 -06:00
|
|
|
))
|