bd7c51921d 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #919  from matrix-org/erikj/auth_fix  
							
							... 
							
							
							
							Various auth.py fixes. 
							
						 
						
							2016-07-15 11:38:33 +01:00  
				
					
						
							
							
								 
						
							
							
								ebdafd8114 
								
							
								 
							
						 
						
							
							
								
								Check sender signed event  
							
							
							
						 
						
							2016-07-14 17:03:24 +01:00  
				
					
						
							
							
								 
						
							
							
								0136a522b1 
								
							
								 
							
						 
						
							
							
								
								Bug fix: expire invalid access tokens  
							
							
							
						 
						
							2016-07-13 15:00:37 +02:00  
				
					
						
							
							
								 
						
							
							
								2cb758ac75 
								
							
								 
							
						 
						
							
							
								
								Check if alias event's state_key matches sender's domain  
							
							
							
						 
						
							2016-07-13 13:12:25 +01:00  
				
					
						
							
							
								 
						
							
							
								560c71c735 
								
							
								 
							
						 
						
							
							
								
								Check creation event's room_id domain matches sender's  
							
							
							
						 
						
							2016-07-13 13:07:19 +01:00  
				
					
						
							
							
								 
						
							
							
								067596d341 
								
							
								 
							
						 
						
							
							
								
								Fix bug where we did not correctly explode when multiple user_ids were set in macaroon  
							
							
							
						 
						
							2016-07-07 16:22:24 +01:00  
				
					
						
							
							
								 
						
							
							
								1f31cc37f8 
								
							
								 
							
						 
						
							
							
								
								Working unsubscribe links going straight to the HS  
							
							... 
							
							
							
							and authed by macaroons that let you delete pushers and nothing else 
							
						 
						
							2016-06-02 17:21:31 +01:00  
				
					
						
							
							
								 
						
							
							
								812b5de0fe 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into dbkr/email_unsubscribe  
							
							
							
						 
						
							2016-06-02 15:33:28 +01:00  
				
					
						
							
							
								 
						
							
							
								aaa70e26a2 
								
							
								 
							
						 
						
							
							
								
								special case m.room.third_party_invite event auth to match invites, otherwise they get out of sync and you get  https://github.com/vector-im/vector-web/issues/1208  
							
							
							
						 
						
							2016-06-01 22:13:47 +01:00  
				
					
						
							
							
								 
						
							
							
								991af8b0d6 
								
							
								 
							
						 
						
							
							
								
								WIP on unsubscribing email notifs without logging in  
							
							
							
						 
						
							2016-06-01 17:40:52 +01:00  
				
					
						
							
							
								 
						
							
							
								1a3a2002ff 
								
							
								 
							
						 
						
							
							
								
								Spell "domain" correctly  
							
							... 
							
							
							
							s/domian/domain/g 
							
						 
						
							2016-05-16 19:17:23 +01:00  
				
					
						
							
							
								 
						
							
							
								40aa6e8349 
								
							
								 
							
						 
						
							
							
								
								Create user with expiry  
							
							... 
							
							
							
							- Add unittests for client, api and handler
