cleanup

[cyrus-sasl.git] / lib / client.c

diff --git a/lib/client.c b/lib/client.c
index 5ba6116..8cc2d1d 100644 (file)
--- a/lib/client.c
+++ b/lib/client.c
@@ -390,17 +390,64 @@ static int have_prompts(sasl_conn_t *conn,
   return 1; /* we have all the prompts */
 }
 
-static inline int sasl_is_plus_mech(const char *mech)
+static int
+_mech_plus_p(const char *mech, size_t len)
+{
+    return (len > 5 && strncasecmp(&mech[len - 5], "-PLUS", 5) == 0);
+}
+
+/*
+ * Order PLUS mechanisms first. Returns NUL separated list of
+ * *count items.
+ */
+static int
+_sasl_client_order_mechs(const sasl_utils_t *utils,
+                        const char *mechs,
+                        int has_cb_data,
+                        char **ordered_mechs,
+                        size_t *count,
+                        int *server_can_cb)
 {
-    size_t len = strlen(mech);
-    const char *p;
+    char *list, *listp;
+    size_t i;
+    const char *p, *start  = NULL;
 
-    if (len < 5)
-        return 0;
+    *count = 0;
+    *server_can_cb = 0;
 
-    p = &mech[len - 5];
+    listp = list = utils->malloc(strlen(mechs) + 1);
+    if (list == NULL)
+       return SASL_NOMEM;
 
-    return (strcmp(p, "-PLUS") == 0);
+    do {
+       for (start = p = mechs, i = 0; *p != '\0'; p++) {
+           if (isspace(*p) || p[1] == '\0') {
+               size_t len = p - start;
+
+               if (p[1] == '\0')
+                   len++;
+
+               if (_mech_plus_p(start, len) == has_cb_data) {
+                   memcpy(listp, start, len);
+                   listp[len] = '\0';
+                   listp += len + 1;
+                   (*count)++;
+                   if (*server_can_cb == 0 && has_cb_data)
+                       *server_can_cb = 1;
+               }
+               start = p + 1;
+           }
+       }
+       if (has_cb_data)
+           has_cb_data = 0;
+       else
+           break;
+    } while (1);
+
+    *listp = '\0';
+    *ordered_mechs = list;
+
+    return SASL_OK;
 }
 
 /* select a mechanism for a connection
@@ -434,12 +481,12 @@ int sasl_client_start(sasl_conn_t *conn,
                      const char **mech)
 {
     sasl_client_conn_t *c_conn= (sasl_client_conn_t *) conn;
-    char name[SASL_MECHNAMEMAX + 1];
+    char *ordered_mechs = NULL, *name;
     cmechanism_t *m=NULL,*bestm=NULL;
-    size_t pos=0,place;
-    size_t list_len;
+    size_t i, list_len;
     sasl_ssf_t bestssf = 0, minssf = 0;
-    int result;
+    int result, server_can_cb = 0;
+    unsigned int cbindingdisp;
 
     if(_sasl_client_active==0) return SASL_NOTINIT;
 
@@ -464,38 +511,33 @@ int sasl_client_start(sasl_conn_t *conn,
        minssf = conn->props.min_ssf - conn->external.ssf;
     }
 
-    /* parse mechlist */
-    list_len = strlen(mechlist);
+    result = _sasl_client_order_mechs(c_conn->cparams->utils,
+                                     mechlist,
+                                     SASL_CB_PRESENT(c_conn->cparams),
+                                     &ordered_mechs,
+                                     &list_len,
+                                     &server_can_cb);
+    if (result != 0)
+       goto done;
 
