349 Commits

Author	SHA1	Message	Date
Muthu Subramanian	8cd34dfe95	Make SAML2 optional and add some references/comments	2015-07-09 13:34:47 +05:30
Muthu Subramanian	d2caa5351a	code beautify	2015-07-09 12:58:15 +05:30
Muthu Subramanian	77c5db5977	code beautify	2015-07-08 16:05:20 +05:30
Muthu Subramanian	81682d0f82	Integrate SAML2 basic authentication - uses pysaml2	2015-07-08 15:36:54 +05:30
Erik Johnston	fb7def3344	Remove access_token from synapse.rest.client.v1.transactions {get,store}_response logging	2015-06-16 10:09:43 +01:00
Erik Johnston	5730b20c6d	Merge pull request #175 from matrix-org/erikj/thumbnail_thread ... Thumbnail images on a seperate thread	2015-06-03 17:26:56 +01:00
Erik Johnston	2ef2f6d593	SYN-403: Make content repository use its own http client.	2015-06-03 10:17:37 +01:00
Erik Johnston	5044e6c544	Thumbnail images on a seperate thread	2015-06-02 15:39:08 +01:00
Erik Johnston	a7b65bdedf	Add config option to turn off freezing events. Use new encode_json api and ujson.loads	2015-05-29 12:17:33 +01:00
Erik Johnston	9ba3c1ede4	Merge pull request #165 from matrix-org/bugs/SYN-390 ... SYN-390: Don't modify the dictionary returned from the data store	2015-05-26 10:20:36 +01:00
Mark Haines	a0bebeda8b	SYN-390: Don't modify the dictionary returned from the data store	2015-05-26 10:14:15 +01:00
David Baker	c37a6e151f	Make shared secret registration work again	2015-05-14 12:03:13 +01:00
Erik Johnston	fca28d243e	Change the way we create observers to deferreds so that we don't get spammed by 'unhandled errors'	2015-05-08 16:28:08 +01:00
David Baker	eb9bd2d949	user_id now in user_threepids	2015-05-01 15:04:37 +01:00
Mark Haines	4ad8b45155	Merge branch 'develop' into key_distribution ... Conflicts: synapse/config/homeserver.py	2015-04-29 13:15:14 +01:00
Mark Haines	46d200a3a1	Implement minimum_valid_until_ts in the remote key resource	2015-04-29 11:57:26 +01:00
Mark Haines	9182f87664	Merge pull request #126 from matrix-org/csauth ... Client / Server Auth Refactor	2015-04-28 11:00:27 +01:00
Mark Haines	f8b865264a	Merge branch 'develop' into key_distribution ... Conflicts: synapse/crypto/keyring.py	2015-04-27 18:29:32 +01:00
Erik Johnston	e701aec2d1	Implement locks using create_observer for fetching media and server keys	2015-04-27 14:20:26 +01:00
David Baker	03c4f0ed67	pep8	2015-04-27 12:36:59 +01:00
David Baker	f1acb9fd40	logging args	2015-04-27 11:56:34 +01:00
David Baker	7ac8a60c6f	More underscores	2015-04-24 11:44:27 +01:00
David Baker	a218619626	Use underscores instead of camelcase for id server stuff	2015-04-24 11:27:38 +01:00
Mark Haines	31e262e6b4	Copyright notice	2015-04-24 10:36:51 +01:00
Mark Haines	eede182df7	Merge branch 'develop' into key_distribution	2015-04-24 10:35:49 +01:00
Mark Haines	4e2f8b8722	Copyright notices	2015-04-24 10:35:29 +01:00
David Baker	6532b6e607	Merge branch 'develop' into csauth ... Conflicts: synapse/http/server.py	2015-04-24 09:37:54 +01:00
David Baker	03eb4adc6e	Dedicated error code for failed 3pid auth verification	2015-04-23 18:20:17 +01:00
Mark Haines	4bbf7156ef	Update to match the specification for key/v2	2015-04-23 16:39:13 +01:00
Mark Haines	f30d47c876	Implement remote key lookup api	2015-04-22 14:21:08 +01:00
Mark Haines	3ba522bb23	Merge branch 'develop' into key_distribution	2015-04-21 17:10:25 +01:00
Mark Haines	812a99100b	Set a version_string in BaseMediaResource so that the request_handler wrapper works	2015-04-21 16:43:58 +01:00
Mark Haines	1967650bc4	Combine the request wrappers in rest/media/v1 and http/server into a single wrapper decorator	2015-04-21 16:35:53 +01:00
Mark Haines	2f9157b427	Implement v2 key lookup	2015-04-20 16:23:47 +01:00
David Baker	8db6832db8	Password reset, finally.	2015-04-17 19:53:47 +01:00
David Baker	117f35ac4a	Add endpoint to get threepids from server	2015-04-17 17:20:18 +01:00
David Baker	f96ab9d18d	make add3pid servlet work	2015-04-17 16:44:49 +01:00
David Baker	0b1a8500a2	just the once would probably be fine	2015-04-17 13:53:54 +01:00
David Baker	cb03fafdf1	Merge branch 'develop' into csauth	2015-04-17 13:51:10 +01:00
David Baker	bf5e54f255	Register the 3pid servlet	2015-04-17 13:44:55 +01:00
David Baker	94e1e58b4d	password -> account servlet and add start of an 'add 3pid' endpoint	2015-04-17 13:44:12 +01:00
David Baker	ea1776f556	Return user ID in use error straight away	2015-04-16 19:56:44 +01:00
David Baker	766bd8e880	Dummy login so we can do the first POST request to get login flows without it just succeeding	2015-04-15 17:14:25 +01:00
David Baker	a19b739909	Regstration with email in v2	2015-04-15 15:50:38 +01:00
Mark Haines	32e14d8181	Return a sha256 fingerprint rather than the entire tls certificate	2015-04-14 19:10:09 +01:00
Mark Haines	d488463fa3	Add a version 2 of the key server api	2015-04-14 16:04:52 +01:00
Mark Haines	3cbc286d06	Move server key api into rest/key/v1	2015-04-14 13:28:11 +01:00
David Baker	4eb6d66b45	Add app service auth back in to v2 register	2015-04-02 17:51:19 +01:00
David Baker	6b59650753	Throw sensible errors on not-json when allowing empty body	2015-04-02 17:45:16 +01:00
David Baker	41cd778d66	pep8	2015-04-02 17:06:17 +01:00