X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Fliblutil%2Fsasl.c;h=ffbd29846e67b03fadbcd18010c79a319b3c4d32;hb=c3e28a5488a8011ef0352f48fca85c48679205ba;hp=a005cdf6bc61e3def38a71fb57b26eb999efd4ae;hpb=bab26b3142a2464ce62af7d0350a760a8509e8a2;p=openldap

diff --git a/libraries/liblutil/sasl.c b/libraries/liblutil/sasl.c
index a005cdf6bc..ffbd29846e 100644
--- a/libraries/liblutil/sasl.c
+++ b/libraries/liblutil/sasl.c
@@ -1,7 +1,16 @@
 /* $OpenLDAP$ */
-/*
- * Copyright 2000 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2007 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -13,20 +22,108 @@
 #include <ac/string.h>
 #include <ac/unistd.h>
 
+#ifdef HAVE_SASL_SASL_H
+#include <sasl/sasl.h>
+#else
 #include <sasl.h>
+#endif
 
 #include <ldap.h>
+#include "ldap_pvt.h"
 #include "lutil_ldap.h"
 
+
+typedef struct lutil_sasl_defaults_s {
+	char *mech;
+	char *realm;
+	char *authcid;
+	char *passwd;
+	char *authzid;
+	char **resps;
+	int nresps;
+} lutilSASLdefaults;
+
+
+void
+lutil_sasl_freedefs(
+	void *defaults )
+{
+	lutilSASLdefaults *defs = defaults;
+	
+	if (defs->mech) ber_memfree(defs->mech);
+	if (defs->realm) ber_memfree(defs->realm);
+	if (defs->authcid) ber_memfree(defs->authcid);
+	if (defs->passwd) ber_memfree(defs->passwd);
+	if (defs->authzid) ber_memfree(defs->authzid);
+	if (defs->resps) ldap_charray_free(defs->resps);
+
+	ber_memfree(defs);
+}
+
+void *
+lutil_sasl_defaults(
+	LDAP *ld,
+	char *mech,
+	char *realm,
+	char *authcid,
+	char *passwd,
+	char *authzid )
+{
+	lutilSASLdefaults *defaults;
+	
+	defaults = ber_memalloc( sizeof( lutilSASLdefaults ) );
+
+	if( defaults == NULL ) return NULL;
+
+	defaults->mech = mech ? ber_strdup(mech) : NULL;
+	defaults->realm = realm ? ber_strdup(realm) : NULL;
+	defaults->authcid = authcid ? ber_strdup(authcid) : NULL;
+	defaults->passwd = passwd ? ber_strdup(passwd) : NULL;
+	defaults->authzid = authzid ? ber_strdup(authzid) : NULL;
+
+	if( defaults->mech == NULL ) {
+		ldap_get_option( ld, LDAP_OPT_X_SASL_MECH, &defaults->mech );
+	}
+	if( defaults->realm == NULL ) {
+		ldap_get_option( ld, LDAP_OPT_X_SASL_REALM, &defaults->realm );
+	}
+	if( defaults->authcid == NULL ) {
+		ldap_get_option( ld, LDAP_OPT_X_SASL_AUTHCID, &defaults->authcid );
+	}
+	if( defaults->authzid == NULL ) {
+		ldap_get_option( ld, LDAP_OPT_X_SASL_AUTHZID, &defaults->authzid );
+	}
+	defaults->resps = NULL;
+	defaults->nresps = 0;
+
+	return defaults;
+}
+
 static int interaction(
-	sasl_interact_t *interact )
+	unsigned flags,
+	sasl_interact_t *interact,
+	lutilSASLdefaults *defaults )
 {
+	const char *dflt = interact->defresult;
 	char input[1024];
 
 	int noecho=0;
 	int challenge=0;
 
 	switch( interact->id ) {
+	case SASL_CB_GETREALM:
+		if( defaults ) dflt = defaults->realm;
+		break;
+	case SASL_CB_AUTHNAME:
+		if( defaults ) dflt = defaults->authcid;
+		break;
+	case SASL_CB_PASS:
+		if( defaults ) dflt = defaults->passwd;
+		noecho = 1;
+		break;
+	case SASL_CB_USER:
+		if( defaults ) dflt = defaults->authzid;
+		break;
 	case SASL_CB_NOECHOPROMPT:
 		noecho = 1;
 		challenge = 1;
@@ -34,22 +131,33 @@ static int interaction(
 	case SASL_CB_ECHOPROMPT:
 		challenge = 1;
 		break;
-	case SASL_CB_PASS:
-		noecho = 1;
-		break;
+	}
+
+	if( dflt && !*dflt ) dflt = NULL;
+
+	if( flags != LDAP_SASL_INTERACTIVE &&
+		( dflt || interact->id == SASL_CB_USER ) )
+	{
+		goto use_default;
+	}
+
+	if( flags == LDAP_SASL_QUIET ) {
+		/* don't prompt */
+		return LDAP_OTHER;
 	}
 
 	if( challenge ) {
 		if( interact->challenge ) {
-			fprintf( stderr, "Challenge: %s\n", interact->challenge );
-		}
-		if( interact->defresult ) {
-			fprintf( stderr, "Default Result: %s\n", interact->defresult );
+			fprintf( stderr, _("Challenge: %s\n"), interact->challenge );
 		}
 	}
 
-	sprintf( input, "%s: ",
-		interact->prompt ? interact->prompt : "Interaction required" );
+	if( dflt ) {
+		fprintf( stderr, _("Default: %s\n"), dflt );
+	}
+
+	snprintf( input, sizeof input, "%s: ",
+		interact->prompt ? interact->prompt : _("Interact") );
 
 	if( noecho ) {
 		interact->result = (char *) getpassphrase( input );
@@ -81,15 +189,18 @@ static int interaction(
 
 	if( interact->len > 0 ) {
 		/* duplicate */
-		char *p = interact->result;
-		interact->result = strdup( p );
+		char *p = (char *)interact->result;
+		ldap_charray_add(&defaults->resps, interact->result);
+		interact->result = defaults->resps[defaults->nresps++];
 
 		/* zap */
 		memset( p, '\0', interact->len );
 
 	} else {
-		/* must be empty */
-		interact->result = strdup("");
+use_default:
+		/* input must be empty */
+		interact->result = (dflt && *dflt) ? dflt : "";
+		interact->len = strlen( interact->result );
 	}
 
 	return LDAP_SUCCESS;
@@ -97,14 +208,20 @@ static int interaction(
 
 int lutil_sasl_interact(
 	LDAP *ld,
+	unsigned flags,
+	void *defaults,
 	void *in )
 {
 	sasl_interact_t *interact = in;
 
-	fputs( "SASL Interaction\n", stderr );
+	if( ld == NULL ) return LDAP_PARAM_ERROR;
+
+	if( flags == LDAP_SASL_INTERACTIVE ) {
+		fputs( _("SASL Interaction\n"), stderr );
+	}
 
 	while( interact->id != SASL_CB_LIST_END ) {
-		int rc = interaction( interact );
+		int rc = interaction( flags, interact, defaults );
 
 		if( rc )  return rc;
 		interact++;
@@ -112,5 +229,4 @@ int lutil_sasl_interact(
 	
 	return LDAP_SUCCESS;
 }
-
 #endif