Skip to content

Commit 97d01a4

Browse files
authored
Merge pull request #525 from alex268/fix_log_vulnerability
Hide token & passwords from SDK trace logs
2 parents af5f970 + 95d852f commit 97d01a4

File tree

2 files changed

+18
-4
lines changed

2 files changed

+18
-4
lines changed

core/src/main/java/tech/ydb/core/impl/call/ReadWriteStreamCall.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import tech.ydb.core.grpc.GrpcStatuses;
2323
import tech.ydb.core.grpc.GrpcTransport;
2424
import tech.ydb.core.impl.auth.AuthCallOptions;
25+
import tech.ydb.proto.topic.YdbTopic;
2526

2627
/**
2728
*
@@ -96,8 +97,12 @@ public void sendNext(W message) {
9697
try {
9798
if (flush()) {
9899
if (logger.isTraceEnabled()) {
99-
String msg = TextFormat.shortDebugString((Message) message);
100-
logger.trace("ReadWriteStreamCall[{}] --> {}", traceId, msg);
100+
if (message instanceof YdbTopic.UpdateTokenRequest) {
101+
logger.trace("ReadWriteStreamCall[{}] --> {}", traceId, "update_token_request { token: XXXX }");
102+
} else {
103+
String msg = TextFormat.shortDebugString((Message) message);
104+
logger.trace("ReadWriteStreamCall[{}] --> {}", traceId, msg);
105+
}
101106
}
102107
call.sendMessage(message);
103108
} else {

core/src/main/java/tech/ydb/core/impl/call/UnaryCall.java

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import tech.ydb.core.StatusCode;
1919
import tech.ydb.core.grpc.GrpcStatuses;
2020
import tech.ydb.core.grpc.GrpcTransport;
21+
import tech.ydb.proto.auth.YdbAuth;
2122

2223
/**
2324
*
@@ -51,7 +52,11 @@ public CompletableFuture<Result<RespT>> startCall(ReqT request, Metadata headers
5152
try {
5253
call.start(this, headers);
5354
if (logger.isTraceEnabled()) {
54-
logger.trace("UnaryCall[{}] --> {}", traceId, TextFormat.shortDebugString((Message) request));
55+
if (request instanceof YdbAuth.LoginRequest) {
56+
logger.trace("UnaryCall[{}] --> {}", traceId, "LoginRequest user: XXXX password: XXXX");
57+
} else {
58+
logger.trace("UnaryCall[{}] --> {}", traceId, TextFormat.shortDebugString((Message) request));
59+
}
5560
}
5661
call.sendMessage(request);
5762
call.halfClose();
@@ -71,7 +76,11 @@ public CompletableFuture<Result<RespT>> startCall(ReqT request, Metadata headers
7176
@Override
7277
public void onMessage(RespT value) {
7378
if (logger.isTraceEnabled()) {
74-
logger.trace("UnaryCall[{}] <-- {}", traceId, TextFormat.shortDebugString((Message) value));
79+
if (value instanceof YdbAuth.LoginResponse) {
80+
logger.trace("UnaryCall[{}] <-- {}", traceId, "LoginResponse XXXX");
81+
} else {
82+
logger.trace("UnaryCall[{}] <-- {}", traceId, TextFormat.shortDebugString((Message) value));
83+
}
7584
}
7685
if (!this.value.compareAndSet(null, value)) {
7786
future.complete(Result.fail(MULTIPLY_VALUES));

0 commit comments

Comments
 (0)