Signed-off-by: Negar Fazeli <negar.fazeli@ericsson.com> 
							
						 
						
							2016-05-13 15:34:15 +02:00  
				
					
						
							
							
								 
						
							
							
								08dfa8eee2 
								
							
								 
							
						 
						
							
							
								
								Add and use get_domian_from_id  
							
							
							
						 
						
							2016-05-09 10:36:03 +01:00  
				
					
						
							
							
								 
						
							
							
								0f2ca8cde1 
								
							
								 
							
						 
						
							
							
								
								Measure Auth.check  
							
							
							
						 
						
							2016-04-13 11:15:59 +01:00  
				
					
						
							
							
								 
						
							
							
								c53f9d561e 
								
							
								 
							
						 
						
							
							
								
								Don't auto log failed auth checks  
							
							
							
						 
						
							2016-04-13 11:11:46 +01:00  
				
					
						
							
							
								 
						
							
							
								3e7fac0d56 
								
							
								 
							
						 
						
							
							
								
								Add published room list edit API  
							
							
							
						 
						
							2016-03-21 15:06:07 +00:00  
				
					
						
							
							
								 
						
							
							
								874fd43257 
								
							
								 
							
						 
						
							
							
								
								Send the user ID matching the guest access token, since there is no Matrix API to discover what user ID an access token is for.  
							
							
							
						 
						
							2016-03-07 17:13:56 +00:00  
				
					
						
							
							
								 
						
							
							
								577951b032 
								
							
								 
							
						 
						
							
							
								
								Allow third_party_signed to be specified on /join  
							
							
							
						 
						
							2016-02-23 15:11:25 +00:00  
				
					
						
							
							
								 
						
							
							
								2c1fbea531 
								
							
								 
							
						 
						
							
							
								
								Fix up logcontexts  
							
							
							
						 
						
							2016-02-08 14:26:45 +00:00  
				
					
						
							
							
								 
						
							
							
								2df6114bc4 
								
							
								 
							
						 
						
							
							
								
								Log more diagnostics for unrecognised access tokens  
							
							
							
						 
						
							2016-02-02 19:21:49 +00:00  
				
					
						
							
							
								 
						
							
							
								d83d004ccd 
								
							
								 
							
						 
						
							
							
								
								Fix flake8 warnings for new flake8  
							
							
							
						 
						
							2016-02-02 17:18:50 +00:00  
				
					
						
							
							
								 
						
							
							
								808a8aedab 
								
							
								 
							
						 
						
							
							
								
								Don't error on AS non-ghost user use  
							
							... 
							
							
							
							This will probably go away either when we fix our existing ASes, or when
we kill the concept of non-ghost users. 
							
						 
						
							2016-01-18 16:33:05 +00:00  
				
					
						
							
							
								 
						
							
							
								74474a6d63 
								
							
								 
							
						 
						
							
							
								
								Pull out app service user lookup  
							
							... 
							
							
							
							I find this a lot simpler than nested try-catches and stuff 
							
						 
						
							2016-01-18 16:32:33 +00:00  
				
					
						
							
							
								 
						
							
							
								7d09ab8915 
								
							
								 
							
						 
						
							
							
								
								Require AS users to be registered before use  
							
							
							
						 
						
							2016-01-13 13:19:47 +00:00  
				
					
						
							
							
								 
						
							
							
								2110e35fd6 
								
							
								 
							
						 
						
							
							
								
								Introduce a Requester object  
							
							... 
							
							
							
							This tracks data about the entity which made the request. This is
instead of passing around a tuple, which requires call-site
modifications every time a new piece of optional context is passed
around.
I tried to introduce a User object. I gave up. 
							
						 
						
							2016-01-11 17:48:45 +00:00  
				
					
						
							
							
								 
						
							
							
								cfd07aafff 
								
							
								 
							
						 
						
							
							
								
								Allow guests to upgrade their accounts  
							
							
							
						 
						
							2016-01-05 18:01:18 +00:00  
				
					
						
							
							
								 
						
							
							
								8c5f252edb 
								
							
								 
							
						 
						
							
							
								
								Strip address and such out of 3pid invites  
							
							... 
							
							
							
							We're not meant to leak that into the graph 
							
						 
						
							2015-12-17 18:09:51 +01:00  
				
					
						
							
							
								 
						
							
							
								17dd5071ef 
								
							
								 
							
						 
						
							
							
								
								Allow user to redact with an equal power  
							
							... 
							
							
							
							Users only need their power level to be equal to the redact level for
them to be allowed to redact events. 
							
						 
						
							2015-11-26 11:17:57 +00:00  
				
					
						
							
							
								 
						
							
							
								1cfda3d2d8 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into daniel/forgetrooms  
							
							
							
						 
						
							2015-11-19 16:53:13 +00:00  
				
					
						
							
							
								 
						
							
							
								248cfd5eb3 
								
							
								 
							
						 
						
							
							
								
								Take a boolean not a list of lambdas  
							
							
							
						 
						
							2015-11-19 15:16:25 +00:00  
				
					
						
							
							
								 
						
							
							
								ba26eb3d5d 
								
							
								 
							
						 
						
							
							
								
								Allow users to forget rooms  
							
							
							
						 
						
							2015-11-17 17:17:30 -05:00  
				
					
						
							
							
								 
						
							
							
								f20d064e05 
								
							
								 
							
						 
						
							
							
								
								Always check guest = true in macaroons  
							
							
							
						 
						
							2015-11-17 10:58:05 +00:00  
				
					
						
							
							
								 
						
							
							
								dd2eb49385 
								
							
								 
							
						 
						
							
							
								
								Share more code between macaroon validation  
							
							
							
						 
						
							2015-11-11 11:12:35 +00:00  
				
					
						
							
							
								 
						
							
							
								2cebe53545 
								
							
								 
							
						 
						
							
							
								
								Exchange 3pid invites for m.room.member invites  
							
							
							
						 
						
							2015-11-05 16:43:19 +00:00  
				
					
						
							
							
								 
						
							
							
								f522f50a08 
								
							
								 
							
						 
						
							
							
								
								Allow guests to register and call /events?room_id=  
							
							... 
							
							
							
							This follows the same flows-based flow as regular registration, but as
