0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #1691 remove netbios name

Browse source
This commit is contained in:
Shinsuke Sugaya 2018-06-07 17:43:43 +09:00
parent d14505c4c6
commit 9234bcc922
3 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/org/codelibs/fess/helper/SambaHelper.java
View file

@ -57,6 +57,6 @@ public class SambaHelper {
}
protected String createSearchRole(final int type, final String name) {
return type + name;
return type + fessConfig.getCanonicalLdapName(name);
}
}

18
src/main/java/org/codelibs/fess/ldap/LdapManager.java
View file

@ -18,7 +18,6 @@ package org.codelibs.fess.ldap;
import static org.codelibs.core.stream.StreamUtil.stream;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Base64;
import java.util.Collections;
import java.util.Hashtable;
@ -247,22 +246,7 @@ public class LdapManager {
} else {
name = entryDn.substring(start, end);
}
if (fessConfig.isLdapIgnoreNetbiosName()) {
final String[] values = name.split("\\\\");
if (values.length == 0) {
return null;
} else if (values.length == 1) {
if (logger.isDebugEnabled()) {
logger.debug("name(1): " + values[0]);
}
return values[0];
}
name = String.join("\\", Arrays.copyOfRange(values, 1, values.length));
if (logger.isDebugEnabled()) {
logger.debug("name(2): " + name);
}
return name;
}
name = fessConfig.getCanonicalLdapName(name);
if (logger.isDebugEnabled()) {
logger.debug("name: " + name);
}

14
src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java
View file

@ -1817,4 +1817,18 @@ public interface FessProp {
stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).toArray(n -> new String[n]));
}
boolean isLdapIgnoreNetbiosName();
public default String getCanonicalLdapName(final String name) {
if (isLdapIgnoreNetbiosName()) {
final String[] values = name.split("\\\\");
if (values.length == 0) {
return null;
} else if (values.length == 1) {
return values[0];
}
return String.join("\\", Arrays.copyOfRange(values, 1, values.length));
}
return name;
}
}