313 Commits

Author	SHA1	Message	Date
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	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
David Baker	70a84f17f3	Add shared secret auth into register v2 and switch the script over.	2015-04-02 17:01:29 +01:00
David Baker	e9c908ebc0	Completely replace fallback auth for C/S V2: ... * Now only the auth part goes to fallback, not the whole operation * Auth fallback is a normal API endpoint, not a static page * Params like the recaptcha pubkey can just live in the config Involves a little engineering on JsonResource so its servlets aren't always forced to return JSON. I should document this more, in fact I'll do that now.	2015-04-01 15:05:30 +01:00
David Baker	9f642a93ec	pep8	2015-03-31 09:50:44 +01:00
Kegan Dougal	e7887e37a8	Remove appservice REST servlets	2015-03-31 09:32:40 +01:00
David Baker	59bf16eddc	New registration for C/S API v2. Only ReCAPTCHA working currently.	2015-03-30 18:13:10 +01:00
David Baker	c1a256cc4c	Allow multiple pushers for a single app ID & pushkey, honouring the 'append' flag in the API.	2015-03-25 19:06:22 +00:00
David Baker	c7023f2155	1) Pushers are now associated with an access token ... 2) Change places where we mean unauthenticated to 401, not 403, in C/S v2: hack so it stays as 403 in v1 because web client relies on it.	2015-03-24 17:24:15 +00:00
David Baker	d19e79ecc9	Make deleting other access tokens when you change your password actually work	2015-03-24 15:33:48 +00:00
David Baker	78adccfaf4	pep8 / pyflakes	2015-03-23 14:23:51 +00:00
David Baker	d98660a60d	Implement password changing (finally) along with a start on making client/server auth more general.	2015-03-23 14:20:28 +00:00
Erik Johnston	f88db7ac0b	Factor out user id validation checks	2015-03-18 11:34:18 +00:00
Erik Johnston	57976f646f	Do more validation of incoming request	2015-03-18 11:30:04 +00:00
Erik Johnston	250e143084	Use 403 instead of 400	2015-03-16 13:11:42 +00:00
Erik Johnston	69135f59aa	Implement registering with shared secret.	2015-03-13 15:23:37 +00:00
Matthew Hodgson	f55bd3f94b	bump dep on syweb 0.6.5	2015-03-12 18:56:53 +00:00
David Baker	04f8478aaa	Add the master push rule for the break-my-push button. Allow server default rules to be disabled by default.	2015-03-10 17:26:25 +00:00
David Baker	92b3dc3219	Merge branch 'develop' into pushrules2	2015-03-04 14:56:41 +00:00
David Baker	6fab7bd2c1	s/user_name/user/ as per mjark's comment	2015-03-02 18:17:19 +00:00
David Baker	09f9e8493c	Oops, missed a replacement.	2015-03-02 17:37:22 +00:00
David Baker	20436cdf75	Blank lines	2015-03-02 15:58:12 +00:00
David Baker	2a6dedd7cc	It's set_tweak now, not set_sound	2015-02-27 18:38:56 +00:00
Kegan Dougal	16b90764ad	Convert expected format for AS regex to include exclusivity. ... Previously you just specified the regex as a string, now it expects a JSON object with a 'regex' key and an 'exclusive' boolean, as per spec.	2015-02-27 10:44:32 +00:00
David Baker	1959088156	Add API for getting/setting enabled-ness of push rules.	2015-02-26 18:07:44 +00:00
David Baker	a025055643	SYWEB-278 Don't allow rules with no rule_id.	2015-02-25 14:02:38 +00:00
Erik Johnston	15e2d7e387	Always allow AS to register	2015-02-20 11:39:53 +00:00
Erik Johnston	0722f982d3	Disable registration if config option was set.	2015-02-19 14:22:20 +00:00
Mark Haines	6375bd3e33	SYN-282: Don't log tracebacks for client errors	2015-02-18 12:01:37 +00:00
Mark Haines	0d872f5aa6	Merge pull request #50 from matrix-org/application-services ... Application Services	2015-02-13 15:06:14 +00:00
Erik Johnston	4ebbaf0d43	Blunty replace json with simplejson	2015-02-11 14:23:10 +00:00
Kegan Dougal	14d413752b	Fix newline on __init__	2015-02-11 10:53:47 +00:00
Kegan Dougal	fd40d992ad	PEP8-ify	2015-02-11 10:41:33 +00:00
Kegan Dougal	8beb613916	Add newline to EOF	2015-02-11 10:36:48 +00:00
Kegan Dougal	c7783d6fee	Notify ASes for events sent by other users in a room which an AS user is a part of.	2015-02-11 10:36:08 +00:00
Kegan Dougal	9978c5c103	Merge branch 'develop' into application-services	2015-02-11 10:03:24 +00:00
Mark Haines	84a769cdb7	Fix code-style	2015-02-10 17:58:36 +00:00
Mark Haines	b085fac735	Code-style fixes	2015-02-10 16:30:48 +00:00