From 5ddbf87ed2d5143d6053fa4e4fea6d088808884e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lauri=20V=C3=B5sandi?= <lauri.vosandi@gmail.com>
Date: Wed, 26 Apr 2017 00:10:12 +0300
Subject: [PATCH] Add test for fetching logs

---
 certidude/api/__init__.py | 16 +++++++++++++++-
 certidude/cli.py          | 17 +----------------
 tests/test_cli.py         | 19 ++++++++++++++-----
 3 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/certidude/api/__init__.py b/certidude/api/__init__.py
index 3d468c5..2a5a7ec 100644
--- a/certidude/api/__init__.py
+++ b/certidude/api/__init__.py
@@ -179,7 +179,7 @@ class NormalizeMiddleware(object):
         if isinstance(resp.location, unicode):
             resp.location = resp.location.encode("ascii")
 
-def certidude_app():
+def certidude_app(log_handlers=[]):
     from certidude import config
     from .revoked import RevocationListResource
     from .signed import SignedCertificateDetailResource
@@ -225,4 +225,18 @@ def certidude_app():
     # Add sink for serving static files
     app.add_sink(StaticResource(os.path.join(__file__, "..", "..", "static")))
 
+    # Set up log handlers
+    if config.LOGGING_BACKEND == "sql":
+        from certidude.mysqllog import LogHandler
+        from certidude.api.log import LogResource
+        uri = config.cp.get("logging", "database")
+        log_handlers.append(LogHandler(uri))
+        app.add_route("/api/log/", LogResource(uri))
+    elif config.LOGGING_BACKEND == "syslog":
+        from logging.handlers import SyslogHandler
+        log_handlers.append(SysLogHandler())
+        # Browsing syslog via HTTP is obviously not possible out of the box
+    elif config.LOGGING_BACKEND:
+        raise ValueError("Invalid logging.backend = %s" % config.LOGGING_BACKEND)
+
     return app
diff --git a/certidude/cli.py b/certidude/cli.py
index 1423631..e153b75 100755
--- a/certidude/cli.py
+++ b/certidude/cli.py
@@ -1204,7 +1204,7 @@ def certidude_serve(port, listen, fork):
 
     click.echo("Listening on %s:%d" % (listen, port))
 
-    app = certidude_app()
+    app = certidude_app(log_handlers)
 
     httpd = make_server(listen, port, app, ThreadingWSGIServer)
 
@@ -1236,21 +1236,6 @@ def certidude_serve(port, listen, fork):
 
         os.umask(0o007)
 
-
-    # Set up log handlers
-    if config.LOGGING_BACKEND == "sql":
-        from certidude.mysqllog import LogHandler
-        from certidude.api.log import LogResource
-        uri = config.cp.get("logging", "database")
-        log_handlers.append(LogHandler(uri))
-        app.add_route("/api/log/", LogResource(uri))
-    elif config.LOGGING_BACKEND == "syslog":
-        from logging.handlers import SyslogHandler
-        log_handlers.append(SysLogHandler())
-        # Browsing syslog via HTTP is obviously not possible out of the box
-    elif config.LOGGING_BACKEND:
-        raise ValueError("Invalid logging.backend = %s" % config.LOGGING_BACKEND)
-
     if config.EVENT_SOURCE_PUBLISH:
         from certidude.push import EventSourceLogHandler
         log_handlers.append(EventSourceLogHandler())
diff --git a/tests/test_cli.py b/tests/test_cli.py
index eaec5ed..e4d4218 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -52,11 +52,6 @@ def test_cli_setup_authority():
     result = runner.invoke(cli, ['users'])
     assert not result.exception
 
-
-    # Try starting up forked server
-    result = runner.invoke(cli, ['serve', '-f', '-p', '8080'])
-    assert not result.exception
-
     # Check that we can retrieve empty CRL
     r = client().simulate_get("/api/revoked/")
     assert r.status_code == 200
@@ -264,4 +259,18 @@ def test_cli_setup_authority():
     assert r.status_code == 200
 
 
+    # Log can be read only by admin
+    r = client().simulate_get("/api/log/")
+    assert r.status_code == 401
+    r = client().simulate_get("/api/log/",
+        headers={"Authorization":usertoken})
+    assert r.status_code == 403
+    r = client().simulate_get("/api/log/",
+        headers={"Authorization":admintoken})
+    assert r.status_code == 200
+    assert r.headers.get('content-type') == "application/json; charset=UTF-8"
+
+    # Try starting up forked server
+    result = runner.invoke(cli, ['serve', '-f', '-p', '8080'])
+    assert not result.exception