Skip to content

Commit 0eaa51b

Browse files
committed
PCBC-519: Implement log redaction
Change-Id: I0b2fb8574b89085a554217cefcd71e34eae86511 Reviewed-on: http://review.couchbase.org/88852 Tested-by: Build Bot <[email protected]> Reviewed-by: Sergey Avseyev <[email protected]>
1 parent 1520813 commit 0eaa51b

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

src/couchbase/bucket.c

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,10 @@ PHP_METHOD(Bucket, query)
299299
if (Z_N1QL_QUERY_OBJ_P(query)->cross_bucket) {
300300
cmd.cmdflags |= LCB_CMD_F_MULTIAUTH;
301301
}
302-
pcbc_log(LOGARGS(obj, TRACE), "N1QL: %*s", PCBC_SMARTSTR_TRACE(buf));
302+
pcbc_log(LOGARGS(obj, TRACE), "N1QL: " LCB_LOG_SPEC("%.*s"),
303+
lcb_is_redacting_logs(obj->conn->lcb) ? LCB_LOG_UD_OTAG : "",
304+
PCBC_SMARTSTR_TRACE(buf),
305+
lcb_is_redacting_logs(obj->conn->lcb) ? LCB_LOG_UD_CTAG : "");
303306
pcbc_bucket_n1ql_request(obj, &cmd, 1, json_options, 0, return_value TSRMLS_CC);
304307
smart_str_free(&buf);
305308
} else if (instanceof_function(Z_OBJCE_P(query), pcbc_search_query_ce TSRMLS_CC)) {
@@ -315,7 +318,10 @@ PHP_METHOD(Bucket, query)
315318
}
316319
smart_str_0(&buf);
317320
PCBC_SMARTSTR_SET(buf, cmd.query, cmd.nquery);
318-
pcbc_log(LOGARGS(obj, TRACE), "FTS: %*s", PCBC_SMARTSTR_TRACE(buf));
321+
pcbc_log(LOGARGS(obj, TRACE), "FTS: " LCB_LOG_SPEC("%.*s"),
322+
lcb_is_redacting_logs(obj->conn->lcb) ? LCB_LOG_UD_OTAG : "",
323+
PCBC_SMARTSTR_TRACE(buf),
324+
lcb_is_redacting_logs(obj->conn->lcb) ? LCB_LOG_UD_CTAG : "");
319325
pcbc_bucket_cbft_request(obj, &cmd, 1, json_options, return_value TSRMLS_CC);
320326
smart_str_free(&buf);
321327
} else if (instanceof_function(Z_OBJCE_P(query), pcbc_analytics_query_ce TSRMLS_CC)) {
@@ -335,7 +341,10 @@ PHP_METHOD(Bucket, query)
335341
smart_str_0(&buf);
336342
cmd.cmdflags |= LCB_CMDN1QL_F_CBASQUERY;
337343
PCBC_SMARTSTR_SET(buf, cmd.query, cmd.nquery);
338-
pcbc_log(LOGARGS(obj, TRACE), "ANALYTICS: %*s", PCBC_SMARTSTR_TRACE(buf));
344+
pcbc_log(LOGARGS(obj, TRACE), "ANALYTICS: " LCB_LOG_SPEC("%.*s"),
345+
lcb_is_redacting_logs(obj->conn->lcb) ? LCB_LOG_UD_OTAG : "",
346+
PCBC_SMARTSTR_TRACE(buf),
347+
lcb_is_redacting_logs(obj->conn->lcb) ? LCB_LOG_UD_CTAG : "");
339348
pcbc_bucket_n1ql_request(obj, &cmd, 1, json_options, 1, return_value TSRMLS_CC);
340349
smart_str_free(&buf);
341350
} else if (instanceof_function(Z_OBJCE_P(query), pcbc_view_query_encodable_ce TSRMLS_CC)) {

0 commit comments

Comments
 (0)