FIX: 4.0.0

src/kubedash/blueprint/cluster.py

@@ -29,7 +29,7 @@
 
 @cluster_bp.route("/namespace", methods=['GET', 'POST'])
 @login_required
-def namespaces():
+def namespace():
     selected = None
     user_token = get_user_token(session)
 
@@ -80,11 +80,11 @@ def namespaces_data():
 @login_required
 def namespaces_create():
     if request.method == 'POST':
-        if request.form.get('ns_select', None):
-            session['ns_select'] = request.form['namespace']
+        if request.form.get('namespace', None):
+            namespace = request.form['namespace']
         user_token = get_user_token(session)
 
-        k8sNamespaceCreate(session['user_role'], user_token, session['ns_select'])
+        k8sNamespaceCreate(session['user_role'], user_token, namespace)
         return redirect(url_for('.namespace'))
     else:
         return redirect(url_for('.namespace'))
@@ -93,11 +93,11 @@ def namespaces_create():
 @login_required
 def namespaces_delete():
     if request.method == 'POST':
-        if request.form.get('ns_select', None):
-            session['ns_select'] = request.form['namespace']
+        if request.form.get('namespace', None):
+            namespace = request.form['namespace']
         user_token = get_user_token(session)
 
-        k8sNamespaceDelete(session['user_role'], user_token, session['ns_select'])
+        k8sNamespaceDelete(session['user_role'], namespace)
         return redirect(url_for('.namespace'))
     else:
         return redirect(url_for('.namespace'))

src/kubedash/blueprint/cluster_permission.py

@@ -1,11 +1,13 @@
+from math import e
 from flask import (Blueprint, redirect, render_template, request, session,
                    url_for)
 from flask_login import login_required
 
 from lib.helper_functions import get_logger
 from lib.k8s.namespace import k8sNamespaceListGet
