86fac9c95e
Remove unused import
2015-08-26 16:03:17 +01:00
3063383547
Swap out bcrypt for md5 in tests
...
This reduces our ~8 second sequential test time down to ~7 seconds
2015-08-26 15:59:32 +01:00
81450fded8
Turn TODO into thing which actually will fail
2015-08-26 13:56:01 +01:00
4c56928263
Merge pull request #254 from matrix-org/markjh/tox_setuptools
...
Make 'setup.py test' run tox
2015-08-26 13:50:59 +01:00
6f0c344ca7
Merge pull request #255 from matrix-org/mergeeriksmadness
...
Merge erikj/user_dedup to develop
2015-08-26 13:49:38 +01:00
37f0ddca5f
Merge branch 'mergeeriksmadness' into auth
2015-08-26 13:45:06 +01:00
d3c0e48859
Merge erikj/user_dedup to develop
2015-08-26 13:42:45 +01:00
6a4b650d8a
Attempt to validate macaroons
...
A couple of weird caveats:
* If we can't validate your macaroon, we fall back to checking that
your access token is in the DB, and ignoring the failure
* Even if we can validate your macaroon, we still have to hit the DB to
get the access token ID, which we pretend is a device ID all over the
codebase.
This mostly adds the interesting code, and points out the two pieces we
need to delete (and necessary conditions) in order to fix the above
caveats.
2015-08-26 13:22:23 +01:00
06094591c5
Pass an empty list of arguments to tox if no arguments are given
2015-08-26 13:13:01 +01:00
fd246fde89
Install tox locally if it wasn't already installed when running setup.py test
2015-08-26 12:59:02 +01:00
4f6fa981ec
Make 'setup.py test' run tox
2015-08-26 12:45:29 +01:00
3cab86a122
Merge pull request #253 from matrix-org/tox
...
Allow tests to be filter when using tox
2015-08-26 11:48:41 +01:00
e768d7b3a6
Allow tests to be filter when using tox
...
`tox` will run all tests
`tox tests.api.test_auth.AuthTestCase` will run just the tests in AuthTestCase
2015-08-26 11:41:42 +01:00
efdaa5dd55
Merge pull request #252 from matrix-org/erikj/typing_loop
...
Don't loop over all rooms ever in typing.get_new_events_for_user
2015-08-26 11:12:25 +01:00
da51acf0e7
Remove needless existence checks
2015-08-26 11:08:23 +01:00
f4d552589e
Don't loop over all rooms ever in typing.get_new_events_for_user
2015-08-26 10:51:08 +01:00
90fde4b8d7
Bump changelog and version
2015-08-25 17:49:58 +01:00
0de2aad061
Merge pull request #250 from matrix-org/erikj/generated_directory
...
Add config option to specify where generated files should be dumped
2015-08-25 17:40:19 +01:00
3f6f74686a
Update config doc
2015-08-25 17:37:21 +01:00
82145912c3
s/--generated-directory/--keys-directory/
2015-08-25 17:31:22 +01:00
a2355fae7e
Merge pull request #251 from matrix-org/removeadmin
...
Stop looking up "admin", which we never read
2015-08-25 17:23:05 +01:00
ee3fa1a99c
Merge pull request #248 from matrix-org/deviceid
...
Remove completely unused concepts from codebase
2015-08-25 17:19:06 +01:00
59891a294f
Merge pull request #249 from matrix-org/erikj/allow_config_path_dirs
...
Allow specifying directories as config paths
2015-08-25 17:17:57 +01:00
3e1029fe80
Warn if we encounter unexpected files in config directories
2015-08-25 17:08:23 +01:00
af7c1397d1
Add config option to specify where generated files should be dumped
2015-08-25 16:58:01 +01:00
460cad7c11
Merge branch 'deviceid' into removeadmin
2015-08-25 16:37:59 +01:00
825f0875bc
Fix up one more reference
2015-08-25 16:37:37 +01:00
a9d8bd95e7
Stop looking up "admin", which we never read
2015-08-25 16:29:39 +01:00
bfb66773a4
Allow specifying directories as config files
2015-08-25 16:25:54 +01:00
57619d6058
Re-wrap line
2015-08-25 16:25:46 +01:00
a0b181bd17
Remove completely unused concepts from codebase
...
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.
2015-08-25 16:23:06 +01:00
1925a38f95
Merge pull request #247 from matrix-org/markjh/tox
...
Add a tox.ini config for synapse.
2015-08-25 16:03:55 +01:00
747535f20f
Merge pull request #245 from matrix-org/erikj/configurable_client_location
...
Allow specifying a directory to host a web client from
2015-08-25 15:50:25 +01:00
133d90abfb
Merge pull request #246 from matrix-org/erikj/config_helper_function
...
Add utility to parse config and print out a key
2015-08-25 15:49:21 +01:00
3a20cdcd27
Add .tox to .gitignore
2015-08-25 15:45:03 +01:00
d046adf4ec
Set PYTHONDONTWRITEBYTECODE in the tox environment so that we don't spew .pyc files everywhere
2015-08-25 15:44:05 +01:00
1d1c303b9b
Fix typo when using sys.stderr.write
2015-08-25 15:39:16 +01:00
d33f31d741
Print the correct pip install line when failing due to lack of matrix-angular-sdk
2015-08-25 15:33:23 +01:00
c63df2d4e0
Prod jenkins
2015-08-25 15:22:39 +01:00
f63208a1c0
Add utility to parse config and print out a key
...
Usage:
```
$ python -m synapse.config read server_name -c homeserver.yaml
localhost
```
2015-08-25 15:16:31 +01:00
43f2e42bfd
Prod jenkins
2015-08-25 15:12:38 +01:00
4bd05573e9
Prod jenkins
2015-08-25 15:03:32 +01:00
12b1a47ba4
Only include demo/demo.tls.dh. Don't include any other dh file
2015-08-25 14:33:37 +01:00
37403ab06c
Update the log message
2015-08-25 14:19:09 +01:00
2e31dd2ad3
Add tox.ini file for synapse
2015-08-25 14:14:02 +01:00
8b52fe48b5
Revert previous commit. Instead, always download matrix-angular-sdk as a requirement, but don't complain (when we do check_requirements) if we don't have it when we start synapse.
2015-08-25 14:10:31 +01:00
d9088c923f
Remove dependency on matrix-angular-sdk
2015-08-25 13:34:50 +01:00
86cef6a91b
Allow specifying a directory to host a web client from
2015-08-25 12:01:23 +01:00
1c847af28a
Merge pull request #243 from matrix-org/markjh/remove_syutil
...
Replace syutil dependency with smaller, single-purpose libraries
2015-08-25 10:52:16 +01:00
cf8c04948f
Fix typo in module imports and package dependencies
2015-08-25 10:42:59 +01:00
Daniel Wagner-Hall