55fcf62e9c
Merge pull request #133 from matrix-org/invite_power_level
...
Invite power level
2015-04-28 10:50:34 +01:00
b96c133034
Add server_keys.sql to the current delta rather than creating a new delta
2015-04-28 10:50:00 +01:00
252e6f6869
Merge pull request #130 from matrix-org/server_rename_check
...
Fix for SYN-266
2015-04-28 10:39:31 +01:00
0bc71103e1
Output vim style mode markers into the yaml config file
2015-04-28 10:17:10 +01:00
f8b865264a
Merge branch 'develop' into key_distribution
...
Conflicts:
synapse/crypto/keyring.py
2015-04-27 18:29:32 +01:00
38432d8c25
Merge branch 'develop' into invite_power_level
2015-04-27 17:09:25 +01:00
42b7139dec
Remove unused import
2015-04-27 15:59:56 +01:00
1ef66cc3bd
Move database configuration into config module
2015-04-27 15:57:43 +01:00
416a3e6c4f
Ensure check_same_thread is enabled for sqlite3
2015-04-27 15:44:30 +01:00
8558e1ec73
Make get_max_token into inlineCallbacks so that the lock works.
2015-04-27 15:19:44 +01:00
6f8e2d517e
Merge branch 'develop' of github.com:matrix-org/synapse into postgres
2015-04-27 14:41:40 +01:00
2c70849dc3
Fix newlines
2015-04-27 14:38:29 +01:00
0a016b0525
Pull inner function out.
2015-04-27 14:37:24 +01:00
e701aec2d1
Implement locks using create_observer for fetching media and server keys
2015-04-27 14:20:26 +01:00
412ece18e7
Add commentage.
2015-04-27 14:08:45 +01:00
1c82fbd2eb
Implement create_observer.
...
`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.
2015-04-27 13:59:37 +01:00
2732be83d9
Shuffle operations so that locking upsert happens last in the txn. This ensures the lock is held for the least amount of time possible.
2015-04-27 13:22:30 +01:00
e4c4664d73
Handle the fact that postgres databases can be restarted from under us
2015-04-27 12:40:49 +01:00
03c4f0ed67
pep8
2015-04-27 12:36:59 +01:00
f1acb9fd40
logging args
2015-04-27 11:56:34 +01:00
8a5be236e0
pep8
2015-04-27 11:49:18 +01:00
df75914791
pep8
2015-04-27 11:48:33 +01:00
b02e1006b9
Run database check before daemonizing, at the cost of database hygiene.
2015-04-27 11:46:00 +01:00
f8152f2708
rename db method to be more informative
2015-04-27 10:16:26 +01:00
2f475bd5d5
pep8
2015-04-24 18:15:07 +01:00
a7b51f4539
Check users in our table aren't on a different domain to the one we're configured with to try & fix SYN-266
2015-04-24 18:11:21 +01:00
288702170d
Add config for setting the perspective servers
2015-04-24 17:01:34 +01:00
1bac74b9ae
Change to https for ID server communication
2015-04-24 14:48:49 +01:00
ed83638668
Make one-to-one rule an underride otherwise bings don't work in one-to-one wrooms. Likewise a couple of other rules.
2015-04-24 14:27:17 +01:00
7ac8a60c6f
More underscores
2015-04-24 11:44:27 +01:00
c253b14f6e
Merge branch 'develop' into key_distribution
2015-04-24 11:29:46 +01:00
bdcb23ca25
Fix spelling
2015-04-24 11:29:19 +01:00
b2c2dc8940
Merge branch 'develop' into key_distribution
2015-04-24 11:28:10 +01:00
869dc94cbb
Call the super classes when generating config
2015-04-24 11:27:56 +01:00
a218619626
Use underscores instead of camelcase for id server stuff
2015-04-24 11:27:38 +01:00
b1e68add19
Add a config file for perspective servers
2015-04-24 11:26:19 +01:00
31e262e6b4
Copyright notice
2015-04-24 10:36:51 +01:00
eede182df7
Merge branch 'develop' into key_distribution
2015-04-24 10:35:49 +01:00
4e2f8b8722
Copyright notices
2015-04-24 10:35:29 +01:00
c8c710eca7
Move the key related config parser into a separate file
2015-04-24 10:22:22 +01:00
149ed9f151
Better help for the old-signing-key option
2015-04-24 10:07:55 +01:00
f7a79a37be
pep8
2015-04-24 09:42:37 +01:00
6532b6e607
Merge branch 'develop' into csauth
...
Conflicts:
synapse/http/server.py
2015-04-24 09:37:54 +01:00
74270defda
No commas here, otherwise our error string constants become tuples.
2015-04-24 09:28:57 +01:00
e1e5e53127
Remove users from the remote_offline_serials list (and clean up empty elements) when they go online again
2015-04-23 19:01:37 +01:00
b3bda8a75f
Don't let the remote offline serial list grow arbitrarily large
2015-04-23 18:40:47 +01:00
8a785c3006
Store a list of the presence serial number at which remote users went offline, so that when we delete them from the cachemap, we can still synthesize OFFLINE events for them (SYN-261)
2015-04-23 18:40:19 +01:00
191f7f09ce
Generate presence event-stream JSON structures directly
2015-04-23 18:27:25 +01:00
03eb4adc6e
Dedicated error code for failed 3pid auth verification
2015-04-23 18:20:17 +01:00
4bbf7156ef
Update to match the specification for key/v2
2015-04-23 16:39:13 +01:00
0eb61a3d16
Remove ultimately unused feature of saving params from the first call in the session: it's probably too open to abuse.
2015-04-23 14:44:12 +01:00
a2c10d37d7
Add an error code to 'missing token' response.
2015-04-23 13:23:44 +01:00
2e0d9219b9
Remove now-redundant email config
2015-04-23 11:45:29 +01:00
f30d47c876
Implement remote key lookup api
2015-04-22 14:21:08 +01:00
a16eaa0c33
Neater fetching of user's auth level in a room - squash to int() at access time (SYN-353)
2015-04-22 14:20:04 +01:00
f43063158a
Appease pep8
2015-04-22 13:12:11 +01:00
2808c040ef
Also remember to check 'invite' level for changes
2015-04-21 21:13:14 +01:00
48b6ee2b67
Create an 'invite' powerlevel when making new rooms
2015-04-21 21:07:35 +01:00
bc41f0398f
Initial implementation of an 'invite' power_level
2015-04-21 20:56:08 +01:00
d3309933f5
Much neater fetching of defined powerlevels from m.room.power_levels state event
2015-04-21 20:53:23 +01:00
b568c0231c
Remove debugging print statement accidentally committed
2015-04-21 20:21:14 +01:00
3a7d7a3f22
Sanitise a user's powerlevel to an int() before numerical comparison, because otherwise Python is "helpful" with it (SYN-351)
2015-04-21 20:18:29 +01:00
3ba522bb23
Merge branch 'develop' into key_distribution
2015-04-21 17:10:25 +01:00
6080830bef
Bump syutil version to 0.0.5
2015-04-21 17:04:06 +01:00
8b183781cb
Merge pull request #128 from matrix-org/unify_http_wrappers
...
Unify http wrappers
2015-04-21 17:01:04 +01:00
812a99100b
Set a version_string in BaseMediaResource so that the request_handler wrapper works
2015-04-21 16:43:58 +01:00
1967650bc4
Combine the request wrappers in rest/media/v1 and http/server into a single wrapper decorator
2015-04-21 16:35:53 +01:00
1ebff9736b
Split out the JsonResource request logging and error handling into a separate wrapper function
2015-04-21 16:07:20 +01:00
24d21887ed
SYN-350: Don't ratelimit the individual events generated during room creation
2015-04-21 14:14:19 +01:00
db8d4e8dd6
Merge branch 'develop' into key_distribution
2015-04-20 16:24:21 +01:00
2f9157b427
Implement v2 key lookup
2015-04-20 16:23:47 +01:00
91c8f828e1
pep8
2015-04-17 19:56:04 +01:00
8db6832db8
Password reset, finally.
2015-04-17 19:53:47 +01:00
117f35ac4a
Add endpoint to get threepids from server
2015-04-17 17:20:18 +01:00
4eea5cf6c2
pep8
2015-04-17 16:46:45 +01:00
f96ab9d18d
make add3pid servlet work
2015-04-17 16:44:49 +01:00
865398b4a9
Revert needless change to rest.profile
2015-04-17 16:14:51 +01:00
e3417bbbe0
Revert needless change to storage.profile
2015-04-17 16:13:14 +01:00
2492efb162
Merge branch 'develop' of github.com:matrix-org/synapse into postgres
2015-04-17 16:08:42 +01:00
4a5990ff8f
Merge branch 'master' of github.com:matrix-org/synapse into develop
2015-04-17 16:08:28 +01:00
5e7a90316d
Update --database-path metavar to SQLITE_DATABASE_PATH
2015-04-17 16:08:18 +01:00
0b1a8500a2
just the once would probably be fine
2015-04-17 13:53:54 +01:00
cb03fafdf1
Merge branch 'develop' into csauth
2015-04-17 13:51:10 +01:00
bf5e54f255
Register the 3pid servlet
2015-04-17 13:44:55 +01:00
94e1e58b4d
password -> account servlet and add start of an 'add 3pid' endpoint
2015-04-17 13:44:12 +01:00
ced39d019f
Bump version
2015-04-17 13:25:16 +01:00
83b554437e
Need to yield the username check, otherwise very very weird things happen.
2015-04-17 12:57:25 +01:00
6ba2e3df4e
Merge branch 'develop' of github.com:matrix-org/synapse into postgres
2015-04-17 11:22:31 +01:00
0ec346d942
Add unique index to room_aliases, remove duplicates on upgrade. Convert some columns back to TEXT from bytea
2015-04-17 11:10:20 +01:00
4cd5fb13a3
Oops, left debugging in.
2015-04-16 20:03:13 +01:00
ea1776f556
Return user ID in use error straight away
2015-04-16 19:56:44 +01:00
e1c0970c11
PEP8
2015-04-16 11:18:45 +01:00
b8092fbc82
Go back to storing JSON in TEXT
2015-04-16 11:17:52 +01:00
bc9e69e160
Move encoding and decoding of JSON into storage layer
2015-04-16 11:01:09 +01:00
f2cf37518b
Filter typing nofication events to only those rooms the requesting user is a member of (SYN-328)
2015-04-15 23:34:16 +01:00
0268d40281
Have TypingNotificationEventSource.get_new_events_for_user() return a deferred, for consistency and extensibility
2015-04-15 23:09:35 +01:00
399b5add58
Neater implementation of membership change auth checks, ensuring we can't forget to check if the calling user is a member of the room
2015-04-15 18:40:23 +01:00
e6e130b9ba
Ensure that non-room-members cannot ban others, even if they do have enough powerlevel (SYN-343)
2015-04-15 18:07:33 +01:00
766bd8e880
Dummy login so we can do the first POST request to get login flows without it just succeeding
2015-04-15 17:14:25 +01:00
ffad75bd62
Remove mysql/maria support
2015-04-15 17:00:50 +01:00
a429515bdd
Add methods for storing and retrieving the raw key json
2015-04-15 16:58:35 +01:00
8d761134c2
Fail quicker for 4xx responses in the key client, optional hit a different API path
2015-04-15 16:57:58 +01:00
cf04cedf21
Change full_schemas/11 to work with postgres
2015-04-15 16:53:47 +01:00
5b31afcbd1
Remove debug logging
2015-04-15 16:27:04 +01:00
6e91f14d09
Add missing yield
2015-04-15 16:25:07 +01:00
ed26e4012b
pushers table requires a unique id.
2015-04-15 16:24:14 +01:00
806f380a8b
Make LruCache thread safe, as its used for event cache
2015-04-15 16:07:59 +01:00
a19b739909
Regstration with email in v2
2015-04-15 15:50:38 +01:00
a5c72780e6
Don't pass in removed flag
2015-04-15 15:13:22 +01:00
e19f794fee
Change from exception to warn
2015-04-15 15:12:57 +01:00
d5ff9effcf
Don't wait on federation_handler.handle_new_event
2015-04-15 15:05:57 +01:00
e845434028
Remove run_on_reactor()s
2015-04-15 15:05:45 +01:00
4af32a2817
Postgres does not allow you to continue using a cursor after a DB exception has been raised, so move _simple_insert or_ignore flag out of transaction
2015-04-15 14:51:21 +01:00
bc6cef823f
Do more parellelization for initialSync
2015-04-15 14:21:59 +01:00
1ec6fa98c9
Parellelize initial sync
2015-04-15 14:17:16 +01:00
25d2914fba
Turn off persistance of sent_transactions.response_json
2015-04-15 14:09:35 +01:00
cce5d057d3
Add index on events (topological_ordering, stream_ordering) to help with ORDER BY clauses
2015-04-15 11:43:25 +01:00
6606f7c659
Merge branch 'develop' of github.com:matrix-org/synapse into postgres
2015-04-15 10:27:20 +01:00
a971fa9d58
Use try..finally in contextlib.contextmanager
2015-04-15 10:25:43 +01:00
ded4128965
Use True for True rather than 1
2015-04-15 10:24:24 +01:00
f9e12f79ca
Add missing yield in storage func
2015-04-15 10:24:07 +01:00
c756dfeb14
Correctly identify deadlocks
2015-04-15 10:23:42 +01:00
32e14d8181
Return a sha256 fingerprint rather than the entire tls certificate
2015-04-14 19:10:09 +01:00
88cb06e996
Update syutil version to 0.0.4
2015-04-14 16:18:17 +01:00
d488463fa3
Add a version 2 of the key server api
2015-04-14 16:04:52 +01:00
127fad17dd
Add postgres database engine
2015-04-14 14:50:29 +01:00
5a95cd4442
Rename user_ips.user -> user_id
2015-04-14 13:54:09 +01:00
58d8339966
Add support for postgres instead of mysql. Change sql accourdingly. blob + varbinary -> bytea. No support for UNSIGNED or CREATE INDEX IF NOT EXISTS.
2015-04-14 13:53:20 +01:00
3cbc286d06
Move server key api into rest/key/v1
2015-04-14 13:28:11 +01:00
3c741682e5
Correctly increment the _next_id initially
2015-04-14 09:54:44 +01:00
86fc9b617c
For backwards compat, make state_groups.id have a type of int, not varchar
2015-04-13 17:03:49 +01:00
93937b2b31
Remove duplicate rows
2015-04-10 18:47:03 +01:00
c5365dee56
Use case sensitive collations
2015-04-10 18:46:33 +01:00
4103b1c470
DROP indexes before recreating them
2015-04-10 18:46:09 +01:00
4d5b098626
Use LONGBLOB and TEXT for arbitary length rows
2015-04-10 18:45:09 +01:00
7ed2ec3061
Handle the fact that in sqlite binary data might be stored as unicode or bytes
2015-04-10 13:41:54 +01:00
ce797ad373
Bump schema version
2015-04-10 11:22:30 +01:00
7e863c51e6
Use unsigned bigint
2015-04-10 11:22:04 +01:00
0f12772e32
SQLite wants INTEGER and not BIGINT for primary keys
2015-04-10 11:16:09 +01:00
d5d4281647
Update full_schemas/16 to match delta files. Add delta/16 scripts
2015-04-10 10:59:46 +01:00
cda4a6f93f
Revert non-trivial changes to upgrade scripts
2015-04-10 10:19:50 +01:00
e2722f58ee
Fix schema again
2015-04-10 10:16:29 +01:00
a1665c5094
Revert non-trivial schema changes and move them to a new schema version.
2015-04-10 10:05:44 +01:00
2ded344620
Remove unused import
2015-04-09 13:46:06 +01:00
9707acfc40
Remove spurious spaces
2015-04-09 13:45:20 +01:00
8bf285e082
Merge branch 'develop' of github.com:matrix-org/synapse into mysql
2015-04-09 13:13:26 +01:00
1280a47fc6
Add comment
2015-04-09 11:42:21 +01:00
23d285ad57
Unset the timer in the timeout callback so that we don't try to cancel it if it has been called
2015-04-09 11:41:50 +01:00
8ad0f4912e
Stream ordering and out of order insertions.
...
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.
2015-04-09 11:41:36 +01:00
6f9dea7483
SYN-339: Cancel the notifier timeout when the notifier fires
2015-04-09 11:07:20 +01:00
Mark Haines