Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | replace admin_email with admin_uri for greater flexibility | Neil Johnson | 2018-08-15 | 1 | -1/+1 |
| | |||||
* | support admin_email config and pass through into blocking errors, return ↵ | Neil Johnson | 2018-08-13 | 1 | -0/+1 |
| | | | | AuthError in all cases | ||||
* | Revert "support admin_email config and pass through into blocking errors, ↵ | Neil Johnson | 2018-08-13 | 1 | -1/+0 |
| | | | | | | return AuthError in all cases" This reverts commit 0d43f991a19840a224d3dac78d79f13d78212ee6. | ||||
* | support admin_email config and pass through into blocking errors, return ↵ | Neil Johnson | 2018-08-13 | 1 | -0/+1 |
| | | | | AuthError in all cases | ||||
* | Run tests under PostgreSQL (#3423) | Amber Brown | 2018-08-13 | 1 | -18/+115 |
| | |||||
* | Run black. | black | 2018-08-10 | 1 | -43/+35 |
| | |||||
* | Merge pull request #3439 from vojeroen/send_sni_for_federation_requests | Richard van der Hoff | 2018-08-10 | 1 | -0/+2 |
|\ | | | | | send SNI for federation requests | ||||
| * | Merge branch 'develop' into send_sni_for_federation_requests | Richard van der Hoff | 2018-07-27 | 1 | -0/+3 |
| |\ | |||||
| * \ | Merge remote-tracking branch 'upstream/develop' into ↵ | Jeroen | 2018-07-14 | 1 | -1/+3 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | send_sni_for_federation_requests # Conflicts: # synapse/crypto/context_factory.py | ||||
| * | | | send SNI for federation requests | Jeroen | 2018-06-24 | 1 | -0/+2 |
| | | | | |||||
* | | | | Merge pull request #3655 from matrix-org/neilj/disable_hs | Neil Johnson | 2018-08-09 | 1 | -0/+2 |
|\ \ \ \ | | | | | | | | | | | Flag to disable HS without disabling federation | ||||
| * \ \ \ | Merge branch 'develop' into neilj/disable_hs | Neil Johnson | 2018-08-08 | 1 | -0/+4 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'develop' into neilj/disable_hs | Neil Johnson | 2018-08-08 | 1 | -0/+2 |
| |\ \ \ \ \ | |||||
| * | | | | | | disable HS from config | Neil Johnson | 2018-08-04 | 1 | -0/+2 |
| | | | | | | | |||||
* | | | | | | | Test fixes for Python 3 (#3647) | Amber Brown | 2018-08-09 | 1 | -4/+5 |
| |_|/ / / / |/| | | | | | |||||
* | | | | | | Merge pull request #3654 from matrix-org/rav/room_versions | Richard van der Hoff | 2018-08-08 | 1 | -0/+4 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Support for room versioning | ||||
| * | | | | | Basic support for room versioning | Richard van der Hoff | 2018-08-03 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the first tranche of support for room versioning. It includes: * setting the default room version in the config file * new room_version param on the createRoom API * storing the version of newly-created rooms in the m.room.create event * fishing the version of existing rooms out of the m.room.create event | ||||
* | | | | | | mock config.max_mau_value | Neil Johnson | 2018-08-08 | 1 | -0/+1 |
| | | | | | | |||||
* | | | | | | add default mau_limits_reserved_threepids | Neil Johnson | 2018-08-06 | 1 | -0/+1 |
| |/ / / / |/| | | | | |||||
* | | | | | fix (lots of) py3 test failures | Neil Johnson | 2018-08-03 | 1 | -0/+1 |
|/ / / / | |||||
* | | / | Python 3: Convert some unicode/bytes uses (#3569) | Amber Brown | 2018-08-02 | 1 | -3/+6 |
| |_|/ |/| | | |||||
* | | | Admin API for creating new users (#3415) | Amber Brown | 2018-07-20 | 1 | -0/+3 |
| |/ |/| | |||||
* | | Fix unit tests | Richard van der Hoff | 2018-07-13 | 1 | -0/+1 |
| | | |||||
* | | run isort | Amber Brown | 2018-07-09 | 1 | -1/+2 |
|/ | |||||
* | Pass around the reactor explicitly (#3385) | Amber Brown | 2018-06-22 | 1 | -1/+6 |
| | |||||
* | Reject attempts to send event before privacy consent is given | Richard van der Hoff | 2018-05-22 | 1 | -0/+1 |
| | | | | | | Returns an M_CONSENT_NOT_GIVEN error (cf https://github.com/matrix-org/matrix-doc/issues/1252) if consent is not yet given. | ||||
* | Move consent config parsing into ConsentConfig | Richard van der Hoff | 2018-05-22 | 1 | -1/+1 |
| | | | | turns out we need to reuse this, so it's better in the config class. | ||||
* | Send users a server notice about consent | Richard van der Hoff | 2018-05-22 | 1 | -0/+1 |
| | | | | | When a user first syncs, we will send them a server notice asking them to consent to the privacy policy if they have not already done so. | ||||
* | Merge pull request #3108 from NotAFile/py3-six-urlparse | Richard van der Hoff | 2018-04-30 | 1 | -3/+2 |
|\ | | | | | Use six.moves.urlparse | ||||
| * | Use six.moves.urlparse | Adrian Tschira | 2018-04-15 | 1 | -3/+2 |
| | | | | | | | | | | | | The imports were shuffled around a bunch in py3 Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
* | | Add some more variables to the unittest config | Adrian Tschira | 2018-04-15 | 1 | -0/+4 |
|/ | | | | | | | These worked accidentally before (python2 doesn't complain if you compare incompatible types) but under py3 this blows up spectacularly Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
* | Add b prefixes to some strings that are bytes in py3 | Adrian Tschira | 2018-04-04 | 1 | -1/+1 |
| | | | | | | This has no effect on python2 Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
* | Add tests for user directory search | Richard van der Hoff | 2018-01-27 | 1 | -0/+1 |
| | |||||
* | Make it possible to run tests against postgres | Richard van der Hoff | 2018-01-27 | 1 | -9/+34 |
| | |||||
* | Create dbpool as normal in tests | Richard van der Hoff | 2018-01-27 | 1 | -43/+17 |
| | | | | | | | | ... instead of creating our own special SQLiteMemoryDbPool, whose purpose was a bit of a mystery. For some reason this makes one of the tests run slightly slower, so bump the sleep(). Sorry. | ||||
* | Run on_new_connection for unit tests | Richard van der Hoff | 2018-01-27 | 1 | -7/+17 |
| | | | | | Configure the connectionpool used for unit tests to run the `on_new_connection` function. | ||||
* | Remove unused/bitrotted MemoryDataStore | Richard van der Hoff | 2018-01-26 | 1 | -151/+13 |
| | | | | This isn't used, and looks thoroughly bitrotted. | ||||
* | Add federation_domain_whitelist option (#2820) | Matthew Hodgson | 2018-01-22 | 1 | -0/+1 |
| | | | | | | Add federation_domain_whitelist gives a way to restrict which domains your HS is allowed to federate with. useful mainly for gracefully preventing a private but internet-connected HS from trying to federate to the wider public Matrix network | ||||
* | Disable user_directory updates for UTs | Richard van der Hoff | 2018-01-09 | 1 | -0/+4 |
| | | | | | Fix flakiness in the UTs caused by the user_directory being updated in the background | ||||
* | fix tests | Richard van der Hoff | 2017-10-31 | 1 | -0/+1 |
| | |||||
* | replace 'except:' with 'except Exception:' | Richard van der Hoff | 2017-10-23 | 1 | -4/+4 |
| | | | | what could possibly go wrong | ||||
* | Add a config option to block all room invites (#2457) | Richard van der Hoff | 2017-09-19 | 1 | -0/+1 |
| | | | | | - allows sysadmins the ability to lock down their servers so that people can't send their users room invites. | ||||
* | Only load jinja2 templates once | Erik Johnston | 2017-05-22 | 1 | -0/+1 |
| | | | | | Instead of every time a new email pusher is created, as loading jinja2 templates is slow. | ||||
* | Fix unit tests | Erik Johnston | 2016-12-09 | 1 | -0/+4 |
| | |||||
* | Fix tests | Erik Johnston | 2016-11-23 | 1 | -0/+1 |
| | |||||
* | Fix tests and flake8 | Erik Johnston | 2016-11-22 | 1 | -0/+1 |
| | |||||
* | Fix tests | Erik Johnston | 2016-11-21 | 1 | -0/+2 |
| | |||||
* | Merge pull request #1098 from matrix-org/markjh/bearer_token | Mark Haines | 2016-10-25 | 1 | -4/+14 |
|\ | | | | | Allow clients to supply access_tokens as headers | ||||
| * | Fix unit tests | Mark Haines | 2016-09-12 | 1 | -4/+14 |
| | | |||||
* | | Merge pull request #1164 from pik/error-codes | Erik Johnston | 2016-10-19 | 1 | -1/+1 |
|\ \ | | | | | | | Clarify Error codes for GET /filter/ | ||||
| * | | Fix MockHttpRequest always returning M_UNKNOWN errcode in testing | pik | 2016-10-14 | 1 | -1/+1 |
| | | | |||||
* | | | Implement pluggable password auth | Erik Johnston | 2016-10-03 | 1 | -0/+1 |
|/ / | | | | | | | | | | | Allows delegating the password auth to an external module. This also moves the LDAP auth to using this system, allowing it to be removed from the synapse tree entirely in the future. | ||||
* / | Time out typing over federation | Erik Johnston | 2016-09-23 | 1 | -1/+8 |
|/ | |||||
* | Add `create_requester` function | Richard van der Hoff | 2016-07-26 | 1 | -5/+0 |
| | | | | | Wrap the `Requester` constructor with a function which provides sensible defaults, and use it throughout | ||||
* | Rework ldap integration with ldap3 | Martin Weinelt | 2016-06-22 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | Use the pure-python ldap3 library, which eliminates the need for a system dependency. Offer both a `search` and `simple_bind` mode, for more sophisticated ldap scenarios. - `search` tries to find a matching DN within the `user_base` while employing the `user_filter`, then tries the bind when a single matching DN was found. - `simple_bind` tries the bind against a specific DN by combining the localpart and `user_base` Offer support for STARTTLS on a plain connection. The configuration was changed to reflect these new possibilities. Signed-off-by: Martin Weinelt <hexa@darmstadt.ccc.de> | ||||
* | Enable use_frozen_events in tests | Erik Johnston | 2016-06-17 | 1 | -0/+1 |
| | |||||
* | Split out the auth handler | David Baker | 2016-06-02 | 1 | -10/+5 |
| | |||||
* | Inject fake room list handler in tests | David Baker | 2016-06-01 | 1 | -0/+2 |
| | | | | Otherwise it tries to start the remote public room list updating looping call which breaks. | ||||
* | Replaces calls to fetch_room_distributions_into with get_joined_hosts_for_room | Mark Haines | 2016-05-16 | 1 | -1/+1 |
| | |||||
* | Create user with expiry | Negi Fazeli | 2016-05-13 | 1 | -0/+1 |
| | | | | | | - Add unittests for client, api and handler Signed-off-by: Negar Fazeli <negar.fazeli@ericsson.com> | ||||
* | Don't require config to create database | Erik Johnston | 2016-04-06 | 1 | -3/+3 |
| | |||||
* | tests/utils: added room_invite_state_types to test config | Patrik Oldsberg | 2016-03-04 | 1 | -0/+1 |
| | | | | Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com> | ||||
* | Pass whole requester to ratelimiting | Daniel Wagner-Hall | 2016-03-03 | 1 | -0/+5 |
| | | | | This will enable more detailed decisions | ||||
* | Merge pull request #571 from matrix-org/daniel/asids | Daniel Wagner-Hall | 2016-03-03 | 1 | -6/+14 |
|\ | | | | | Mark AS users with their AS's ID | ||||
| * | Mark AS users with their AS's ID | Daniel Wagner-Hall | 2016-02-11 | 1 | -6/+14 |
| | | |||||
* | | Add a /replication API for extracting the updates that happened on | Mark Haines | 2016-03-01 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | synapse This is necessary for replicating the data in synapse to be visible to a separate service because presence and typing notifications aren't stored in a database so won't be visible to another process. This API can be used to either get the raw data by requesting the tables themselves or to just receive notifications for updates by following the streams meta-stream. Returns updates for each table requested a JSON array of arrays with a row for each row in the table. Each table is prefixed by a header row with the: name of the table, current stream_id position for the table, number of rows, number of columns and the names of the columns. This is followed by the rows that have been added to the server since the requester last asked. The API has a timeout and is hooked up to the notifier so that a slave can long poll for updates. | ||||
* | | Fix flake8 warnings for tests | Mark Haines | 2016-02-19 | 1 | -17/+13 |
| | | |||||
* | | Initial cut | Erik Johnston | 2016-02-17 | 1 | -2/+2 |
|/ | |||||
* | Rename config field to reflect yaml name | Daniel Wagner-Hall | 2016-02-03 | 1 | -1/+1 |
| | |||||
* | Fix the mock homserver used in the tests | Mark Haines | 2016-01-29 | 1 | -0/+1 |
| | |||||
* | Fix tests | Erik Johnston | 2016-01-27 | 1 | -0/+8 |
| | |||||
* | Remove redundated BaseHomeServer | Erik Johnston | 2016-01-26 | 1 | -0/+18 |
| | |||||
* | copyrights | Matthew Hodgson | 2016-01-07 | 1 | -1/+1 |
| | |||||
* | Host /unstable and /r0 versions of r0 APIs | Daniel Wagner-Hall | 2015-12-01 | 1 | -2/+3 |
| | |||||
* | Test for background updates | Mark Haines | 2015-11-10 | 1 | -0/+3 |
| | |||||
* | Remove more unused parameters | Daniel Wagner-Hall | 2015-11-02 | 1 | -1/+1 |
| | |||||
* | rename schema_prepare to prepare_database | Erik Johnston | 2015-10-13 | 1 | -1/+1 |
| | |||||
* | Expose error more nicely | Erik Johnston | 2015-10-13 | 1 | -1/+1 |
| | |||||
* | Swap out bcrypt for md5 in tests | Daniel Wagner-Hall | 2015-08-26 | 1 | -0/+13 |
| | | | | This reduces our ~8 second sequential test time down to ~7 seconds | ||||
* | Stop looking up "admin", which we never read | Daniel Wagner-Hall | 2015-08-25 | 1 | -1/+0 |
| | |||||
* | Remove completely unused concepts from codebase | Daniel Wagner-Hall | 2015-08-25 | 1 | -2/+1 |
| | | | | | | | | | | 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. | ||||
* | s/by_token/by_access_token/g | Daniel Wagner-Hall | 2015-08-20 | 1 | -1/+1 |
| | | | | We're about to have two kinds of token, access and refresh | ||||
* | Issue macaroons as opaque auth tokens | Daniel Wagner-Hall | 2015-08-18 | 1 | -0/+2 |
| | | | | | | | | | | | | | 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 | ||||
* | Fix tests | Erik Johnston | 2015-06-12 | 1 | -0/+2 |
| | |||||
* | Discard unused NotifierUserStreams | Mark Haines | 2015-05-13 | 1 | -0/+3 |
| | |||||
* | Don't bother checking for updates if the stream token hasn't advanced for a user | Mark Haines | 2015-05-13 | 1 | -1/+1 |
| | |||||
* | Make work in both Maria and SQLite. Fix tests | Erik Johnston | 2015-04-01 | 1 | -1/+10 |
| | |||||
* | Update tests | Erik Johnston | 2015-02-19 | 1 | -0/+1 |
| | |||||
* | Use git aware version string in User-Agent and Server headers | Erik Johnston | 2015-02-18 | 1 | -2/+8 |
| | |||||
* | Add a cache for get_event | Mark Haines | 2015-02-11 | 1 | -0/+1 |
| | |||||
* | Factor out some of the common homeserver setup code into a | Mark Haines | 2015-02-11 | 1 | -0/+23 |
| | | | | setup_test_homeserver function in utils. | ||||
* | Have MockClock detect attempts to cancel expired timers, to prevent a repeat ↵ | Paul "LeoNerd" Evans | 2015-01-13 | 1 | -4/+16 |
| | | | | of SYN-230 | ||||
* | Kill off synapse.api.events.* | Erik Johnston | 2014-12-16 | 1 | -6/+2 |
| | |||||
* | Fix tests and remove debug logging | Erik Johnston | 2014-12-12 | 1 | -2/+7 |
| | |||||
* | Implement .cancel_call_later() in MockClock | Paul "LeoNerd" Evans | 2014-12-10 | 1 | -2/+5 |
| | |||||
* | Implement .call_later() in MockClock | Paul "LeoNerd" Evans | 2014-12-10 | 1 | -0/+26 |
| | |||||
* | Sign outgoing PDUs. | Mark Haines | 2014-10-16 | 1 | -1/+2 |
| | |||||
* | Raise a SynapseError if the authorisation header is missing or malformed | Mark Haines | 2014-10-13 | 1 | -0/+4 |
| | |||||
* | Verify signatures for server2server requests | Mark Haines | 2014-10-13 | 1 | -0/+3 |
| | |||||
* | Merge branch 'develop' into server2server_signing | Mark Haines | 2014-09-30 | 1 | -2/+9 |
|\ | | | | | | | | | | | Conflicts: synapse/storage/__init__.py tests/rest/test_presence.py | ||||
| * | Unbreak tests after changing storage API | Erik Johnston | 2014-09-29 | 1 | -2/+6 |
| | | |||||
| * | Track the IP users connect with. Add an admin column to users table. | Erik Johnston | 2014-09-26 | 1 | -0/+3 |
| | | |||||
| * | Fix test. | Erik Johnston | 2014-09-24 | 1 | -1/+1 |
| | | |||||
* | | Sign federation transactions | Mark Haines | 2014-09-24 | 1 | -0/+15 |
|/ | |||||
* | Move SQLiteMemoryDbPool implementation into tests.utils | Paul "LeoNerd" Evans | 2014-09-10 | 1 | -0/+14 |
| | |||||
* | fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org ↵ | Matthew Hodgson | 2014-09-03 | 1 | -1/+1 |
| | | | | hasn't been incorporated in time for launch. | ||||
* | Fix room permissions test | Erik Johnston | 2014-09-02 | 1 | -0/+3 |
| | |||||
* | Fix the tests to include new db calls | Erik Johnston | 2014-09-01 | 1 | -0/+14 |
| | |||||
* | Have MemoryDataStore's get_rooms_for_user_where_membership_is() return room ↵ | Paul "LeoNerd" Evans | 2014-09-01 | 1 | -2/+3 |
| | | | | membership event objects, as per interface contract | ||||
* | Fix a couple of bugs in presence handler related to pushing updatesto the ↵ | Erik Johnston | 2014-08-29 | 1 | -6/+31 |
| | | | | correct user. Fix presence tests. | ||||
* | Ability to assert a DeferredMockCallable has received no calls | Paul "LeoNerd" Evans | 2014-08-28 | 1 | -0/+15 |
| | |||||
* | Remove get_state_for_room function from federation handler | Mark Haines | 2014-08-28 | 1 | -0/+10 |
| | |||||
* | Fill out prev_events before calling persist_event | Mark Haines | 2014-08-27 | 1 | -1/+3 |
| | |||||
* | Merge branch 'develop' into storage_transactions | Mark Haines | 2014-08-26 | 1 | -3/+5 |
|\ | | | | | | | | | | | | | Conflicts: synapse/api/auth.py synapse/handlers/room.py synapse/storage/__init__.py | ||||
| * | Fix ALL THE UNIT TESTS | Kegan Dougal | 2014-08-26 | 1 | -3/+5 |
| | | |||||
* | | Take a snapshot of the state of the room before performing updates | Mark Haines | 2014-08-22 | 1 | -0/+7 |
|/ | |||||
* | Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor | Erik Johnston | 2014-08-19 | 1 | -1/+42 |
|\ | | | | | | | | | | | | | Conflicts: tests/rest/test_presence.py tests/rest/test_rooms.py tests/utils.py | ||||
| * | Add a DeferredMockCallable; like mock's MockCallable but allows awaiting | Paul "LeoNerd" Evans | 2014-08-19 | 1 | -0/+41 |
| | | | | | | | | on method calls to be made later | ||||
| * | Rename MockHttpServer to MockHttpResource as it stands for one server ↵ | Paul "LeoNerd" Evans | 2014-08-19 | 1 | -1/+2 |
| | | | | | | | | resource rather than an entire server | ||||
* | | Change the MemoryDataStore to implement new storage api | Erik Johnston | 2014-08-18 | 1 | -99/+50 |
| | | |||||
* | | Fix some of the tests to reflect changes in the storage layer. | Erik Johnston | 2014-08-15 | 1 | -22/+2 |
|/ | |||||
* | Allow advancing the MockClock's time | Paul "LeoNerd" Evans | 2014-08-13 | 1 | -0/+4 |
| | |||||
* | Move MockClock into tests.utils so we can reüse it | Paul "LeoNerd" Evans | 2014-08-13 | 1 | -0/+10 |
| | |||||
* | add in copyrights to everything, not just the synapse subdir, and add a ↵ | Matthew Hodgson | 2014-08-13 | 1 | -0/+15 |
| | | | | copyrighter.pl whilst we're at it | ||||
* | Reference Matrix Home Server | matrix.org | 2014-08-12 | 1 | -0/+252 |