the only implemented flow has no requirements, it auto-succeeds. In the
future, other flows (e.g. captcha) may be required, so clients should
treat this like the regular registration flow choices. 
							
						 
						
							2015-11-04 17:29:07 +00:00  
				
					
						
							
							
								 
						
							
							
								e60dad86ba 
								
							
								 
							
						 
						
							
							
								
								Reject events which are too large  
							
							... 
							
							
							
							SPEC-222 
							
						 
						
							2015-10-22 11:44:31 +01:00  
				
					
						
							
							
								 
						
							
							
								137fafce4e 
								
							
								 
							
						 
						
							
							
								
								Allow rejecting invites  
							
							... 
							
							
							
							This is done by using the same /leave flow as you would use if you had
already accepted the invite and wanted to leave. 
							
						 
						
							2015-10-20 11:58:58 +01:00  
				
					
						
							
							
								 
						
							
							
								0e5239ffc3 
								
							
								 
							
						 
						
							
							
								
								Stuff signed data in a standalone object  
							
							... 
							
							
							
							Makes both generating it in sydent, and verifying it here, simpler at
the cost of some repetition 
							
						 
						
							2015-10-16 17:45:48 +01:00  
				
					
						
							
							
								 
						
							
							
								c225d63e9e 
								
							
								 
							
						 
						
							
							
								
								Add signing host and keyname to signatures  
							
							
							
						 
						
							2015-10-16 15:07:56 +01:00  
				
					
						
							
							
								 
						
							
							
								b8dd5b1a2d 
								
							
								 
							
						 
						
							
							
								
								Verify third party ID server certificates  
							
							
							
						 
						
							2015-10-16 14:54:54 +01:00  
				
					
						
							
							
								 
						
							
							
								0c38e8637f 
								
							
								 
							
						 
						
							
							
								
								Remove unnecessary class-wrapping  
							
							
							
						 
						
							2015-10-13 18:00:38 +01:00  
				
					
						
							
							
								 
						
							
							
								95e53ac535 
								
							
								 
							
						 
						
							
							
								
								Add some docstring  
							
							
							
						 
						
							2015-10-13 17:18:24 +01:00  
				
					
						
							
							
								 
						
							
							
								17dffef5ec 
								
							
								 
							
						 
						
							
							
								
								Move event contents into third_party_layout field  
							
							
							
						 
						
							2015-10-13 15:48:12 +01:00  
				
					
						
							
							
								 
						
							
							
								1cacc71050 
								
							
								 
							
						 
						
							
							
								
								Add third party invites to auth_events for joins  
							
							
							
						 
						
							2015-10-06 10:13:28 -05:00  
				
					
						
							
							
								 
						
							
							
								58e6a58eb7 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into daniel/3pidinvites  
							
							
							
						 
						
							2015-10-05 10:33:41 -05:00  
				
					
						
							
							
								 
						
							
							
								d5e081c7ae 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatable  
							
							
							
						 
						
							2015-10-02 10:33:49 +01:00  
				
					
						
							
							
								 
						
							
							
								5b3e9713dd 
								
							
								 
							
						 
						
							
							
								
								Implement third party identifier invites  
							
							
							
						 
						
							2015-10-01 17:49:52 +01:00  
				
					
						
							
							
								 
						
							
							
								ee2d722f0f 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #276  from matrix-org/markjh/history_for_rooms_that_have_been_left  
							
							... 
							
							
							
							SPEC-216: Allow users to view the history of rooms that they have left. 
							
						 
						
							2015-09-21 14:38:13 +01:00  
				
					
						
							
							
								 
						
							
							
								8e3bbc9bd0 
								
							
								 
							
						 
						
							
							
								
								Clarify which event is returned by check_user_was_in_room  
							
							
							
						 
						
							2015-09-21 13:47:44 +01:00  
				
					
						
							
							
								 
						
							
							
								728d07c8c1 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #256  from matrix-org/auth  
							
							... 
							
							
							
							Attempt to validate macaroons 
							
						 
						
							2015-09-14 18:09:33 +01:00  
				
					
						
							
							
								 
						
							
							
								d59acb8c5b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatable  
							
							
							
						 
						
							2015-09-14 18:05:31 +01:00  
				
					
						
							
							
								 
						
							
							
								91cb3b630d 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #265  from matrix-org/erikj/check_room_exists  
							
							... 
							
							
							
							Check room exists when authenticating an event 
							
						 
						
							2015-09-14 17:56:18 +01:00  
				
					
						
							
							
								 
						
							
							
								1d579df664 
								
							
								 
							
						 
						
							
							
								
								Allow rooms/{roomId}/state for a room that has been left  
							
							
							
						 
						
							2015-09-09 14:12:24 +01:00  
				
					
						
							
							
								 
						
							
							
								89ae0166de 
								
							
								 
							
						 
						
							
							
								
								Allow room initialSync for users that have left the room, returning a snapshot of how the room was when they left it  
							
							
							
						 
						
							2015-09-09 13:25:22 +01:00  
				
					
						
							
							
								 
						
							
							
								9b05ef6f39 
								
							
								 
							
						 
						
							
							
								
								Also check the domains for membership state_keys  
							
							
							
						 
						
							2015-09-01 16:17:25 +01:00  
				
					
						
							
							
								 
						
							
							
								187320b019 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'erikj/check_room_exists' into erikj/unfederatable  
							
							
							
						 
						
							2015-09-01 15:58:10 +01:00  
				
					
						
							
							
								 
						
							
							
								b345853918 
								
							
								 
							
						 
						
							
							
								
								Check against sender rather than event_id  
							
							
							
						 
						
							2015-09-01 15:57:35 +01:00  
				
					
						
							
							
								 
						
							
							
								a88e16152f 
								
							
								 
							
						 
						
							
							
								
								Add flag which disables federation of the room  
							
							
							
						 
						
							2015-09-01 15:47:30 +01:00  
				
					
						
							
							
								 
						
							
							
								00149c063b 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							
							
						 
						
							2015-09-01 15:42:03 +01:00  
				
					
						
							
							
								 
						
							
							
								ab9e01809d 
								
							
								 
							
						 
						
							
							
								
								Check room exists when authenticating an event, by asserting they reference a creation event  
							
							
							
						 
						
							2015-09-01 15:21:24 +01:00  
				
					
						
							
							
								 
						
							
							
								e255c2c32f 
								
							
								 
							
						 
						
							
							
								
								s/user_id/user/g for consistency  
							
							
							
						 
						
							2015-09-01 12:41:16 +01:00  
				
					
						
							
							
								 
						
							
							
								b854a375b0 
								
							
								 
							
						 
						
							
							
								
								Check domain of events properly  
							
							... 
							
							
							
							Federated servers still need to delegate authority to owning servers 
							
						 
						
							2015-09-01 11:53:31 +01:00  
				
					
						
							
							
								 
						
							
							
								8256a8ece7 
								
							
								 
							
						 
						
							
							
								
								Allow users to redact their own events  
							
							
							
						 
						
							2015-08-28 15:31:49 +01:00  
				
					
						
							
							
								 
						
							
							
								6a4b650d8a 
								
							
								 
							
						 
						
							
							
								
								Attempt to validate macaroons  
							
							... 
							
							
							
							A couple of weird caveats:
 * If we can't validate your macaroon, we fall back to checking that
   your access token is in the DB, and ignoring the failure
 * Even if we can validate your macaroon, we still have to hit the DB to
   get the access token ID, which we pretend is a device ID all over the
   codebase.
