TremoloSecurity
diff --git a/‎unison/unison-applications-k8s/src/main/java/com/tremolosecurity/k8s/util/PortalGroupMapper.java‎
Lines changed: 65 additions & 0 deletions b/‎unison/unison-applications-k8s/src/main/java/com/tremolosecurity/k8s/util/PortalGroupMapper.java‎
Lines changed: 65 additions & 0 deletions
diff --git a/‎unison/unison-idp-openidconnect/src/main/java/com/tremolosecurity/idp/providers/OpenIDConnectIdP.java‎
Lines changed: 1 addition & 1 deletion b/‎unison/unison-idp-openidconnect/src/main/java/com/tremolosecurity/idp/providers/OpenIDConnectIdP.java‎
Lines changed: 1 addition & 1 deletion
@@ -19,6 +19,7 @@
 import com.google.common.collect.ComparisonChain;
 import com.novell.ldap.LDAPAttribute;
 import com.novell.ldap.LDAPEntry;
+import com.novell.ldap.util.ByteArray;
 import com.tremolosecurity.myvd.dataObj.ClusterInfo;
 import com.tremolosecurity.myvd.dataObj.RoleInfo;
 import com.tremolosecurity.provisioning.core.ProvisioningException;
@@ -142,6 +143,70 @@ public int compare(RoleInfo o1, RoleInfo o2) {
         return portalGroupVals;
     }
 
+    public List<String> getClusterGroups(List<ByteArray> groups,String clusterName) throws ProvisioningException {
+        HashMap<String, ClusterInfo> clusterAz = new HashMap<>();
+        List<String> clusterGroups = new ArrayList<String>();
+
+
+
+        for (ByteArray rawGroup : groups) {
+            String group = rawGroup.toString();
+            RoleInfo ri = this.roles.get(group);
+            if (ri == null) {
+
+                    ri = this.loadRoleInfo(group);
+
+
+
+
+
+
+            }
+
+
+
+            ClusterInfo cluster = clusterAz.get(ri.getCluster());
+            if (cluster == null) {
+                cluster = new ClusterInfo(ri.getCluster());
+                clusterAz.put(ri.getCluster(), cluster);
+            }
+
+            cluster.getGroups().add(group);
+
+            Map<String, Integer> ns = cluster.getNamespaces().get(ri.getNamespace());
+            if (ns == null) {
+                ns = new HashMap<String, Integer>();
+                cluster.getNamespaces().put(ri.getNamespace(), ns);
+            }
+            ns.put(ri.getName(), 1);
+
+
+
+
+            ClusterInfo clusterInfo = clusterAz.get("N/A");
+            logger.info("clusterInfo NA : " + clusterInfo);
+            if (clusterInfo != null) {
+
+                clusterGroups.addAll(clusterInfo.getGroups());
+            }
+
+            clusterInfo = clusterAz.get(clusterName);
+            logger.info("clusterInfo : " + clusterInfo);
+            if (clusterInfo != null) {
+                clusterGroups.addAll(clusterInfo.getGroups());
+            }
+
+
+
+        }
+
+
+
+
+
+        return clusterGroups;
+    }
+
     public List<String> generateMappings(LDAPEntry entry) throws ProvisioningException {
         JSONArray portalGroupVals = new JSONArray();
         List<RoleInfo> sortedRoles = new ArrayList<RoleInfo>();
 
@@ -1941,7 +1941,7 @@ private void completeFederation(HttpServletRequest request,
 
 
 		if (! authInfo.isAuthComplete()) {
-			logger.warn("Attempted completetd federation before autthentication is completeed, clearing authentication and redirecting to the original URL");
+			logger.warn("Attempted completetd federation before authentication is completed, clearing authentication and redirecting to the original URL");
 
 			UrlHolder holder = (UrlHolder) request.getAttribute(ProxyConstants.AUTOIDM_CFG);
 			request.getSession().removeAttribute(ProxyConstants.AUTH_CTL);