From 1d7e51aad9e3cd649d0921b533669fa24cbd7ab2 Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Tue, 7 Oct 2014 13:47:39 -0300
Subject: Bump version of dep on soledad.common.

---
 server/pkg/requirements.pip | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'server')

diff --git a/server/pkg/requirements.pip b/server/pkg/requirements.pip
index be5d156b..28717664 100644
--- a/server/pkg/requirements.pip
+++ b/server/pkg/requirements.pip
@@ -9,7 +9,7 @@ PyOpenSSL<0.14
 twisted>=12.0.0
 
 # leap deps -- bump me!
-leap.soledad.common>=0.3.0
+leap.soledad.common>=0.6.0
 
 #
 # Things yet to fix:
-- 
cgit v1.2.3


From 17682563bd30e780cf7d620624a856376d257e83 Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Wed, 26 Nov 2014 20:20:52 -0200
Subject: Enforce TLSv1 in soledad server (#6437).

---
 server/changes/bug_6437_avoid-sslv3 | 1 +
 server/pkg/soledad                  | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 server/changes/bug_6437_avoid-sslv3

(limited to 'server')

diff --git a/server/changes/bug_6437_avoid-sslv3 b/server/changes/bug_6437_avoid-sslv3
new file mode 100644
index 00000000..5d41fbb3
--- /dev/null
+++ b/server/changes/bug_6437_avoid-sslv3
@@ -0,0 +1 @@
+  o Avoid use of SSLv3 (#6437).
diff --git a/server/pkg/soledad b/server/pkg/soledad
index 841233d1..62b7c5f8 100644
--- a/server/pkg/soledad
+++ b/server/pkg/soledad
@@ -19,6 +19,7 @@ CERT_PATH=/etc/leap/soledad-server.pem
 PRIVKEY_PATH=/etc/leap/soledad-server.key
 TWISTD_PATH=/usr/bin/twistd
 HOME=/var/lib/soledad/
+SSL_METHOD=TLSv1_METHOD
 
 [ -r /etc/default/soledad ] && . /etc/default/soledad
 
@@ -35,7 +36,7 @@ case "$1" in
             --logfile=$LOGFILE \
             web \
             --wsgi=$OBJ \
-            --port=ssl:$HTTPS_PORT:privateKey=$PRIVKEY_PATH:certKey=$CERT_PATH
+            --port=ssl:${HTTPS_PORT}:privateKey=${PRIVKEY_PATH}:certKey=${CERT_PATH}:sslmethod=${SSL_METHOD}
         echo "."
     ;;
 
-- 
cgit v1.2.3


From 93bd3fb17670c0c8db5b50028ba2b3ce811dcf5d Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Wed, 26 Nov 2014 20:23:33 -0200
Subject: Run daemon as user soledad (#6436).

---
 server/changes/bug_6436_run-daemon-as-user-soledad | 1 +
 server/pkg/soledad                                 | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 server/changes/bug_6436_run-daemon-as-user-soledad

(limited to 'server')

diff --git a/server/changes/bug_6436_run-daemon-as-user-soledad b/server/changes/bug_6436_run-daemon-as-user-soledad
new file mode 100644
index 00000000..886964f1
--- /dev/null
+++ b/server/changes/bug_6436_run-daemon-as-user-soledad
@@ -0,0 +1 @@
+  o Run daemon as user soledad (#6436).
diff --git a/server/pkg/soledad b/server/pkg/soledad
index 62b7c5f8..7f48e2c8 100644
--- a/server/pkg/soledad
+++ b/server/pkg/soledad
@@ -20,6 +20,8 @@ PRIVKEY_PATH=/etc/leap/soledad-server.key
 TWISTD_PATH=/usr/bin/twistd
 HOME=/var/lib/soledad/
 SSL_METHOD=TLSv1_METHOD
+USER=soledad
+GROUP=soledad
 
 [ -r /etc/default/soledad ] && . /etc/default/soledad
 
@@ -31,7 +33,9 @@ test -r /etc/leap/ || exit 0
 case "$1" in
     start)
         echo -n "Starting soledad: twistd"
-          start-stop-daemon --start --quiet --exec $TWISTD_PATH -- \
+          start-stop-daemon --start --quiet \
+            --user=$USER --group=$GROUP \
+            --exec $TWISTD_PATH -- \
             --pidfile=$PIDFILE \
             --logfile=$LOGFILE \
             web \
-- 
cgit v1.2.3


From 2414b23ecdb8cfc8b8a5852243c22b6fbb89536f Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Fri, 28 Nov 2014 09:39:41 -0200
Subject: Enclose server initscript variables in curly brackets.

---
 server/pkg/soledad | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'server')

diff --git a/server/pkg/soledad b/server/pkg/soledad
index 7f48e2c8..bf24dac2 100644
--- a/server/pkg/soledad
+++ b/server/pkg/soledad
@@ -30,16 +30,16 @@ test -r /etc/leap/ || exit 0
 . /lib/lsb/init-functions
 
 
-case "$1" in
+case "${1}" in
     start)
         echo -n "Starting soledad: twistd"
           start-stop-daemon --start --quiet \
-            --user=$USER --group=$GROUP \
-            --exec $TWISTD_PATH -- \
-            --pidfile=$PIDFILE \
-            --logfile=$LOGFILE \
+            --user=${USER} --group=${GROUP} \
+            --exec ${TWISTD_PATH} -- \
+            --pidfile=${PIDFILE} \
+            --logfile=${LOGFILE} \
             web \
-            --wsgi=$OBJ \
+            --wsgi=${OBJ} \
             --port=ssl:${HTTPS_PORT}:privateKey=${PRIVKEY_PATH}:certKey=${CERT_PATH}:sslmethod=${SSL_METHOD}
         echo "."
     ;;
@@ -47,21 +47,21 @@ case "$1" in
     stop)
         echo -n "Stopping soledad: twistd"
         start-stop-daemon --stop --quiet  \
