Merge pull request #130 from matrix-org/server_rename_check

Fix for SYN-266
pull/134/head
Mark Haines 2015-04-28 10:39:31 +01:00
commit 252e6f6869
2 changed files with 28 additions and 1 deletions

View File

@ -18,7 +18,8 @@ import sys
sys.dont_write_bytecode = True
from synapse.storage import (
prepare_database, prepare_sqlite3_database, UpgradeDatabaseException,
prepare_database, prepare_sqlite3_database, are_all_users_on_domain,
UpgradeDatabaseException,
)
from synapse.server import HomeServer
@ -241,6 +242,21 @@ class SynapseHomeServer(HomeServer):
)
logger.info("Metrics now running on 127.0.0.1 port %d", config.metrics_port)
def run_startup_checks(self, db_conn):
all_users_native = are_all_users_on_domain(
db_conn, self.hostname
)
if not all_users_native:
sys.stderr.write(
"\n"
"******************************************************\n"
"Found users in database not native to %s!\n"
"You cannot changed a synapse server_name after it's been configured\n"
"******************************************************\n"
"\n" % (self.hostname,)
)
sys.exit(1)
def get_version_string():
try:
@ -375,6 +391,7 @@ def setup(config_options):
with sqlite3.connect(db_name) as db_conn:
prepare_sqlite3_database(db_conn)
prepare_database(db_conn)
hs.run_startup_checks(db_conn)
except UpgradeDatabaseException:
sys.stderr.write(
"\nFailed to upgrade database.\n"

View File

@ -421,3 +421,13 @@ def prepare_sqlite3_database(db_conn):
" VALUES (?,?)",
(row[0], False)
)
def are_all_users_on_domain(txn, domain):
sql = "SELECT COUNT(*) FROM users WHERE name NOT LIKE ?"
pat = "%:" + domain
cursor = txn.execute(sql, (pat,))
num_not_matching = cursor.fetchall()[0][0]
if num_not_matching == 0:
return True
return False