Skip to content

Commit

Permalink
improvements to some integration tests (see below for more info)
Browse files Browse the repository at this point in the history 
- Renamed some methods in EchoObjectsUsingSocks5ClientToSocksServerUsingSocks5UserpassMethodIT to simpler names
- Split test classes involving GSS-API and SSL/TLS/DTLS into multiple test classes
- Increased jdk.virtualThreadScheduler.parallelism to 2000
- Added system property jdk.virtualThreadScheduler.maxPoolSize set at 3000
  • Loading branch information
@jh3nd3rs0n
jh3nd3rs0n committed Dec 23, 2024
1 parent 696d6e8 commit 3029e57
Show file tree
Hide file tree
Showing 12 changed files with 2,566 additions and 2,186 deletions.
3 changes: 2 additions & 1 deletion jargyle-test-echo-server-performance/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@
<com.github.jh3nd3rs0n.jargyle.internal.concurrent.useVirtualThreads>false</com.github.jh3nd3rs0n.jargyle.internal.concurrent.useVirtualThreads>
-->
<!-- -->
<jdk.virtualThreadScheduler.parallelism>30</jdk.virtualThreadScheduler.parallelism>
<jdk.virtualThreadScheduler.parallelism>2000</jdk.virtualThreadScheduler.parallelism>
<jdk.virtualThreadScheduler.maxPoolSize>3000</jdk.virtualThreadScheduler.maxPoolSize>
<!-- -->
<performance.reports.directory>${project.build.directory}${file.separator}performance-reports${file.separator}</performance.reports.directory>
</systemPropertyVariables>
Expand Down
5 changes: 5 additions & 0 deletions jargyle-test-echo/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,11 @@
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<excludes>
<exclude>**/EchoObjectsUsingSocks5ClientToSocksServerUsingSocks5GssapiMethod*IT</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
29 changes: 29 additions & 0 deletions ...gyle/test/echo/AllEchoObjectsUsingSocks5ClientToSocksServerUsingSocks5GssapiMethodIT.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package com.github.jh3nd3rs0n.jargyle.test.echo;

import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;

import java.io.IOException;

@RunWith(Suite.class)
@Suite.SuiteClasses({
EchoObjectsUsingSocks5ClientToSocksServerUsingSocks5GssapiMethodIT.class,
EchoObjectsUsingSocks5ClientToSocksServerUsingSocks5GssapiMethodNecReferenceImplIT.class,
EchoObjectsUsingSocks5ClientToSocksServerUsingSocks5GssapiMethodNecReferenceImplWithSelectiveIntegOrConfProtectionIT.class,
EchoObjectsUsingSocks5ClientToSocksServerUsingSocks5GssapiMethodWithSelectiveIntegOrConfProtectionIT.class
})
public class AllEchoObjectsUsingSocks5ClientToSocksServerUsingSocks5GssapiMethodIT {

@BeforeClass
public static void setUpBeforeClass() throws IOException {
GssEnvironment.setUpBeforeClass(AllEchoObjectsUsingSocks5ClientToSocksServerUsingSocks5GssapiMethodIT.class);
}

@AfterClass
public static void tearDownAfterClass() throws IOException {
GssEnvironment.tearDownAfterClass(AllEchoObjectsUsingSocks5ClientToSocksServerUsingSocks5GssapiMethodIT.class);
}

}
1,149 changes: 108 additions & 1,041 deletions ...jargyle/test/echo/EchoObjectsUsingSocks5ClientToSocksServerUsingSocks5GssapiMethodIT.java
View file

Large diffs are not rendered by default.

611 changes: 611 additions & 0 deletions ...o/EchoObjectsUsingSocks5ClientToSocksServerUsingSocks5GssapiMethodNecReferenceImplIT.java
View file

Large diffs are not rendered by default.

271 changes: 271 additions & 0 deletions ...cksServerUsingSocks5GssapiMethodNecReferenceImplWithSelectiveIntegOrConfProtectionIT.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,271 @@
package com.github.jh3nd3rs0n.jargyle.test.echo;

