Skip to content
Snippets Groups Projects
Commit 9864efa5 authored by Richard van der Hoff's avatar Richard van der Hoff Committed by GitHub
Browse files

Fix concurrent server_key requests (#2458)

Fix a bug where we could end up firing off multiple requests for server_keys
for the same server at the same time.
parent aa620d09
No related branches found
No related tags found
No related merge requests found
......@@ -201,7 +201,9 @@ class Keyring(object):
server_name = verify_request.server_name
request_id = id(verify_request)
server_to_request_ids.setdefault(server_name, set()).add(request_id)
deferred.addBoth(remove_deferreds, server_name, verify_request)
verify_request.deferred.addBoth(
remove_deferreds, server_name, verify_request,
)
# Pass those keys to handle_key_deferred so that the json object
# signatures can be verified
......
......@@ -12,17 +12,27 @@
# 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.
import signedjson
from mock import Mock
from synapse.api.errors import SynapseError
from synapse.crypto import keyring
from synapse.util import async
from synapse.util.logcontext import LoggingContext
from tests import utils, unittest
from tests import unittest, utils
from twisted.internet import defer
class KeyringTestCase(unittest.TestCase):
@defer.inlineCallbacks
def setUp(self):
self.hs = yield utils.setup_test_homeserver(handlers=None)
self.http_client = Mock()
self.hs = yield utils.setup_test_homeserver(
handlers=None,
http_client=self.http_client,
)
self.hs.config.perspectives = {
"persp_server": {"k": "v"}
}
@defer.inlineCallbacks
def test_wait_for_previous_lookups(self):
......@@ -72,3 +82,45 @@ class KeyringTestCase(unittest.TestCase):
# now the second wait should complete and restore our
# loggingcontext.
yield wait_2_deferred
@defer.inlineCallbacks
def test_verify_json_objects_for_server_awaits_previous_requests(self):
key1 = signedjson.key.generate_signing_key(1)
kr = keyring.Keyring(self.hs)
json1 = {}
signedjson.sign.sign_json(json1, "server1", key1)
self.http_client.post_json.return_value = defer.Deferred()
# start off a first set of lookups
res_deferreds = kr.verify_json_objects_for_server(
[("server1", json1),
("server2", {})
]
)
# the unsigned json should be rejected pretty quickly
try:
yield res_deferreds[1]
self.assertFalse("unsigned json didn't cause a failure")
except SynapseError:
pass
self.assertFalse(res_deferreds[0].called)
# wait a tick for it to send the request to the perspectives server
# (it first tries the datastore)
yield async.sleep(0.005)
self.http_client.post_json.assert_called_once()
# a second request for a server with outstanding requests should
# block rather than start a second call
self.http_client.post_json.reset_mock()
self.http_client.post_json.return_value = defer.Deferred()
kr.verify_json_objects_for_server(
[("server1", json1)],
)
yield async.sleep(0.005)
self.http_client.post_json.assert_not_called()
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment