Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin

1 files changed, 12 insertions, 0 deletions

diff --git a/mediagoblin/app.py b/mediagoblin/app.py
index 1984ce77..96461711 100644
--- a/mediagoblin/app.py
+++ b/mediagoblin/app.py
@@ -37,6 +37,8 @@ from mediagoblin.init import (get_jinja_loader, get_staticdirector,
     setup_storage)
 from mediagoblin.tools.pluginapi import PluginManager, hook_transform
 from mediagoblin.tools.crypto import setup_crypto
+from mediagoblin.auth.tools import check_auth_enabled, no_auth_logout
+from mediagoblin import notifications
 
 
 _log = logging.getLogger(__name__)
@@ -97,6 +99,11 @@ class MediaGoblinApp(object):
             PluginManager().get_template_paths()
             )
 
+        # Check if authentication plugin is enabled and respond accordingly.
+        self.auth = check_auth_enabled()
+        if not self.auth:
+            app_config['allow_comments'] = False
+
         # Set up storage systems
         self.public_store, self.queue_store = setup_storage()
 
@@ -186,6 +193,11 @@ class MediaGoblinApp(object):
 
         request.urlgen = build_proxy
 
+        # Log user out if authentication_disabled
+        no_auth_logout(request)
+
+        request.notifications = notifications
+
         mg_request.setup_user_in_request(request)
 
         request.controller_name = None