X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/b797ae637bde7403d5b767bcca4b193cdc5afce2..e5afa1df87c24d49f0572ff903d4b0ee2eb803a8:/sbr/netsec.c

diff --git a/sbr/netsec.c b/sbr/netsec.c
index 5f822b19..788b23bf 100644
--- a/sbr/netsec.c
+++ b/sbr/netsec.c
@@ -108,17 +108,26 @@ static int checkascii(const unsigned char *byte, size_t len);
 /*
  * How this code works, in general.
  *
- * _If_ we are using no encryption or SASL encryption, then we buffer the
- * network data through ns_inbuffer and ns_outbuffer.  That should be
- * relatively self-explanatory.
+ * _If_ we are using no encryption then we buffer the network data
+ * through ns_inbuffer and ns_outbuffer.  That should be relatively
+ * self-explanatory.
  *
- * If we are using SSL for encryption, then use a buffering BIO for output
- * (that just easier).  Still do buffering for reads; when we need more
- * data we call the BIO_read() function to fill our local buffer.
+ * If we use encryption, then ns_inbuffer and ns_outbuffer contain the
+ * cleartext data.  When it comes time to send the encrypted data on the
+ * (either from a flush or the buffer is full) we either use BIO_write()
+ * for TLS or sasl_encode() (followed by a write() for Cyrus-SASL.  For
+ * reads we either use BIO_read() (TLS) or do a network read into a
+ * temporary buffer and use sasl_decode() (Cyrus-SASL).  Note that if
+ * negotiate TLS then we disable SASL encryption.
  *
- * For SASL, we make use of (for now) the Cyrus-SASL library.  For some
- * mechanisms, we implement those mechanisms directly since the Cyrus SASL
- * library doesn't support them (like OAuth).
+ * We used to use a buffering BIO for the reads/writes for TLS, but it
+ * ended up being complicated to special-case the buffering for everything
+ * except TLS, so the buffering is now unified, no matter which encryption
+ * method is being used (even none).
+ *
+ * For SASL authentication, we make use of (for now) the Cyrus-SASL
+ * library.  For some mechanisms, we implement those mechanisms directly
+ * since the Cyrus SASL library doesn't support them (like OAuth).
  */
 
 /*
@@ -128,8 +137,9 @@ static int checkascii(const unsigned char *byte, size_t len);
 netsec_context *
 netsec_init(void)
 {
-    netsec_context *nsc = mh_xmalloc(sizeof(*nsc));
+    netsec_context *nsc;
 
+    NEW(nsc);
     nsc->ns_readfd = -1;
     nsc->ns_writefd = -1;
     nsc->ns_snoop = 0;
@@ -550,10 +560,38 @@ retry:
 	 */
     }
 
+    /*
+     * Some explanation:
+     *
+     * startoffset is the offset from the beginning of the input
+     * buffer to data that is in our input buffer, but has not yet
+     * been consumed.  This can be non-zero if functions like
+     * netsec_readline() leave leftover data.
+     *
+     * remaining is the remaining amount of unconsumed data in the input
+     * buffer.
+     *
+     * end is a pointer to the end of the valid data + 1; it's where
+     * the next read should go.
+     */
+
     startoffset = nsc->ns_inptr - nsc->ns_inbuffer;
     remaining = nsc->ns_inbufsize - (startoffset + nsc->ns_inbuflen);
     end = nsc->ns_inptr + nsc->ns_inbuflen;
 
+    /*
+     * If we're past the halfway point in our read buffers, shuffle everything
+     * back to the beginning.
+     */
+
+    if (startoffset > nsc->ns_inbufsize / 2) {
+	memmove(nsc->ns_inbuffer, nsc->ns_inptr, nsc->ns_inbuflen);
+	nsc->ns_inptr = nsc->ns_inbuffer;
+	startoffset = 0;
+	remaining = nsc->ns_inbufsize - nsc->ns_inbuflen;
+	end = nsc->ns_inptr + nsc->ns_inbuflen;
+    }
+
     /*
      * If we are using TLS, then just read via the BIO.  But we still
      * use our local buffer.
@@ -679,16 +717,6 @@ retry:
 #endif /* CYRUS_SASL */
 	nsc->ns_inbuflen += rc;
 
-    /*
-     * If we're past the halfway point in our read buffers, shuffle everything
-     * back to the beginning.
-     */
-
-    if (startoffset > nsc->ns_inbufsize / 2) {
-	memmove(nsc->ns_inbuffer, nsc->ns_inptr, nsc->ns_inbuflen);
-	nsc->ns_inptr = nsc->ns_inbuffer;
-    }
-
     return OK;
 }
 
@@ -974,7 +1002,7 @@ netsec_set_sasl_params(netsec_context *nsc, const char *hostname,
 	return NOTOK;
     }
 
-    nsc->sasl_hostname = getcpy(hostname);
+    nsc->sasl_hostname = mh_xstrdup(hostname);
 #else /* CYRUS_SASL */
     NMH_UNUSED(hostname);
     NMH_UNUSED(service);
@@ -989,7 +1017,7 @@ netsec_set_sasl_params(netsec_context *nsc, const char *hostname,
 
     if (mechanism) {
 	char *p;
-	nsc->sasl_mech = getcpy(mechanism);
+	nsc->sasl_mech = mh_xstrdup(mechanism);
 
 	for (p = nsc->sasl_mech; *p; p++)
 	    if (isascii((unsigned char) *p))	/* Just in case */
@@ -1025,7 +1053,7 @@ int netsec_get_user(void *context, int id, const char **result,
 	 */
 
 	if (nsc->sasl_creds == NULL) {
-	    nsc->sasl_creds = mh_xmalloc(sizeof(*nsc->sasl_creds));
+	    NEW(nsc->sasl_creds);
 	    nsc->sasl_creds->user = NULL;
 	    nsc->sasl_creds->password = NULL;
 	}
@@ -1065,7 +1093,7 @@ netsec_get_password(sasl_conn_t *conn, void *context, int id,
 	return SASL_BADPARAM;
 
     if (nsc->sasl_creds == NULL) {
-	nsc->sasl_creds = mh_xmalloc(sizeof(*nsc->sasl_creds));
+	NEW(nsc->sasl_creds);
 	nsc->sasl_creds->user = NULL;
 	nsc->sasl_creds->password = NULL;
     }
@@ -1172,7 +1200,7 @@ netsec_negotiate_sasl(netsec_context *nsc, const char *mechlist, char **errstr)
 	    return NOTOK;
 	}
 
-	nsc->sasl_chosen_mech = getcpy(nsc->sasl_mech);
+	nsc->sasl_chosen_mech = mh_xstrdup(nsc->sasl_mech);
 
 	if (mh_oauth_do_xoauth(nsc->ns_userid, nsc->oauth_service,
 			       &xoauth_client_res, &xoauth_client_res_len,