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

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