Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-21 15:48:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename NoiseStreamHandler to NoiseTransportHandler for consistency with Noise specification terminology

Browse Source
This commit is contained in:
Jon Chambers
2024-03-26 16:52:43 -04:00
committed by Jon Chambers
parent 75bb22f08b
commit 8a587d1d12
8 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
service/src/test/java/org/whispersystems/textsecuregcm/grpc/net/NoiseNXClientHandshakeHandler.java
View File

@@ -35,7 +35,7 @@ class NoiseNXClientHandshakeHandler extends AbstractNoiseClientHandler {
receivedServerStaticKeyMessage = true;
handleServerStaticKeyMessage(context, frame);
context.pipeline().replace(this, null, new NoiseStreamHandler(getHandshakeState().split()));
context.pipeline().replace(this, null, new NoiseTransportHandler(getHandshakeState().split()));
context.fireUserEventTriggered(new NoiseHandshakeCompleteEvent(Optional.empty()));
} finally {
frame.release();

2
service/src/test/java/org/whispersystems/textsecuregcm/grpc/net/NoiseNXHandshakeHandlerTest.java
View File

@@ -78,7 +78,7 @@ class NoiseNXHandshakeHandlerTest extends AbstractNoiseHandshakeHandlerTest {
assertNull(embeddedChannel.pipeline().get(NoiseNXHandshakeHandler.class),
"Handshake handler should remove self from pipeline after successful handshake");
assertNotNull(embeddedChannel.pipeline().get(NoiseStreamHandler.class),
assertNotNull(embeddedChannel.pipeline().get(NoiseTransportHandler.class),
"Handshake handler should insert a Noise stream handler after successful handshake");
}
}

4
service/src/test/java/org/whispersystems/textsecuregcm/grpc/net/NoiseStreamHandlerTest.java → service/src/test/java/org/whispersystems/textsecuregcm/grpc/net/NoiseTransportHandlerTest.java
View File

@@ -21,7 +21,7 @@ import java.security.NoSuchAlgorithmException;
import static org.junit.jupiter.api.Assertions.*;
class NoiseStreamHandlerTest extends AbstractLeakDetectionTest {
class NoiseTransportHandlerTest extends AbstractLeakDetectionTest {
private CipherStatePair clientCipherStatePair;
private EmbeddedChannel embeddedChannel;
@@ -51,7 +51,7 @@ class NoiseStreamHandlerTest extends AbstractLeakDetectionTest {
clientHandshakeState.readMessage(serverEphemeralKeyMessage, 0, serverEphemeralKeyMessage.length, EmptyArrays.EMPTY_BYTES, 0);
clientCipherStatePair = clientHandshakeState.split();
embeddedChannel = new EmbeddedChannel(new NoiseStreamHandler(serverHandshakeState.split()));
embeddedChannel = new EmbeddedChannel(new NoiseTransportHandler(serverHandshakeState.split()));
clientHandshakeState.destroy();
serverHandshakeState.destroy();

2
service/src/test/java/org/whispersystems/textsecuregcm/grpc/net/NoiseXXClientHandshakeHandler.java
View File

@@ -77,7 +77,7 @@ class NoiseXXClientHandshakeHandler extends AbstractNoiseClientHandler {
context.writeAndFlush(new BinaryWebSocketFrame(Unpooled.wrappedBuffer(staticKeyAndIdentityMessage)))
.addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE);
context.pipeline().replace(this, null, new NoiseStreamHandler(handshakeState.split()));
context.pipeline().replace(this, null, new NoiseTransportHandler(handshakeState.split()));
context.fireUserEventTriggered(new NoiseHandshakeCompleteEvent(Optional.empty()));
} finally {
frame.release();

15
service/src/test/java/org/whispersystems/textsecuregcm/grpc/net/NoiseXXHandshakeHandlerTest.java
View File

@@ -25,7 +25,6 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ThreadLocalRandom;
import javax.crypto.BadPaddingException;
import javax.crypto.ShortBufferException;
import io.netty.util.ReferenceCountUtil;
import io.netty.util.internal.EmptyArrays;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -84,7 +83,7 @@ class NoiseXXHandshakeHandlerTest extends AbstractNoiseHandshakeHandlerTest {
assertNull(embeddedChannel.pipeline().get(NoiseXXHandshakeHandler.class),
"Handshake handler should remove self from pipeline after successful handshake");
assertNotNull(embeddedChannel.pipeline().get(NoiseStreamHandler.class),
assertNotNull(embeddedChannel.pipeline().get(NoiseTransportHandler.class),
"Handshake handler should insert a Noise stream handler after successful handshake");
}
@@ -133,7 +132,7 @@ class NoiseXXHandshakeHandlerTest extends AbstractNoiseHandshakeHandlerTest {
assertNotNull(embeddedChannel.pipeline().get(NoiseXXHandshakeHandler.class),
"Handshake handler should not remove self from pipeline after failed handshake");
assertNull(embeddedChannel.pipeline().get(NoiseStreamHandler.class),
assertNull(embeddedChannel.pipeline().get(NoiseTransportHandler.class),
"Noise stream handler should not be added to pipeline after failed handshake");
}
@@ -182,7 +181,7 @@ class NoiseXXHandshakeHandlerTest extends AbstractNoiseHandshakeHandlerTest {
assertNotNull(embeddedChannel.pipeline().get(NoiseXXHandshakeHandler.class),
"Handshake handler should not remove self from pipeline after failed handshake");
assertNull(embeddedChannel.pipeline().get(NoiseStreamHandler.class),
assertNull(embeddedChannel.pipeline().get(NoiseTransportHandler.class),
"Noise stream handler should not be added to pipeline after failed handshake");
}
@@ -216,7 +215,7 @@ class NoiseXXHandshakeHandlerTest extends AbstractNoiseHandshakeHandlerTest {
assertNotNull(embeddedChannel.pipeline().get(NoiseXXHandshakeHandler.class),
"Handshake handler should not remove self from pipeline after failed handshake");
assertNull(embeddedChannel.pipeline().get(NoiseStreamHandler.class),
assertNull(embeddedChannel.pipeline().get(NoiseTransportHandler.class),
"Noise stream handler should not be added to pipeline after failed handshake");
}
@@ -250,7 +249,7 @@ class NoiseXXHandshakeHandlerTest extends AbstractNoiseHandshakeHandlerTest {
assertNotNull(embeddedChannel.pipeline().get(NoiseXXHandshakeHandler.class),
"Handshake handler should not remove self from pipeline after failed handshake");
assertNull(embeddedChannel.pipeline().get(NoiseStreamHandler.class),
assertNull(embeddedChannel.pipeline().get(NoiseTransportHandler.class),
"Noise stream handler should not be added to pipeline after failed handshake");
}
@@ -306,7 +305,7 @@ class NoiseXXHandshakeHandlerTest extends AbstractNoiseHandshakeHandlerTest {
assertNull(embeddedChannel.pipeline().get(NoiseXXHandshakeHandler.class),
"Handshake handler should remove self from pipeline after successful handshake");
assertNotNull(embeddedChannel.pipeline().get(NoiseStreamHandler.class),
assertNotNull(embeddedChannel.pipeline().get(NoiseTransportHandler.class),
"Handshake handler should insert a Noise stream handler after successful handshake");
for (final ByteBuf additionalMessage : additionalMessages) {
@@ -369,7 +368,7 @@ class NoiseXXHandshakeHandlerTest extends AbstractNoiseHandshakeHandlerTest {
assertNotNull(embeddedChannel.pipeline().get(NoiseXXHandshakeHandler.class),
"Handshake handler should not remove self from pipeline after failed handshake");
assertNull(embeddedChannel.pipeline().get(NoiseStreamHandler.class),
assertNull(embeddedChannel.pipeline().get(NoiseTransportHandler.class),
"Noise stream handler should not be added to pipeline after failed handshake");
assertTrue(embeddedChannel.inboundMessages().isEmpty(),