-from lib.k8s.security import (k8sClusterRoleBindingListGet,
-                              k8sClusterRoleListGet, k8sRoleBindingListGet,
+from lib.k8s.security import (k8sClusterRoleBindingListGet, k8sRoleGet,
+                              k8sClusterRoleListGet, k8sClusterRoleGet, 
+                              k8sRoleBindingListGet,
                               k8sRoleListGet, k8sSaListGet)
 from lib.sso import get_user_token
 
@@ -29,7 +31,8 @@ def service_accounts():
     user_token = get_user_token(session)
 
     if request.method == 'POST':
-        session['ns_select'] = request.form.get('ns_select')
+        if 'ns_select' in request.form:
+            session['ns_select'] = request.form.get('ns_select')
         selected = request.form.get('selected')
 
     namespace_list, error = k8sNamespaceListGet(session['user_role'], user_token)
@@ -57,7 +60,8 @@ def roles():
     user_token = get_user_token(session)
 
     if request.method == 'POST':
-        session['ns_select'] = request.form.get('ns_select')
+        if 'ns_select' in request.form:
+            session['ns_select'] = request.form.get('ns_select')
         selected = request.form.get('selected')
 
     namespace_list, error = k8sNamespaceListGet(session['user_role'], user_token)
@@ -77,21 +81,19 @@ def roles():
 @login_required
 def role_data():
     if request.method == 'POST':
-        session['ns_select'] = request.form.get('ns_select')
+        if 'ns_select' in request.form:
+            session['ns_select'] = request.form.get('ns_select')
         r_name = request.form.get('r_name')
 
         user_token = get_user_token(session)
 
         namespace_list, error = k8sNamespaceListGet(session['user_role'], user_token)
-        if not error:
-            roles = k8sRoleListGet(session['user_role'], user_token, session['ns_select'])
-        else:
-            roles = list()
+        role = k8sRoleGet(session['user_role'], user_token, r_name, session['ns_select'])
 
         return render_template(
             'cluster-permission/role-data.html.j2',
             namespace_list = namespace_list,
-            roles = roles,
+            role = role,
             r_name = r_name,
         )
     else:
@@ -108,7 +110,8 @@ def role_bindings():
     user_token = get_user_token(session)
 
     if request.method == 'POST':
-        session['ns_select'] = request.form.get('ns_select')
+        if 'ns_select' in request.form:
+            session['ns_select'] = request.form.get('ns_select')
         selected = request.form.get('rb_name')
 
     namespace_list, error = k8sNamespaceListGet(session['user_role'], user_token)
@@ -151,12 +154,11 @@ def cluster_role_data():
     if request.method == 'POST':
         cr_name = request.form.get('cr_name')
         user_token = get_user_token(session)
-        cluster_roles = k8sClusterRoleListGet(session['user_role'], user_token)
-
+        cluster_role = k8sClusterRoleGet(session['user_role'], user_token, cr_name)
 
         return render_template(
             'cluster-permission/cluster-role-data.html.j2',
-            cluster_roles = cluster_roles,
+            cluster_role = cluster_role,
             cr_name = cr_name,
         )
     else:

src/kubedash/blueprint/dashboard.py

@@ -74,7 +74,7 @@ def workloads():
         span.set_attribute("http.method", request.method)
 
     if request.method == 'POST':
-        if request.form.get('ns_select', None):
+        if 'ns_select' in request.form:
             session['ns_select'] = request.form.get('ns_select')
         if tracer and span.is_recording():
             span.set_attribute("namespace.selected", request.form.get('ns_select'))

src/kubedash/blueprint/network.py

@@ -74,7 +74,7 @@ def ingresses():
     user_token = get_user_token(session)
 
     if request.method == 'POST':
-        if request.form.get('ns_select', None):
+        if 'ns_select' in request.form:
             session['ns_select'] = request.form.get('ns_select')
         selected = request.form.get('selected')
 
@@ -123,7 +123,7 @@ def services():
     user_token = get_user_token(session)
 
     if request.method == 'POST':
-        if request.form.get('ns_select', None):
+        if 'ns_select' in request.form:
             session['ns_select'] = request.form.get('ns_select')
         selected = request.form.get('selected')
 
@@ -143,7 +143,7 @@ def services_data():
     pod_list = None
     if request.method == 'POST':
         service_name = request.form.get('service_name')
-        if request.form.get('ns_select', None):
+        if 'ns_select' in request.form:
             session['ns_select'] = request.form.get('ns_select')
 
         user_token = get_user_token(session)

src/kubedash/blueprint/other_resources.py

@@ -30,7 +30,7 @@ def vpa():
     user_token = get_user_token(session)
 
     if request.method == 'POST':
-        if request.form.get('ns_select'):
+        if 'ns_select' in request.form:
             session['ns_select'] = request.form.get('ns_select')
         selected = request.form.get('selected')
 
@@ -82,7 +82,7 @@ def hpa():
     selected = None
 
     if request.method == 'POST':
-        if request.form.get('ns_select'):
+        if 'ns_select' in request.form:
             session['ns_select'] = request.form.get('ns_select')
         selected = request.form.get('selected')
 
@@ -135,7 +135,7 @@ def pdp():
     user_token = get_user_token(session)
 
     if request.method == 'POST':
-        if request.form.get('ns_select'):
+        if 'ns_select' in request.form:
             session['ns_select'] = request.form.get('ns_select')
         selected = request.form.get('selected')
 
@@ -187,7 +187,7 @@ def resource_quota():
     user_token = get_user_token(session)
 
     if request.method == 'POST':
-        if request.form.get('ns_select'):
+        if 'ns_select' in request.form:
             session['ns_select'] = request.form.get('ns_select')
         selected = request.form.get('selected')
 
@@ -239,7 +239,7 @@ def limit_range():
     user_token = get_user_token(session)
 
     if request.method == 'POST':
-        if request.form.get('ns_select'):
+        if 'ns_select' in request.form:
             session['ns_select'] = request.form.get('ns_select')
         selected = request.form.get('selected')
 

src/kubedash/blueprint/security.py

@@ -28,7 +28,7 @@ def secrets():
     user_token = get_user_token(session)
 
     if request.method == 'POST':
-        if request.form.get('ns_select', None):
+        if 'ns_select' in request.form:
             session['ns_select'] = request.form.get('ns_select')
         selected = request.form.get('selected')
 
@@ -50,7 +50,7 @@ def secrets():
 def secrets_data():
     if request.method == 'POST':
         secret_name = request.form.get('secret_name')
-        if request.form.get('ns_select', None):
+        if 'ns_select' in request.form:
             session['ns_select'] = request.form.get('ns_select')
 
         user_token = get_user_token(session)
@@ -84,7 +84,7 @@ def policies_list():
     user_token = get_user_token(session)
 
     if request.method == 'POST':
-        if request.form.get('ns_select', None):
+        if 'ns_select' in request.form:
             session['ns_select'] = request.form.get('ns_select')
         selected = request.form.get('selected')
 
@@ -106,7 +106,7 @@ def policies_list():
 def policies_data():
     if request.method == 'POST':
         policy_name = request.form.get('policy_name')
-        if request.form.get('ns_select', None):
+        if 'ns_select' in request.form:
             session['ns_select'] = request.form.get('ns_select')
 
         user_token = get_user_token(session)
@@ -154,7 +154,7 @@ def priorityclass_list():
 def priorityclass_data():
     if request.method == 'POST':
         pc_name = request.form.get('pc_name')
-        if request.form.get('ns_select', None):
+        if 'ns_select' in request.form:
             session['ns_select'] = request.form.get('ns_select')
 
         user_token = get_user_token(session)

src/kubedash/blueprint/settings.py

@@ -38,15 +38,26 @@
 def sso_config():
     if request.method == 'POST':
         oauth_server_uri = request.form['oauth_server_uri']
-        oauth_server_ca = str(base64_encode(oauth_server_ca.strip()), 'UTF-8') if oauth_server_ca else None
+        oauth_server_ca = None
+        if "oauth_server_ca" in request.form:
+            oauth_server_ca_bas64 = request.form['oauth_server_ca']
+            oauth_server_ca = str(base64_encode(oauth_server_ca_bas64.strip()), 'UTF-8')
         client_id = request.form['client_id']
         client_secret = request.form['client_secret']
         base_uri = request.form['base_uri']
         if not base_uri:
             base_uri = request.root_url.rstrip(request.root_url[-1])
-        scope = request.form.getlist('scope')
-        while("" in scope):
-            scope.remove("")
+        if "scope" in request.form:
+            scope = request.form.getlist('scope')
+            while("" in scope):
+                scope.remove("")
+        else:
+            scope = [
+                "openid",          # mandatory for OpenIDConnect auth
+                "email",           # smallest and most consistent scope and claim
+                "offline_access",  # needed to actually ask for refresh_token
+                "profile",
+            ]
 
         request_type = request.form['request_type']
         if request_type == "edit":
@@ -71,13 +82,7 @@ def sso_config():
             return render_template(
                 'settings/sso-config.html.j2',
                 base_uri = request.root_url.rstrip(request.root_url[-1]),
-                scope = [
-                    "openid",          # mandatory for OpenIDConnect auth
-                    "email",           # smallest and most consistent scope and claim
-                    "offline_access",  # needed to actually ask for refresh_token
-                    "good-service",
-                    "profile",
-                ]
+                scope = scope
             )
         else:
             return render_template(
@@ -99,7 +104,7 @@ def callback():
             flash('Error encountered.', "danger")
     ssoServer = SSOSererGet()
     if ('code' not in request.args and 'state' not in request.args) or not ssoServer:
-        return redirect(url_for('sso_bp.login'))
+        return redirect(url_for('sso.login'))
     else:
         auth_server_info, oauth = get_auth_server_info()
         token_url = auth_server_info["token_endpoint"]

src/kubedash/blueprint/storage.py

@@ -123,7 +123,7 @@ def pvc():
     user_token = get_user_token(session)
 
     if request.method == 'POST':
-        if request.form.get('ns_select', None):
+        if 'ns_select' in request.form:
             session['ns_select'] = request.form.get('ns_select')
         selected = request.form.get('selected')
 
@@ -179,7 +179,7 @@ def pv():
     user_token = get_user_token(session)
 
     if request.method == 'POST':
-        if request.form.get('ns_select', None):
+        if 'ns_select' in request.form:
             session['ns_select'] = request.form.get('ns_select')
         selected = request.form.get('selected')
 
@@ -202,7 +202,7 @@ def pv():
 def pv_data():
     pv_data = None
     if request.method == 'POST':
-        if request.form.get('ns_select', None):
+        if 'ns_select' in request.form:
             session['ns_select'] = request.form.get('ns_select')
         selected = request.form.get('selected')
         user_token = get_user_token(session)
@@ -257,7 +257,7 @@ def configmap():
     user_token = get_user_token(session)
 
     if request.method == 'POST':
-        if request.form.get('ns_select', None):
+        if 'ns_select' in request.form:
             session['ns_select'] = request.form.get('ns_select')
         selected = request.form.get('selected')
 
@@ -279,7 +279,7 @@ def configmap():
 def configmap_data():
     if request.method == 'POST':
         configmap_name = request.form.get('configmap_name')
-        if request.form.get('ns_select', None):
+        if 'ns_select' in request.form:
             session['ns_select'] = request.form.get('ns_select')
 
         user_token = get_user_token(session)

src/kubedash/blueprint/user.py

@@ -97,19 +97,19 @@ def users_add():
         email_test = bool(email_check(email))
         if not email_test:
             flash("Email is not valid", "danger")
-            return redirect(url_for('users_bp.users_list'))
+            return redirect(url_for('users.users_list'))
 
         elif not len(password) >= 8:
             flash("Password must be 8 character in length", "danger")
-            return redirect(url_for('users_bp.users_list'))
+            return redirect(url_for('users.users_list'))
         else:
             if type != "Local":
                 private_key_base64, user_certificate_base64 = k8sCreateUser(username)
                 KubectlConfigStore(username, type, private_key_base64, user_certificate_base64)
 
             UserCreate(username, password, email, type, role, None)
             flash("User Created Successfully", "success")
-            return redirect(url_for('users_bp.users_list'))
+            return redirect(url_for('users.users_list'))
     else:
         return redirect(url_for('auth.login'))
 
@@ -120,7 +120,7 @@ def users_delete():
         username = request.form['username']
         UserDelete(username)
         flash("User Deleted Successfully", "success")
-        return redirect(url_for('users_bp.users_list'))
+        return redirect(url_for('users.users_list'))
     else:
         return redirect(url_for('auth.login'))