This mostly adds the interesting code, and points out the two pieces we
need to delete (and necessary conditions) in order to fix the above
caveats. 
							
						 
						
							2015-08-26 13:22:23 +01:00  
				
					
						
							
							
								 
						
							
							
								a9d8bd95e7 
								
							
								 
							
						 
						
							
							
								
								Stop looking up "admin", which we never read  
							
							
							
						 
						
							2015-08-25 16:29:39 +01:00  
				
					
						
							
							
								 
						
							
							
								57619d6058 
								
							
								 
							
						 
						
							
							
								
								Re-wrap line  
							
							
							
						 
						
							2015-08-25 16:25:46 +01:00  
				
					
						
							
							
								 
						
							
							
								a0b181bd17 
								
							
								 
							
						 
						
							
							
								
								Remove completely unused concepts from codebase  
							
							... 
							
							
							
							Removes device_id and ClientInfo
device_id is never actually written, and the matrix.org DB has no
non-null entries for it. Right now, it's just cluttering up code.
This doesn't remove the columns from the database, because that's
fiddly. 
							
						 
						
							2015-08-25 16:23:06 +01:00  
				
					
						
							
							
								 
						
							
							
								13a6517d89 
								
							
								 
							
						 
						
							
							
								
								s/by_token/by_access_token/g  
							
							... 
							
							
							
							We're about to have two kinds of token, access and refresh 
							
						 
						
							2015-08-20 16:01:29 +01:00  
				
					
						
							
							
								 
						
							
							
								ee59af9ac0 
								
							
								 
							
						 
						
							
							
								
								Set request.authenticated_entity for application services  
							
							
							
						 
						
							2015-08-18 15:17:47 +01:00  
				
					
						
							
							
								 
						
							
							
								45610305ea 
								
							
								 
							
						 
						
							
							
								
								Add missing space because linter  
							
							
							
						 
						
							2015-08-11 16:43:27 +01:00  
				
					
						
							
							
								 
						
							
							
								88e03da39f 
								
							
								 
							
						 
						
							
							
								
								Minor docs cleanup  
							
							
							
						 
						
							2015-08-11 16:35:28 +01:00  
				
					
						
							
							
								 
						
							
							
								9dba813234 
								
							
								 
							
						 
						
							
							
								
								Remove redundant if-guard  
							
							... 
							
							
							
							The startswith("@") does the job 
							
						 
						
							2015-08-11 16:34:17 +01:00  
				
					
						
							
							
								 
						
							
							
								016c089f13 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/power_level_sanity  
							
							
							
						 
						
							2015-07-13 13:48:13 +01:00  
				
					
						
							
							
								 
						
							
							
								a5ea22d468 
								
							
								 
							
						 
						
							
							
								
								Sanitize power level checks  
							
							
							
						 
						
							2015-07-10 14:05:38 +01:00  
				
					
						
							
							
								 
						
							
							
								7e3b14fe78 
								
							
								 
							
						 
						
							
							
								
								You shouldn't be able to ban/kick users with higher power levels  
							
							
							
						 
						
							2015-07-10 14:05:38 +01:00  
				
					
						
							
							
								 
						
							
							
								1a3255b507 
								
							
								 
							
						 
						
							
							
								
								Add m.room.history_visibility to newly created rooms' m.room.power_levels  
							
							
							
						 
						
							2015-07-06 13:25:35 +01:00  
				
					
						
							
							
								 
						
							
							
								00ab882ed6 
								
							
								 
							
						 
						
							
							
								
								Add m.room.history_visibility to list of auth events  
							
							
							
						 
						
							2015-07-03 10:31:24 +01:00  
				
					
						
							
							
								 
						
							
							
								cee69441d3 
								
							
								 
							
						 
						
							
							
								
								Log more when we have processed the request  
							
							
							
						 
						
							2015-06-15 17:11:44 +01:00  
				
					
						
							
							
								 
						
							
							
								22c7c5eb8f 
								
							
								 
							
						 
						
							
							
								
								Typo  
							
							
							
						 
						
							2015-05-01 14:41:25 +01:00  
				
					
						
							
							
								 
						
							
							
								42c12c04f6 
								
							
								 
							
						 
						
							
							
								
								Remove some run_on_reactors  
							
							
							
						 
						
							2015-05-01 14:41:25 +01:00  
				
					
						
							
							
								 
						
							
							
								adb5b76ff5 
								
							
								 
							
						 
						
							
							
								
								Don't log all auth events every time we call auth.check  
							
							
							
						 
						
							2015-05-01 14:41:25 +01:00  
				
					
						
							
							
								 
						
							
							
								80b4119279 
								
							
								 
							
						 
						
							
							
								
								Don't wait for storage of access_token  
							
							
							
						 
						
							2015-05-01 13:14:05 +01:00  
				
					
						
							
							
								 
						
							
							
								9182f87664 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #126  from matrix-org/csauth  
							
							... 
							
							
							
							Client / Server Auth Refactor 
							
						 
						
							2015-04-28 11:00:27 +01:00  
				
					
						
							
							
								 
						
							
							
								38432d8c25 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into invite_power_level  
							
							
							
						 
						
							2015-04-27 17:09:25 +01:00  
				
					
						
							
							
								 
						
							
							
								6532b6e607 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into csauth  
							
							... 
							
							
							
							Conflicts:
	synapse/http/server.py 
							
						 
						
							2015-04-24 09:37:54 +01:00  
				
					
						
							
							
								 
						
							
							
								a2c10d37d7 
								
							
								 
							
						 
						
							
							
								
								Add an error code to 'missing token' response.  
							
							
							
						 
						
							2015-04-23 13:23:44 +01:00  
				
					
						
							
							
								 
						
							
							
								a16eaa0c33 
								
							
								 
							
						 
						
							
							
								
								Neater fetching of user's auth level in a room - squash to int() at access time (SYN-353)  
							
							
							
						 
						
							2015-04-22 14:20:04 +01:00  
				
					
						
							
							
								 
						
							
							
								f43063158a 
								
							
								 
							
						 
						
							
							
								
								Appease pep8  
							
							
							
						 
						
							2015-04-22 13:12:11 +01:00  
				
					
						
							
							
								 
						
							
							
								2808c040ef 
								
							
								 
							
						 
						
							
							
								
								Also remember to check 'invite' level for changes  
							
							
							
						 
						
							2015-04-21 21:13:14 +01:00  
				
					
						
							
							
								 
						
							
							
								bc41f0398f 
								
							
								 
							
						 
						
							
							
								
								Initial implementation of an 'invite' power_level  
							
							
							
						 
						
							2015-04-21 20:56:08 +01:00  
				
					
						
							
							
								 
						
							
							
								d3309933f5 
								
							
								 
							
						 
						
							
							
								
								Much neater fetching of defined powerlevels from m.room.power_levels state event  
							
							
							
						 
						
							2015-04-21 20:53:23 +01:00  
				
					
						
							
							
								 
						
							
							
								b568c0231c 
								
							
								 
							
						 
						
							
							
								
								Remove debugging print statement accidentally committed  
							
							
							
						 
						
							2015-04-21 20:21:14 +01:00  
				
					
						
							
							
								 
						
							
							
								3a7d7a3f22 
								
							
								 
							
						 
						
							
							
								
								Sanitise a user's powerlevel to an int() before numerical comparison, because otherwise Python is "helpful" with it (SYN-351)  
							
							
							
						 
						
							2015-04-21 20:18:29 +01:00  
				
					
						
							
							
								 
						
							
							
								cb03fafdf1 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into csauth  
							
							
							
						 
						
							2015-04-17 13:51:10 +01:00  
				
					
						
							
							
								 
						
							
							
								399b5add58 
								
							
								 
							
						 
						
							
							
								
								Neater implementation of membership change auth checks, ensuring we can't forget to check if the calling user is a member of the room  
							
							
							
						 
						
							2015-04-15 18:40:23 +01:00  
				
					
						
							
							
								 
						
							
							
								e6e130b9ba 
								
							
								 
							
						 
						
							
							
								
								Ensure that non-room-members cannot ban others, even if they do have enough powerlevel (SYN-343)  
							
							
							
						 
						
							2015-04-15 18:07:33 +01:00  
				
					
						
							
							
								 
						
							
							
								ae8ff92e05 
								
							
								 
							
						 
						
							
							
								
								Fix a bug which causes a send event level of 0 to not be honoured.  
							
							... 
							
							
							
							Caused by a bad if check, which incorrectly executes for both 0 and None,
when None was the original intent. 
							
						 
						
							2015-04-07 15:48:20 +01:00  
				
					
						
							
							
								 
						
							
							
								9aa0224cdf 
								
							
								 
							
						 
						
							
							
								
								unused import  
							
							
							
						 
						
							2015-03-24 17:25:59 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								93978c5e2b 
								
							
								 
							
						 
						
							
							
								
								@cached() annotate get_user_by_token() - achieves a minor DB performance improvement  
							
							
							
						 
						
							2015-03-17 17:24:51 +00:00