Changeset 653 for trunk/sx/sasl_gsasl.c

Timestamp:

09/08/08 18:04:44 (5 months ago)

Author:

smoku

Message:

Checking return value of gsasl_base64_to/from(). Fixes #242

Files:

• trunk/sx/sasl_gsasl.c (modified) (5 diffs)

trunk/sx/sasl_gsasl.c

@@ -336 +336 @@
         } else {
             /* decode and process */
-            gsasl_base64_from(in, inlen, &buf, &buflen);
+            ret = gsasl_base64_from(in, inlen, &buf, &buflen);
+            if (ret != GSASL_OK) {
+                _sx_debug(ZONE, "gsasl_base64_from failed, no sasl for this conn; (%d): %s", ret, gsasl_strerror(ret));
+                _sx_nad_write(s, _sx_sasl_failure(s, _sasl_err_MALFORMED_REQUEST), 0);
+            }
         }
 
@@ -351 +355 @@
     else {
         /* decode and process */
-        gsasl_base64_from(in, inlen, &buf, &buflen);
+        ret = gsasl_base64_from(in, inlen, &buf, &buflen);
+        if (ret != GSASL_OK) {
+            _sx_debug(ZONE, "gsasl_base64_from failed, no sasl for this conn; (%d): %s", ret, gsasl_strerror(ret));
+            _sx_nad_write(s, _sx_sasl_failure(s, _sasl_err_MALFORMED_REQUEST), 0);
+        }
+
         if(!sd) {
             _sx_debug(ZONE, "response send before auth request enabling mechanism (decoded: %.*s)", buflen, buf);
@@ -385 +394 @@
 
         /* encode the challenge */
-        gsasl_base64_to(out, outlen, &buf, &buflen);
+        ret = gsasl_base64_to(out, outlen, &buf, &buflen);
         
+        if (ret == GSASL_OK) {
+            _sx_nad_write(s, _sx_sasl_challenge(s, buf, buflen), 0);
+            free(buf);
+        }
+
         if(out != NULL) free(out);
-
-        _sx_nad_write(s, _sx_sasl_challenge(s, buf, buflen), 0);
-
-        free(buf);
 
         return;
@@ -414 +424 @@
 
     /* decode the response */
-    gsasl_base64_from(in, inlen, &buf, &buflen);
-    _sx_debug(ZONE, "decoded data: %.*s", buflen, buf);
-
-    /* process the data */
-    ret = gsasl_step(sd, buf, buflen, &out, &outlen);
-    if(buf != NULL) free(buf);
-
-    /* in progress */
-    if(ret == GSASL_OK || ret == GSASL_NEEDS_MORE) {
-        _sx_debug(ZONE, "sasl handshake in progress (response: %.*s)", outlen, out);
-
-        /* encode the response */
-        gsasl_base64_to(out, outlen, &buf, &buflen);
-
+    ret = gsasl_base64_from(in, inlen, &buf, &buflen);
+
+    if (ret == GSASL_OK) {
+        _sx_debug(ZONE, "decoded data: %.*s", buflen, buf);
+    
+        /* process the data */
+        ret = gsasl_step(sd, buf, buflen, &out, &outlen);
+        if(buf != NULL) free(buf);
+    
+        /* in progress */
+        if(ret == GSASL_OK || ret == GSASL_NEEDS_MORE) {
+            _sx_debug(ZONE, "sasl handshake in progress (response: %.*s)", outlen, out);
+    
+            /* encode the response */
+            ret = gsasl_base64_to(out, outlen, &buf, &buflen);
+    
+            if (ret == GSASL_OK) {
+                _sx_nad_write(s, _sx_sasl_response(s, buf, buflen), 0);
+                if(buf != NULL) free(buf);
+            }
+    
+            if(out != NULL) free(out);
+    
+            return;
+        }
+    
         if(out != NULL) free(out);
-
-        _sx_nad_write(s, _sx_sasl_response(s, buf, buflen), 0);
-
-        if(buf != NULL) free(buf);
-
-        return;
-    }
-
-    if(out != NULL) free(out);
+    }
 
     /* its over */
@@ -804 +818 @@
 
     /* encode the challenge */
-    gsasl_base64_to(out, outlen, &buf, &buflen);
+    ret = gsasl_base64_to(out, outlen, &buf, &buflen);
+    if(ret != GSASL_OK) {
+        _sx_debug(ZONE, "gsasl_base64_to failed, not authing; (%d): %s", ret, gsasl_strerror(ret));
+
+        gsasl_finish(sd);
+
+        return 1;
+    }
     free(out);