Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 22161 invoked from network); 16 Feb 2011 15:19:08 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 16 Feb 2011 15:19:08 -0000 Received: (qmail 21048 invoked by uid 500); 16 Feb 2011 15:19:08 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 20973 invoked by uid 500); 16 Feb 2011 15:19:06 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 20964 invoked by uid 99); 16 Feb 2011 15:19:06 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Feb 2011 15:19:05 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Feb 2011 15:19:05 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 41AD42388A33; Wed, 16 Feb 2011 15:18:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1071281 - /directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java Date: Wed, 16 Feb 2011 15:18:45 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110216151845.41AD42388A33@eris.apache.org> Author: pamarcelot Date: Wed Feb 16 15:18:43 2011 New Revision: 1071281 URL: http://svn.apache.org/viewvc?rev=1071281&view=rev Log: Fix for DIRAPI-42 (Add additional classes and clean method arguments for SASL binds (CRAM-MD5, DIGEST-MD5, GSS-API)). Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java?rev=1071281&r1=1071280&r2=1071281&view=diff ============================================================================== --- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java (original) +++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java Wed Feb 16 15:18:43 2011 @@ -36,6 +36,9 @@ import javax.net.ssl.TrustManager; import javax.net.ssl.TrustManagerFactory; import javax.net.ssl.X509TrustManager; +import org.apache.directory.ldap.client.api.CramMd5Request; +import org.apache.directory.ldap.client.api.DigestMd5Request; +import org.apache.directory.ldap.client.api.GssApiRequest; import org.apache.directory.ldap.client.api.LdapConnectionConfig; import org.apache.directory.ldap.client.api.LdapNetworkConnection; import org.apache.directory.ldap.client.api.exception.InvalidConnectionException; @@ -314,21 +317,33 @@ public class DirectoryApiConnectionWrapp // CRAM-MD5 Authentication else if ( connection.getConnectionParameter().getAuthMethod() == ConnectionParameter.AuthenticationMethod.SASL_CRAM_MD5 ) { - bindResponse = ldapConnection.bindCramMd5( bindPrincipal, bindPassword, null ); + CramMd5Request cramMd5Request = new CramMd5Request(); + cramMd5Request.setUsername( bindPrincipal ); + cramMd5Request.setCredentials( bindPassword ); + + bindResponse = ldapConnection.bind( cramMd5Request ); } // DIGEST-MD5 Authentication else if ( connection.getConnectionParameter().getAuthMethod() == ConnectionParameter.AuthenticationMethod.SASL_DIGEST_MD5 ) { - bindResponse = ldapConnection.bindDigestMd5( bindPrincipal, bindPassword, null, - connection.getConnectionParameter().getSaslRealm() ); + DigestMd5Request digestMd5Request = new DigestMd5Request(); + digestMd5Request.setUsername( bindPrincipal ); + digestMd5Request.setCredentials( bindPassword ); + digestMd5Request.setRealmName( connection.getConnectionParameter().getSaslRealm() ); + + bindResponse = ldapConnection.bind( digestMd5Request ); } // GSSAPI Authentication else if ( connection.getConnectionParameter().getAuthMethod() == ConnectionParameter.AuthenticationMethod.SASL_GSSAPI ) { - bindResponse = ldapConnection.bindGssApi( bindPrincipal, bindPassword, - connection.getConnectionParameter().getKrb5Realm(), - connection.getConnectionParameter().getKrb5KdcHost(), - connection.getConnectionParameter().getKrb5KdcPort() ); + GssApiRequest gssApiRequest = new GssApiRequest(); + gssApiRequest.setUsername( bindPrincipal ); + gssApiRequest.setCredentials( bindPassword ); + gssApiRequest.setRealmName( connection.getConnectionParameter().getKrb5Realm() ); + gssApiRequest.setKdcHost( connection.getConnectionParameter().getKrb5KdcHost() ); + gssApiRequest.setKdcPort( connection.getConnectionParameter().getKrb5KdcPort() ); + + bindResponse = ldapConnection.bind( gssApiRequest ); } checkResponse( bindResponse );