Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2024-10-01 11:49:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfixes-0.0.1' of github.com:matrix-org/synapse

Browse Source
This commit is contained in:
Erik Johnston 2014-08-24 12:17:59 +01:00
commit 4521c2d277
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
synapse/app/homeserver.py
View File

@ -37,6 +37,7 @@ import logging
import logging.config import logging.config
import sqlite3 import sqlite3
import os import os
import re
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -255,8 +256,14 @@ def setup():
logger.info("Server hostname: %s", args.host) logger.info("Server hostname: %s", args.host)
if re.search(":[0-9]+$", args.host):
domain_with_port = args.host
else:
domain_with_port = "%s:%s" % (args.host, args.port)
hs = SynapseHomeServer( hs = SynapseHomeServer(
args.host, args.host,
domain_with_port=domain_with_port,
upload_dir=os.path.abspath("uploads"), upload_dir=os.path.abspath("uploads"),
db_name=db_name, db_name=db_name,
) )

4
synapse/http/server.py
View File

@ -325,7 +325,9 @@ class ContentRepoResource(resource.Resource):
# FIXME (erikj): These should use constants. # FIXME (erikj): These should use constants.
file_name = os.path.basename(fname) file_name = os.path.basename(fname)
url = "http://%s/matrix/content/%s" % (self.hs.hostname, file_name) url = "http://%s/matrix/content/%s" % (
self.hs.domain_with_port, file_name
)
respond_with_json_bytes(request, 200, respond_with_json_bytes(request, 200,
json.dumps({"content_token": url}), json.dumps({"content_token": url}),

4
synapse/rest/register.py
View File

@ -33,10 +33,10 @@ class RegisterRestServlet(RestServlet):
try: try:
register_json = json.loads(request.content.read()) register_json = json.loads(request.content.read())
if "password" in register_json: if "password" in register_json:
password = register_json["password"] password = register_json["password"].encode("utf-8")
if type(register_json["user_id"]) == unicode: if type(register_json["user_id"]) == unicode:
desired_user_id = register_json["user_id"] desired_user_id = register_json["user_id"].encode("utf-8")
if urllib.quote(desired_user_id) != desired_user_id: if urllib.quote(desired_user_id) != desired_user_id:
raise SynapseError( raise SynapseError(
400, 400,

3
synapse/storage/schema/im.sql
View File

@ -98,5 +98,6 @@ CREATE TABLE IF NOT EXISTS rooms(
CREATE TABLE IF NOT EXISTS room_hosts( CREATE TABLE IF NOT EXISTS room_hosts(
room_id TEXT NOT NULL, room_id TEXT NOT NULL,
host TEXT NOT NULL host TEXT NOT NULL,
CONSTRAINT room_hosts_uniq UNIQUE (room_id, host) ON CONFLICT IGNORE
); );