diff options
Diffstat (limited to 'soledad_server')
| -rw-r--r-- | soledad_server/changes/2621-refactor-audh-to-make-it-adaptable | 2 | ||||
| -rw-r--r-- | soledad_server/changes/fix_privkey | 2 | ||||
| -rw-r--r-- | soledad_server/setup.py | 4 | ||||
| -rw-r--r-- | soledad_server/src/leap/soledad_server/__init__.py | 2 | ||||
| -rw-r--r-- | soledad_server/src/leap/soledad_server/auth.py | 4 |
5 files changed, 5 insertions, 9 deletions
diff --git a/soledad_server/changes/2621-refactor-audh-to-make-it-adaptable b/soledad_server/changes/2621-refactor-audh-to-make-it-adaptable deleted file mode 100644 index 775f7e8d..00000000 --- a/soledad_server/changes/2621-refactor-audh-to-make-it-adaptable +++ /dev/null @@ -1,2 +0,0 @@ - o Refactor server side auth classes to make it possible for other kinds of - authentication to be easily implemented. Closes #2621. diff --git a/soledad_server/changes/fix_privkey b/soledad_server/changes/fix_privkey deleted file mode 100644 index 87bf4d54..00000000 --- a/soledad_server/changes/fix_privkey +++ /dev/null @@ -1,2 +0,0 @@ -Fix double specified /etc/leap/soledad-server.pem in initscript by pointing -the PRIVKEY_PATH to /etc/leap/soledad-server.key. Fixes #3174. diff --git a/soledad_server/setup.py b/soledad_server/setup.py index f9cdd07f..f022c9cf 100644 --- a/soledad_server/setup.py +++ b/soledad_server/setup.py @@ -34,7 +34,7 @@ install_requirements = [ 'six==1.1.0', 'routes', 'PyOpenSSL', - 'leap.soledad>=0.2.1', + 'leap.soledad>=0.2.3', ] @@ -60,7 +60,7 @@ trove_classifiers = ( setup( name='leap.soledad_server', - version='0.2.2', + version='0.2.3', url='https://leap.se/', license='GPLv3+', description='Synchronization of locally encrypted data among devices.', diff --git a/soledad_server/src/leap/soledad_server/__init__.py b/soledad_server/src/leap/soledad_server/__init__.py index afbb057e..18a0546e 100644 --- a/soledad_server/src/leap/soledad_server/__init__.py +++ b/soledad_server/src/leap/soledad_server/__init__.py @@ -61,7 +61,7 @@ class SoledadApp(http_app.HTTPApp): The name of the shared database that holds user's encrypted secrets. """ - USER_DB_PREFIX = 'uuid-' + USER_DB_PREFIX = 'user-' """ The string prefix of users' databases. """ diff --git a/soledad_server/src/leap/soledad_server/auth.py b/soledad_server/src/leap/soledad_server/auth.py index e0169523..3bcfcf04 100644 --- a/soledad_server/src/leap/soledad_server/auth.py +++ b/soledad_server/src/leap/soledad_server/auth.py @@ -343,8 +343,8 @@ class SoledadAuthMiddleware(object): @rtype: bool """ return URLToAuthorization( - uuid, self.app.SHARED_DB_NAME, - self.app.USER_DB_PREFIX + uuid, self._app.SHARED_DB_NAME, + self._app.USER_DB_PREFIX ).is_authorized(environ) @abstractmethod |