import com.github.jh3nd3rs0n.jargyle.client.Properties;
import com.github.jh3nd3rs0n.jargyle.client.Scheme;
import com.github.jh3nd3rs0n.jargyle.client.Socks5PropertySpecConstants;
import com.github.jh3nd3rs0n.jargyle.client.SocksClient;
import com.github.jh3nd3rs0n.jargyle.common.net.Host;
import com.github.jh3nd3rs0n.jargyle.common.net.Port;
import com.github.jh3nd3rs0n.jargyle.common.number.PositiveInteger;
import com.github.jh3nd3rs0n.jargyle.protocolbase.socks5.Method;
import com.github.jh3nd3rs0n.jargyle.protocolbase.socks5.Methods;
import com.github.jh3nd3rs0n.jargyle.protocolbase.socks5.gssapimethod.ProtectionLevel;
import com.github.jh3nd3rs0n.jargyle.protocolbase.socks5.gssapimethod.ProtectionLevels;
import com.github.jh3nd3rs0n.jargyle.server.*;
import com.github.jh3nd3rs0n.jargyle.test.help.net.DatagramServer;
import com.github.jh3nd3rs0n.jargyle.test.help.net.Server;
import com.github.jh3nd3rs0n.jargyle.test.help.string.StringConstants;
import com.github.jh3nd3rs0n.jargyle.test.help.thread.ThreadHelper;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.Timeout;

import java.io.IOException;
import java.net.InetAddress;
import java.util.concurrent.TimeUnit;

import static org.junit.Assert.assertEquals;

