From: Martin Willi <martin@revosec.ch>
Date: Tue, 26 Mar 2013 17:04:27 +0000 (+0100)
Subject: charon-cmd: prompt for EAP passwords on-demand using a callback credential set
X-Git-Tag: 5.1.0dr1~154^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ca58c32beb8d05b010f59bf0e6fb9934c790255;p=thirdparty%2Fstrongswan.git

charon-cmd: prompt for EAP passwords on-demand using a callback credential set
---

diff --git a/src/charon-cmd/cmd/cmd_creds.c b/src/charon-cmd/cmd/cmd_creds.c
index 45f16522b4..6112e96df4 100644
--- a/src/charon-cmd/cmd/cmd_creds.c
+++ b/src/charon-cmd/cmd/cmd_creds.c
@@ -15,8 +15,11 @@
 
 #include "cmd_creds.h"
 
+#include <unistd.h>
+
 #include <utils/debug.h>
 #include <credentials/sets/mem_cred.h>
+#include <credentials/sets/callback_cred.h>
 
 typedef struct private_cmd_creds_t private_cmd_creds_t;
 
@@ -34,8 +37,50 @@ struct private_cmd_creds_t {
 	 * Reused in-memory credential set
 	 */
 	mem_cred_t *creds;
+
+	/**
+	 * Callback credential set to get secrets
+	 */
+	callback_cred_t *cb;
+
+	/**
+	 * Already prompted for password?
+	 */
+	bool prompted;
 };
 
+/**
+ * Callback function to prompt for secret
+ */
+static shared_key_t* callback_shared(private_cmd_creds_t *this,
+								shared_key_type_t type,
+								identification_t *me, identification_t *other,
+								id_match_t *match_me, id_match_t *match_other)
+{
+	char *label, *pwd;
+
+	if (this->prompted)
+	{
+		return NULL;
+	}
+	switch (type)
+	{
+		case SHARED_EAP:
+			label = "EAP password: ";
+			break;
+		default:
+			return NULL;
+	}
+	pwd = getpass(label);
+	if (!pwd || strlen(pwd) == 0)
+	{
+		return NULL;
+	}
+	this->prompted = TRUE;
+	*match_me = *match_other = ID_MATCH_PERFECT;
+	return shared_key_create(type, chunk_clone(chunk_from_str(pwd)));
+}
+
 /**
  * Load a trusted certificate from path
  */
@@ -92,7 +137,9 @@ METHOD(cmd_creds_t, destroy, void,
 	private_cmd_creds_t *this)
 {
 	lib->credmgr->remove_set(lib->credmgr, &this->creds->set);
+	lib->credmgr->remove_set(lib->credmgr, &this->cb->set);
 	this->creds->destroy(this->creds);
+	this->cb->destroy(this->cb);
 	free(this);
 }
 
@@ -110,8 +157,10 @@ cmd_creds_t *cmd_creds_create()
 		},
 		.creds = mem_cred_create(),
 	);
+	this->cb = callback_cred_create_shared((void*)callback_shared, this);
 
 	lib->credmgr->add_set(lib->credmgr, &this->creds->set);
+	lib->credmgr->add_set(lib->credmgr, &this->cb->set);
 
 	return &this->public;
 }