From e35d2b4cefe7881babd5b715d09e9205872392ed Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: May 25 2016 14:56:37 +0000 Subject: allow kojiweb login to be disabled Signed-off-by: Dennis Gilmore --- diff --git a/www/kojiweb/includes/header.chtml b/www/kojiweb/includes/header.chtml index ff04063..e927d12 100644 --- a/www/kojiweb/includes/header.chtml +++ b/www/kojiweb/includes/header.chtml @@ -92,12 +92,15 @@ $localnav - $koji.formatTimeLong($currentDate) | + $koji.formatTimeLong($currentDate) + #if not $LoginDisabled + | #if $currentUser $greeting(), $currentUser.name | logout #else login #end if + #end if
diff --git a/www/kojiweb/wsgi_publisher.py b/www/kojiweb/wsgi_publisher.py index 6262bc2..f250afd 100644 --- a/www/kojiweb/wsgi_publisher.py +++ b/www/kojiweb/wsgi_publisher.py @@ -86,6 +86,8 @@ class Dispatcher(object): ['Secret', 'string', None], + ['LoginDisabled', 'boolean', False], + ['LibPath', 'string', '/usr/share/koji-web/lib'], ['LogLevel', 'string', 'WARNING'], diff --git a/www/lib/kojiweb/util.py b/www/lib/kojiweb/util.py index bf4fac0..5f065a5 100644 --- a/www/lib/kojiweb/util.py +++ b/www/lib/kojiweb/util.py @@ -133,6 +133,11 @@ def _genHTML(environ, fileName): environ['koji.values']['winEnabled'] = environ['koji.session'].winEnabled() else: environ['koji.values']['winEnabled'] = False + if not environ['koji.values'].has_key('LoginDisabled'): + if 'koji.options' in environ: + environ['koji.values']['LoginDisabled'] = environ['koji.options']['LoginDisabled'] + else: + environ['koji.values']['LoginDisabled'] = False tmpl_class = TEMPLATES.get(fileName) if not tmpl_class: