Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix bug where we sometimes didn't fetch all the keys requested for a | Erik Johnston | 2015-09-17 | 1 | -4/+3 |
| | | | | server. | ||||
* | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-09-16 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch 'erikj/update_extremeties' into hotfixes-v0.10.0-r2 | Erik Johnston | 2015-09-16 | 2 | -0/+11 |
| |\ | |||||
| * | | Fix adding threepids to an existing account | David Baker | 2015-09-10 | 1 | -0/+1 |
| | | | |||||
| * | | Bump version and change log | Erik Johnston | 2015-09-10 | 1 | -1/+1 |
| | | | |||||
| * | | Various bug fixes to crypto.keyring | Erik Johnston | 2015-09-10 | 1 | -10/+17 |
| | | | |||||
* | | | Merge pull request #281 from matrix-org/erikj/update_extremeties | Erik Johnston | 2015-09-15 | 2 | -0/+11 |
|\ \ \ | | |/ | |/| | When updating a stored event from outlier to non-outlier, remember to update the extremeties | ||||
| * | | "Comments" | Erik Johnston | 2015-09-15 | 1 | -0/+6 |
| | | | |||||
| * | | When updating a stored event from outlier to non-outlier, remember to update ↵ | Erik Johnston | 2015-09-15 | 2 | -0/+5 |
| |/ | | | | | | | the extremeties | ||||
* | | Merge pull request #272 from matrix-org/daniel/insecureclient | Daniel Wagner-Hall | 2015-09-15 | 7 | -12/+55 |
|\ \ | | | | | | | Allow configuration to ignore invalid SSL certs | ||||
| * | | Use shorter config key name | Daniel Wagner-Hall | 2015-09-15 | 2 | -4/+5 |
| | | | |||||
| * | | Rename context factory | Daniel Wagner-Hall | 2015-09-15 | 2 | -5/+5 |
| | | | | | | | | | | | | Mjark is officially no fun. | ||||
| * | | Merge branch 'master' into daniel/insecureclient | Daniel Wagner-Hall | 2015-09-15 | 1 | -1/+1 |
| |\| | |||||
| * | | Merge branch 'daniel/insecureclient' into develop | Daniel Wagner-Hall | 2015-09-09 | 7 | -12/+54 |
| |\ \ | |||||
| | * | | Better document the intent of the insecure SSL setting | Daniel Wagner-Hall | 2015-09-09 | 1 | -2/+6 |
| | | | | |||||
| | * | | Fix random formatting | Daniel Wagner-Hall | 2015-09-09 | 2 | -2/+2 |
| | | | | |||||
| | * | | Allow configuration to ignore invalid SSL certs | Daniel Wagner-Hall | 2015-09-09 | 7 | -12/+50 |
| | | | | | | | | | | | | | | | | | | | | This will be useful for sytest, and sytest only, hence the aggressive config key name. | ||||
* | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-09-15 | 1 | -1/+1 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Bump version/changelog v0.10.0-r1 | Erik Johnston | 2015-09-08 | 1 | -1/+1 |
| | | | | |||||
* | | | | Hacky attempt at catching SIGHUP and rotating the logfile around | Paul "LeoNerd" Evans | 2015-09-14 | 1 | -0/+14 |
| | | | | |||||
* | | | | Merge pull request #256 from matrix-org/auth | Daniel Wagner-Hall | 2015-09-14 | 1 | -3/+89 |
|\ \ \ \ | | | | | | | | | | | Attempt to validate macaroons | ||||
| * | | | | s/user_id/user/g for consistency | Daniel Wagner-Hall | 2015-09-01 | 1 | -10/+10 |
| | | | | | |||||
| * | | | | Merge branch 'mergeeriksmadness' into auth | Daniel Wagner-Hall | 2015-08-26 | 4 | -12/+50 |
| |\ \ \ \ | |||||
| * | | | | | Attempt to validate macaroons | Daniel Wagner-Hall | 2015-08-26 | 1 | -9/+95 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | | | | Merge pull request #265 from matrix-org/erikj/check_room_exists | Erik Johnston | 2015-09-14 | 1 | -0/+8 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Check room exists when authenticating an event | ||||
| * | | | | | | Fix tests | Erik Johnston | 2015-09-01 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Check room exists when authenticating an event, by asserting they reference ↵ | Erik Johnston | 2015-09-01 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | a creation event | ||||
* | | | | | | | Drop unused index | Erik Johnston | 2015-09-14 | 1 | -0/+16 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #274 from matrix-org/add_threepid_fix | David Baker | 2015-09-10 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix adding threepids to an existing account | ||||
| * | | | | | | | Fix adding threepids to an existing account | David Baker | 2015-09-10 | 1 | -0/+1 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #270 from matrix-org/markjh/fix_metrics | Erik Johnston | 2015-09-10 | 1 | -4/+7 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix the size reported by maxrss. | ||||
| * | | | | | | | Check that /proc/self/fd exists before listing it | Mark Haines | 2015-09-07 | 1 | -0/+4 |
| | | | | | | | | |||||
| * | | | | | | | The maxrss reported by getrusage is in kilobytes, not pages | Mark Haines | 2015-09-07 | 1 | -4/+3 |
| | |_|_|_|/ / | |/| | | | | | |||||
* / | | | | | | Various bug fixes to crypto.keyring | Erik Johnston | 2015-09-09 | 1 | -10/+17 |
|/ / / / / / | |||||
* | | | | / | Merge branch 'master' into develop | Mark Haines | 2015-09-07 | 3 | -3/+3 |
|\| | | | | | |_|_|_|/ |/| | | | | | | | | | | | | | | Conflicts: setup.py | ||||
| * | | | | Change log level to info | Erik Johnston | 2015-09-03 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Bump version and changelog | Erik Johnston | 2015-09-03 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Lists use 'append' | Erik Johnston | 2015-09-02 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Bump version and changelog v0.10.0-rc6 | Erik Johnston | 2015-09-02 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #262 from matrix-org/redactyoself | Daniel Wagner-Hall | 2015-09-02 | 2 | -9/+43 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Allow users to redact their own events | ||||
| * | | | | Check domain of events properly | Daniel Wagner-Hall | 2015-09-01 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | Federated servers still need to delegate authority to owning servers | ||||
| * | | | | Merge branch 'develop' into redactyoself | Daniel Wagner-Hall | 2015-08-28 | 16 | -72/+219 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/handlers/_base.py | ||||
| * | | | | | Allow users to redact their own events | Daniel Wagner-Hall | 2015-08-28 | 2 | -10/+42 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Use the version of "matrix-angular-sdk" hosted on pypi | Mark Haines | 2015-09-01 | 1 | -5/+0 |
| | | | | | |||||
* | | | | | Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-09-01 | 2 | -1/+3 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Merge pull request #261 from matrix-org/erikj/scripts_clean | Erik Johnston | 2015-09-01 | 1 | -0/+2 |
| |\ \ \ \ | | | | | | | | | | | | | Clean up scripts/ | ||||
| | * | | | | Actually add config path | Erik Johnston | 2015-08-28 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | Lower size of 'stateGroupCache' now that we have data from matrix.org to ↵ | Erik Johnston | 2015-09-01 | 1 | -1/+1 |
| |/ / / / | | | | | | | | | | | | | | | | support doing so | ||||
* | | | | | don't log the whole DB config (including postgres password...) | Matthew Hodgson | 2015-08-29 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge pull request #258 from matrix-org/slowtestsmakemesad | Daniel Wagner-Hall | 2015-08-28 | 2 | -4/+26 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Swap out bcrypt for md5 in tests | ||||
| * | | | | Remove unused import | Daniel Wagner-Hall | 2015-08-26 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Swap out bcrypt for md5 in tests | Daniel Wagner-Hall | 2015-08-26 | 2 | -3/+26 |
| | |/ / | |/| | | | | | | | | | | This reduces our ~8 second sequential test time down to ~7 seconds | ||||
* | | | | Merge branch 'release-v0.10.0' into develop | Mark Haines | 2015-08-28 | 16 | -72/+219 |
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | | Conflicts: synapse/handlers/auth.py synapse/python_dependencies.py synapse/rest/client/v1/login.py | ||||
| * | | Bump version and changelog v0.10.0-rc5 | Erik Johnston | 2015-08-27 | 1 | -1/+1 |
| | | | |||||
| * | | Consistency | Erik Johnston | 2015-08-27 | 1 | -3/+3 |
| | | | |||||
| * | | Check for an internationalised filename first | Erik Johnston | 2015-08-27 | 1 | -8/+14 |
| | | | |||||
| * | | None check the correct variable | Erik Johnston | 2015-08-27 | 1 | -2/+3 |
| | | | |||||
| * | | Check for None | Erik Johnston | 2015-08-27 | 1 | -1/+1 |
| | | | |||||
| * | | Bump changelog and version v0.10.0-rc4 | Erik Johnston | 2015-08-27 | 1 | -1/+1 |
| | | | |||||
| * | | Give a sensible error message if the filename is invalid UTF-8 | Mark Haines | 2015-08-26 | 2 | -2/+8 |
| | | | |||||
| * | | Handle unicode filenames given when downloading or received over federation | Mark Haines | 2015-08-26 | 1 | -5/+21 |
| | | | |||||
| * | | Allow non-ascii filenames for attachments | Mark Haines | 2015-08-26 | 3 | -8/+17 |
| | | | |||||
| * | | Remove needless existence checks | Erik Johnston | 2015-08-26 | 1 | -7/+3 |
| | | | |||||
| * | | Don't loop over all rooms ever in typing.get_new_events_for_user | Erik Johnston | 2015-08-26 | 1 | -2/+2 |
| | | | |||||
| * | | Bump changelog and version v0.10.0-rc3 | Erik Johnston | 2015-08-25 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #250 from matrix-org/erikj/generated_directory | Erik Johnston | 2015-08-25 | 1 | -2/+15 |
| |\ \ | | | | | | | | | Add config option to specify where generated files should be dumped | ||||
| | * | | Update config doc | Erik Johnston | 2015-08-25 | 1 | -1/+2 |
| | | | | |||||
| | * | | s/--generated-directory/--keys-directory/ | Erik Johnston | 2015-08-25 | 1 | -7/+7 |
| | | | | |||||
| | * | | Add config option to specify where generated files should be dumped | Erik Johnston | 2015-08-25 | 1 | -2/+14 |
| | | | | |||||
| * | | | Warn if we encounter unexpected files in config directories | Erik Johnston | 2015-08-25 | 1 | -7/+17 |
| |/ / | |||||
| * | | Allow specifying directories as config files | Erik Johnston | 2015-08-25 | 1 | -6/+24 |
| | | | |||||
| * | | Merge pull request #245 from matrix-org/erikj/configurable_client_location | Erik Johnston | 2015-08-25 | 3 | -14/+30 |
| |\ \ | | | | | | | | | Allow specifying a directory to host a web client from | ||||
| | * | | Print the correct pip install line when failing due to lack of ↵ | Erik Johnston | 2015-08-25 | 2 | -8/+9 |
| | | | | | | | | | | | | | | | | matrix-angular-sdk | ||||
| | * | | Update the log message | Erik Johnston | 2015-08-25 | 1 | -5/+10 |
| | | | | |||||
| | * | | Revert previous commit. Instead, always download matrix-angular-sdk as a ↵ | Erik Johnston | 2015-08-25 | 1 | -3/+7 |
| | | | | | | | | | | | | | | | | requirement, but don't complain (when we do check_requirements) if we don't have it when we start synapse. | ||||
| | * | | Remove dependency on matrix-angular-sdk | Erik Johnston | 2015-08-25 | 2 | -6/+9 |
| | | | | |||||
| | * | | Allow specifying a directory to host a web client from | Erik Johnston | 2015-08-25 | 2 | -3/+6 |
| | | | | |||||
| * | | | Fix typo when using sys.stderr.write | Erik Johnston | 2015-08-25 | 1 | -1/+1 |
| | | | | |||||
| * | | | Add utility to parse config and print out a key | Erik Johnston | 2015-08-25 | 1 | -0/+30 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Usage: ``` $ python -m synapse.config read server_name -c homeserver.yaml localhost ``` | ||||
| * | | Bump version and changelog v0.10.0-rc2 | Erik Johnston | 2015-08-24 | 1 | -1/+1 |
| | | | |||||
| * | | Do auth checks *before* persisting the event | Erik Johnston | 2015-08-24 | 1 | -16/+16 |
| | | | |||||
| * | | Don't make pushers handle presence/typing events | Erik Johnston | 2015-08-24 | 3 | -6/+19 |
| | | | |||||
| * | | Don't insert events into 'event_*_extremeties' tables if they're outliers | Erik Johnston | 2015-08-23 | 1 | -2/+8 |
| | | | |||||
| * | | Actually check if event_id isn't returned by _get_state_groups | Erik Johnston | 2015-08-21 | 1 | -2/+9 |
| | | | |||||
| * | | Doc string | Erik Johnston | 2015-08-21 | 1 | -0/+6 |
| | | | |||||
| * | | When logging in fetch user by user_id case insensitively, *unless* there are ↵ | Erik Johnston | 2015-08-21 | 3 | -12/+31 |
| | | | | | | | | | | | | multiple case insensitive matches, in which case require the exact user_id | ||||
| * | | Don't allow people to register user ids which only differ by case to an ↵ | Erik Johnston | 2015-08-21 | 2 | -2/+13 |
| | | | | | | | | | | | | existing one | ||||
* | | | Merge erikj/user_dedup to develop | Daniel Wagner-Hall | 2015-08-26 | 4 | -12/+50 |
| |/ |/| | |||||
* | | Merge pull request #251 from matrix-org/removeadmin | Daniel Wagner-Hall | 2015-08-25 | 2 | -6/+3 |
|\ \ | | | | | | | Stop looking up "admin", which we never read | ||||
| * \ | Merge branch 'deviceid' into removeadmin | Daniel Wagner-Hall | 2015-08-25 | 2 | -4/+2 |
| |\ \ | |||||
| * | | | Stop looking up "admin", which we never read | Daniel Wagner-Hall | 2015-08-25 | 2 | -6/+3 |
| | | | | |||||
* | | | | Merge pull request #248 from matrix-org/deviceid | Daniel Wagner-Hall | 2015-08-25 | 23 | -75/+60 |
|\ \ \ \ | | |/ / | |/| | | Remove completely unused concepts from codebase | ||||
| * | | | Fix up one more reference | Daniel Wagner-Hall | 2015-08-25 | 2 | -4/+2 |
| |/ / | |||||
| * | | Re-wrap line | Daniel Wagner-Hall | 2015-08-25 | 1 | -3/+1 |
| | | | |||||
| * | | Remove completely unused concepts from codebase | Daniel Wagner-Hall | 2015-08-25 | 22 | -70/+59 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | Merge pull request #243 from matrix-org/markjh/remove_syutil | Mark Haines | 2015-08-25 | 17 | -71/+69 |
|\ \ \ | |/ / |/| | | Replace syutil dependency with smaller, single-purpose libraries | ||||
| * | | Fix typo in module imports and package dependencies | Mark Haines | 2015-08-25 | 2 | -2/+2 |
| | | | |||||
| * | | Fix indent | Mark Haines | 2015-08-24 | 1 | -1/+1 |
| | | | |||||
| * | | Remove syutil dependency in favour of smaller single-purpose libraries | Mark Haines | 2015-08-24 | 17 | -71/+69 |
| | | | |||||
* | | | Remove autoincrement since we incrementing the ID in the storage layer | Mark Haines | 2015-08-24 | 1 | -1/+1 |
|/ / | |||||
* | | Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-08-21 | 3 | -2/+7 |
|\| | |||||
| * | Fix bug where we didn't correctly serialize the redacted_because key over ↵ | Erik Johnston | 2015-08-21 | 2 | -1/+6 |
| | | | | | | | | federation | ||||
| * | Add missing param in store.get_state_groups invocation | Erik Johnston | 2015-08-21 | 1 | -1/+1 |
| | | |||||
* | | Return fully qualified user_id as per spec | David Baker | 2015-08-20 | 1 | -1/+1 |
| | | |||||
* | | Fix bad merge | Daniel Wagner-Hall | 2015-08-20 | 1 | -8/+1 |
| | | |||||
* | | Fix indentation | Daniel Wagner-Hall | 2015-08-20 | 1 | -1/+2 |
| | | |||||
* | | Fix flake8 warnings | Daniel Wagner-Hall | 2015-08-20 | 1 | -4/+6 |
| | | |||||
* | | Merge branch 'auth' into refresh | Daniel Wagner-Hall | 2015-08-20 | 2 | -4/+4 |
|\ \ | | | | | | | | | | | | | Conflicts: synapse/handlers/register.py | ||||
| * | | Remove incorrect whitespace | Daniel Wagner-Hall | 2015-08-20 | 1 | -3/+3 |
| | | | |||||
| * | | Merge branch 'develop' into auth | Daniel Wagner-Hall | 2015-08-20 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Correct pynacl version to 0.3.0 | Daniel Wagner-Hall | 2015-08-20 | 1 | -1/+1 |
| | |/ | | | | | | | | | | 0.0.3 was a typo | ||||
| * | | Merge branch 'develop' into auth | Daniel Wagner-Hall | 2015-08-20 | 17 | -48/+379 |
| |\| | |||||
* | | | Merge branch 'develop' into refresh | Daniel Wagner-Hall | 2015-08-20 | 15 | -35/+346 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: synapse/rest/client/v1/login.py | ||||
| * | | Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-08-20 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Bump version and changelog | Erik Johnston | 2015-08-20 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #235 from matrix-org/erikj/room_avatars | Erik Johnston | 2015-08-20 | 2 | -2/+4 |
| |\ \ \ | | | | | | | | | | | Add m.room.avatar to default power levels. | ||||
| | * | | | Add m.room.avatar to default power levels. Change default required power ↵ | Erik Johnston | 2015-08-20 | 2 | -2/+4 |
| | |/ / | | | | | | | | | | | | | levels of such events to 50 | ||||
| * | | | Remove spurious extra arg to set_password | David Baker | 2015-08-20 | 1 | -1/+1 |
| | | | | |||||
| * | | | Another use of check_password that got missed in the yield fix | David Baker | 2015-08-20 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #231 from matrix-org/erikj/pushers_store_last_token | Erik Johnston | 2015-08-20 | 1 | -5/+11 |
| |\ \ | | | | | | | | | Push: store the 'last_token' in the db, even if we processed no events | ||||
| | * | | Store the 'last_token' in the db, even if we processed no events | Erik Johnston | 2015-08-19 | 1 | -0/+6 |
| | | | | |||||
| | * | | Block on storing the current last_tokens | Erik Johnston | 2015-08-19 | 1 | -5/+5 |
| | | | | |||||
| * | | | Merge pull request #206 from matrix-org/erikj/generate_presice_thumbnails | Mark Haines | 2015-08-20 | 3 | -21/+226 |
| |\ \ \ | | | | | | | | | | | Always return a thumbnail of the requested size. | ||||
| | * | | | Fix flake8 warning | Mark Haines | 2015-08-13 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | Merge remote-tracking branch 'origin/develop' into ↵ | Mark Haines | 2015-08-13 | 26 | -300/+399 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | erikj/generate_presice_thumbnails | ||||
| | * | | | | Doc-string for config ultility function | Mark Haines | 2015-08-12 | 1 | -0/+11 |
| | | | | | | |||||
| | * | | | | Add config option for setting the list of thumbnail sizes to precalculate | Mark Haines | 2015-08-12 | 2 | -16/+41 |
| | | | | | | |||||
| | * | | | | Make a config option for whether to generate new thumbnail sizes dynamically | Mark Haines | 2015-08-12 | 3 | -7/+27 |
| | | | | | | |||||
| | * | | | | Factor out thumbnail() | Erik Johnston | 2015-07-23 | 1 | -56/+40 |
| | | | | | | |||||
| | * | | | | Fix remote thumbnailing | Erik Johnston | 2015-07-23 | 2 | -7/+11 |
| | | | | | | |||||
| | * | | | | Always return a thumbnail of the requested size. | Erik Johnston | 2015-07-23 | 2 | -2/+162 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before, we returned a thumbnail that was at least as big (if possible) as the requested size. Now, if we don't have a thumbnail of the given size we generate (and persist) one of that size. | ||||
| * | | | | | Merge pull request #233 from matrix-org/erikj/canonical_alias | Erik Johnston | 2015-08-20 | 3 | -1/+19 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Add server side support for canonical aliases | ||||
| | * | | | | | Check that the canonical room alias actually points to the room | Erik Johnston | 2015-08-20 | 1 | -1/+17 |
| | | | | | | | |||||
| | * | | | | | Add canonical alias to the default power levels | Erik Johnston | 2015-08-19 | 2 | -0/+2 |
| | | |_|/ / | | |/| | | | |||||
| * | | | | | Comma comma comma comma comma chameleon | David Baker | 2015-08-20 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge branch 'develop' into email_login | David Baker | 2015-08-20 | 51 | -679/+1615 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge pull request #211 from matrix-org/email_in_use | Mark Haines | 2015-08-20 | 4 | -0/+73 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Changes for unique emails | ||||
| | | * | | | | | Check absent before trying to access keys | David Baker | 2015-08-12 | 1 | -3/+3 |
| | | | | | | | | |||||
| | | * | | | | | Just leaving off the $ is fine. r* == registerrrrrrrrr | David Baker | 2015-08-12 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Allow sign in using email address | David Baker | 2015-08-04 | 1 | -5/+12 |
| | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Remember to yield: not much point testing is a deferred is not None | David Baker | 2015-08-04 | 1 | -1/+2 |
| | | | | | | | |||||
| * | | | | | | splt long line | David Baker | 2015-08-04 | 1 | -1/+3 |
| | | | | | | | |||||
| * | | | | | | Bump schema version | David Baker | 2015-08-04 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Add endpoint that proxies ID server request token and errors if the given ↵ | David Baker | 2015-08-04 | 4 | -1/+71 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | email is in use on this Home Server. | ||||
* | | | | | | | /tokenrefresh POST endpoint | Daniel Wagner-Hall | 2015-08-20 | 8 | -8/+177 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows refresh tokens to be exchanged for (access_token, refresh_token). It also starts issuing them on login, though no clients currently interpret them. | ||||
* | | | | | | | s/by_token/by_access_token/g | Daniel Wagner-Hall | 2015-08-20 | 2 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're about to have two kinds of token, access and refresh | ||||
* | | | | | | | Move token generation to auth handler | Daniel Wagner-Hall | 2015-08-20 | 2 | -24/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I prefer the auth handler to worry about all auth, and register to call into it as needed, than to smatter auth logic between the two. | ||||
* | | | | | | | Merge branch 'auth' into refresh | Daniel Wagner-Hall | 2015-08-20 | 3 | -6/+18 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | / | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Merge branch 'develop' into auth | Daniel Wagner-Hall | 2015-08-19 | 9 | -25/+128 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| * | | | | | Re-add whitespace around caveat operators | Daniel Wagner-Hall | 2015-08-19 | 1 | -4/+4 |
| | | | | | | |||||
| * | | | | | Switch to pymacaroons-pynacl | Daniel Wagner-Hall | 2015-08-19 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Remove padding space around caveat operators | Daniel Wagner-Hall | 2015-08-18 | 1 | -4/+4 |
| | | | | | | |||||
| * | | | | | Fix some formatting to use tuples | Daniel Wagner-Hall | 2015-08-18 | 1 | -4/+4 |
| | | | | | | |||||
| * | | | | | Merge branch 'develop' into auth | Daniel Wagner-Hall | 2015-08-18 | 31 | -448/+1236 |
| |\ \ \ \ \ | |||||
| * | | | | | | Remove accidentally added file | Daniel Wagner-Hall | 2015-08-18 | 1 | -0/+0 |
| | | | | | | | |||||
| * | | | | | | Issue macaroons as opaque auth tokens | Daniel Wagner-Hall | 2015-08-18 | 4 | -6/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This just replaces random bytes with macaroons. The macaroons are not inspected by the client or server. In particular, they claim to have an expiry time, but nothing verifies that they have not expired. Follow-up commits will actually enforce the expiration, and allow for token refresh. See https://bit.ly/matrix-auth for more information | ||||
* | | | | | | | Don't get apservice interested rooms in RoomHandler.get_joined_rooms_for_users | Erik Johnston | 2015-08-19 | 3 | -12/+32 |
| |_|/ / / / |/| | | | | | |||||
* | | | | | | Remove an access token log line | Erik Johnston | 2015-08-19 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Fix regression where we incorrectly responded with a 200 to /login | Erik Johnston | 2015-08-19 | 1 | -1/+2 |
| | | | | | | |||||
* | | | | | | Merge pull request #228 from matrix-org/erikj/_get_state_for_groups | Erik Johnston | 2015-08-18 | 1 | -2/+5 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Ensure we never return a None event from _get_state_for_groups | ||||
| * | | | | | | Remove newline because vertical whitespace makes mjark sad | Erik Johnston | 2015-08-18 | 1 | -2/+1 |
| | | | | | | | |||||
| * | | | | | | Rejig the code to make it nicer | Erik Johnston | 2015-08-18 | 1 | -3/+2 |
| | | | | | | | |||||
| * | | | | | | Ensure we never return a None event from _get_state_for_groups | Erik Johnston | 2015-08-18 | 1 | -3/+8 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #230 from matrix-org/erikj/appservice_auth_entity | Erik Johnston | 2015-08-18 | 1 | -0/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Set request.authenticated_entity for application services | ||||
| * | | | | | | Set request.authenticated_entity for application services | Erik Johnston | 2015-08-18 | 1 | -0/+3 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #227 from matrix-org/erikj/receipts_take2 | Erik Johnston | 2015-08-18 | 4 | -17/+91 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Re-enable receipts API. | ||||
| * | | | | | | Rename unhelpful variable name | Erik Johnston | 2015-08-18 | 1 | -7/+2 |
| | | | | | | | |||||
| * | | | | | | Comments | Erik Johnston | 2015-08-18 | 1 | -4/+14 |
| | | | | | | | |||||
| * | | | | | | Add index receipts_linearized_room_stream | Erik Johnston | 2015-08-17 | 2 | -1/+19 |
| | | | | | | | |||||
| * | | | | | | Remove unused import | Erik Johnston | 2015-08-17 | 1 | -2/+0 |
| | | | | | | | |||||
| * | | | | | | Remove added unused methods | Erik Johnston | 2015-08-17 | 1 | -7/+0 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-08-17 | 10 | -147/+105 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | erikj/receipts_take2 | ||||
| * | | | | | | | Batch _get_linearized_receipts_for_rooms | Erik Johnston | 2015-08-14 | 1 | -15/+64 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-08-13 | 2 | -51/+15 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/receipts_take2 | ||||
| * | | | | | | | | Add metrics to the receipts cache | Erik Johnston | 2015-08-13 | 2 | -0/+13 |
| | | | | | | | | | |||||
| * | | | | | | | | Re-enable receipts | Erik Johnston | 2015-08-13 | 1 | -2/+0 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #225 from matrix-org/erikj/reactor_metrics | Erik Johnston | 2015-08-18 | 1 | -3/+25 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix pending_calls metric to not lie | ||||
| * | | | | | | | | | Also check for presence of 'threadCallQueue' in reactor | Erik Johnston | 2015-08-18 | 1 | -1/+8 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Use more helpful variable names | Erik Johnston | 2015-08-18 | 1 | -3/+3 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fix pending_calls metric to not lie | Erik Johnston | 2015-08-14 | 1 | -3/+18 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Bump size of get_presence_state cache | Erik Johnston | 2015-08-18 | 1 | -1/+1 |
| |_|_|_|/ / / / |/| | | | | | | | |||||
* | | | | | | | | Typo | Erik Johnston | 2015-08-18 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | None check | Erik Johnston | 2015-08-18 | 1 | -0/+2 |
| | | | | | | | | |||||
* | | | | | | | | Don't assume @cachedList function returns keys for everything | Erik Johnston | 2015-08-18 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | Reduce cache size from obscenely large to quite large | Erik Johnston | 2015-08-18 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #226 from matrix-org/erikj/room_presence | Erik Johnston | 2015-08-18 | 3 | -15/+122 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add and use cached batched storage.get_state function. | ||||
| * | | | | | | | | More helpful variable names | Erik Johnston | 2015-08-18 | 1 | -7/+7 |
| | | | | | | | | | |||||
| * | | | | | | | | Doc strings | Erik Johnston | 2015-08-18 | 1 | -0/+28 |
| | | | | | | | | | |||||
| * | | | | | | | | Remove debug try/catch | Erik Johnston | 2015-08-18 | 1 | -47/+43 |
| | | | | | | | | | |||||
| * | | | | | | | | Remember to invalidate caches | Erik Johnston | 2015-08-17 | 1 | -2/+8 |
| | | | | | | | | | |||||
| * | | | | | | | | Implement a batched presence_handler.get_state and use it | Erik Johnston | 2015-08-17 | 3 | -14/+73 |
| | | | | | | | | | |||||
| * | | | | | | | | Add batched version of store.get_presence_state | Erik Johnston | 2015-08-17 | 1 | -1/+19 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #208 from matrix-org/markjh/end-to-end-key-federation | Mark Haines | 2015-08-18 | 5 | -30/+233 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Federation for end-to-end key requests. | ||||
| * | | | | | | | Merge remote-tracking branch 'origin/develop' into ↵ | Mark Haines | 2015-08-13 | 27 | -301/+401 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | markjh/end-to-end-key-federation | ||||
| | * | | | | | | Merge branch 'develop' into erikj/reactor_metrics | Mark Haines | 2015-08-13 | 1 | -1/+0 |
| | |\ \ \ \ \ \ | |||||
| * | | | | | | | | Add a few strategic new lines to break up the on_query_client_keys and ↵ | Mark Haines | 2015-08-13 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on_claim_client_keys methods in federation_server.py | ||||
| * | | | | | | | | Get the end-to-end key federation working | Mark Haines | 2015-07-24 | 4 | -21/+17 |
| | | | | | | | | | |||||
| * | | | | | | | | Add federation support for end-to-end key requests | Mark Haines | 2015-07-23 | 5 | -30/+231 |
| | | | | | | | | | |||||
* | | | | | | | | | Fix bug where we were leaking None into state event lists | Erik Johnston | 2015-08-17 | 1 | -2/+3 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #221 from matrix-org/auth | Daniel Wagner-Hall | 2015-08-14 | 9 | -145/+102 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | / / / | | |_|_|_|/ / / | |/| | | | | | | Simplify LoginHander and AuthHandler | ||||
| * | | | | | | | Merge password checking implementations | Daniel Wagner-Hall | 2015-08-12 | 1 | -20/+15 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'develop' into auth | Daniel Wagner-Hall | 2015-08-12 | 1 | -45/+36 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Simplify LoginHander and AuthHandler | Daniel Wagner-Hall | 2015-08-12 | 9 | -131/+93 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Merge LoginHandler -> AuthHandler * Add a bunch of documentation * Improve some naming * Remove unused branches I will start merging the actual logic of the two handlers shortly | ||||
* | | | | | | | | | Remove pointless map | Erik Johnston | 2015-08-13 | 1 | -7/+3 |
| | | | | | | | | | |||||
* | | | | | | | | | Remove some vertical space | Erik Johnston | 2015-08-13 | 1 | -36/+9 |
| | | | | | | | | | |||||
* | | | | | | | | | Replace list comprehension | Erik Johnston | 2015-08-13 | 1 | -8/+3 |
| |_|_|_|_|/ / / |/| | | | | | | | |||||
* | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-08-13 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | erikj/dictionary_cache | ||||
| * | | | | | | | PEP8 | Erik Johnston | 2015-08-13 | 1 | -1/+0 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'erikj/reactor_metrics' into erikj/dictionary_cache | Erik Johnston | 2015-08-13 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | Don't time getDelayedCalls | Erik Johnston | 2015-08-13 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'erikj/reactor_metrics' into erikj/dictionary_cache | Erik Johnston | 2015-08-13 | 3 | -54/+57 |
|\| | | | | | | | |||||
| * | | | | | | | Add some metrics about the reactor | Erik Johnston | 2015-08-13 | 1 | -0/+29 |
| |/ / / / / / | |||||
| * | | | | | | Depend on Twisted>=15.1 rather than pining to a particular version | Mark Haines | 2015-08-12 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'develop' into markjh/twisted-15 | Mark Haines | 2015-08-12 | 79 | -1560/+4136 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | Conflicts: synapse/http/matrixfederationclient.py | ||||
| * | | | | | | Merge branch 'develop' into markjh/twisted-15 | Mark Haines | 2015-06-01 | 10 | -21/+51 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/python_dependencies.py | ||||
| * | | | | | | | Use Twisted-15.2.1, Use Agent.usingEndpointFactory rather than implement our ↵ | Mark Haines | 2015-06-01 | 2 | -51/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | own Agent | ||||
* | | | | | | | | Comment | Erik Johnston | 2015-08-12 | 1 | -1/+2 |
| | | | | | | | | |||||
* | | | | | | | | Explain why we're prefilling dict with Nones | Erik Johnston | 2015-08-12 | 1 | -0/+4 |
| | | | | | | | | |||||
* | | | | | | | | Better variable name | Erik Johnston | 2015-08-12 | 1 | -5/+5 |
| | | | | | | | | |||||
* | | | | | | | | Split _get_state_for_group_from_cache into two | Erik Johnston | 2015-08-12 | 1 | -32/+53 |
| | | | | | | | | |||||
* | | | | | | | | Fix _filter_events_for_client | Erik Johnston | 2015-08-12 | 2 | -6/+2 |
| | | | | | | | | |||||
* | | | | | | | | Docstring | Erik Johnston | 2015-08-12 | 1 | -0/+27 |
| | | | | | | | | |||||
* | | | | | | | | Simplify staggered deferred lists | Erik Johnston | 2015-08-12 | 1 | -2/+2 |
| | | | | | | | | |||||
* | | | | | | | | Use list comprehension instead of filter | Erik Johnston | 2015-08-12 | 2 | -20/+6 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-08-12 | 3 | -61/+57 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | erikj/dictionary_cache | ||||
| * | | | | | | | Merge pull request #220 from matrix-org/markjh/generate_keys | Erik Johnston | 2015-08-12 | 1 | -45/+36 |
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | Fix the --generate-keys option. | ||||
| | * | | | | | | Fix the --generate-keys option. Make it do the same thing as ↵ | Mark Haines | 2015-08-12 | 1 | -45/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --generate-config does when the config file exists, but without printing a warning | ||||
| * | | | | | | | Add missing space because linter | Daniel Wagner-Hall | 2015-08-11 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Minor docs cleanup | Daniel Wagner-Hall | 2015-08-11 | 2 | -3/+9 |
| | | | | | | | | |||||
| * | | | | | | | Remove redundant if-guard | Daniel Wagner-Hall | 2015-08-11 | 1 | -13/+12 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | The startswith("@") does the job | ||||
* | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-08-12 | 1 | -1/+3 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/dictionary_cache | ||||
| * | | | | | | Use TypeError instead of ValueError and give a nicer error mesasge | Mark Haines | 2015-08-10 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | when someone calls Cache.invalidate with the wrong type. | ||||
| * | | | | | | Merge pull request #215 from matrix-org/erikj/cache_varargs_interface | Erik Johnston | 2015-08-10 | 11 | -66/+67 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Change Cache to not use *args in its interface | ||||
* | | | | | | | | Wire up the dictionarycache to the metrics | Erik Johnston | 2015-08-12 | 3 | -45/+41 |
| | | | | | | | | |||||
* | | | | | | | | Move all the caches into their own package, synapse.util.caches | Erik Johnston | 2015-08-11 | 20 | -347/+405 |
| | | | | | | | | |||||
* | | | | | | | | Comments | Erik Johnston | 2015-08-11 | 2 | -3/+13 |
| | | | | | | | | |||||
* | | | | | | | | Comment | Erik Johnston | 2015-08-11 | 1 | -0/+2 |
| | | | | | | | | |||||
* | | | | | | | | Docs | Erik Johnston | 2015-08-11 | 1 | -0/+9 |
| | | | | | | | | |||||
* | | | | | | | | Remove debug loggers | Erik Johnston | 2015-08-11 | 2 | -6/+0 |
| | | | | | | | | |||||
* | | | | | | | | Fix application of ACLs | Erik Johnston | 2015-08-11 | 4 | -17/+33 |
| | | | | | | | | |||||
* | | | | | | | | Fix state cache | Erik Johnston | 2015-08-11 | 1 | -36/+49 |
| | | | | | | | | |||||
* | | | | | | | | Clean up StateStore | Erik Johnston | 2015-08-10 | 1 | -62/+11 |
| | | | | | | | | |||||
* | | | | | | | | Remove unused function | Erik Johnston | 2015-08-10 | 1 | -7/+0 |
| | | | | | | | | |||||
* | | | | | | | | Comments | Erik Johnston | 2015-08-10 | 1 | -0/+6 |
| | | | | | | | | |||||
* | | | | | | | | Comments | Erik Johnston | 2015-08-10 | 1 | -0/+3 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'erikj/cache_varargs_interface' of ↵ | Erik Johnston | 2015-08-10 | 1 | -5/+5 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | github.com:matrix-org/synapse into erikj/dictionary_cache | ||||
| * | | | | | | | Rename keyargs to args in CacheDescriptor | Erik Johnston | 2015-08-10 | 1 | -5/+5 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'erikj/cache_varargs_interface' of ↵ | Erik Johnston | 2015-08-10 | 1 | -9/+9 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:matrix-org/synapse into erikj/dictionary_cache | ||||
| * | | | | | | | Rename keyargs to args in Cache | Erik Johnston | 2015-08-10 | 1 | -9/+9 |
| | | | | | | | | |||||
* | | | | | | | | Do bounds check | Erik Johnston | 2015-08-10 | 1 | -1/+4 |
| | | | | | | | |