-            --pidfile $PIDFILE
+            --pidfile ${PIDFILE}
         echo "."
     ;;
 
     restart)
-        $0 stop
-        $0 start
+        ${0} stop
+        ${0} start
     ;;
 
     force-reload)
-        $0 restart
+        ${0} restart
     ;;
 
     status)
-        status_of_proc -p $PIDFILE $TWISTD_PATH soledad && exit 0 || exit $?
+        status_of_proc -p ${PIDFILE} ${TWISTD_PATH} soledad && exit 0 || exit ${?}
     ;;
 
     *)
-- 
cgit v1.2.3


From 31eeafd715f407c61d8de4e6555241a1de33fba1 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Wed, 3 Dec 2014 00:22:18 +0100
Subject: Use SSL negotiation.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Although the API can be misleading, PROTOCOL_SSLv23 selects the highest
protocol version that both the client and server support. Despite the
name, this option can select “TLS” protocols as well as “SSL”.

In this way, we can use TLSv1.2 (PROTOCOL_TLSv1 will *only* give us TLS
v1.0)

In the client side, we try to disable SSLv2 and SSLv3 options
explicitely.

The python version in wheezy does not offer PROTOCOL_TLSv1_2 nor
OP_NO_SSLv2 or OP_NO_SSLv3 (It's new in 2.7.9)
---
 server/pkg/soledad | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'server')

diff --git a/server/pkg/soledad b/server/pkg/soledad
index bf24dac2..ccb3e9b0 100644
--- a/server/pkg/soledad
+++ b/server/pkg/soledad
@@ -19,7 +19,7 @@ CERT_PATH=/etc/leap/soledad-server.pem
 PRIVKEY_PATH=/etc/leap/soledad-server.key
 TWISTD_PATH=/usr/bin/twistd
 HOME=/var/lib/soledad/