-    while (pos<list_len)
-    {
-       place=0;
-       while ((pos<list_len) && (isalnum((unsigned char)mechlist[pos])
-                                 || mechlist[pos] == '_'
-                                 || mechlist[pos] == '-')) {
-           name[place]=mechlist[pos];
-           pos++;
-           place++;
-           if (SASL_MECHNAMEMAX < place) {
-               place--;
-               while(pos<list_len && (isalnum((unsigned char)mechlist[pos])
-                                      || mechlist[pos] == '_'
-                                      || mechlist[pos] == '-'))
-                   pos++;
-           }
+    if (SASL_CB_PRESENT(c_conn->cparams)) {
+       if (server_can_cb == 0 && SASL_CB_CRITICAL(c_conn->cparams)) {
+           result = SASL_NOMECH;
+           goto done;
+       } else {
+           cbindingdisp = SASL_CB_DISP_WANT;
        }
-       pos++;
-       name[place]=0;
-
-       if (! place) continue;
+    } else {
+       cbindingdisp = SASL_CB_DISP_NONE;
+    }
 
+    for (i = 0, name = ordered_mechs; i < list_len; i++) {
        /* foreach in client list */
        for (m = cmechlist->mech_list; m != NULL; m = m->next) {
-           int myflags;
-           
-           /* Is this the mechanism the server is suggesting? */
-           if (strcasecmp(m->m.plug->mech_name, name))
-               continue; /* no */
+           int myflags, plus;
+
+           if (!_sasl_is_equal_mech(name, m->m.plug->mech_name, &plus))
+               continue;
 
            /* Do we have the prompts for it? */
            if (!have_prompts(conn, m->m.plug))
@@ -519,6 +561,11 @@ int sasl_client_start(sasl_conn_t *conn,
            }
 
            /* Can we meet it's features? */
+          if (SASL_CB_PRESENT(c_conn->cparams) &&
+               !(m->m.plug->features & SASL_FEAT_CHANNEL_BINDING)) {
+               break;
+           }
+
            if ((m->m.plug->features & SASL_FEAT_NEEDSERVERFQDN)
                && !conn->serverFQDN) {
                break;
@@ -530,12 +577,6 @@ int sasl_client_start(sasl_conn_t *conn,
                break;
            }
 
-           /* If client requires channel binding, prefer -PLUS mech */
-           if (c_conn->cparams->chanbindingscrit &&
-               !sasl_is_plus_mech(name)) {
-               break;
-           }
-           
 #ifdef PREFER_MECH
            if (strcasecmp(m->m.plug->mech_name, PREFER_MECH) &&
                bestm && m->m.plug->max_ssf <= bestssf) {
@@ -574,6 +615,11 @@ int sasl_client_start(sasl_conn_t *conn,
                break;
            }
 
+           /* Prefer server advertised CB mechanisms */
+           if (SASL_CB_PRESENT(c_conn->cparams) && plus) {
+               cbindingdisp = SASL_CB_DISP_USED;
+           }
+
            if (mech) {
                *mech = m->m.plug->mech_name;
            }
@@ -581,6 +627,7 @@ int sasl_client_start(sasl_conn_t *conn,
            bestm = m;
            break;
        }
+       name += strlen(name) + 1;
     }
 
     if (bestm == NULL) {
@@ -603,6 +650,7 @@ int sasl_client_start(sasl_conn_t *conn,
 
     c_conn->cparams->external_ssf = conn->external.ssf;
     c_conn->cparams->props = conn->props;
+    c_conn->cparams->cbindingdisp = cbindingdisp;
     c_conn->mech = bestm;
 
     /* init that plugin */
@@ -627,6 +675,8 @@ int sasl_client_start(sasl_conn_t *conn,
        result = SASL_CONTINUE;
 
  done:
+    if (ordered_mechs != NULL)
+       c_conn->cparams->utils->free(ordered_mechs);
     RETURN(conn, result);
 }
 
@@ -963,6 +1013,16 @@ _sasl_print_mechanism (
            printf ("%cNEED_SERVER_FQDN", delimiter);
            delimiter = '|';
        }
+
+       if (m->plug->features & SASL_FEAT_GSS_FRAMING) {
+           printf ("%cGSS_FRAMING", delimiter);
+           delimiter = '|';
+       }
+
+       if (m->plug->features & SASL_FEAT_CHANNEL_BINDING) {
+           printf ("%cCHANNEL_BINDING", delimiter);
+           delimiter = '|';
+       }
     }
 
 /* Delay loading is not supported for the client side plugins: