4011 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Erik Johnston	0d7f0febf4	Uniquely name unique constraint	2015-07-10 13:43:03 +01:00
Erik Johnston	b7cb37b189	Merge pull request #198 from matrix-org/markjh/client-end-to-end-key-management ... Client end to end key management API	2015-07-10 13:36:17 +01:00
Mark Haines	a01097d60b	Assume that each device for a user has only one of each type of key	2015-07-10 13:26:18 +01:00
Erik Johnston	f3049d0b81	Small tweaks to SAML2 configuration. ... - Add saml2 config docs to default config. - Use existence of saml2 config to indicate if saml2 should be enabled.	2015-07-10 10:50:14 +01:00
Erik Johnston	a887efa07a	Add Muthu Subramanian to AUTHORS	2015-07-10 10:37:24 +01:00
Erik Johnston	9158ad1abb	Merge pull request #201 from EricssonResearch/msba/saml2-develop ... Integrate SAML2 basic authentication - uses pysaml2	2015-07-10 10:25:56 +01:00
Mark Haines	bf0d59ed30	Don't bother with a timeout for one time keys on the server.	2015-07-09 14:04:03 +01:00
Erik Johnston	294dbd712f	We don't want semicolons.	2015-07-09 11:47:24 +01:00
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
Matthew Hodgson	fb8d2862c1	remove the tls_certificate_chain_path param and simply support tls_certificate_path pointing to a file containing a chain of certificates	2015-07-09 00:45:41 +01:00
Matthew Hodgson	8ad2d2d1cb	document tls_certificate_chain_path more clearly	2015-07-09 00:06:01 +01:00
Matthew Hodgson	f26a3df1bf	oops, context.tls_certificate_chain_file() expects a file, not a certificate.	2015-07-08 21:33:02 +01:00
Matthew Hodgson	19fa3731ae	typo	2015-07-08 18:53:41 +01:00
Matthew Hodgson	465acb0c6a	*cough*	2015-07-08 18:30:59 +01:00
Matthew Hodgson	64afbe6ccd	add new optional config for tls_certificate_chain_path for folks with intermediary SSL certs	2015-07-08 18:20:02 +01:00
Mark Haines	8fb79eeea4	Only remove one time keys when new one time keys are added	2015-07-08 17:04:29 +01:00
Muthu Subramanian	f53bae0c19	code beautify	2015-07-08 16:05:46 +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	dfc74c30c9	Merge pull request #197 from matrix-org/mjark/missing_regex_group ... Don't 500 if a group is missing from the regex match	2015-07-07 09:37:38 +01:00
Mark Haines	28ef344077	Merge branch 'mjark/missing_regex_group' into markjh/client-end-to-end-key-management	2015-07-06 18:48:27 +01:00
Mark Haines	2ef182ee93	Add client API for uploading and querying keys for end to end encryption	2015-07-06 18:47:57 +01:00
Mark Haines	b5770f8947	Add store for client end to end keys	2015-07-06 18:46:47 +01:00
Mark Haines	a7dcbfe430	Don't 500 if a group is missing from the regex	2015-07-06 16:47:17 +01:00
Erik Johnston	65e69dec8b	Don't explode if we don't recognize one of the event_ids in the backfill request	2015-07-06 09:33:03 +01:00
Erik Johnston	c0a975cc2e	Merge pull request #195 from matrix-org/erikj/content_disposition ... Add Content-Disposition headers to media repo downloads	2015-07-03 11:26:06 +01:00
Erik Johnston	12b83f1a0d	If user supplies filename in URL when downloading from media repo, use that name in Content Disposition	2015-07-03 11:24:55 +01:00
Erik Johnston	9beaedd164	Enforce ascii filenames for uploads	2015-06-30 10:31:59 +01:00
Erik Johnston	2124f668db	Add Content-Disposition headers to media repo v1 downloads	2015-06-30 09:35:44 +01:00
David Baker	6825eef955	Oops: underride rule had an identifier with override in it.	2015-06-23 14:26:14 +01:00
Erik Johnston	6924852592	Batch SELECTs in _get_auth_chain_ids_txn	2015-06-23 11:01:04 +01:00
Erik Johnston	2f556e0c55	Fix typo	2015-06-19 16:22:53 +01:00
Erik Johnston	7fa1363fb0	Merge pull request #192 from matrix-org/erikj/fix_log_context ... Fix log context when sending requests	2015-06-19 16:21:40 +01:00
Erik Johnston	275dab6b55	Merge pull request #190 from matrix-org/erikj/syn-412 ... Fix notifier leak	2015-06-19 11:49:58 +01:00
Erik Johnston	a68abc79fd	Add comment on cancellation of observers	2015-06-19 11:48:55 +01:00
Erik Johnston	653533a3da	Fix log context when sending requests	2015-06-19 11:46:49 +01:00
Erik Johnston	9bf61ef97b	Merge pull request #189 from matrix-org/erikj/room_init_sync ... Improve room init sync speed.	2015-06-19 11:36:06 +01:00
Erik Johnston	0e58d19163	Merge pull request #187 from matrix-org/erikj/sanitize_logging ... Sanitize logging	2015-06-19 11:35:59 +01:00
Erik Johnston	18968efa0a	Remove stale debug lines	2015-06-19 10:18:02 +01:00
Erik Johnston	eb928c9f52	Add site_tag to logger	2015-06-19 10:16:48 +01:00
Erik Johnston	9d112f4440	Add IDs to outbound transactions	2015-06-19 10:13:03 +01:00
Erik Johnston	ad460a8315	Add Eric Myhre to AUTHORS	2015-06-19 09:23:26 +01:00
Erik Johnston	bf628cf6dd	Merge pull request #191 from heavenlyhash/configurable-upload-dir ... Make upload dir a configurable path.	2015-06-19 09:16:04 +01:00
Eric Myhre	9e5a353663	Make upload dir a configurable path. ... Fixes SYN-425. Signed-off-by: Eric Myhre <hash@exultant.us>	2015-06-18 23:38:20 -05:00
Erik Johnston	6f6ebd216d	PEP8	2015-06-18 17:00:32 +01:00
Erik Johnston	73513ececc	Documentation	2015-06-18 16:15:10 +01:00
Erik Johnston	1f24c2e589	Don't bother proxying lookups on _NotificationListener to underlying deferred	2015-06-18 16:09:53 +01:00
Erik Johnston	22049ea700	Refactor the notifier.wait_for_events code to be clearer. Add _NotifierUserStream.new_listener that accpets a token to avoid races.	2015-06-18 15:49:24 +01:00
Erik Johnston	050ebccf30	Fix notifier leak	2015-06-18 11:36:26 +01:00