Merge branch 'master' into feature-edit-or-remove-server-restore

burpui/misc/auth/handler.py

@@ -46,8 +46,9 @@ class UserAuthHandler(BUIhandler):
 class UserHandler(BUIuser):
     """See :class:`burpui.misc.auth.interface.BUIuser`"""
     def __init__(self, backends=None, name=None):
+        sess = session._get_current_object()
         self.active = False
-        self.authenticated = session.get('authenticated', False)
+        self.authenticated = sess.get('authenticated', False)
         self.backends = backends
         self.name = name
         self.real = None
@@ -74,7 +75,8 @@ class UserHandler(BUIuser):
                     break
         elif self.real:  # pragma: no cover
             self.authenticated = self.real.login(name, passwd)
-        session['authenticated'] = self.authenticated
+        sess = session._get_current_object()
+        sess['authenticated'] = self.authenticated
         return self.authenticated
 
     @property

burpui/routes.py

@@ -252,8 +252,9 @@ def login():
 @view.route('/logout')
 @login_required
 def logout():
-    if 'authenticated' in session:
-        session.pop('authenticated')
+    sess = session._get_current_object()
+    if 'authenticated' in sess:
+        sess.pop('authenticated')
     logout_user()
     return redirect(url_for('.home'))
 

docs/gunicorn.rst

@@ -49,6 +49,7 @@ If you are using this sample configuration file, make sure to create the
 ::
 
     apt-get install gunicorn
+    cp /usr/local/share/burpui/contrib/gunicorn/burp-ui /etc/gunicorn.d/
     useradd -r -d /var/lib/burpui -c 'Burp-UI daemon user' burpui
     mkdir /etc/burp
     cp /usr/local/share/burpui/etc/burpui.sample.cfg /etc/burp/burpui.cfg
@@ -57,6 +58,40 @@ If you are using this sample configuration file, make sure to create the
     service gunicorn restart
 
 
+You will also need a custom client configuration and you will have to create the
+certificates accordingly:
+
+::
+
+    cat >/var/lib/burpui/burp.conf<<EOF
+    mode = client
+    port = 4971
+    status_port = 4972
+    server = 127.0.0.1
+    password = abcdefgh
+    cname = bui-agent1
+    pidfile = /var/lib/burpui/bui-agent1.client.pid
+    syslog = 0
+    stdout = 1
+    progress_counter = 1
+    ca_burp_ca = /usr/sbin/burp_ca
+    ca_csr_dir = /var/lib/burpui/CA-client
+    ssl_cert_ca = /var/lib/burpui/ssl_cert_ca.pem
+    ssl_cert = /var/lib/burpui/ssl_cert-client.pem
+    ssl_key = /var/lib/burpui/ssl_cert-client.key
+    ssl_peer_cn = burpserver
+    EOF
+    burp_ca --name bui-agent1 --ca burpCA --key --request --sign --batch
+    cp /etc/burp/ssl_cert_ca.pem /var/lib/burpui/
+    cp -a /etc/burp/CA/bui-agent1.crt /var/lib/burpui/ssl_cert-client.pem
+    cp -a /etc/burp/CA/bui-agent1.key /var/lib/burpui/ssl_cert-client.key
+    chown -R burpui: /var/lib/burpui/
+
+
+Finally, make sure you set ``bconfcli: /var/lib/burpui/burp.conf`` in your 
+`Burp-UI`_ configuration file.
+
+
 Reverse Proxy
 -------------