Error if macaroon key is missing from config
Currently we store all access tokens in the DB, and fall back to that
check if we can't validate the macaroon, so our fallback works here, but
for guests, their macaroons don't get persisted, so we don't get to
find them in the database. Each restart, we generate a new ephemeral
key, so guests lose access after each server restart.
I tried to fix up the config stuff to be less insane, but gave up, so
instead I bolt on yet another piece of custom one-off insanity.
Also, add some basic tests for config generation and loading.
2016-02-04 20:58:23 -05: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.
|
2018-01-09 06:28:33 -05:00
|
|
|
|
Error if macaroon key is missing from config
Currently we store all access tokens in the DB, and fall back to that
check if we can't validate the macaroon, so our fallback works here, but
for guests, their macaroons don't get persisted, so we don't get to
find them in the database. Each restart, we generate a new ephemeral
key, so guests lose access after each server restart.
I tried to fix up the config stuff to be less insane, but gave up, so
instead I bolt on yet another piece of custom one-off insanity.
Also, add some basic tests for config generation and loading.
2016-02-04 20:58:23 -05:00
|
|
|
import os.path
|
2018-01-09 06:28:33 -05:00
|
|
|
import re
|
Error if macaroon key is missing from config
Currently we store all access tokens in the DB, and fall back to that
check if we can't validate the macaroon, so our fallback works here, but
for guests, their macaroons don't get persisted, so we don't get to
find them in the database. Each restart, we generate a new ephemeral
key, so guests lose access after each server restart.
I tried to fix up the config stuff to be less insane, but gave up, so
instead I bolt on yet another piece of custom one-off insanity.
Also, add some basic tests for config generation and loading.
2016-02-04 20:58:23 -05:00
|
|
|
import shutil
|
|
|
|
import tempfile
|
2018-01-09 06:28:33 -05:00
|
|
|
|
Error if macaroon key is missing from config
Currently we store all access tokens in the DB, and fall back to that
check if we can't validate the macaroon, so our fallback works here, but
for guests, their macaroons don't get persisted, so we don't get to
find them in the database. Each restart, we generate a new ephemeral
key, so guests lose access after each server restart.
I tried to fix up the config stuff to be less insane, but gave up, so
instead I bolt on yet another piece of custom one-off insanity.
Also, add some basic tests for config generation and loading.
2016-02-04 20:58:23 -05:00
|
|
|
from synapse.config.homeserver import HomeServerConfig
|
|
|
|
from tests import unittest
|
|
|
|
|
|
|
|
|
|
|
|
class ConfigGenerationTestCase(unittest.TestCase):
|
|
|
|
|
|
|
|
def setUp(self):
|
|
|
|
self.dir = tempfile.mkdtemp()
|
|
|
|
self.file = os.path.join(self.dir, "homeserver.yaml")
|
|
|
|
|
|
|
|
def tearDown(self):
|
|
|
|
shutil.rmtree(self.dir)
|
|
|
|
|
|
|
|
def test_generate_config_generates_files(self):
|
2016-06-09 13:50:38 -04:00
|
|
|
HomeServerConfig.load_or_generate_config("", [
|
Error if macaroon key is missing from config
Currently we store all access tokens in the DB, and fall back to that
check if we can't validate the macaroon, so our fallback works here, but
for guests, their macaroons don't get persisted, so we don't get to
find them in the database. Each restart, we generate a new ephemeral
key, so guests lose access after each server restart.
I tried to fix up the config stuff to be less insane, but gave up, so
instead I bolt on yet another piece of custom one-off insanity.
Also, add some basic tests for config generation and loading.
2016-02-04 20:58:23 -05:00
|
|
|
"--generate-config",
|
|
|
|
"-c", self.file,
|
|
|
|
"--report-stats=yes",
|
|
|
|
"-H", "lemurs.win"
|
|
|
|
])
|
|
|
|
|
|
|
|
self.assertSetEqual(
|
|
|
|
set([
|
|
|
|
"homeserver.yaml",
|
|
|
|
"lemurs.win.log.config",
|
|
|
|
"lemurs.win.signing.key",
|
|
|
|
"lemurs.win.tls.crt",
|
|
|
|
"lemurs.win.tls.dh",
|
|
|
|
"lemurs.win.tls.key",
|
|
|
|
]),
|
|
|
|
set(os.listdir(self.dir))
|
|
|
|
)
|
2018-01-09 06:28:33 -05:00
|
|
|
|
|
|
|
self.assert_log_filename_is(
|
|
|
|
os.path.join(self.dir, "lemurs.win.log.config"),
|
|
|
|
os.path.join(os.getcwd(), "homeserver.log"),
|
|
|
|
)
|
|
|
|
|
|
|
|
def assert_log_filename_is(self, log_config_file, expected):
|
|
|
|
with open(log_config_file) as f:
|
|
|
|
config = f.read()
|
|
|
|
# find the 'filename' line
|
|
|
|
matches = re.findall("^\s*filename:\s*(.*)$", config, re.M)
|
|
|
|
self.assertEqual(1, len(matches))
|
|
|
|
self.assertEqual(matches[0], expected)
|