- markus@cvs.openbsd.org 2013/03/07 19:27:25
[auth.h auth2-chall.c auth2.c monitor.c sshd_config.5]
add submethod support to AuthenticationMethods; ok and freedback djm@
diff --git a/auth2.c b/auth2.c
index e367a10..e444821 100644
--- a/auth2.c
+++ b/auth2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2.c,v 1.126 2012/12/02 20:34:09 djm Exp $ */
+/* $OpenBSD: auth2.c,v 1.127 2013/03/07 19:27:25 markus Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
*
@@ -98,8 +98,12 @@
/* helper */
static Authmethod *authmethod_lookup(Authctxt *, const char *);
static char *authmethods_get(Authctxt *authctxt);
-static int method_allowed(Authctxt *, const char *);
-static int list_starts_with(const char *, const char *);
+
+#define MATCH_NONE 0 /* method or submethod mismatch */
+#define MATCH_METHOD 1 /* method matches (no submethod specified) */
+#define MATCH_BOTH 2 /* method and submethod match */
+#define MATCH_PARTIAL 3 /* method matches, submethod can't be checked */
+static int list_starts_with(const char *, const char *, const char *);
char *
auth2_read_banner(void)
@@ -316,7 +320,7 @@
}
if (authenticated && options.num_auth_methods != 0) {
- if (!auth2_update_methods_lists(authctxt, method)) {
+ if (!auth2_update_methods_lists(authctxt, method, submethod)) {
authenticated = 0;
partial = 1;
}
@@ -387,8 +391,9 @@
* methods list. Returns 1 if allowed, or no methods lists configured.
* 0 otherwise.
*/
-static int
-method_allowed(Authctxt *authctxt, const char *method)
+int
+auth2_method_allowed(Authctxt *authctxt, const char *method,
+ const char *submethod)
{
u_int i;
@@ -399,7 +404,8 @@
if (options.num_auth_methods == 0)
return 1;
for (i = 0; i < authctxt->num_auth_methods; i++) {
- if (list_starts_with(authctxt->auth_methods[i], method))
+ if (list_starts_with(authctxt->auth_methods[i], method,
+ submethod) != MATCH_NONE)
return 1;
}
return 0;
@@ -419,7 +425,8 @@
if (authmethods[i]->enabled == NULL ||
*(authmethods[i]->enabled) == 0)
continue;
- if (!method_allowed(authctxt, authmethods[i]->name))
+ if (!auth2_method_allowed(authctxt, authmethods[i]->name,
+ NULL))
continue;
if (buffer_len(&b) > 0)
buffer_append(&b, ",", 1);
@@ -442,7 +449,8 @@
if (authmethods[i]->enabled != NULL &&
*(authmethods[i]->enabled) != 0 &&
strcmp(name, authmethods[i]->name) == 0 &&
- method_allowed(authctxt, authmethods[i]->name))
+ auth2_method_allowed(authctxt,
+ authmethods[i]->name, NULL))
return authmethods[i];
debug2("Unrecognized authentication method name: %s",
name ? name : "NULL");
@@ -457,7 +465,7 @@
int
auth2_methods_valid(const char *_methods, int need_enable)
{
- char *methods, *omethods, *method;
+ char *methods, *omethods, *method, *p;
u_int i, found;
int ret = -1;
@@ -468,6 +476,8 @@
omethods = methods = xstrdup(_methods);
while ((method = strsep(&methods, ",")) != NULL) {
for (found = i = 0; !found && authmethods[i] != NULL; i++) {
+ if ((p = strchr(method, ':')) != NULL)
+ *p = '\0';
if (strcmp(method, authmethods[i]->name) != 0)
continue;
if (need_enable) {
@@ -533,15 +543,30 @@
}
static int
-list_starts_with(const char *methods, const char *method)
+list_starts_with(const char *methods, const char *method,
+ const char *submethod)
{
size_t l = strlen(method);
+ int match;
+ const char *p;
if (strncmp(methods, method, l) != 0)
- return 0;
- if (methods[l] != ',' && methods[l] != '\0')
- return 0;
- return 1;
+ return MATCH_NONE;
+ p = methods + l;
+ match = MATCH_METHOD;
+ if (*p == ':') {
+ if (!submethod)
+ return MATCH_PARTIAL;
+ l = strlen(submethod);
+ p += 1;
+ if (strncmp(submethod, p, l))
+ return MATCH_NONE;
+ p += l;
+ match = MATCH_BOTH;
+ }
+ if (*p != ',' && *p != '\0')
+ return MATCH_NONE;
+ return match;
}
/*
@@ -550,14 +575,21 @@
* if it did.
*/
static int
-remove_method(char **methods, const char *method)
+remove_method(char **methods, const char *method, const char *submethod)
{
- char *omethods = *methods;
+ char *omethods = *methods, *p;
size_t l = strlen(method);
+ int match;
- if (!list_starts_with(omethods, method))
+ match = list_starts_with(omethods, method, submethod);
+ if (match != MATCH_METHOD && match != MATCH_BOTH)
return 0;
- *methods = xstrdup(omethods + l + (omethods[l] == ',' ? 1 : 0));
+ p = omethods + l;
+ if (submethod && match == MATCH_BOTH)
+ p += 1 + strlen(submethod); /* include colon */
+ if (*p == ',')
+ p++;
+ *methods = xstrdup(p);
free(omethods);
return 1;
}
@@ -569,13 +601,15 @@
* Returns 1 if the method completed any authentication list or 0 otherwise.
*/
int
-auth2_update_methods_lists(Authctxt *authctxt, const char *method)
+auth2_update_methods_lists(Authctxt *authctxt, const char *method,
+ const char *submethod)
{
u_int i, found = 0;
debug3("%s: updating methods list after \"%s\"", __func__, method);
for (i = 0; i < authctxt->num_auth_methods; i++) {
- if (!remove_method(&(authctxt->auth_methods[i]), method))
+ if (!remove_method(&(authctxt->auth_methods[i]), method,
+ submethod))
continue;
found = 1;
if (*authctxt->auth_methods[i] == '\0') {