-SSL_METHOD=TLSv1_METHOD
+SSL_METHOD=SSLv23_METHOD
 USER=soledad
 GROUP=soledad
 
-- 
cgit v1.2.3


From e909a218efb0ad31f413c47c90303f44f6906158 Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Tue, 16 Dec 2014 14:47:21 -0200
Subject: Fix server initscript location (#6557).

---
 .../bug_6557_fix-server-initscript-location        |  1 +
 server/pkg/soledad                                 | 73 ----------------------
 server/pkg/soledad-server                          | 73 ++++++++++++++++++++++
 server/setup.py                                    |  2 +-
 4 files changed, 75 insertions(+), 74 deletions(-)
 create mode 100644 server/changes/bug_6557_fix-server-initscript-location
 delete mode 100644 server/pkg/soledad
 create mode 100644 server/pkg/soledad-server

(limited to 'server')

diff --git a/server/changes/bug_6557_fix-server-initscript-location b/server/changes/bug_6557_fix-server-initscript-location
new file mode 100644
index 00000000..6032b302
--- /dev/null
+++ b/server/changes/bug_6557_fix-server-initscript-location
@@ -0,0 +1 @@
+  o Fix server initscript location (#6557).
diff --git a/server/pkg/soledad b/server/pkg/soledad
deleted file mode 100644
index ccb3e9b0..00000000
--- a/server/pkg/soledad
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          soledad
-# Required-Start:    $network $named $remote_fs $syslog $time
-# Required-Stop:     $network $named $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Start soledad daemon at boot time
-# Description:       Synchronization of locally encrypted data among devices
-### END INIT INFO
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-PIDFILE=/var/run/soledad.pid
-RUNDIR=/var/lib/soledad/
-OBJ=leap.soledad.server.application
-LOGFILE=/var/log/soledad.log
-HTTPS_PORT=2424
-CERT_PATH=/etc/leap/soledad-server.pem
-PRIVKEY_PATH=/etc/leap/soledad-server.key
-TWISTD_PATH=/usr/bin/twistd
-HOME=/var/lib/soledad/
-SSL_METHOD=SSLv23_METHOD
-USER=soledad
-GROUP=soledad
-
-[ -r /etc/default/soledad ] && . /etc/default/soledad
-
-test -r /etc/leap/ || exit 0
-
-. /lib/lsb/init-functions
-
-
-case "${1}" in
-    start)
-        echo -n "Starting soledad: twistd"
-          start-stop-daemon --start --quiet \
-            --user=${USER} --group=${GROUP} \
-            --exec ${TWISTD_PATH} -- \
-            --pidfile=${PIDFILE} \
-            --logfile=${LOGFILE} \
-            web \
-            --wsgi=${OBJ} \
-            --port=ssl:${HTTPS_PORT}:privateKey=${PRIVKEY_PATH}:certKey=${CERT_PATH}:sslmethod=${SSL_METHOD}
-        echo "."
-    ;;
-
-    stop)
-        echo -n "Stopping soledad: twistd"
-        start-stop-daemon --stop --quiet  \
-            --pidfile ${PIDFILE}
-        echo "."
-    ;;
-
-    restart)
-        ${0} stop
-        ${0} start
-    ;;
-
-    force-reload)
-        ${0} restart
-    ;;
-
-    status)
-        status_of_proc -p ${PIDFILE} ${TWISTD_PATH} soledad && exit 0 || exit ${?}
-    ;;
-
-    *)
-        echo "Usage: /etc/init.d/soledad {start|stop|restart|force-reload|status}" >&2
-        exit 1
-    ;;
-esac
-
-exit 0
diff --git a/server/pkg/soledad-server b/server/pkg/soledad-server
new file mode 100644
index 00000000..ccb3e9b0
--- /dev/null
+++ b/server/pkg/soledad-server
@@ -0,0 +1,73 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          soledad
+# Required-Start:    $network $named $remote_fs $syslog $time
+# Required-Stop:     $network $named $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start soledad daemon at boot time
+# Description:       Synchronization of locally encrypted data among devices
+### END INIT INFO
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+PIDFILE=/var/run/soledad.pid
+RUNDIR=/var/lib/soledad/
+OBJ=leap.soledad.server.application
+LOGFILE=/var/log/soledad.log
+HTTPS_PORT=2424
+CERT_PATH=/etc/leap/soledad-server.pem
+PRIVKEY_PATH=/etc/leap/soledad-server.key
+TWISTD_PATH=/usr/bin/twistd
+HOME=/var/lib/soledad/
+SSL_METHOD=SSLv23_METHOD
+USER=soledad
+GROUP=soledad
+
+[ -r /etc/default/soledad ] && . /etc/default/soledad
+
+test -r /etc/leap/ || exit 0
+
+. /lib/lsb/init-functions
+
+
+case "${1}" in
+    start)
+        echo -n "Starting soledad: twistd"
+          start-stop-daemon --start --quiet \
+            --user=${USER} --group=${GROUP} \
+            --exec ${TWISTD_PATH} -- \
+            --pidfile=${PIDFILE} \
+            --logfile=${LOGFILE} \
+            web \
+            --wsgi=${OBJ} \
+            --port=ssl:${HTTPS_PORT}:privateKey=${PRIVKEY_PATH}:certKey=${CERT_PATH}:sslmethod=${SSL_METHOD}
+        echo "."
+    ;;
+
+    stop)
+        echo -n "Stopping soledad: twistd"
+        start-stop-daemon --stop --quiet  \
+            --pidfile ${PIDFILE}
+        echo "."
+    ;;
+
+    restart)
+        ${0} stop
+        ${0} start
+    ;;
+
+    force-reload)
+        ${0} restart
+    ;;
+
+    status)
+        status_of_proc -p ${PIDFILE} ${TWISTD_PATH} soledad && exit 0 || exit ${?}
+    ;;
+
+    *)
+        echo "Usage: /etc/init.d/soledad {start|stop|restart|force-reload|status}" >&2
+        exit 1
+    ;;
+esac
+
+exit 0
diff --git a/server/setup.py b/server/setup.py
index 573622ce..124ddd32 100644
--- a/server/setup.py
+++ b/server/setup.py
@@ -35,7 +35,7 @@ if isset('VIRTUAL_ENV') or isset('LEAP_SKIP_INIT'):
     data_files = None
 else:
     # XXX this should go only for linux/mac
