grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "netty: add exporting SSL/TLS master key log feature (#7724)" (#7792) 

This reverts commit 9bc05fba67.
This commit is contained in:
Chengyuan Zhang 2021-01-08 15:45:58 -08:00 committed by GitHub
parent 9bc05fba67
commit 32173975e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
netty/src/main/java/io/grpc/netty/ProtocolNegotiators.java
View File

@ -64,7 +64,6 @@ import io.netty.handler.ssl.SslContext;
import io.netty.handler.ssl.SslContextBuilder;
import io.netty.handler.ssl.SslHandler;
import io.netty.handler.ssl.SslHandshakeCompletionEvent;
import io.netty.handler.ssl.SslMasterKeyHandler;
import io.netty.handler.ssl.SslProvider;
import io.netty.util.AsciiString;
import io.netty.util.Attribute;
@ -397,14 +396,6 @@ final class ProtocolNegotiators {
ctx.pipeline().addBefore(ctx.name(), /* name= */ null, this.executor != null
? new SslHandler(sslEngine, false, this.executor)
: new SslHandler(sslEngine, false));
// Support exporting the key and session identifier to the log named
// "io.netty.wireshark" when the system property named "io.netty.ssl.masterKeyHandler"
// is "true". This feature is used to analyze gRPC traffic with Wireshark.
if (Boolean.getBoolean(SslMasterKeyHandler.SYSTEM_PROP_KEY)) {
ctx.pipeline().addBefore(ctx.name(), null,
SslMasterKeyHandler.newWireSharkSslMasterKeyHandler());
}
}
@Override
@ -581,14 +572,6 @@ final class ProtocolNegotiators {
ctx.pipeline().addBefore(ctx.name(), /* name= */ null, this.executor != null
? new SslHandler(sslEngine, false, this.executor)
: new SslHandler(sslEngine, false));
// Support exporting the key and session identifier to the log named
// "io.netty.wireshark" when the system property named "io.netty.ssl.masterKeyHandler"
// is "true". This feature is used to analyze gRPC traffic with Wireshark.
if (Boolean.getBoolean(SslMasterKeyHandler.SYSTEM_PROP_KEY)) {
ctx.pipeline().addBefore(ctx.name(), null,
SslMasterKeyHandler.newWireSharkSslMasterKeyHandler());
}
}
@Override

52
netty/src/test/java/io/grpc/netty/ProtocolNegotiatorsTest.java
View File

@ -94,20 +94,17 @@ import io.netty.handler.ssl.SslContext;
import io.netty.handler.ssl.SslContextBuilder;
import io.netty.handler.ssl.SslHandler;
import io.netty.handler.ssl.SslHandshakeCompletionEvent;
import io.netty.handler.ssl.SslMasterKeyHandler;
import io.netty.handler.ssl.SupportedCipherSuiteFilter;
import io.netty.handler.ssl.util.SelfSignedCertificate;
import java.io.File;
import java.net.InetSocketAddress;
import java.net.SocketAddress;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
import java.util.logging.Filter;
import java.util.logging.Handler;
import java.util.logging.Level;
import java.util.logging.LogRecord;
import java.util.logging.Logger;
@ -1213,53 +1210,4 @@ public class ProtocolNegotiatorsTest {
ctx.pipeline().fireUserEventTriggered(ProtocolNegotiationEvent.DEFAULT);
}
}
@Test
public void clientTlsHandler_serverTlsHandler_sslMasterKeyLog() throws Exception {
final List<LogRecord> logs = new ArrayList<>();
Handler handler = new Handler() {
@Override public void publish(LogRecord record) {
logs.add(record);
}
@Override public void flush() {}
@Override public void close() {}
};
Logger logger = Logger.getLogger("io.netty.wireshark");
logger.addHandler(handler);
String oldPropValue = System.getProperty(SslMasterKeyHandler.SYSTEM_PROP_KEY);
try {
// The master key log feature should be disabled
// when the "io.netty.ssl.masterKeyHandler" property is missing.
System.clearProperty(SslMasterKeyHandler.SYSTEM_PROP_KEY);
clientTlsHandler_firesNegotiation();
assertThat(logs).isEmpty();
// The master key log feature should be disabled
// when the value of "io.netty.ssl.masterKeyHandler" property is not "true".
System.setProperty(SslMasterKeyHandler.SYSTEM_PROP_KEY, "false");
clientTlsHandler_firesNegotiation();
assertThat(logs).isEmpty();
// The master key log feature should be enabled
// when the value of "io.netty.ssl.masterKeyHandler" property is "true".
System.setProperty(SslMasterKeyHandler.SYSTEM_PROP_KEY, "true");
clientTlsHandler_firesNegotiation();
// writing key twice because both client and server will enable key log feature
assertThat(logs.size()).isEqualTo(2);
assertThat(logs.get(0).getMessage()).containsMatch("^RSA Session-ID:.+ Master-Key:");
assertThat(logs.get(1).getMessage()).containsMatch("^RSA Session-ID:.+ Master-Key:");
} finally {
logger.removeHandler(handler);
if (oldPropValue != null) {
System.setProperty(SslMasterKeyHandler.SYSTEM_PROP_KEY, oldPropValue);
} else {
System.clearProperty(SslMasterKeyHandler.SYSTEM_PROP_KEY);
}
}
}
}