X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/d79618303ff42aa5e0bc2dba51fdd7b385bc97d4..6a420d96a080e04da6c441f88cc52e60fe661089:/sbr/netsec.c diff --git a/sbr/netsec.c b/sbr/netsec.c index 98a221a2..75be76a3 100644 --- a/sbr/netsec.c +++ b/sbr/netsec.c @@ -7,6 +7,7 @@ */ #include "h/mh.h" +#include "credentials.h" #include "getcpy.h" #include "brkstring.h" #include "h/utils.h" @@ -322,7 +323,7 @@ netsec_b64_snoop_decoder(netsec_context *nsc, const char *string, size_t len, len -= offset; } - if (decodeBase64(string, &decoded, &decodedlen, 1, NULL) == OK) { + if (decodeBase64(string, &decoded, &decodedlen, 1) == OK) { /* * Some mechanisms produce large binary tokens, which aren't really * readable. So let's do a simple heuristic. If the token is greater @@ -1190,6 +1191,22 @@ netsec_negotiate_sasl(netsec_context *nsc, const char *mechlist, char **errstr) int rc; #endif /* CYRUS_SASL || OAUTH_SUPPORT */ + /* + * Output some SASL information if snoop is turned on + */ + + if (nsc->ns_snoop) { + fprintf(stderr, "SASL mechanisms supported by server: %s\n", mechlist); + + if (nsc->sasl_mech) { + fprintf(stderr, "User has requested SASL mechanism: %s\n", + nsc->sasl_mech); + } else { + fprintf(stderr, "No SASL mech selected, will pick " + "the best mech supported by SASL library\n"); + } + } + /* * If we've been passed a requested mechanism, check our mechanism * list from the protocol. If it's not supported, return an error. @@ -1228,6 +1245,10 @@ netsec_negotiate_sasl(netsec_context *nsc, const char *mechlist, char **errstr) * error message. */ + if (nsc->ns_snoop) { + fprintf(stderr, "Using internal XOAUTH2 mechanism\n"); + } + if (! nsc->oauth_service) { netsec_err(errstr, "Internal error: OAuth2 service name not given"); return NOTOK; @@ -1290,6 +1311,21 @@ netsec_negotiate_sasl(netsec_context *nsc, const char *mechlist, char **errstr) * messages. */ + if (nsc->ns_snoop) { + const char *client_mechlist; + + rc = sasl_listmech(nsc->sasl_conn, NULL, NULL, " ", NULL, + &client_mechlist, NULL, NULL); + + if (rc != SASL_OK) { + fprintf(stderr, "Unable to get client mechlist: %s\n", + sasl_errstring(rc, NULL, NULL)); + } else { + fprintf(stderr, "Client supported SASL mechanisms: %s\n", + client_mechlist); + } + } + ZERO(&secprops); secprops.maxbufsize = SASL_MAXRECVBUF; @@ -1303,6 +1339,12 @@ netsec_negotiate_sasl(netsec_context *nsc, const char *mechlist, char **errstr) #endif /* TLS_SUPPORT */ UINT_MAX; +#ifdef TLS_SUPPORT + if (nsc->ns_snoop && nsc->tls_active) + fprintf(stderr, "SASL security layers disabled due to the use " + "of TLS\n"); +#endif /* TLS_SUPPORT */ + rc = sasl_setprop(nsc->sasl_conn, SASL_SEC_PROPS, &secprops); if (rc != SASL_OK) { @@ -1329,6 +1371,9 @@ netsec_negotiate_sasl(netsec_context *nsc, const char *mechlist, char **errstr) nsc->sasl_chosen_mech = getcpy(chosen_mech); + if (nsc->ns_snoop) + fprintf(stderr, "Chosen sasl mechanism: %s\n", chosen_mech); + if (nsc->sasl_proto_cb(NETSEC_SASL_START, saslbuf, saslbuflen, NULL, 0, nsc->sasl_proto_context, errstr) != OK) return NOTOK; @@ -1403,6 +1448,10 @@ netsec_negotiate_sasl(netsec_context *nsc, const char *mechlist, char **errstr) nsc->sasl_ssf = *ssf; if (nsc->sasl_ssf > 0) { + if (nsc->ns_snoop) + fprintf(stderr, "SASL security layer negotiated, SASL will " + "perform encryption\n"); + rc = sasl_getprop(nsc->sasl_conn, SASL_MAXOUTBUF, (const void **) &outbufmax); @@ -1455,6 +1504,15 @@ netsec_negotiate_sasl(netsec_context *nsc, const char *mechlist, char **errstr) } nsc->sasl_seclayer = 1; + } else if (nsc->ns_snoop) { + fprintf(stderr, "SASL Security layer NOT negotiated, SASL will NOT " + "perform encryption\n"); +#ifdef TLS_SUPPORT + if (nsc->tls_active) { + fprintf(stderr, "Encryption will be handled by TLS\n"); + } else +#endif /* TLS_SUPPORT */ + fprintf(stderr, "Connection will NOT be encrypted, use caution\n"); } return OK; @@ -1496,6 +1554,7 @@ netsec_get_sasl_ssf(netsec_context *nsc) #ifdef CYRUS_SASL return nsc->sasl_ssf; #else /* CYRUS_SASL */ + NMH_UNUSED(nsc); return 0; #endif /* CYRUS_SASL */ }