summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Use bytea rather than BLOBMark Haines2015-04-291-1/+1
|
* Merge branch 'develop' into key_distributionMark Haines2015-04-2995-1011/+3332
|\ | | | | | | | | Conflicts: synapse/config/homeserver.py
| * Delete ugly commented out log line.Mark Haines2015-04-291-1/+0
| |
| * comment out ugly test loglineMatthew Hodgson2015-04-291-1/+1
| |
| * Ensure we never miss any presence updatesErik Johnston2015-04-281-1/+7
| |
| * Fix typoErik Johnston2015-04-281-1/+1
| |
| * Ensure the serial returned by presence is always an integerErik Johnston2015-04-281-3/+3
| |
| * Remove unused importsErik Johnston2015-04-281-2/+1
| |
| * Merge branch 'develop' of github.com:matrix-org/synapse into postgresErik Johnston2015-04-2830-287/+1310
| |\
| | * Merge pull request #126 from matrix-org/csauthMark Haines2015-04-2826-264/+1267
| | |\ | | | | | | | | Client / Server Auth Refactor
| | | * Add commentage.David Baker2015-04-271-0/+4
| | | |
| | | * pep8David Baker2015-04-271-1/+2
| | | |
| | | * logging argsDavid Baker2015-04-271-2/+2
| | | |
| | | * Change to https for ID server communicationDavid Baker2015-04-241-3/+2
| | | |
| | | * More underscoresDavid Baker2015-04-242-4/+4
| | | |
| | | * Use underscores instead of camelcase for id server stuffDavid Baker2015-04-243-14/+14
| | | |
| | | * pep8David Baker2015-04-241-2/+2
| | | |
| | | * Merge branch 'develop' into csauthDavid Baker2015-04-2413-367/+337
| | | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/http/server.py
| | | * | Dedicated error code for failed 3pid auth verificationDavid Baker2015-04-232-1/+4
| | | | |
| | | * | Remove ultimately unused feature of saving params from the first call in the ↵David Baker2015-04-231-2/+10
| | | | | | | | | | | | | | | | | | | | session: it's probably too open to abuse.
| | | * | Add an error code to 'missing token' response.David Baker2015-04-232-1/+3
| | | | |
| | | * | Remove now-redundant email configDavid Baker2015-04-232-44/+1
| | | | |
| | | * | pep8David Baker2015-04-171-1/+1
| | | | |
| | | * | Password reset, finally.David Baker2015-04-173-7/+38
| | | | |
| | | * | Add endpoint to get threepids from serverDavid Baker2015-04-172-0/+23
| | | | |
| | | * | pep8David Baker2015-04-174-9/+6
| | | | |
| | | * | make add3pid servlet workDavid Baker2015-04-174-12/+82
| | | | |
| | | * | just the once would probably be fineDavid Baker2015-04-171-1/+0
| | | | |
| | | * | Merge branch 'develop' into csauthDavid Baker2015-04-1732-473/+970
| | | |\ \
| | | * | | Register the 3pid servletDavid Baker2015-04-171-1/+3
| | | | | |
| | | * | | password -> account servlet and add start of an 'add 3pid' endpointDavid Baker2015-04-172-2/+17
| | | | | |
| | | * | | Need to yield the username check, otherwise very very weird things happen.David Baker2015-04-171-1/+1
| | | | | |
| | | * | | Oops, left debugging in.David Baker2015-04-161-6/+0
| | | | | |
| | | * | | Return user ID in use error straight awayDavid Baker2015-04-164-66/+88
| | | | | |
| | | * | | Dummy login so we can do the first POST request to get login flows without ↵David Baker2015-04-154-7/+24
| | | | | | | | | | | | | | | | | | | | | | | | it just succeeding
| | | * | | Regstration with email in v2David Baker2015-04-156-29/+123
| | | | | |
| | | * | | Add app service auth back in to v2 registerDavid Baker2015-04-022-5/+8
| | | | | |
| | | * | | Throw sensible errors on not-json when allowing empty bodyDavid Baker2015-04-021-1/+4
| | | | | |
| | | * | | pep8David Baker2015-04-021-0/+1
| | | | | |
| | | * | | Add shared secret auth into register v2 and switch the script over.David Baker2015-04-022-12/+61
| | | | | |
| | | * | | Explain how I justified to myself making JsonResource not always send JSON.David Baker2015-04-011-0/+7
| | | | | |
| | | * | | Completely replace fallback auth for C/S V2:David Baker2015-04-015-25/+275
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
| | | * | | Make docs a bit more trueDavid Baker2015-03-311-1/+1
| | | | | |
| | | * | | Grammar and deduplicationDavid Baker2015-03-311-5/+4
| | | | | |
| | | * | | pep8David Baker2015-03-313-4/+5
| | | | | |
| | | * | | New registration for C/S API v2. Only ReCAPTCHA working currently.David Baker2015-03-308-16/+192
| | | | | |
| | | * | | pep8David Baker2015-03-261-2/+4
| | | | | |
| | | * | | Delete pushers when changing passwordDavid Baker2015-03-263-37/+31
| | | | | |
| | | * | | pep8 blank linesDavid Baker2015-03-251-1/+0
| | | | | |
| | | * | | Allow multiple pushers for a single app ID & pushkey, honouring the 'append' ↵David Baker2015-03-255-28/+96
| | | | | | | | | | | | | | | | | | | | | | | | flag in the API.
| | | * | | unused importDavid Baker2015-03-241-1/+1
| | | | | |
| | | * | | 1) Pushers are now associated with an access tokenDavid Baker2015-03-248-26/+48
| | | | | | | | | | | | | | | | | | | | | | | | 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.
| | | * | | Make deleting other access tokens when you change your password actually workDavid Baker2015-03-242-6/+15
| | | | | |
| | | * | | pep8 / pyflakesDavid Baker2015-03-232-7/+3
| | | | | |
| | | * | | Implement password changing (finally) along with a start on making ↵David Baker2015-03-237-49/+236
| | | | | | | | | | | | | | | | | | | | | | | | client/server auth more general.
| | * | | | Merge pull request #133 from matrix-org/invite_power_levelMark Haines2015-04-282-1/+10
| | |\ \ \ \ | | | | | | | | | | | | | | Invite power level
| | | * \ \ \ Merge branch 'develop' into invite_power_levelPaul "LeoNerd" Evans2015-04-2713-67/+206
| | | |\ \ \ \
| | | * | | | | Also remember to check 'invite' level for changesPaul "LeoNerd" Evans2015-04-211-0/+1
| | | | | | | |
| | | * | | | | Create an 'invite' powerlevel when making new roomsPaul "LeoNerd" Evans2015-04-211-1/+2
| | | | | | | |
| | | * | | | | Initial implementation of an 'invite' power_levelPaul "LeoNerd" Evans2015-04-211-0/+7
| | | | | | | |
| | * | | | | | Merge pull request #130 from matrix-org/server_rename_checkMark Haines2015-04-282-1/+28
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix for SYN-266
| | | * | | | | | pep8David Baker2015-04-271-1/+1
| | | | | | | | |
| | | * | | | | | pep8David Baker2015-04-271-1/+0
| | | | | | | | |
| | | * | | | | | Run database check before daemonizing, at the cost of database hygiene.David Baker2015-04-273-27/+18
| | | | | | | | |
| | | * | | | | | rename db method to be more informativeDavid Baker2015-04-272-5/+5
| | | | | | | | |
| | | * | | | | | pep8David Baker2015-04-241-2/+2
| | | | | | | | |
| | | * | | | | | Check users in our table aren't on a different domain to the one we're ↵David Baker2015-04-242-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configured with to try & fix SYN-266
| | * | | | | | | Output vim style mode markers into the yaml config fileMark Haines2015-04-281-3/+4
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Use TEXT instead of VARCHAR(n), since PostgreSQL treats them the same except ↵Erik Johnston2015-04-2832-289/+289
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for a limit
| * | | | | | | Remove unused importErik Johnston2015-04-271-1/+0
| | | | | | | |
| * | | | | | | Move database configuration into config moduleErik Johnston2015-04-272-33/+25
| | | | | | | |
| * | | | | | | Ensure check_same_thread is enabled for sqlite3Erik Johnston2015-04-271-0/+1
| | | | | | | |
| * | | | | | | Make get_max_token into inlineCallbacks so that the lock works.Erik Johnston2015-04-271-3/+4
| | | | | | | |
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into postgresErik Johnston2015-04-2720-385/+482
| |\| | | | | |
| * | | | | | | Shuffle operations so that locking upsert happens last in the txn. This ↵Erik Johnston2015-04-275-56/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ensures the lock is held for the least amount of time possible.
| * | | | | | | Handle the fact that postgres databases can be restarted from under usErik Johnston2015-04-273-1/+33
| | | | | | | |
| * | | | | | | Revert needless change to rest.profileErik Johnston2015-04-171-6/+1
| | | | | | | |
| * | | | | | | Revert needless change to storage.profileErik Johnston2015-04-171-6/+1
| | | | | | | |
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into postgresErik Johnston2015-04-171-1/+1
| |\ \ \ \ \ \ \
| * | | | | | | | Update --database-path metavar to SQLITE_DATABASE_PATHErik Johnston2015-04-171-1/+1
| | | | | | | | |
| * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into postgresErik Johnston2015-04-172-15/+24
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Add unique index to room_aliases, remove duplicates on upgrade. Convert some ↵Erik Johnston2015-04-177-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | columns back to TEXT from bytea
| * | | | | | | | PEP8Erik Johnston2015-04-163-6/+0
| | | | | | | | |
| * | | | | | | | Go back to storing JSON in TEXTErik Johnston2015-04-1611-41/+20
| | | | | | | | |
| * | | | | | | | Move encoding and decoding of JSON into storage layerErik Johnston2015-04-162-27/+7
| | | | | | | | |
| * | | | | | | | Remove mysql/maria supportErik Johnston2015-04-154-61/+2
| | | | | | | | |
| * | | | | | | | Change full_schemas/11 to work with postgresErik Johnston2015-04-1513-84/+90
| | | | | | | | |
| * | | | | | | | Remove debug loggingErik Johnston2015-04-151-2/+0
| | | | | | | | |
| * | | | | | | | Add missing yieldErik Johnston2015-04-151-1/+1
| | | | | | | | |
| * | | | | | | | pushers table requires a unique id.Erik Johnston2015-04-152-3/+11
| | | | | | | | |
| * | | | | | | | Make LruCache thread safe, as its used for event cacheErik Johnston2015-04-151-0/+20
| | | | | | | | |
| * | | | | | | | Don't pass in removed flagErik Johnston2015-04-151-1/+0
| | | | | | | | |
| * | | | | | | | Change from exception to warnErik Johnston2015-04-151-1/+1
| | | | | | | | |
| * | | | | | | | Don't wait on federation_handler.handle_new_eventErik Johnston2015-04-151-3/+7
| | | | | | | | |
| * | | | | | | | Remove run_on_reactor()sErik Johnston2015-04-151-4/+0
| | | | | | | | |
| * | | | | | | | Postgres does not allow you to continue using a cursor after a DB exception ↵Erik Johnston2015-04-151-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | has been raised, so move _simple_insert or_ignore flag out of transaction
| * | | | | | | | Do more parellelization for initialSyncErik Johnston2015-04-151-7/+11
| | | | | | | | |
| * | | | | | | | Parellelize initial syncErik Johnston2015-04-151-2/+8
| | | | | | | | |
| * | | | | | | | Turn off persistance of sent_transactions.response_jsonErik Johnston2015-04-151-1/+1
| | | | | | | | |
| * | | | | | | | Add index on events (topological_ordering, stream_ordering) to help with ↵Erik Johnston2015-04-152-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ORDER BY clauses
| * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into postgresErik Johnston2015-04-156-5/+33
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Use try..finally in contextlib.contextmanagerErik Johnston2015-04-151-3/+5
| | | | | | | | | |
| * | | | | | | | | Use True for True rather than 1Erik Johnston2015-04-151-5/+7
| | | | | | | | | |
| * | | | | | | | | Add missing yield in storage funcErik Johnston2015-04-151-1/+1
| | | | | | | | | |
| * | | | | | | | | Correctly identify deadlocksErik Johnston2015-04-151-1/+1
| | | | | | | | | |
| * | | | | | | | | Add postgres database engineErik Johnston2015-04-141-0/+44
| | | | | | | | | |
| * | | | | | | | | Rename user_ips.user -> user_idErik Johnston2015-04-143-8/+8
| | | | | | | | | |
| * | | | | | | | | Add support for postgres instead of mysql. Change sql accourdingly. blob + ↵Erik Johnston2015-04-1421-140/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | varbinary -> bytea. No support for UNSIGNED or CREATE INDEX IF NOT EXISTS.
| * | | | | | | | | Correctly increment the _next_id initiallyErik Johnston2015-04-141-2/+4
| | | | | | | | | |
| * | | | | | | | | For backwards compat, make state_groups.id have a type of int, not varcharErik Johnston2015-04-132-2/+2
| | | | | | | | | |
| * | | | | | | | | Remove duplicate rowsErik Johnston2015-04-101-0/+9
| | | | | | | | | |
| * | | | | | | | | Use case sensitive collationsErik Johnston2015-04-102-3/+2
| | | | | | | | | |
| * | | | | | | | | DROP indexes before recreating themErik Johnston2015-04-102-1/+9
| | | | | | | | | |
| * | | | | | | | | Use LONGBLOB and TEXT for arbitary length rowsErik Johnston2015-04-1012-34/+34
| | | | | | | | | |
| * | | | | | | | | Handle the fact that in sqlite binary data might be stored as unicode or bytesErik Johnston2015-04-105-5/+20
| | | | | | | | | |
| * | | | | | | | | Bump schema versionErik Johnston2015-04-101-1/+1
| | | | | | | | | |
| * | | | | | | | | Use unsigned bigintErik Johnston2015-04-1019-50/+50
| | | | | | | | | |
| * | | | | | | | | SQLite wants INTEGER and not BIGINT for primary keysErik Johnston2015-04-106-9/+9
| | | | | | | | | |
| * | | | | | | | | Update full_schemas/16 to match delta files. Add delta/16 scriptsErik Johnston2015-04-106-0/+245
| | | | | | | | | |
| * | | | | | | | | Revert non-trivial changes to upgrade scriptsErik Johnston2015-04-103-5/+5
| | | | | | | | | |
| * | | | | | | | | Fix schema againErik Johnston2015-04-102-3/+3
| | | | | | | | | |
| * | | | | | | | | Revert non-trivial schema changes and move them to a new schema version.Erik Johnston2015-04-1019-27/+636
| | | | | | | | | |
| * | | | | | | | | Remove unused importErik Johnston2015-04-091-1/+1
| | | | | | | | | |
| * | | | | | | | | Remove spurious spacesErik Johnston2015-04-0915-50/+50
| | | | | | | | | |
| * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into mysqlErik Johnston2015-04-094-27/+62
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Stream ordering and out of order insertions.Erik Johnston2015-04-095-65/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle the fact that events can be persisted out of order, and so to get the "current max" stream token becomes non trivial - as we need to make sure that *all* stream tokens less than the current max have also successfully been persisted.
| * | | | | | | | | | Use generic db exceptions rather than sqlite3 specific onesErik Johnston2015-04-082-6/+2
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into mysqlErik Johnston2015-04-083-6/+38
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into mysqlErik Johnston2015-04-082-8/+48
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Retry transaction, not SQL queryErik Johnston2015-04-081-21/+25
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix maria engine to correctly recognize deadlocksErik Johnston2015-04-081-2/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into mysqlErik Johnston2015-04-071-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into mysqlErik Johnston2015-04-071-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into mysqlErik Johnston2015-04-0721-455/+863
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Retry on deadlockErik Johnston2015-04-073-3/+21
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | PEP8Erik Johnston2015-04-076-13/+2
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix prepare_sqlite3_database's convert_param_styleErik Johnston2015-04-071-7/+2
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Bump database versionErik Johnston2015-04-071-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Add index to presence tableErik Johnston2015-04-071-0/+2
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Don't use multiple UNIQUE constraints; it will cause deadlocksErik Johnston2015-04-074-15/+17
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Implement or_ignore flag on insertsErik Johnston2015-04-072-4/+10
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Don't use AUTOINCREMENT, use an in memory versionErik Johnston2015-04-075-19/+68
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Explicitly name the __main__ module loggerErik Johnston2015-04-071-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix unicode supportErik Johnston2015-04-0222-168/+193
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix SQLite supportErik Johnston2015-04-011-3/+12
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Make work in both Maria and SQLite. Fix testsErik Johnston2015-04-0126-108/+213
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix unicode database supportErik Johnston2015-03-2515-44/+88
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Escape non printing ascii characterErik Johnston2015-03-241-3/+3
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Don't reinsert into event_edgesErik Johnston2015-03-241-8/+8
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix bugs in transactions storageErik Johnston2015-03-241-2/+3
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Don't use room hosts tableErik Johnston2015-03-241-25/+4
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Don't order by rowidErik Johnston2015-03-241-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Use _simple_upsertErik Johnston2015-03-242-5/+7
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Remove uses of REPLACE and ON CONFLICT IGNORE to make the SQL more portable.Erik Johnston2015-03-234-16/+4
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Sanitize RoomMemberStoreErik Johnston2015-03-232-82/+61
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Use 'update or insert' rather than on 'conflict replace'Erik Johnston2015-03-231-10/+17
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Sanitize TransactionStoreErik Johnston2015-03-232-88/+105
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into mysqlErik Johnston2015-03-2031-141/+369
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Rearrange storage modulesErik Johnston2015-03-207-509/+486
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Generate transaction id in codeErik Johnston2015-03-201-1/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | decode_result takes an iterableErik Johnston2015-03-202-2/+5
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Make database selection configurableErik Johnston2015-03-202-11/+42
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fix up schemas some moreErik Johnston2015-03-203-3/+3
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Convert storage layer to be mysql compatibleErik Johnston2015-03-1913-101/+171
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Remove redundant keyErik Johnston2015-03-191-1/+0
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fix up schemas to work with mariadbErik Johnston2015-03-1915-84/+82
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Update schema to work with mariadbErik Johnston2015-03-1816-256/+224
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Update the query format used by keyring to match current key v2 specMark Haines2015-04-291-1/+12
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Implement minimum_valid_until_ts in the remote key resourceMark Haines2015-04-292-4/+56
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | And don't bump the schema version unnecessarilyMark Haines2015-04-281-1/+1
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Add server_keys.sql to the current delta rather than creating a new deltaMark Haines2015-04-281-0/+0
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'develop' into key_distributionMark Haines2015-04-274-22/+63
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/crypto/keyring.py
| * | | | | | | | | | | | | | | | Fix newlinesErik Johnston2015-04-271-2/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Pull inner function out.Erik Johnston2015-04-271-76/+77
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Implement locks using create_observer for fetching media and server keysErik Johnston2015-04-272-60/+82
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Implement create_observer.Erik Johnston2015-04-271-0/+19
| | |_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `create_observer` takes a deferred and create a new deferred that *observers* the original deferred. Any callbacks added to the observing deferred will *not* affect the origin deferred.
| * | | | | | | | | | | | | | | Make one-to-one rule an underride otherwise bings don't work in one-to-one ↵David Baker2015-04-241-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wrooms. Likewise a couple of other rules.
* | | | | | | | | | | | | | | | Add config for setting the perspective serversMark Haines2015-04-243-5/+27
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'develop' into key_distributionMark Haines2015-04-241-1/+1
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix spellingMark Haines2015-04-241-1/+1
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'develop' into key_distributionMark Haines2015-04-241-0/+1
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Call the super classes when generating configMark Haines2015-04-241-0/+1
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Add a config file for perspective serversMark Haines2015-04-242-0/+30
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Copyright noticeMark Haines2015-04-241-0/+14
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'develop' into key_distributionMark Haines2015-04-249-67/+160
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Copyright noticesMark Haines2015-04-246-0/+84
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | No commas here, otherwise our error string constants become tuples.David Baker2015-04-241-2/+2
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Remove users from the remote_offline_serials list (and clean up empty ↵Paul "LeoNerd" Evans2015-04-231-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | elements) when they go online again
| * | | | | | | | | | | | | | Don't let the remote offline serial list grow arbitrarily largePaul "LeoNerd" Evans2015-04-231-0/+5
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Store a list of the presence serial number at which remote users went ↵Paul "LeoNerd" Evans2015-04-231-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | offline, so that when we delete them from the cachemap, we can still synthesize OFFLINE events for them (SYN-261)
| * | | | | | | | | | | | | | Generate presence event-stream JSON structures directlyPaul "LeoNerd" Evans2015-04-231-8/+9
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Neater fetching of user's auth level in a room - squash to int() at access ↵Paul "LeoNerd" Evans2015-04-221-35/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | time (SYN-353)
| * | | | | | | | | | | | | | Appease pep8Paul "LeoNerd" Evans2015-04-221-1/+0
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Much neater fetching of defined powerlevels from m.room.power_levels state eventPaul "LeoNerd" Evans2015-04-211-31/+21
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Remove debugging print statement accidentally committedPaul "LeoNerd" Evans2015-04-211-1/+0
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Sanitise a user's powerlevel to an int() before numerical comparison, ↵Paul "LeoNerd" Evans2015-04-211-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | because otherwise Python is "helpful" with it (SYN-351)
* | | | | | | | | | | | | | Move the key related config parser into a separate fileMark Haines2015-04-243-85/+113
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Better help for the old-signing-key optionMark Haines2015-04-241-1/+4
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Update to match the specification for key/v2Mark Haines2015-04-233-21/+26
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Implement remote key lookup apiMark Haines2015-04-227-61/+252
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'develop' into key_distributionMark Haines2015-04-219-296/+258
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Bump syutil version to 0.0.5Mark Haines2015-04-211-3/+3
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #128 from matrix-org/unify_http_wrappersMark Haines2015-04-217-289/+251
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unify http wrappers
| | * | | | | | | | | | | | | Set a version_string in BaseMediaResource so that the request_handler ↵Mark Haines2015-04-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wrapper works
| | * | | | | | | | | | | | | Combine the request wrappers in rest/media/v1 and http/server into a single ↵Mark Haines2015-04-217-198/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wrapper decorator
| | * | | | | | | | | | | | | Split out the JsonResource request logging and error handling into a ↵Mark Haines2015-04-211-94/+113
| | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | separate wrapper function
| * / | | | | | | | | | | | SYN-350: Don't ratelimit the individual events generated during room creationMark Haines2015-04-211-4/+4
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'develop' into key_distributionMark Haines2015-04-204-19/+28
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-04-171-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Bump versionErik Johnston2015-04-171-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Filter typing nofication events to only those rooms the requesting user is a ↵Paul "LeoNerd" Evans2015-04-151-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | member of (SYN-328)
| * | | | | | | | | | | | Have TypingNotificationEventSource.get_new_events_for_user() return a ↵Paul "LeoNerd" Evans2015-04-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deferred, for consistency and extensibility
| * | | | | | | | | | | | Neater implementation of membership change auth checks, ensuring we can't ↵Paul "LeoNerd" Evans2015-04-151-18/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | forget to check if the calling user is a member of the room
| * | | | | | | | | | | | Ensure that non-room-members cannot ban others, even if they do have enough ↵Paul "LeoNerd" Evans2015-04-151-0/+5
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | powerlevel (SYN-343)
| * | | | | | | | | | | Update syutil version to 0.0.4Mark Haines2015-04-142-4/+4
| | | | | | | | | | | |
* | | | | | | | | | | | Implement v2 key lookupMark Haines2015-04-202-18/+254
| | | | | | | | | | | |
* | | | | | | | | | | | Add methods for storing and retrieving the raw key jsonMark Haines2015-04-152-3/+59
| | | | | | | | | | | |
* | | | | | | | | | | | Fail quicker for 4xx responses in the key client, optional hit a different ↵Mark Haines2015-04-151-6/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API path
* | | | | | | | | | | | Return a sha256 fingerprint rather than the entire tls certificateMark Haines2015-04-143-3/+33
| | | | | | | | | | | |
* | | | | | | | | | | | Add a version 2 of the key server apiMark Haines2015-04-146-2/+179
|/ / / / / / / / / / /
* | | | | | | | | / / Move server key api into rest/key/v1Mark Haines2015-04-144-1/+29
| |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
* | | | | | | | | | Add commentMark Haines2015-04-091-0/+1
| | | | | | | | | |
* | | | | | | | | | Unset the timer in the timeout callback so that we don't try to cancel it if ↵Mark Haines2015-04-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it has been called
* | | | | | | | | | SYN-339: Cancel the notifier timeout when the notifier firesMark Haines2015-04-091-4/+26
| | | | | | | | | |
* | | | | | | | | | Merge pull request #114 from matrix-org/improve_get_event_cacheMark Haines2015-04-083-23/+34
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | Improve get event cache
| * | | | | | | | | Appease pep8Paul "LeoNerd" Evans2015-03-261-1/+2
| | | | | | | | | |
| * | | | | | | | | Implement the main getEvent cache using Cache() instead of a custom ↵Paul "LeoNerd" Evans2015-03-251-12/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | application of LruCache; also unify its two-level structure into just one
| * | | | | | | | | Use FrozenEvent's reject_reason to decide whether to return it; don't ↵Paul "LeoNerd" Evans2015-03-251-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include allow_rejected in the main getEvents cache key
| * | | | | | | | | Store the rejected reason in (Frozen)Event structsPaul "LeoNerd" Evans2015-03-252-4/+12
| | | | | | | | | |
| * | | | | | | | | Indirect invalidations of _get_event_cache via a helper method to keep all ↵Paul "LeoNerd" Evans2015-03-252-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uses of the cache lexically within one .py file
* | | | | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-04-082-2/+2
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Bump versionErik Johnston2015-04-081-1/+1
| | | | | | | | | |
| * | | | | | | | | SYN-338: Fix typo that caused the cache to throw an exception in some instancesErik Johnston2015-04-081-1/+1
| | | | | | | | | |
* | | | | | | | | | typoErik Johnston2015-04-081-1/+1
| | | | | | | | | |
* | | | | | | | | | Don't yield on notifying all listenersErik Johnston2015-04-081-4/+36
| |_|_|_|_|_|_|/ / |/| | | | | | | |
* | | | | | | | | Merge pull request #117 from matrix-org/notifier-leakMark Haines2015-04-081-7/+46
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix a notifier leak
| * | | | | | | | | Move comment into docstringErik Johnston2015-04-081-5/+2
| | | | | | | | | |
| * | | | | | | | | Factor out loops into '_discard_if_notified'Erik Johnston2015-04-081-15/+14
| | | | | | | | | |
| * | | | | | | | | Also perform paranoia checks in 'on_new_user_event'Erik Johnston2015-04-081-2/+16
| | | | | | | | | |
| * | | | | | | | | Add paranoia checks to make sure that we evict stale NotificationListeners ↵Erik Johnston2015-04-081-5/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when we are about to process them
| * | | | | | | | | Fix bug where we didn't inform the NotificataionListeners about new rooms ↵Erik Johnston2015-04-081-0/+3
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | they have been subscribed to. This meant that the listeners didn't clean themselves up fully from all the dicts
* / | | | | | | | Move database timer logging to seperate loggerErik Johnston2015-04-081-1/+2
|/ / / / / / / /
* | | | | | / / Fix --enable-registration flag to work if you don't give a valueErik Johnston2015-04-071-1/+1
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Fix a bug which causes a send event level of 0 to not be honoured.Kegan Dougal2015-04-071-1/+1
| |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Caused by a bad if check, which incorrectly executes for both 0 and None, when None was the original intent.
* | | | | | Appease pep8Paul "LeoNerd" Evans2015-04-011-0/+1
| | | | | |
* | | | | | Report process open filehandles in metricsPaul "LeoNerd" Evans2015-04-011-0/+34
| | | | | |
* | | | | | Fix more AS sender ID thinkos.Kegan Dougal2015-04-012-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specifically, the ASes own user ID wasn't being treated as 'exclusive' so a human could nab it. Also, the HS would needlessly send user queries to the AS for its own user ID.
* | | | | | Merge branch 'develop' into application-services-registration-scriptKegan Dougal2015-04-011-1/+4
|\ \ \ \ \ \
| * | | | | | Fix thinko whereby events *for the AS specifically* were not passed on.Kegan Dougal2015-03-311-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was caused by not explicitly checking the service.sender field. This has now been fixed and a regression test has been added.
* | | | | | | Add same user_id char checks as registration.Kegan Dougal2015-03-311-1/+7
| | | | | | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-16 07:45:14 +0000