summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2015-04-09 12:20:19 -0300
committerdrebs <drebs@leap.se>2015-04-09 12:20:19 -0300
commit5a9eac4ba0d4ddc419fdaaee4d08dbc7d8115294 (patch)
treeefe96285a8fa692aca7a5729fcd420aaa333551e
parent578d986b8eb502cde027c0cd1e05742a59def496 (diff)
[fix] remove unneded params to CouchServerState
This commit removes some leftover code from a time when Soledad Server used to check for permissions on certain databases when starting (i.e. shared and tokens databases). This was later removed as correct permissions enforcement was relayed to tapicero. Closes: #6833.
-rw-r--r--common/changes/bug_6833_remove-unneeded-params-from-couch-server-state2
-rw-r--r--common/src/leap/soledad/common/couch.py8
-rw-r--r--server/changes/bug_6833_remove-unneeded-params-from-couch-server-state2
-rw-r--r--server/src/leap/soledad/server/__init__.py5
4 files changed, 6 insertions, 11 deletions
diff --git a/common/changes/bug_6833_remove-unneeded-params-from-couch-server-state b/common/changes/bug_6833_remove-unneeded-params-from-couch-server-state
new file mode 100644
index 00000000..2c927717
--- /dev/null
+++ b/common/changes/bug_6833_remove-unneeded-params-from-couch-server-state
@@ -0,0 +1,2 @@
+ o Remove unneeded parameters from CouchServerState initialization. Closes
+ #6833.
diff --git a/common/src/leap/soledad/common/couch.py b/common/src/leap/soledad/common/couch.py
index a98a8f25..8d262ccd 100644
--- a/common/src/leap/soledad/common/couch.py
+++ b/common/src/leap/soledad/common/couch.py
@@ -1528,20 +1528,14 @@ class CouchServerState(ServerState):
Inteface of the WSGI server with the CouchDB backend.
"""
- def __init__(self, couch_url, shared_db_name, tokens_db_name):
+ def __init__(self, couch_url):
"""
Initialize the couch server state.
:param couch_url: The URL for the couch database.
:type couch_url: str
- :param shared_db_name: The name of the shared database.
- :type shared_db_name: str
- :param tokens_db_name: The name of the tokens database.
- :type tokens_db_name: str
"""
self._couch_url = couch_url
- self._shared_db_name = shared_db_name
- self._tokens_db_name = tokens_db_name
def open_database(self, dbname):
"""
diff --git a/server/changes/bug_6833_remove-unneeded-params-from-couch-server-state b/server/changes/bug_6833_remove-unneeded-params-from-couch-server-state
new file mode 100644
index 00000000..2c927717
--- /dev/null
+++ b/server/changes/bug_6833_remove-unneeded-params-from-couch-server-state
@@ -0,0 +1,2 @@
+ o Remove unneeded parameters from CouchServerState initialization. Closes
+ #6833.
diff --git a/server/src/leap/soledad/server/__init__.py b/server/src/leap/soledad/server/__init__.py
index cd006f51..adb5b561 100644
--- a/server/src/leap/soledad/server/__init__.py
+++ b/server/src/leap/soledad/server/__init__.py
@@ -296,10 +296,7 @@ def load_configuration(file_path):
def application(environ, start_response):
conf = load_configuration('/etc/leap/soledad-server.conf')
- state = CouchServerState(
- conf['couch_url'],
- SoledadApp.SHARED_DB_NAME,
- SoledadTokenAuthMiddleware.TOKENS_DB)
+ state = CouchServerState(conf['couch_url'])
# WSGI application that may be used by `twistd -web`
application = GzipMiddleware(
SoledadTokenAuthMiddleware(SoledadApp(state)))