more tolerant mechlist parsing

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

diff --git a/lib/client.c b/lib/client.c
index 9f3e594..854d9ab 100644 (file)
--- a/lib/client.c
+++ b/lib/client.c
@@ -185,7 +185,7 @@ client_idle(sasl_conn_t *conn)
 /* initialize the SASL client drivers
  *  callbacks      -- base callbacks for all client connections
  * returns:
- *  SASL_OK    -- Success
+ *  SASL_OK        -- Success
  *  SASL_NOMEM     -- Not enough memory
  *  SASL_BADVERS   -- Mechanism version mismatch
  *  SASL_BADPARAM  -- error in config file
@@ -419,9 +419,18 @@ _sasl_client_order_mechs(const sasl_utils_t *utils,
     if (list == NULL)
        return SASL_NOMEM;
 
+    /* xxx confirm this with rfc 2222
+     * SASL mechanism allowable characters are "AZaz-_"
+     * seperators can be any other characters and of any length
+     * even variable lengths between
+     *
+     * Apps should be encouraged to simply use space or comma space
+     * though
+     */
+#define ismechchar(c)   (isalnum((c)) || (c) == '_' || (c) == '-')
     do {
        for (start = p = mechs, i = 0; *p != '\0'; p++) {
-           if (isspace(*p) || p[1] == '\0') {
+           if (!ismechchar(*p) || p[1] == '\0') {
                size_t len = p - start;
 
                if (p[1] == '\0')
@@ -452,11 +461,11 @@ _sasl_client_order_mechs(const sasl_utils_t *utils,
 
 /* select a mechanism for a connection
  *  mechlist      -- mechanisms server has available (punctuation ignored)
- *  secret     -- optional secret from previous session
+ *  secret        -- optional secret from previous session
  * output:
  *  prompt_need   -- on SASL_INTERACT, list of prompts needed to continue
  *  clientout     -- the initial client response to send to the server
- *  mech         -- set to mechanism name
+ *  mech          -- set to mechanism name
  *
  * Returns:
  *  SASL_OK       -- success
@@ -465,14 +474,6 @@ _sasl_client_order_mechs(const sasl_utils_t *utils,
  *  SASL_INTERACT -- user interaction needed to fill in prompt_need list
  */
 
-/* xxx confirm this with rfc 2222
- * SASL mechanism allowable characters are "AZaz-_"
- * seperators can be any other characters and of any length
- * even variable lengths between
- *
- * Apps should be encouraged to simply use space or comma space
- * though
- */
 int sasl_client_start(sasl_conn_t *conn,
                      const char *mechlist,
                      sasl_interact_t **prompt_need,
@@ -486,7 +487,7 @@ int sasl_client_start(sasl_conn_t *conn,
     size_t i, list_len;
     sasl_ssf_t bestssf = 0, minssf = 0;
     int result, server_can_cb = 0;
-    unsigned int cbindingdisp = 0;
+    unsigned int cbindingdisp;
 
     if(_sasl_client_active==0) return SASL_NOTINIT;
 
@@ -522,7 +523,7 @@ int sasl_client_start(sasl_conn_t *conn,
 
     if (SASL_CB_PRESENT(c_conn->cparams)) {
        if (server_can_cb == 0 && SASL_CB_CRITICAL(c_conn->cparams)) {
-           result = SASL_NOMECH;
+           result = SASL_BADBINDING;
            goto done;
        } else {
            cbindingdisp = SASL_CB_DISP_WANT;
@@ -662,14 +663,14 @@ int sasl_client_start(sasl_conn_t *conn,
     /* do a step -- but only if we can do a client-send-first */
  dostep:
     if(clientout) {
-       if(c_conn->mech->m.plug->features & SASL_FEAT_SERVER_FIRST) {
-           *clientout = NULL;
-           *clientoutlen = 0;
-           result = SASL_CONTINUE;
-       } else {
-           result = sasl_client_step(conn, NULL, 0, prompt_need,
-                                     clientout, clientoutlen);
-       }
+        if(c_conn->mech->m.plug->features & SASL_FEAT_SERVER_FIRST) {
+            *clientout = NULL;
+            *clientoutlen = 0;
+            result = SASL_CONTINUE;
+        } else {
+            result = sasl_client_step(conn, NULL, 0, prompt_need,
+                                      clientout, clientoutlen);
+        }
     }
     else
        result = SASL_CONTINUE;
@@ -682,13 +683,13 @@ int sasl_client_start(sasl_conn_t *conn,
 
 /* do a single authentication step.
  *  serverin    -- the server message received by the client, MUST have a NUL
- *              sentinel, not counted by serverinlen
+ *                 sentinel, not counted by serverinlen
  * output:
  *  prompt_need -- on SASL_INTERACT, list of prompts needed to continue
  *  clientout   -- the client response to send to the server
  *
  * returns:
- *  SASL_OK    -- success
+ *  SASL_OK        -- success
  *  SASL_INTERACT  -- user interaction needed to fill in prompt_need list
  *  SASL_BADPROT   -- server protocol incorrect/cancelled
  *  SASL_BADSERV   -- server failed mutual auth
@@ -1066,7 +1067,7 @@ int sasl_client_plugin_info (
                m = m->next;
            }
        } else {
-           mech_list = strdup (c_mech_list);
+            mech_list = strdup (c_mech_list);
 
            cur_mech = mech_list;
 
@@ -1092,7 +1093,7 @@ int sasl_client_plugin_info (
                cur_mech = p;
            }
 
-           free (mech_list);
+            free (mech_list);
        }
 
        info_cb (NULL, SASL_INFO_LIST_END, info_cb_rock);