Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'develop' into notifier_unify | Mark Haines | 2015-05-12 | 2 | -23/+27 |
|\ | |||||
| * | SYN-377: Make sure that the StreamIdGenerator.get_next.__exit__ is called ↵ | Mark Haines | 2015-05-12 | 2 | -23/+27 |
| | | | | | | | | from the main thread after the transaction completes, not from database thread before the transaction completes. | ||||
* | | Don't bother passing the events to the notifier since it isn't using them | Mark Haines | 2015-05-11 | 1 | -95/+18 |
| | | |||||
* | | Use wait_for_events to implement 'get_events' | Mark Haines | 2015-05-11 | 1 | -79/+30 |
|/ | |||||
* | Merge pull request #146 from matrix-org/erikj/push_rules_fixes | Erik Johnston | 2015-05-11 | 2 | -57/+54 |
|\ | | | | | Fix 500 on push rule updates. | ||||
| * | Prefer to use _simple_*. | Erik Johnston | 2015-05-11 | 1 | -44/+41 |
| | | |||||
| * | push_rules table expects an 'id' field | Erik Johnston | 2015-05-11 | 2 | -13/+13 |
| | | |||||
* | | Bump version | Erik Johnston | 2015-05-11 | 1 | -1/+1 |
|/ | |||||
* | Bump version | Erik Johnston | 2015-05-10 | 1 | -1/+1 |
| | |||||
* | Fix push rule bug: can't insert bool into small int column | Erik Johnston | 2015-05-10 | 1 | -1/+1 |
| | |||||
* | Bump version | Erik Johnston | 2015-05-08 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-05-08 | 1 | -1/+1 |
|\ | |||||
| * | Bump version | Erik Johnston | 2015-05-08 | 1 | -1/+1 |
| | | |||||
* | | Drop the old table not the new table | Mark Haines | 2015-05-08 | 1 | -1/+1 |
| | | |||||
* | | Rename unique constraint | Mark Haines | 2015-05-08 | 1 | -1/+1 |
| | | |||||
* | | Remove unsigned | Mark Haines | 2015-05-08 | 1 | -2/+2 |
| | | |||||
* | | Bump schema version | Mark Haines | 2015-05-08 | 1 | -1/+1 |
| | | |||||
* | | Make the timestamps in server_keys_json bigints | Mark Haines | 2015-05-08 | 1 | -0/+32 |
| | | |||||
* | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-05-07 | 2 | -4/+4 |
|\| | |||||
| * | Bump syweb version | Erik Johnston | 2015-05-07 | 1 | -3/+3 |
| | | |||||
| * | Bump version | Erik Johnston | 2015-05-06 | 1 | -1/+1 |
| | | |||||
* | | revert accidental bcrypt gensalt round reduction from loadtesting | Mark Haines | 2015-05-07 | 1 | -1/+1 |
| | | |||||
* | | pynacl-0.3.0 was released so we can finally start using it directly from pypi | Mark Haines | 2015-05-07 | 2 | -7/+2 |
| | | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into develop | David Baker | 2015-05-07 | 15 | -136/+261 |
|\ \ | |||||
| * | | Optional profiling using cProfile | Mark Haines | 2015-05-06 | 1 | -1/+21 |
| | | | |||||
| * | | Don't read from the config file before checking it exists | Mark Haines | 2015-05-06 | 1 | -9/+10 |
| |/ | |||||
| * | Merge branch 'erikj/executemany' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-05-05 | 8 | -48/+129 |
| |\ | | | | | | | | | | erikj/SYN-371 | ||||
| | * | And use buffer(...) there as well | Erik Johnston | 2015-05-05 | 2 | -2/+3 |
| | | | |||||
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/executemany | Erik Johnston | 2015-05-05 | 8 | -46/+118 |
| | |\ | |||||
| | | * | Use buffer(...) when inserting into bytea column | Erik Johnston | 2015-05-05 | 2 | -4/+3 |
| | | | | |||||
| | | * | Merge pull request #139 from matrix-org/bugs/SYN-369 | Mark Haines | 2015-05-05 | 4 | -16/+80 |
| | | |\ | | | | | | | | | | | Fix race with cache invalidation. SYN-369 | ||||
| | | | * | Add some doc-string | Mark Haines | 2015-05-05 | 1 | -0/+4 |
| | | | | | |||||
| | | | * | Collect the invalidate callbacks on the transaction object rather than ↵ | Mark Haines | 2015-05-05 | 7 | -51/+51 |
| | | | | | | | | | | | | | | | | | | | | passing around a separate list | ||||
| | | | * | SYN-369: Add comments to the sequence number logic in the cache | Mark Haines | 2015-05-05 | 1 | -0/+7 |
| | | | | | |||||
| | | | * | Add debug flag in synapse/storage/_base.py for debugging the cache logic by ↵ | Mark Haines | 2015-05-05 | 1 | -1/+12 |
| | | | | | | | | | | | | | | | | | | | | comparing what is in the cache with what was in the database on every access | ||||
| | | | * | Invalidate the room_member cache if the current state events updates | Mark Haines | 2015-05-05 | 1 | -0/+5 |
| | | | | | |||||
| | | | * | Missing return for when the event was already persisted | Mark Haines | 2015-05-05 | 1 | -1/+1 |
| | | | | | |||||
| | | | * | Invalidate the caches from the correct thread | Mark Haines | 2015-05-05 | 6 | -29/+46 |
| | | | | | |||||
| | | | * | Sequence the modifications to the cache so that selects don't race with inserts | Mark Haines | 2015-05-05 | 1 | -3/+23 |
| | | | | | |||||
| | | * | | Fix the --help option for synapse | Mark Haines | 2015-05-05 | 1 | -18/+29 |
| | | | | | |||||
| | | * | | Missed events are not outliers | Erik Johnston | 2015-05-05 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Add a comment about the zip(*[zip(sorted(...),...)]) | Erik Johnston | 2015-05-05 | 1 | -0/+8 |
| | | | | | |||||
| * | | | | Don't insert without deduplication. In this case we never actually use this ↵ | Erik Johnston | 2015-05-05 | 1 | -22/+0 |
| |/ / / | | | | | | | | | | | | | table, so simply remove the insert entirely | ||||
| * | | | Fix indentation | Erik Johnston | 2015-05-05 | 1 | -10/+10 |
| | | | | |||||
| * | | | Add support for using executemany | Erik Johnston | 2015-05-05 | 4 | -59/+97 |
| |/ / | |||||
| * / | Don't call 'encode_parameter' no-op | Erik Johnston | 2015-05-05 | 3 | -10/+0 |
| |/ | |||||
| * | Correctly name transaction | Erik Johnston | 2015-05-05 | 1 | -1/+1 |
| | | |||||
| * | Remove some unused indexes | Erik Johnston | 2015-05-01 | 1 | -0/+18 |
| | | |||||
| * | Don't log enqueue_ | Erik Johnston | 2015-05-01 | 1 | -1/+0 |
| | | |||||
* | | Typo | David Baker | 2015-05-07 | 1 | -1/+1 |
|/ | |||||
* | user_id now in user_threepids | David Baker | 2015-05-01 | 2 | -6/+6 |
| | |||||
* | That wasn't a deferred | Erik Johnston | 2015-05-01 | 2 | -4/+2 |
| | |||||
* | Remove inlineCallbacks from non-generator | Erik Johnston | 2015-05-01 | 1 | -2/+0 |
| | |||||
* | Typo | Erik Johnston | 2015-05-01 | 1 | -1/+1 |
| | |||||
* | Remove some run_on_reactors | Erik Johnston | 2015-05-01 | 3 | -10/+0 |
| | |||||
* | Don't log all auth events every time we call auth.check | Erik Johnston | 2015-05-01 | 1 | -1/+4 |
| | |||||
* | Use the daemonize key from the config if it exists | Mark Haines | 2015-05-01 | 1 | -1/+4 |
| | |||||
* | Don't use self.execute: it's designed for fetching stuff | David Baker | 2015-05-01 | 1 | -3/+8 |
| | |||||
* | Merge pull request #136 from matrix-org/markjh/config_cleanup | Mark Haines | 2015-05-01 | 17 | -482/+559 |
|\ | | | | | Config restructuring. | ||||
| * | Allow generate-config to run against an existing config file to generate ↵ | Mark Haines | 2015-05-01 | 3 | -14/+26 |
| | | | | | | | | default keys | ||||
| * | Allow "manhole" to be ommited from the config | Mark Haines | 2015-04-30 | 1 | -1/+1 |
| | | |||||
| * | Remove the ~, comment the lines instead | Mark Haines | 2015-04-30 | 2 | -2/+2 |
| | | |||||
| * | Update key.py | Mark Haines | 2015-04-30 | 1 | -1/+2 |
| | | |||||
| * | Update metrics.py | Mark Haines | 2015-04-30 | 1 | -2/+2 |
| | | |||||
| * | missing import | Mark Haines | 2015-04-30 | 1 | -0/+2 |
| | | |||||
| * | read the pid_file from the config file in synctl | Mark Haines | 2015-04-30 | 1 | -2/+3 |
| | | |||||
| * | Merge branch 'develop' into markjh/config_cleanup | Mark Haines | 2015-04-30 | 16 | -88/+176 |
| |\ | | | | | | | | | | | | | Conflicts: synapse/config/captcha.py | ||||
| * | | Write a default log_config when generating config | Mark Haines | 2015-04-30 | 4 | -4/+57 |
| | | | |||||
| * | | Don't break when sizes or durations are given as integers | Mark Haines | 2015-04-30 | 1 | -9/+12 |
| | | | |||||
| * | | Add a random string to the auto generated key id | Mark Haines | 2015-04-30 | 1 | -1/+3 |
| | | | |||||
| * | | Allow --enable-registration to be passed on the commandline | Mark Haines | 2015-04-30 | 1 | -3/+16 |
| | | | |||||
| * | | Use disable_registration keys if they are present | Mark Haines | 2015-04-30 | 1 | -0/+5 |
| | | | |||||
| * | | Allow multiple config files, set up a default config before applying the ↵ | Mark Haines | 2015-04-30 | 2 | -22/+38 |
| | | | | | | | | | | | | config files | ||||
| * | | remove duplicate parse_size method | Mark Haines | 2015-04-30 | 2 | -10/+0 |
| | | | |||||
| * | | Manually generate the default config yaml, remove most of the commandline ↵ | Mark Haines | 2015-04-30 | 16 | -464/+444 |
| | | | | | | | | | | | | arguments for synapse anticipating that people will use the yaml instead. Simpify implementing config options by not requiring the classes to hit the super class | ||||
* | | | No id field on user | David Baker | 2015-05-01 | 1 | -5/+1 |
| | | | |||||
* | | | More missed get_user_by_id API changes | David Baker | 2015-05-01 | 2 | -4/+4 |
| | | | |||||
* | | | One too many lens | Erik Johnston | 2015-05-01 | 1 | -1/+1 |
| | | | |||||
* | | | Change public room list to use defer.gatherResults | Erik Johnston | 2015-05-01 | 1 | -5/+13 |
| | | | |||||
* | | | This api now no longer returns an array | David Baker | 2015-05-01 | 1 | -1/+1 |
| | | | |||||
* | | | Don't wait for storage of access_token | Erik Johnston | 2015-05-01 | 1 | -1/+1 |
| | | | |||||
* | | | Cache latest_event_ids_in_room | Erik Johnston | 2015-05-01 | 1 | -1/+4 |
| | | | |||||
* | | | Don't lock user_ips table for upsert. | Erik Johnston | 2015-05-01 | 2 | -4/+10 |
| | | | |||||
* | | | Fix bug where we reconnected to the database on every query. | Erik Johnston | 2015-05-01 | 2 | -1/+2 |
| | | | |||||
* | | | Split a storage function in two so that we don't have to do extra work. | Erik Johnston | 2015-05-01 | 3 | -8/+14 |
| | | | |||||
* | | | Remove pointless join | Erik Johnston | 2015-04-30 | 1 | -5/+4 |
| | | | |||||
* | | | Fix broken SQL | Erik Johnston | 2015-04-30 | 1 | -1/+1 |
| | | | |||||
* | | | Need more yield | Erik Johnston | 2015-04-30 | 1 | -1/+1 |
| | | | |||||
* | | | Add missing param | Erik Johnston | 2015-04-30 | 1 | -1/+1 |
| | | | |||||
* | | | More join conditions | Erik Johnston | 2015-04-30 | 1 | -2/+6 |
| | | | |||||
* | | | Add more conditions on JOINs to make postgres go a little faster. | Erik Johnston | 2015-04-30 | 2 | -4/+6 |
| | | | |||||
* | | | Fix up get_current_state and get_room_name_and_aliases queries to parse ↵ | Erik Johnston | 2015-04-30 | 2 | -32/+30 |
| |/ |/| | | | | | events in transaction | ||||
* | | Add get_rooms_for_user cache | Erik Johnston | 2015-04-30 | 1 | -0/+2 |
| | | |||||
* | | Undo changes to logger config, ie. remove the access_log_file option: ↵ | David Baker | 2015-04-30 | 1 | -16/+0 |
| | | | | | | | | decision is to support this through log_config rather tan adding an option. | ||||
* | | Do access log using python's logging stuff, just under a separate logger name | David Baker | 2015-04-30 | 2 | -14/+39 |
| | | |||||
* | | Don't use sub queries, it makes postgres sad | Erik Johnston | 2015-04-30 | 1 | -11/+5 |
| | | |||||
* | | SYN-367: Use upsert rather than insert_or_replace | Mark Haines | 2015-04-30 | 1 | -2/+6 |
| | | |||||
* | | Don't needlessly join on state_events | Erik Johnston | 2015-04-30 | 2 | -6/+4 |
| | | |||||
* | | Add an access_log | David Baker | 2015-04-30 | 3 | -3/+29 |
| | | | | | | | | SYN-161 #resolve | ||||
* | | Unused import | David Baker | 2015-04-30 | 1 | -1/+1 |
| | | |||||
* | | Doesn't look like this is used anymore | David Baker | 2015-04-30 | 1 | -13/+0 |
| | | |||||
* | | Make simple query rather than long one and then throw away half the results | Erik Johnston | 2015-04-30 | 2 | -2/+11 |
| | | |||||
* | | Correctly decode, for sqlite and postgres, rows from pushers table | Erik Johnston | 2015-04-29 | 1 | -19/+24 |
| | | |||||
* | | pushkey' are also bytes. | Erik Johnston | 2015-04-29 | 1 | -8/+17 |
| | | |||||
* | | Typo | Erik Johnston | 2015-04-29 | 1 | -1/+1 |
| | | |||||
* | | Also remove yield from within lock in the other generator | Erik Johnston | 2015-04-29 | 1 | -8/+6 |
| | | |||||
* | | Fix deadlock in id_generators. No idea why this was an actual deadlock. | Erik Johnston | 2015-04-29 | 1 | -14/+16 |
| | | |||||
* | | Also log when we've started pushers | Erik Johnston | 2015-04-29 | 1 | -0/+2 |
| | | |||||
* | | Revert previous | Erik Johnston | 2015-04-29 | 1 | -5/+1 |
| | | |||||
* | | Only start pushers when synapse has fully started | Erik Johnston | 2015-04-29 | 2 | -4/+5 |
| | | |||||
* | | Start pushers on reactor thread | Erik Johnston | 2015-04-29 | 1 | -0/+3 |
| | | |||||
* | | Actually return rows | Erik Johnston | 2015-04-29 | 1 | -0/+2 |
| | | |||||
* | | Typo, args wrong way round | Erik Johnston | 2015-04-29 | 1 | -4/+1 |
| | | |||||
* | | Decode buffers in same thread | Erik Johnston | 2015-04-29 | 1 | -13/+19 |
| | | |||||
* | | We store pusher data as bytes | Erik Johnston | 2015-04-29 | 1 | -2/+2 |
| | | |||||
* | | Fix off by one in presence token handling | Erik Johnston | 2015-04-29 | 1 | -1/+1 |
| | | |||||
* | | Decode the data json in the storage layer (was moved but this part was missed) | David Baker | 2015-04-29 | 2 | -1/+14 |
| | | |||||
* | | Oops, update the contraint too | David Baker | 2015-04-29 | 1 | -1/+1 |
| | | |||||
* | | Be more postgressive | David Baker | 2015-04-29 | 2 | -4/+4 |
| | | |||||
* | | Be postgressive | David Baker | 2015-04-29 | 1 | -4/+3 |
| | | |||||
* | | Oops, forgot the schema delta file | David Baker | 2015-04-29 | 1 | -0/+10 |
| | | |||||
* | | txn.execute doesn't return cursors | Erik Johnston | 2015-04-29 | 1 | -4/+4 |
| | | |||||
* | | txn.execute doesn't return cursors | Erik Johnston | 2015-04-29 | 1 | -2/+2 |
| | | |||||
* | | Fix invalid SQL to work in postgres land | Erik Johnston | 2015-04-29 | 1 | -4/+6 |
| | | |||||
* | | Accept camelcase + underscores in binding too | David Baker | 2015-04-29 | 1 | -2/+17 |
|/ | |||||
* | Fix includes | David Baker | 2015-04-29 | 1 | -1/+2 |
| | |||||
* | Accept both camelcase and underscore threepid creds for transition | David Baker | 2015-04-29 | 1 | -4/+19 |
| | |||||
* | pushers table requires an access_token | Erik Johnston | 2015-04-29 | 1 | -0/+1 |
| | |||||
* | Fix whitespace | Mark Haines | 2015-04-29 | 1 | -1/+1 |
| | |||||
* | Check requirements before doing anything else when running the homeserver | Mark Haines | 2015-04-29 | 1 | -1/+4 |
| | |||||
* | bump syutil to 0.0.6 | Mark Haines | 2015-04-29 | 1 | -3/+3 |
| | |||||
* | We can't use REPLACE when upgrading databases now we have postgres | Erik Johnston | 2015-04-29 | 1 | -1/+2 |
| | |||||
* | Merge pull request #129 from matrix-org/key_distribution | Erik Johnston | 2015-04-29 | 15 | -76/+966 |
|\ | | | | | Key distribution v2 | ||||
| * | bump database schema version | Mark Haines | 2015-04-29 | 2 | -1/+1 |
| | | |||||
| * | Use a defer.gatherResults to collect results from the perspective servers | Mark Haines | 2015-04-29 | 1 | -11/+21 |
| | | |||||
| * | Use bytea rather than BLOB | Mark Haines | 2015-04-29 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'develop' into key_distribution | Mark Haines | 2015-04-29 | 95 | -1011/+3332 |
| |\ | | | | | | | | | | | | | Conflicts: synapse/config/homeserver.py | ||||
| * | | Update the query format used by keyring to match current key v2 spec | Mark Haines | 2015-04-29 | 1 | -1/+12 |
| | | | |||||
| * | | Implement minimum_valid_until_ts in the remote key resource | Mark Haines | 2015-04-29 | 2 | -4/+56 |
| | | | |||||
| * | | And don't bump the schema version unnecessarily | Mark Haines | 2015-04-28 | 1 | -1/+1 |
| | | | |||||
| * | | Add server_keys.sql to the current delta rather than creating a new delta | Mark Haines | 2015-04-28 | 1 | -0/+0 |
| | | | |||||
| * | | Merge branch 'develop' into key_distribution | Mark Haines | 2015-04-27 | 4 | -22/+63 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: synapse/crypto/keyring.py | ||||
| * | | | Add config for setting the perspective servers | Mark Haines | 2015-04-24 | 3 | -5/+27 |
| | | | | |||||
| * | | | Merge branch 'develop' into key_distribution | Mark Haines | 2015-04-24 | 1 | -1/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'develop' into key_distribution | Mark Haines | 2015-04-24 | 1 | -0/+1 |
| |\ \ \ \ | |||||
| * | | | | | Add a config file for perspective servers | Mark Haines | 2015-04-24 | 2 | -0/+30 |
| | | | | | | |||||
| * | | | | | Copyright notice | Mark Haines | 2015-04-24 | 1 | -0/+14 |
| | | | | | | |||||
| * | | | | | Merge branch 'develop' into key_distribution | Mark Haines | 2015-04-24 | 9 | -67/+160 |
| |\ \ \ \ \ | |||||
| * | | | | | | Move the key related config parser into a separate file | Mark Haines | 2015-04-24 | 3 | -85/+113 |
| | | | | | | | |||||
| * | | | | | | Better help for the old-signing-key option | Mark Haines | 2015-04-24 | 1 | -1/+4 |
| | | | | | | | |||||
| * | | | | | | Update to match the specification for key/v2 | Mark Haines | 2015-04-23 | 3 | -21/+26 |
| | | | | | | | |||||
| * | | | | | | Implement remote key lookup api | Mark Haines | 2015-04-22 | 7 | -61/+252 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'develop' into key_distribution | Mark Haines | 2015-04-21 | 9 | -296/+258 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'develop' into key_distribution | Mark Haines | 2015-04-20 | 4 | -19/+28 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Implement v2 key lookup | Mark Haines | 2015-04-20 | 2 | -18/+254 |
| | | | | | | | | | |||||
| * | | | | | | | | Add methods for storing and retrieving the raw key json | Mark Haines | 2015-04-15 | 2 | -3/+59 |
| | | | | | | | | | |||||
| * | | | | | | | | Fail quicker for 4xx responses in the key client, optional hit a different ↵ | Mark Haines | 2015-04-15 | 1 | -6/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API path | ||||
| * | | | | | | | | Return a sha256 fingerprint rather than the entire tls certificate | Mark Haines | 2015-04-14 | 3 | -3/+33 |
| | | | | | | | | | |||||
| * | | | | | | | | Add a version 2 of the key server api | Mark Haines | 2015-04-14 | 6 | -2/+179 |
| | | | | | | | | | |||||
* | | | | | | | | | Make postgres database error slightly more helpful | Erik Johnston | 2015-04-29 | 2 | -13/+17 |
| | | | | | | | | | |||||
* | | | | | | | | | Use __all__ instead of assert to stop pyflakes from warning about unused ↵ | Erik Johnston | 2015-04-29 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | import in __init__ | ||||
* | | | | | | | | | Merge branch 'develop' into erikj/postgres_charset_check | Mark Haines | 2015-04-29 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | Delete ugly commented out log line. | Mark Haines | 2015-04-29 | 1 | -1/+0 |
| | | | | | | | | | |||||
* | | | | | | | | | Appease PEP8 | Erik Johnston | 2015-04-29 | 1 | -0/+2 |
| | | | | | | | | | |||||
* | | | | | | | | | Check that postgres database has correct charset set | Erik Johnston | 2015-04-29 | 5 | -1/+43 |
|/ / / / / / / / | |||||
* | | | | | | | | comment out ugly test logline | Matthew Hodgson | 2015-04-29 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | Ensure we never miss any presence updates | Erik Johnston | 2015-04-28 | 1 | -1/+7 |
| | | | | | | | | |||||
* | | | | | | | | Fix typo | Erik Johnston | 2015-04-28 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | Ensure the serial returned by presence is always an integer | Erik Johnston | 2015-04-28 | 1 | -3/+3 |
| | | | | | | | | |||||
* | | | | | | | | Remove unused imports | Erik Johnston | 2015-04-28 | 1 | -2/+1 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into postgres | Erik Johnston | 2015-04-28 | 30 | -287/+1310 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge pull request #126 from matrix-org/csauth | Mark Haines | 2015-04-28 | 26 | -264/+1267 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Client / Server Auth Refactor | ||||
| | * | | | | | | | | Add commentage. | David Baker | 2015-04-27 | 1 | -0/+4 |
| | | | | | | | | | | |||||
| | * | | | | | | | | pep8 | David Baker | 2015-04-27 | 1 | -1/+2 |
| | | | | | | | | | | |||||
| | * | | | | | | | | logging args | David Baker | 2015-04-27 | 1 | -2/+2 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Change to https for ID server communication | David Baker | 2015-04-24 | 1 | -3/+2 |
| | | | | | | | | | | |||||
| | * | | | | | | | | More underscores | David Baker | 2015-04-24 | 2 | -4/+4 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Use underscores instead of camelcase for id server stuff | David Baker | 2015-04-24 | 3 | -14/+14 |
| | | | | | | | | | | |||||
| | * | | | | | | | | pep8 | David Baker | 2015-04-24 | 1 | -2/+2 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge branch 'develop' into csauth | David Baker | 2015-04-24 | 13 | -367/+337 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/http/server.py | ||||
| | * | | | | | | | | | Dedicated error code for failed 3pid auth verification | David Baker | 2015-04-23 | 2 | -1/+4 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Remove ultimately unused feature of saving params from the first call in the ↵ | David Baker | 2015-04-23 | 1 | -2/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | session: it's probably too open to abuse. | ||||
| | * | | | | | | | | | Add an error code to 'missing token' response. | David Baker | 2015-04-23 | 2 | -1/+3 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Remove now-redundant email config | David Baker | 2015-04-23 | 2 | -44/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | pep8 | David Baker | 2015-04-17 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Password reset, finally. | David Baker | 2015-04-17 | 3 | -7/+38 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Add endpoint to get threepids from server | David Baker | 2015-04-17 | 2 | -0/+23 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | pep8 | David Baker | 2015-04-17 | 4 | -9/+6 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | make add3pid servlet work | David Baker | 2015-04-17 | 4 | -12/+82 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | just the once would probably be fine | David Baker | 2015-04-17 | 1 | -1/+0 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'develop' into csauth | David Baker | 2015-04-17 | 32 | -473/+970 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Register the 3pid servlet | David Baker | 2015-04-17 | 1 | -1/+3 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | password -> account servlet and add start of an 'add 3pid' endpoint | David Baker | 2015-04-17 | 2 | -2/+17 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Need to yield the username check, otherwise very very weird things happen. | David Baker | 2015-04-17 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Oops, left debugging in. | David Baker | 2015-04-16 | 1 | -6/+0 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Return user ID in use error straight away | David Baker | 2015-04-16 | 4 | -66/+88 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Dummy login so we can do the first POST request to get login flows without ↵ | David Baker | 2015-04-15 | 4 | -7/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it just succeeding | ||||
| | * | | | | | | | | | | Regstration with email in v2 | David Baker | 2015-04-15 | 6 | -29/+123 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Add app service auth back in to v2 register | David Baker | 2015-04-02 | 2 | -5/+8 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Throw sensible errors on not-json when allowing empty body | David Baker | 2015-04-02 | 1 | -1/+4 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | pep8 | David Baker | 2015-04-02 | 1 | -0/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Add shared secret auth into register v2 and switch the script over. | David Baker | 2015-04-02 | 2 | -12/+61 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Explain how I justified to myself making JsonResource not always send JSON. | David Baker | 2015-04-01 | 1 | -0/+7 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Completely replace fallback auth for C/S V2: | David Baker | 2015-04-01 | 5 | -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 true | David Baker | 2015-03-31 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Grammar and deduplication | David Baker | 2015-03-31 | 1 | -5/+4 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | pep8 | David Baker | 2015-03-31 | 3 | -4/+5 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | New registration for C/S API v2. Only ReCAPTCHA working currently. | David Baker | 2015-03-30 | 8 | -16/+192 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | pep8 | David Baker | 2015-03-26 | 1 | -2/+4 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Delete pushers when changing password | David Baker | 2015-03-26 | 3 | -37/+31 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | pep8 blank lines | David Baker | 2015-03-25 | 1 | -1/+0 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Allow multiple pushers for a single app ID & pushkey, honouring the 'append' ↵ | David Baker | 2015-03-25 | 5 | -28/+96 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | flag in the API. | ||||
| | * | | | | | | | | | | unused import | David Baker | 2015-03-24 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | 1) Pushers are now associated with an access token | David Baker | 2015-03-24 | 8 | -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 work | David Baker | 2015-03-24 | 2 | -6/+15 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | pep8 / pyflakes | David Baker | 2015-03-23 | 2 | -7/+3 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Implement password changing (finally) along with a start on making ↵ | David Baker | 2015-03-23 | 7 | -49/+236 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/server auth more general. | ||||
| * | | | | | | | | | | | Merge pull request #133 from matrix-org/invite_power_level | Mark Haines | 2015-04-28 | 2 | -1/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Invite power level | ||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into invite_power_level | Paul "LeoNerd" Evans | 2015-04-27 | 13 | -67/+206 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | | Also remember to check 'invite' level for changes | Paul "LeoNerd" Evans | 2015-04-21 | 1 | -0/+1 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Create an 'invite' powerlevel when making new rooms | Paul "LeoNerd" Evans | 2015-04-21 | 1 | -1/+2 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Initial implementation of an 'invite' power_level | Paul "LeoNerd" Evans | 2015-04-21 | 1 | -0/+7 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #130 from matrix-org/server_rename_check | Mark Haines | 2015-04-28 | 2 | -1/+28 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for SYN-266 | ||||
| | * | | | | | | | | | | | | pep8 | David Baker | 2015-04-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | pep8 | David Baker | 2015-04-27 | 1 | -1/+0 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Run database check before daemonizing, at the cost of database hygiene. | David Baker | 2015-04-27 | 3 | -27/+18 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | rename db method to be more informative | David Baker | 2015-04-27 | 2 | -5/+5 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | pep8 | David Baker | 2015-04-24 | 1 | -2/+2 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Check users in our table aren't on a different domain to the one we're ↵ | David Baker | 2015-04-24 | 2 | -0/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configured with to try & fix SYN-266 | ||||
| * | | | | | | | | | | | | | Output vim style mode markers into the yaml config file | Mark Haines | 2015-04-28 | 1 | -3/+4 |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Use TEXT instead of VARCHAR(n), since PostgreSQL treats them the same except ↵ | Erik Johnston | 2015-04-28 | 32 | -289/+289 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for a limit | ||||
* | | | | | | | | | | | | | Remove unused import | Erik Johnston | 2015-04-27 | 1 | -1/+0 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Move database configuration into config module | Erik Johnston | 2015-04-27 | 2 | -33/+25 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Ensure check_same_thread is enabled for sqlite3 | Erik Johnston | 2015-04-27 | 1 | -0/+1 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Make get_max_token into inlineCallbacks so that the lock works. | Erik Johnston | 2015-04-27 | 1 | -3/+4 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into postgres | Erik Johnston | 2015-04-27 | 20 | -385/+482 |
|\| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fix newlines | Erik Johnston | 2015-04-27 | 1 | -2/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Pull inner function out. | Erik Johnston | 2015-04-27 | 1 | -76/+77 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Implement locks using create_observer for fetching media and server keys | Erik Johnston | 2015-04-27 | 2 | -60/+82 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Implement create_observer. | Erik Johnston | 2015-04-27 | 1 | -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 Baker | 2015-04-24 | 1 | -21/+21 |
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wrooms. Likewise a couple of other rules. | ||||
| * | | | | | | | | | | Fix spelling | Mark Haines | 2015-04-24 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| * | | | | | | | | | Call the super classes when generating config | Mark Haines | 2015-04-24 | 1 | -0/+1 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | Copyright notices | Mark Haines | 2015-04-24 | 6 | -0/+84 |
| | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | No commas here, otherwise our error string constants become tuples. | David Baker | 2015-04-24 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | Remove users from the remote_offline_serials list (and clean up empty ↵ | Paul "LeoNerd" Evans | 2015-04-23 | 1 | -1/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | elements) when they go online again | ||||
| * | | | | | | | Don't let the remote offline serial list grow arbitrarily large | Paul "LeoNerd" Evans | 2015-04-23 | 1 | -0/+5 |
| | | | | | | | | |||||
| * | | | | | | | Store a list of the presence serial number at which remote users went ↵ | Paul "LeoNerd" Evans | 2015-04-23 | 1 | -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 directly | Paul "LeoNerd" Evans | 2015-04-23 | 1 | -8/+9 |
| | | | | | | | | |||||
| * | | | | | | | Neater fetching of user's auth level in a room - squash to int() at access ↵ | Paul "LeoNerd" Evans | 2015-04-22 | 1 | -35/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | time (SYN-353) |