public class EchoObjectsUsingSocks5ClientToSocksServerUsingSocks5GssapiMethodNecReferenceImplWithSelectiveIntegOrConfProtectionIT {

private static DatagramServer echoDatagramServer;
private static int echoDatagramServerPort;
private static Server echoServer;
private static int echoServerPort;

private static SocksServer socksServerUsingSocks5GssapiMethodNecReferenceImplWithSelectiveIntegOrConfProtection;
private static int socksServerPortUsingSocks5GssapiMethodNecReferenceImplWithSelectiveIntegOrConfProtection;

@Rule
public Timeout globalTimeout = Timeout.builder()
.withTimeout(60, TimeUnit.SECONDS)
.withLookingForStuckThread(true)
.build();

private static SocksServer newSocksServerUsingSocks5GssapiMethodNecReferenceImplWithSelectiveIntegOrConfProtection() throws IOException {
SocksServer socksServer = new SocksServer(Configuration.newUnmodifiableInstance(Settings.of(
GeneralSettingSpecConstants.INTERNAL_FACING_BIND_HOST.newSetting(
Host.newInstance(InetAddress.getLoopbackAddress().getHostAddress())),
GeneralSettingSpecConstants.PORT.newSetting(
Port.valueOf(0)),
Socks5SettingSpecConstants.SOCKS5_METHODS.newSetting(
Methods.of(Method.GSSAPI)),
Socks5SettingSpecConstants.SOCKS5_GSSAPIMETHOD_NEC_REFERENCE_IMPL.newSetting(
Boolean.TRUE),
Socks5SettingSpecConstants.SOCKS5_GSSAPIMETHOD_PROTECTION_LEVELS.newSetting(
ProtectionLevels.of(ProtectionLevel.SELECTIVE_INTEG_OR_CONF)),
Socks5SettingSpecConstants.SOCKS5_GSSAPIMETHOD_SUGGESTED_INTEG.newSetting(
1),
Socks5SettingSpecConstants.SOCKS5_GSSAPIMETHOD_SUGGESTED_CONF.newSetting(
Boolean.TRUE),
Socks5SettingSpecConstants.SOCKS5_ON_UDP_ASSOCIATE_REQUEST_RELAY_BUFFER_SIZE.newSetting(
PositiveInteger.valueOf(DatagramServer.RECEIVE_BUFFER_SIZE)))));
socksServer.start();
socksServerPortUsingSocks5GssapiMethodNecReferenceImplWithSelectiveIntegOrConfProtection =
socksServer.getPort().intValue();
return socksServer;
}

private static SocksClient newSocks5ClientUsingSocks5GssapiMethodNecReferenceImplWithSelectiveIntegOrConfProtection() {
Properties properties = Properties.of(
Socks5PropertySpecConstants.SOCKS5_METHODS.newProperty(
Methods.of(Method.GSSAPI)),
Socks5PropertySpecConstants.SOCKS5_GSSAPIMETHOD_MECHANISM_OID.newPropertyWithParsedValue(
GssEnvironment.MECHANISM_OID),
Socks5PropertySpecConstants.SOCKS5_GSSAPIMETHOD_SERVICE_NAME.newProperty(
GssEnvironment.SERVICE_NAME),
Socks5PropertySpecConstants.SOCKS5_GSSAPIMETHOD_NEC_REFERENCE_IMPL.newProperty(
Boolean.TRUE),
Socks5PropertySpecConstants.SOCKS5_GSSAPIMETHOD_PROTECTION_LEVELS.newProperty(
ProtectionLevels.of(ProtectionLevel.SELECTIVE_INTEG_OR_CONF)),
Socks5PropertySpecConstants.SOCKS5_GSSAPIMETHOD_SUGGESTED_INTEG.newProperty(
1),
Socks5PropertySpecConstants.SOCKS5_GSSAPIMETHOD_SUGGESTED_CONF.newProperty(
Boolean.TRUE));
return Scheme.SOCKS5.newSocksServerUri(
InetAddress.getLoopbackAddress().getHostAddress(),
socksServerPortUsingSocks5GssapiMethodNecReferenceImplWithSelectiveIntegOrConfProtection)
.newSocksClient(properties);
}

@BeforeClass
public static void setUpBeforeClass() throws IOException {
GssEnvironment.setUpBeforeClass(
EchoObjectsUsingSocks5ClientToSocksServerUsingSocks5GssapiMethodNecReferenceImplWithSelectiveIntegOrConfProtectionIT.class);
echoDatagramServer = EchoDatagramServerHelper.newEchoDatagramServer(0);
echoDatagramServer.start();
echoDatagramServerPort = echoDatagramServer.getPort();
echoServer = EchoServerHelper.newEchoServer(0);
echoServer.start();
echoServerPort = echoServer.getPort();
socksServerUsingSocks5GssapiMethodNecReferenceImplWithSelectiveIntegOrConfProtection =
newSocksServerUsingSocks5GssapiMethodNecReferenceImplWithSelectiveIntegOrConfProtection();
}

@AfterClass
public static void tearDownAfterClass() throws IOException {
GssEnvironment.tearDownAfterClass(
EchoObjectsUsingSocks5ClientToSocksServerUsingSocks5GssapiMethodNecReferenceImplWithSelectiveIntegOrConfProtectionIT.class);
if (echoDatagramServer != null
&& !echoDatagramServer.getState().equals(DatagramServer.State.STOPPED)) {
echoDatagramServer.stop();
}
if (echoServer != null
&& !echoServer.getState().equals(Server.State.STOPPED)) {
echoServer.stop();
}
if (socksServerUsingSocks5GssapiMethodNecReferenceImplWithSelectiveIntegOrConfProtection != null
&& !socksServerUsingSocks5GssapiMethodNecReferenceImplWithSelectiveIntegOrConfProtection.getState().equals(SocksServer.State.STOPPED)) {
socksServerUsingSocks5GssapiMethodNecReferenceImplWithSelectiveIntegOrConfProtection.stop();
}
ThreadHelper.interruptibleSleepForThreeSeconds();
}

@Test
public void testEchoDatagramClientUsingSocks5ClientToSocksServerUsingSocks5GssapiMethodNecReferenceImplWithSelectiveIntegOrConfProtection01() throws IOException {
EchoDatagramClient echoDatagramClient = new EchoDatagramClient(
newSocks5ClientUsingSocks5GssapiMethodNecReferenceImplWithSelectiveIntegOrConfProtection().newSocksNetObjectFactory());
String string = StringConstants.STRING_01;
String returningString = echoDatagramClient.echo(string, echoDatagramServerPort);
assertEquals(string, returningString);
}

@Test
public void testEchoDatagramClientUsingSocks5ClientToSocksServerUsingSocks5GssapiMethodNecReferenceImplWithSelectiveIntegOrConfProtection02() throws IOException {
EchoDatagramClient echoDatagramClient = new EchoDatagramClient(
newSocks5ClientUsingSocks5GssapiMethodNecReferenceImplWithSelectiveIntegOrConfProtection().newSocksNetObjectFactory());
String string = StringConstants.STRING_02;
String returningString = echoDatagramClient.echo(string, echoDatagramServerPort);
assertEquals(string, returningString);
}

@Test
public void testEchoDatagramClientUsingSocks5ClientToSocksServerUsingSocks5GssapiMethodNecReferenceImplWithSelectiveIntegOrConfProtection03() throws IOException {
EchoDatagramClient echoDatagramClient = new EchoDatagramClient(
newSocks5ClientUsingSocks5GssapiMethodNecReferenceImplWithSelectiveIntegOrConfProtection().newSocksNetObjectFactory());
String string = StringConstants.STRING_03;
String returningString = echoDatagramClient.echo(string, echoDatagramServerPort);
assertEquals(string, returningString);
}

@Test
public void testEchoDatagramClientUsingSocks5ClientToSocksServerUsingSocks5GssapiMethodNecReferenceImplWithSelectiveIntegOrConfProtection04() throws IOException {
EchoDatagramClient echoDatagramClient = new EchoDatagramClient(
newSocks5ClientUsingSocks5GssapiMethodNecReferenceImplWithSelectiveIntegOrConfProtection().newSocksNetObjectFactory());
String string = StringConstants.STRING_04;
String returningString = echoDatagramClient.echo(string, echoDatagramServerPort);
assertEquals(string, returningString);
}

@Test
public void testEchoDatagramClientUsingSocks5ClientToSocksServerUsingSocks5GssapiMethodNecReferenceImplWithSelectiveIntegOrConfProtection05() throws IOException {
EchoDatagramClient echoDatagramClient = new EchoDatagramClient(
newSocks5ClientUsingSocks5GssapiMethodNecReferenceImplWithSelectiveIntegOrConfProtection().newSocksNetObjectFactory());
String string = StringConstants.STRING_05;
String returningString = echoDatagramClient.echo(string, echoDatagramServerPort);
assertEquals(string, returningString);
}

@Test
public void testEchoClientUsingSocks5ClientToSocksServerUsingSocks5GssapiMethodNecReferenceImplWithSelectiveIntegOrConfProtection01() throws IOException {
EchoClient echoClient = new EchoClient(
newSocks5ClientUsingSocks5GssapiMethodNecReferenceImplWithSelectiveIntegOrConfProtection().newSocksNetObjectFactory());
String string = StringConstants.STRING_01;
String returningString = echoClient.echo(string, echoServerPort);
assertEquals(string, returningString);
}

@Test
public void testEchoClientUsingSocks5ClientToSocksServerUsingSocks5GssapiMethodNecReferenceImplWithSelectiveIntegOrConfProtection02() throws IOException {
EchoClient echoClient = new EchoClient(
newSocks5ClientUsingSocks5GssapiMethodNecReferenceImplWithSelectiveIntegOrConfProtection().newSocksNetObjectFactory());
String string = StringConstants.STRING_02;
String returningString = echoClient.echo(string, echoServerPort);
assertEquals(string, returningString);
}

@Test
public void testEchoClientUsingSocks5ClientToSocksServerUsingSocks5GssapiMethodNecReferenceImplWithSelectiveIntegOrConfProtection03() throws IOException {
EchoClient echoClient = new EchoClient(
newSocks5ClientUsingSocks5GssapiMethodNecReferenceImplWithSelectiveIntegOrConfProtection().newSocksNetObjectFactory());
String string = StringConstants.STRING_03;
String returningString = echoClient.echo(string, echoServerPort);
assertEquals(string, returningString);
}

@Test
public void testEchoClientUsingSocks5ClientToSocksServerUsingSocks5GssapiMethodNecReferenceImplWithSelectiveIntegOrConfProtection04() throws IOException {
EchoClient echoClient = new EchoClient(
newSocks5ClientUsingSocks5GssapiMethodNecReferenceImplWithSelectiveIntegOrConfProtection().newSocksNetObjectFactory());
String string = StringConstants.STRING_04;
String returningString = echoClient.echo(string, echoServerPort);
assertEquals(string, returningString);
}

@Test
public void testEchoClientUsingSocks5ClientToSocksServerUsingSocks5GssapiMethodNecReferenceImplWithSelectiveIntegOrConfProtection05() throws IOException {
EchoClient echoClient = new EchoClient(
newSocks5ClientUsingSocks5GssapiMethodNecReferenceImplWithSelectiveIntegOrConfProtection().newSocksNetObjectFactory());
String string = StringConstants.STRING_05;
String returningString = echoClient.echo(string, echoServerPort);
assertEquals(string, returningString);
}

@Test
public void testEchoServerUsingSocks5ClientToSocksServerUsingSocks5GssapiMethodNecReferenceImplWithSelectiveIntegOrConfProtection01() throws IOException {
Server echServer = EchoServerHelper.newEchoServer(
newSocks5ClientUsingSocks5GssapiMethodNecReferenceImplWithSelectiveIntegOrConfProtection()
.newSocksNetObjectFactory(), 0);
String string = StringConstants.STRING_01;
String returningString = EchoServerHelper.startThenEchoThenStop(
echServer, new EchoClient(), string);
assertEquals(string, returningString);
}

@Test
public void testEchoServerUsingSocks5ClientToSocksServerUsingSocks5GssapiMethodNecReferenceImplWithSelectiveIntegOrConfProtection02() throws IOException {
Server echServer = EchoServerHelper.newEchoServer(
newSocks5ClientUsingSocks5GssapiMethodNecReferenceImplWithSelectiveIntegOrConfProtection()
.newSocksNetObjectFactory(), 0);
String string = StringConstants.STRING_02;
String returningString = EchoServerHelper.startThenEchoThenStop(
echServer, new EchoClient(), string);
assertEquals(string, returningString);
}

@Test
public void testEchoServerUsingSocks5ClientToSocksServerUsingSocks5GssapiMethodNecReferenceImplWithSelectiveIntegOrConfProtection03() throws IOException {
Server echServer = EchoServerHelper.newEchoServer(
newSocks5ClientUsingSocks5GssapiMethodNecReferenceImplWithSelectiveIntegOrConfProtection()
.newSocksNetObjectFactory(), 0);
String string = StringConstants.STRING_03;
String returningString = EchoServerHelper.startThenEchoThenStop(
echServer, new EchoClient(), string);
assertEquals(string, returningString);
}

@Test
public void testEchoServerUsingSocks5ClientToSocksServerUsingSocks5GssapiMethodNecReferenceImplWithSelectiveIntegOrConfProtection04() throws IOException {
Server echServer = EchoServerHelper.newEchoServer(
newSocks5ClientUsingSocks5GssapiMethodNecReferenceImplWithSelectiveIntegOrConfProtection()
.newSocksNetObjectFactory(), 0);
String string = StringConstants.STRING_04;
String returningString = EchoServerHelper.startThenEchoThenStop(
echServer, new EchoClient(), string);
assertEquals(string, returningString);
}

@Test
public void testEchoServerUsingSocks5ClientToSocksServerUsingSocks5GssapiMethodNecReferenceImplWithSelectiveIntegOrConfProtection05() throws IOException {
Server echServer = EchoServerHelper.newEchoServer(
newSocks5ClientUsingSocks5GssapiMethodNecReferenceImplWithSelectiveIntegOrConfProtection()
.newSocksNetObjectFactory(), 0);
String string = StringConstants.STRING_05;
String returningString = EchoServerHelper.startThenEchoThenStop(
echServer, new EchoClient(), string);
assertEquals(string, returningString);
}

}
Loading

0 comments on commit 3029e57

Please sign in to comment.