-    data_files = [("/etc/init.d/", ["pkg/soledad"])]
+    data_files = [("/etc/init.d/", ["pkg/soledad-server"])]
 
 
 trove_classifiers = (
-- 
cgit v1.2.3


From 61a56f2ee301212d96c2d95a21d524bc06b3a677 Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Mon, 9 Mar 2015 15:22:17 -0300
Subject: Fix soledad initscript uid and gid.

---
 server/changes/bug_fix-initscript-uid-and-gid | 1 +
 server/pkg/soledad-server                     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 server/changes/bug_fix-initscript-uid-and-gid

(limited to 'server')

diff --git a/server/changes/bug_fix-initscript-uid-and-gid b/server/changes/bug_fix-initscript-uid-and-gid
new file mode 100644
index 00000000..d4767984
--- /dev/null
+++ b/server/changes/bug_fix-initscript-uid-and-gid
@@ -0,0 +1 @@
+  o Fix server daemon uid and gid by passing them to twistd on the initscript.
diff --git a/server/pkg/soledad-server b/server/pkg/soledad-server
index ccb3e9b0..811ad55b 100644
--- a/server/pkg/soledad-server
+++ b/server/pkg/soledad-server
@@ -34,8 +34,8 @@ case "${1}" in
     start)
         echo -n "Starting soledad: twistd"
           start-stop-daemon --start --quiet \
