Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update LDAPConnection.java #8728

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update LDAPConnection.java #8728

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
136 changes: 126 additions & 10 deletions engine/src/main/java/org/pentaho/di/trans/steps/ldapinput/LDAPConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,24 @@
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Base64;
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
import java.util.stream.Collectors;

import javax.naming.NameClassPair;
import javax.naming.NameNotFoundException;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
import javax.naming.directory.Attribute;
import javax.naming.directory.Attributes;
import javax.naming.directory.BasicAttribute;
import javax.naming.directory.BasicAttributes;
import javax.naming.directory.DirContext;
import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchControls;
Expand All @@ -56,6 +64,8 @@
import org.pentaho.di.i18n.BaseMessages;

public class LDAPConnection {
private static final String MEMBER_ATTR = "member";

private static Class<?> PKG = LDAPInputMeta.class; // for i18n purposes, needed by Translator2!!

public static final int SEARCH_SCOPE_OBJECT_SCOPE = 0;
Expand All @@ -78,6 +88,8 @@ public class LDAPConnection {

public static final int STATUS_ADDED = 4;

public static final int DEFAULT_RANGE = 1500;

private final LogChannelInterface log;

private String searchBase;
Expand Down Expand Up @@ -278,6 +290,21 @@ public void search( String searchBase, String filter, int limitRows, String[] at
}
}

private String generateRange( int i ) {
int range = GetPagingSize()>0 ? GetPagingSize() : DEFAULT_RANGE;
return "member;range=" + i * range + "-" + ( ( i + 1 ) * range - 1 );
}

private NamingEnumeration<?> getMembers( SearchResult element ) throws NamingException {
while ( element.getAttributes().getIDs().hasMoreElements() ) {
String memberAttr = element.getAttributes().getIDs().next();
if ( memberAttr.startsWith( MEMBER_ATTR ) ) {
return element.getAttributes().get( memberAttr ).getAll();
}
}
return null;
}

public int delete( String dn, boolean checkEntry ) throws KettleException {
try {

Expand Down Expand Up @@ -309,13 +336,30 @@ public int update( String dn, String[] attributes, String[] values, boolean chec
ModificationItem[] mods = new ModificationItem[nrAttributes];
for ( int i = 0; i < nrAttributes; i++ ) {
// Define attribute
Attribute mod = new BasicAttribute( attributes[i], values[i] );
if ( log.isDebug() ) {
log
.logDebug( BaseMessages.getString( PKG, "LDAPConnection.Update.Attribute", attributes[i], values[i] ) );
Attribute mod = null;
if ( Utils.isEmpty( values[i] ) ) {
mods[i] = new ModificationItem( DirContext.REMOVE_ATTRIBUTE, new BasicAttribute( attributes[i] ) );
} else {
try {
if ( values[i].startsWith( "data:" ) ) {
byte[] data = Base64.getDecoder().decode( values[i].substring( values[i].indexOf( ";" ) + 1 ) );
mod = new BasicAttribute( attributes[i], (byte[]) data );
// for (int j = 0; j < data.length; j++) {
// mod.add(data[j]);
// }
} else {
mod = new BasicAttribute( attributes[i], values[i] );
}
} catch ( Exception e ) {
mod = new BasicAttribute( attributes[i], values[i] );
}
if ( log.isDebug() ) {
log
.logDebug( BaseMessages.getString( PKG, "LDAPConnection.Update.Attribute", attributes[i], values[i] ) );
}
// Save update action on attribute
mods[i] = new ModificationItem( DirContext.REPLACE_ATTRIBUTE, mod );
}
// Save update action on attribute
mods[i] = new ModificationItem( DirContext.REPLACE_ATTRIBUTE, mod );
}
// We have all requested attribute
// let's update now
Expand Down Expand Up @@ -416,7 +460,21 @@ public int upsert( String dn, String[] attributes, String[] values, String[] att
// The entry already exist
// let's update
Attributes attrs = buildAttributes( dn, attributesToUpdate, valuesToUpdate, multValuedSeparator );
String[] attributesToRemove = buildAttributesNamesToRemove( dn, attributesToUpdate, valuesToUpdate );
getInitialContext().modifyAttributes( dn, DirContext.REPLACE_ATTRIBUTE, attrs );

if ( attributesToRemove.length > 0 ) {
Attributes attrsToRemove = new BasicAttributes( true );
Attributes attributesValues = getInitialContext().getAttributes( dn, attributesToRemove );
for ( NamingEnumeration<? extends Attribute> attr = attributesValues.getAll(); attr.hasMore(); ) {
Attribute next = attr.next();
if ( next != null && next.getAll().hasMoreElements() ) {
attrsToRemove.put( next );
}
}

getInitialContext().modifyAttributes( dn, DirContext.REMOVE_ATTRIBUTE, attrsToRemove );
}
return STATUS_UPDATED;
}

Expand All @@ -426,6 +484,17 @@ public int upsert( String dn, String[] attributes, String[] values, String[] att
return STATUS_SKIPPED;
}

private String[] buildAttributesNamesToRemove( String dn, String[] attributes, String[] values ) {
List<String> attrs = new ArrayList<>();
int nrAttributes = attributes.length;
for ( int i = 0; i < nrAttributes; i++ ) {
if ( Utils.isEmpty( values[i] ) ) {
attrs.add( attributes[i] );
}
}
return attrs.toArray( new String[] {} );
}

private Attributes buildAttributes( String dn, String[] attributes, String[] values, String multValuedSeparator ) {
Attributes attrs = new javax.naming.directory.BasicAttributes( true );
int nrAttributes = attributes.length;
Expand All @@ -440,7 +509,18 @@ private Attributes buildAttributes( String dn, String[] attributes, String[] val
}
attrs.put( attr );
} else {
attrs.put( attributes[i], value );
Attribute attr = new BasicAttribute( attributes[i], value );
try {
if ( value.startsWith( "data:" ) ) {
byte[] data = Base64.getDecoder().decode( value.substring( value.indexOf( ";" ) + 1 ) );
attr = new BasicAttribute( attributes[i], (byte[]) data );
attrs.put( attr );
} else {
attrs.put( attr );
}
} catch ( Exception e ) {
attrs.put( attr );
}
}
}
}
Expand Down Expand Up @@ -597,9 +677,45 @@ public Attributes getAttributes() throws KettleException {

try {
SearchResult searchResult = getSearchResult().next();
Attributes results = searchResult.getAttributes();
results.put( "dn", searchResult.getNameInNamespace() );
return results;
Attributes attrs = searchResult.getAttributes();
attrs.put( "dn", searchResult.getNameInNamespace() );

int range = 0;

List<String> list = Collections.list( attrs.getIDs() );
if ( list.contains( MEMBER_ATTR ) && isPagingUsed() ) {
if ( !attrs.get( MEMBER_ATTR ).getAll().hasMoreElements() ) {
boolean finished = false;
Set<String> members = new LinkedHashSet<String>();
NamingEnumeration<?> elements = null;
while ( !finished ) {
try {
getSearchControls().setReturningAttributes( new String[] { generateRange( range ) } );

NamingEnumeration<SearchResult> element = getInitialContext().search( searchResult.getNameInNamespace(), getFilter(),
getSearchControls() );
elements = getMembers( element.next() );
while ( elements.hasMore() ) {
String distinguishedName = (String) elements.next();
members.add( distinguishedName );
}
attrs.remove( generateRange( range ) );
range++;
} catch ( Exception e ) {
// Fails means there is no more result
finished = true;
}
}
members = members.stream().sorted().collect( Collectors.toCollection( () -> new TreeSet<>() ) );
BasicAttribute attr = new BasicAttribute( MEMBER_ATTR );
members.forEach( attr::add );
attrs.put( attr );
} else {
// do nothing
}
}

return attrs;
} catch ( Exception e ) {
throw new KettleException( BaseMessages.getString( PKG, "LDAPConnection.Exception.GettingAttributes" ), e );
}
Expand Down