From: Sweidan Omar <TFS\sweidan.omar>
Date: Mon, 6 Dec 2021 13:19:56 +0000 (+0000)
Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... 
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=3f3d3b2ad4b2639b99450b83934d21d7646ee49f;p=mediacube.git

git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C32499
---

diff --git a/server/user.mediacube.gui/src/user/jobengine/zk/util/LDAPUserHandler.java b/server/user.mediacube.gui/src/user/jobengine/zk/util/LDAPUserHandler.java
index 2a03c099..abccda44 100644
--- a/server/user.mediacube.gui/src/user/jobengine/zk/util/LDAPUserHandler.java
+++ b/server/user.mediacube.gui/src/user/jobengine/zk/util/LDAPUserHandler.java
@@ -1,7 +1,5 @@
 package user.jobengine.zk.util;
 
-import java.lang.invoke.MethodHandles;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.Hashtable;
 import java.util.LinkedHashSet;
@@ -28,8 +26,8 @@ public class LDAPUserHandler {
 	private static final String OTHER_MAILBOX = "otherMailbox";
 	private static final Logger logger = LogManager.getLogger();
 	private static final String LDAP_ADDRESS = "ldap://%s:%s";
-	private static final String AD_NONSECUREPORT = "ad_nonsecureport";
-	private static final String AD_HOST = "ad_host";
+//	private static final String AD_NONSECUREPORT = "ad_nonsecureport";
+//	private static final String AD_HOST = "ad_host";
 	// private static final String TECH_ACCOUNT = "tech_account";
 	// private static final String TECH_PASSWORD = "tech_password";
 	private static final String SIMPLE_AUTH = "simple";
@@ -38,10 +36,10 @@ public class LDAPUserHandler {
 	private static final String MAIL = "mail";
 	private static final String DISPLAY_NAME = "displayName";
 	private static final String MEMBER_OF = "memberOf";
-	private static final String AD_BASE_DN = "ad_base_dn";
-	private static final String AD_ADMIN_MAP = "ad_admin_map";
-	private static final String AD_SUBMITTER_MAP = "ad_submitter_map";
-	private static final String AD_EDITOR_MAP = "ad_editor_map";
+//	private static final String AD_BASE_DN = "ad_base_dn";
+//	private static final String AD_ADMIN_MAP = "ad_admin_map";
+//	private static final String AD_SUBMITTER_MAP = "ad_submitter_map";
+//	private static final String AD_EDITOR_MAP = "ad_editor_map";
 
 	public static void main(String[] args) throws Exception {
 		// Properties cfg = new Properties();
@@ -50,8 +48,8 @@ public class LDAPUserHandler {
 		// cfg.setProperty("ad_base_dn", "DC=intra,DC=echotv,DC=hu");
 
 		// Properties cfg = new Properties();
-		URL srcLocation = MethodHandles.lookup().lookupClass().getProtectionDomain().getCodeSource().getLocation();
-		URL location = new URL(srcLocation, "../../-configuration/mediacube-auth.properties");
+//		URL srcLocation = MethodHandles.lookup().lookupClass().getProtectionDomain().getCodeSource().getLocation();
+//		URL location = new URL(srcLocation, "../../-configuration/mediacube-auth.properties");
 		// cfg.load(new FileInputStream(location.toURI().getPath().toString()));
 
 		// LDAPHandler h = new LDAPHandler("echotest", "aA123456+", cfg);
@@ -85,7 +83,8 @@ public class LDAPUserHandler {
 			return false;
 
 		// maradvany?
-		//List<String> remains = ListUtils.intersect(Arrays.asList(property.toString().split(",")), memberOf);
+		// List<String> remains =
+		// ListUtils.intersect(Arrays.asList(property.toString().split(",")), memberOf);
 
 		List<String> remains = ListUtils.intersect(property, memberOf);
 
@@ -136,7 +135,8 @@ public class LDAPUserHandler {
 
 	private LdapContext getContext(String account, String password) throws Exception {
 		Hashtable<String, String> env = new Hashtable<>();
-		String ldapURL = String.format(LDAP_ADDRESS, mediaCubeAuthentication.getAdHost(), mediaCubeAuthentication.getAdNonSecurePort());
+		String ldapURL = String.format(LDAP_ADDRESS, mediaCubeAuthentication.getAdHost(),
+				mediaCubeAuthentication.getAdNonSecurePort());
 		env.put(Context.PROVIDER_URL, ldapURL);
 		env.put(Context.INITIAL_CONTEXT_FACTORY, CTX_FACTORY);
 		env.put(Context.SECURITY_AUTHENTICATION, SIMPLE_AUTH);
@@ -235,7 +235,8 @@ public class LDAPUserHandler {
 		return result;
 	}
 
-	private void setMemberOf(UserPrincipal userPrincipal, Attribute groupMembers, LdapContext ctx) throws NamingException {
+	private void setMemberOf(UserPrincipal userPrincipal, Attribute groupMembers, LdapContext ctx)
+			throws NamingException {
 		List<String> memberOf = new ArrayList<>();
 		for (int i = 0; i < groupMembers.size(); i++) {
 			String groupName = groupMembers.get(i).toString();
@@ -252,7 +253,8 @@ public class LDAPUserHandler {
 		updateMembership(userPrincipal, memberOf, mediaCubeAuthentication);
 	}
 
-	public void updateMembership(UserPrincipal userPrincipal, List<String> memberOf, MediaCubeAuthentication mediaCubeAuthentication) {
+	public void updateMembership(UserPrincipal userPrincipal, List<String> memberOf,
+			MediaCubeAuthentication mediaCubeAuthentication) {
 		if (memberOf == null)
 			return;