-            --user=${USER} --group=${GROUP} \
             --exec ${TWISTD_PATH} -- \
+            --uid=${USER} --gid=${GROUP} \
             --pidfile=${PIDFILE} \
             --logfile=${LOGFILE} \
             web \
-- 
cgit v1.2.3


From cf3c5018820f982ae64c2e062391b0a3b6e52f21 Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Wed, 11 Mar 2015 14:33:10 -0300
Subject: [feat] use monthly tokens database

Any solead release that includes this commit will be incompatible with LEAP
Platform < 0.6.1 because only from that version on the platform implements the
ephemeral monthly tokens databases.

Closes: #6785.
---
 server/changes/feature_6785_use-monthly-token-db |  1 +
 server/src/leap/soledad/server/auth.py           | 22 +++++++++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)
 create mode 100644 server/changes/feature_6785_use-monthly-token-db

(limited to 'server')

diff --git a/server/changes/feature_6785_use-monthly-token-db b/server/changes/feature_6785_use-monthly-token-db
new file mode 100644
index 00000000..f7987cad
--- /dev/null
+++ b/server/changes/feature_6785_use-monthly-token-db
@@ -0,0 +1 @@
+  o Use monthly token databases. Closes #6785.
diff --git a/server/src/leap/soledad/server/auth.py b/server/src/leap/soledad/server/auth.py
index 57f600a1..7af4e54b 100644
--- a/server/src/leap/soledad/server/auth.py
+++ b/server/src/leap/soledad/server/auth.py
@@ -21,10 +21,10 @@ Authentication facilities for Soledad Server.
 """
 
 
+import time
 import httplib
 import simplejson as json
 
-
 from u1db import DBNAME_CONSTRAINTS, errors as u1db_errors
 from abc import ABCMeta, abstractmethod
 from routes.mapper import Mapper
@@ -32,12 +32,8 @@ from couchdb.client import Server
 from twisted.python import log
 from hashlib import sha512
 
-
-from leap.soledad.common import (
-    SHARED_DB_NAME,
-    SHARED_DB_LOCK_DOC_ID_PREFIX,
-    USER_DB_PREFIX,
-)
+from leap.soledad.common import SHARED_DB_NAME
+from leap.soledad.common import USER_DB_PREFIX
 from leap.soledad.common.errors import InvalidAuthTokenError
 
 
@@ -354,7 +350,8 @@ class SoledadTokenAuthMiddleware(SoledadAuthMiddleware):
     Token based authentication.
     """
 
-    TOKENS_DB = "tokens"
+    TOKENS_DB_PREFIX = "tokens_"
+    TOKENS_DB_EXPIRE = 30 * 24 * 3600  # 30 days in seconds
     TOKENS_TYPE_KEY = "type"
     TOKENS_TYPE_DEF = "Token"
     TOKENS_USER_ID_KEY = "user_id"
