From: Kevin Cernekee <cernekee@gmail.com>
Date: Sat, 13 Oct 2012 18:23:35 +0000 (-0700)
Subject: stoken: Add --stoken option to CLI, and invoke library to set up soft token
X-Git-Tag: v4.99~39
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f5e5623d9121aaac5ec60aae8d3bb1ba91b94930;p=users%2Fdwmw2%2Fopenconnect.git

stoken: Add --stoken option to CLI, and invoke library to set up soft token

--stoken allows specifying a token string on the command line, or telling
the library to read it from ~/.stokenrc .

--version will indicate whether openconnect was built with software token
support.

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
---

diff --git a/main.c b/main.c
index 03f0fa92..3ca3bc8e 100644
--- a/main.c
+++ b/main.c
@@ -66,6 +66,8 @@ static int validate_peer_cert(void *_vpninfo,
 			      const char *reason);
 static int process_auth_form(void *_vpninfo,
 			     struct oc_auth_form *form);
+static void init_stoken(struct openconnect_info *vpninfo,
+			const char *token_str);
 
 /* A sanity check that the openconnect executable is running against a
    library of the same version */
@@ -108,6 +110,7 @@ enum {
 	OPT_USERAGENT,
 	OPT_NON_INTER,
 	OPT_DTLS_LOCAL_PORT,
+	OPT_STOKEN,
 };
 
 #ifdef __sun__
@@ -171,6 +174,7 @@ static struct option long_options[] = {
 	OPTION("force-dpd", 1, OPT_FORCE_DPD),
 	OPTION("non-inter", 0, OPT_NON_INTER),
 	OPTION("dtls-local-port", 1, OPT_DTLS_LOCAL_PORT),
+	OPTION("stoken", 2, OPT_STOKEN),
 	OPTION(NULL, 0, 0)
 };
 
@@ -204,6 +208,10 @@ static void print_build_opts(void)
 		printf("%sPKCS#11", sep);
 		sep = comma;
 	}
+	if (openconnect_has_stoken_support()) {
+		printf("%sSoftware token", sep);
+		sep = comma;
+	}
 
 #ifdef HAVE_DTLS
 	printf("%sDTLS", sep);
@@ -271,6 +279,10 @@ static void usage(void)
 	printf("      --no-cert-check             %s\n", _("Do not require server SSL cert to be valid"));
 	printf("      --non-inter                 %s\n", _("Do not expect user input; exit if it is required"));
 	printf("      --passwd-on-stdin           %s\n", _("Read password from standard input"));
+	printf("      --stoken[=TOKENSTRING]      %s\n", _("Use software token to generate password"));
+#ifndef LIBSTOKEN_HDR
+	printf("                                  %s\n", _("(NOTE: libstoken disabled in this build)"));
+#endif
 	printf("      --reconnect-timeout         %s\n", _("Connection retry timeout in seconds"));
 	printf("      --servercert=FINGERPRINT    %s\n", _("Server's certificate SHA1 fingerprint"));
 	printf("      --useragent=STRING          %s\n", _("HTTP header User-Agent: field"));
@@ -433,6 +445,8 @@ int main(int argc, char **argv)
 	char *pidfile = NULL;
 	FILE *fp = NULL;
 	char *config_arg;
+	int use_stoken = 0;
+	char *token_str = NULL;
 
 #ifdef ENABLE_NLS
 	bindtextdomain("openconnect", LOCALEDIR);
@@ -699,6 +713,10 @@ int main(int argc, char **argv)
 		case OPT_DTLS_LOCAL_PORT:
 			vpninfo->dtls_local_port = atoi(config_arg);
 			break;
+		case OPT_STOKEN:
+			use_stoken = 1;
+			token_str = keep_config_arg();
+			break;
 		default:
 			usage();
 		}
@@ -726,6 +744,9 @@ int main(int argc, char **argv)
 #endif
 	}
 
+	if (use_stoken)
+		init_stoken(vpninfo, token_str);
+
 	if (proxy && openconnect_set_http_proxy(vpninfo, strdup(proxy)))
 		exit(1);
 
@@ -1197,3 +1218,26 @@ static int process_auth_form(void *_vpninfo,
 	}
 	return -EINVAL;
 }
+
+static void init_stoken(struct openconnect_info *vpninfo,
+			const char *token_str)
+{
+	int ret = openconnect_set_stoken_mode(vpninfo, 1, token_str);
+
+	switch (ret) {
+	case 0:
+		return;
+	case -EINVAL:
+		fprintf(stderr, _("Soft token string is invalid\n"));
+		exit(1);
+	case -ENOENT:
+		fprintf(stderr, _("Can't open ~/.stokenrc file\n"));
+		exit(1);
+	case -EOPNOTSUPP:
+		fprintf(stderr, _("OpenConnect was not built with soft token support\n"));
+		exit(1);
+	default:
+		fprintf(stderr, _("General failure in libstoken\n"));
+		exit(1);
+	}
+}