OpenSUSE 15.1: Use default authentication service

Signed-off-by: Aline Manera <[email protected]>
kimchi-project · Dec 26, 2019 · fc586b7 · fc586b7
1 parent 50135ea
commit fc586b7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/src/wok/auth.py b/src/wok/auth.py
@@ -176,8 +176,9 @@ def _pam_conv(auth, query_list, userData=None):
                 result.value = 0
             # Debian 10: handle differences on pam module
             except AttributeError:
+                # Use default service as it may vary from Debian 10 to OpenSUSE 15.1
                 result.value = 0 if auth.authenticate(
-                    username=username, password=password, service=service) else 1
+                    username=username, password=password) else 1
             except PAM.error as e:
                 result.value = e.args[1]
 
@@ -268,8 +269,8 @@ def check_auth_session():
         wokRobot = cherrypy.request.headers.get('Wok-Robot')
         if wokRobot == 'wok-robot':
             if (
-                time.time() - cherrypy.session[template.REFRESH] >
-                int(config.get('server', 'session_timeout')) * 60
+                time.time() - cherrypy.session[template.REFRESH]
+                > int(config.get('server', 'session_timeout')) * 60
             ):
                 cherrypy.session[USER_NAME] = None
                 cherrypy.lib.sessions.expire()

diff --git a/src/wok/plugins/gingerbase b/src/wok/plugins/gingerbase
diff --git a/src/wok/plugins/kimchi b/src/wok/plugins/kimchi