@@ -414,7 +411,14 @@ class SoledadTokenAuthMiddleware(SoledadAuthMiddleware):
                                       invalid.
         """
         server = Server(url=self._app.state.couch_url)
-        dbname = self.TOKENS_DB
+        # the tokens db rotates every 30 days, and the current db name is
+        # "tokens_NNN", where NNN is the number of seconds since epoch divided
+        # by the rotate period in seconds. When rotating, old and new tokens
+        # db coexist during a certain window of time and valid tokens are
+        # replicated from the old db to the new one. See:
+        # https://leap.se/code/issues/6785
+        dbname = self.TOKENS_DB_PREFIX + \
+            str(int(time.time() / self.TOKENS_DB_EXPIRE))
         db = server[dbname]
         # lookup key is a hash of the token to prevent timing attacks.
         token = db.get(sha512(token).hexdigest())
-- 
cgit v1.2.3


From 4b78cf9da0874501fa123a02b53d7650e8dfcdf1 Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Thu, 19 Mar 2015 09:54:38 -0300
Subject: [fix] add/fix dependency on twisted

Add dependency on twisted for Soledad Client. Also remove minimum twisted
version for Soledad Server because debian stable currently distributes 12.0.0
and pypi currently distributes 15.0.0.

Closes: #6797
---
 server/changes/bug_6797_add-dependency-on-twisted | 1 +
 server/pkg/requirements.pip                       | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)
 create mode 100644 server/changes/bug_6797_add-dependency-on-twisted

(limited to 'server')

diff --git a/server/changes/bug_6797_add-dependency-on-twisted b/server/changes/bug_6797_add-dependency-on-twisted
new file mode 100644
index 00000000..962222b0
--- /dev/null
+++ b/server/changes/bug_6797_add-dependency-on-twisted
@@ -0,0 +1 @@
+  o Add dependency on Twisted. Closes #6797.
diff --git a/server/pkg/requirements.pip b/server/pkg/requirements.pip
index 28717664..89ec52e7 100644
--- a/server/pkg/requirements.pip
+++ b/server/pkg/requirements.pip
@@ -4,9 +4,7 @@ simplejson
 u1db
 routes
 PyOpenSSL<0.14
-
-# TODO: maybe we just want twisted-web?
-twisted>=12.0.0
+twisted
 
 # leap deps -- bump me!
 leap.soledad.common>=0.6.0
-- 
cgit v1.2.3


From 74dec41c1d99ae8d4a4a79a7cb0d5c3c9f40cbae Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Thu, 19 Mar 2015 10:57:54 -0300
Subject: [fix] add explicit dependency on leap.common

In the past, we wanted dependency on leap.common to be optional, but now
because of the explicit use of the config path prefix and signaling, we want
to enforce dependency on leap.common.
---
 server/pkg/requirements.pip | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'server')

diff --git a/server/pkg/requirements.pip b/server/pkg/requirements.pip
index 89ec52e7..c65ee4f5 100644
--- a/server/pkg/requirements.pip
+++ b/server/pkg/requirements.pip
@@ -9,12 +9,7 @@ twisted
 # leap deps -- bump me!
 leap.soledad.common>=0.6.0
 
-#
-# Things yet to fix:
-#
-
-# oauth is not strictly needed by us, but we need it
-# until u1db adds it to its release as a dep.
-
+# XXX -- fix me!
+# oauth is not strictly needed by us, but we need it until u1db adds it to its
+# release as a dep.
 oauth
-
-- 
cgit v1.2.3


From 5a9eac4ba0d4ddc419fdaaee4d08dbc7d8115294 Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Thu, 9 Apr 2015 12:20:19 -0300
Subject: [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.
---
 .../changes/bug_6833_remove-unneeded-params-from-couch-server-state  | 2 ++
 server/src/leap/soledad/server/__init__.py                           | 5 +----
 2 files changed, 3 insertions(+), 4 deletions(-)
 create mode 100644 server/changes/bug_6833_remove-unneeded-params-from-couch-server-state

(limited to 'server')

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)))
-- 
cgit v1.2.3


From 340b0dcfbc0a819738a28f9c803fdbf848754897 Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Thu, 14 May 2015 11:52:20 -0300
Subject: [pkg] bump version of server dependency on common

soledad-common versions before 0.6.5 do not contain the fix for #6833 and thus
will not work with most recent server. That is why we have to bump this
soledad-server dependency on soledad.common.
---
 server/pkg/requirements.pip | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'server')

diff --git a/server/pkg/requirements.pip b/server/pkg/requirements.pip
index c65ee4f5..df6ad95d 100644
--- a/server/pkg/requirements.pip
+++ b/server/pkg/requirements.pip
@@ -7,7 +7,7 @@ PyOpenSSL<0.14
 twisted
 
 # leap deps -- bump me!
-leap.soledad.common>=0.6.0
+leap.soledad.common>=0.6.5
 
 # XXX -- fix me!
 # oauth is not strictly needed by us, but we need it until u1db adds it to its
-- 
cgit v1.2.3


From 9fb1c47ca7da06d6feef6846b812aec28128ed78 Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Mon, 1 Jun 2015 14:54:27 -0300
Subject: [pkg] fold in changes

---
 server/changes/bug_6436_run-daemon-as-user-soledad                     | 1 -
 server/changes/bug_6437_avoid-sslv3                                    | 1 -
 server/changes/bug_6557_fix-server-initscript-location                 | 1 -
 server/changes/bug_6797_add-dependency-on-twisted                      | 1 -
 server/changes/bug_6833_remove-unneeded-params-from-couch-server-state | 2 --
 server/changes/bug_fix-initscript-uid-and-gid                          | 1 -
 server/changes/feature_6785_use-monthly-token-db                       | 1 -
 7 files changed, 8 deletions(-)
 delete mode 100644 server/changes/bug_6436_run-daemon-as-user-soledad
 delete mode 100644 server/changes/bug_6437_avoid-sslv3
 delete mode 100644 server/changes/bug_6557_fix-server-initscript-location
 delete mode 100644 server/changes/bug_6797_add-dependency-on-twisted
 delete mode 100644 server/changes/bug_6833_remove-unneeded-params-from-couch-server-state
 delete mode 100644 server/changes/bug_fix-initscript-uid-and-gid
 delete mode 100644 server/changes/feature_6785_use-monthly-token-db

(limited to 'server')

diff --git a/server/changes/bug_6436_run-daemon-as-user-soledad b/server/changes/bug_6436_run-daemon-as-user-soledad
deleted file mode 100644
index 886964f1..00000000
--- a/server/changes/bug_6436_run-daemon-as-user-soledad
+++ /dev/null
@@ -1 +0,0 @@
-  o Run daemon as user soledad (#6436).
diff --git a/server/changes/bug_6437_avoid-sslv3 b/server/changes/bug_6437_avoid-sslv3
deleted file mode 100644
index 5d41fbb3..00000000
--- a/server/changes/bug_6437_avoid-sslv3
+++ /dev/null
@@ -1 +0,0 @@
-  o Avoid use of SSLv3 (#6437).
diff --git a/server/changes/bug_6557_fix-server-initscript-location b/server/changes/bug_6557_fix-server-initscript-location
deleted file mode 100644
index 6032b302..00000000
--- a/server/changes/bug_6557_fix-server-initscript-location
+++ /dev/null
@@ -1 +0,0 @@
-  o Fix server initscript location (#6557).
diff --git a/server/changes/bug_6797_add-dependency-on-twisted b/server/changes/bug_6797_add-dependency-on-twisted
deleted file mode 100644
index 962222b0..00000000
--- a/server/changes/bug_6797_add-dependency-on-twisted
+++ /dev/null
@@ -1 +0,0 @@
-  o Add dependency on Twisted. Closes #6797.
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
deleted file mode 100644
index 2c927717..00000000
--- a/server/changes/bug_6833_remove-unneeded-params-from-couch-server-state
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Remove unneeded parameters from CouchServerState initialization. Closes
-    #6833.
diff --git a/server/changes/bug_fix-initscript-uid-and-gid b/server/changes/bug_fix-initscript-uid-and-gid
deleted file mode 100644
index d4767984..00000000
--- a/server/changes/bug_fix-initscript-uid-and-gid
+++ /dev/null
@@ -1 +0,0 @@
-  o Fix server daemon uid and gid by passing them to twistd on the initscript.
diff --git a/server/changes/feature_6785_use-monthly-token-db b/server/changes/feature_6785_use-monthly-token-db
deleted file mode 100644
index f7987cad..00000000
--- a/server/changes/feature_6785_use-monthly-token-db
+++ /dev/null
@@ -1 +0,0 @@
-  o Use monthly token databases. Closes #6785.
-- 
cgit v1.2.3