From 92c616c15e01830c42adca27d26a44f6421eef3a Mon Sep 17 00:00:00 2001 From: Yuta Kasai Date: Tue, 21 May 2024 11:05:36 +0900 Subject: [PATCH 1/4] fix(deps): update dependency com.github.bbottema:java-socks-proxy-server to v4.1.0 --- .../com/linecorp/bot/client/base/ApiClientBuilderTest.java | 4 ++-- gradle/libraries.versions.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/clients/line-bot-client-base/src/test/java/com/linecorp/bot/client/base/ApiClientBuilderTest.java b/clients/line-bot-client-base/src/test/java/com/linecorp/bot/client/base/ApiClientBuilderTest.java index fae1306e5..77bb791e1 100644 --- a/clients/line-bot-client-base/src/test/java/com/linecorp/bot/client/base/ApiClientBuilderTest.java +++ b/clients/line-bot-client-base/src/test/java/com/linecorp/bot/client/base/ApiClientBuilderTest.java @@ -77,8 +77,8 @@ protected IOException buildException(Response response, MyErrorResponse errorBod void socksProxy() { int socksPort = 9020; - SocksServer socksServer = new SocksServer(); - socksServer.start(socksPort); + SocksServer socksServer = new SocksServer(socksPort); + socksServer.start(); WireMockServer wireMockServer = new WireMockServer(wireMockConfig().dynamicPort()); wireMockServer.start(); diff --git a/gradle/libraries.versions.toml b/gradle/libraries.versions.toml index 697d1dd66..d1b17ecc9 100644 --- a/gradle/libraries.versions.toml +++ b/gradle/libraries.versions.toml @@ -46,7 +46,7 @@ mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" } mockito-junit-jupiter = { module = "org.mockito:mockito-junit-jupiter", version.ref = "mockito" } wiremock = { group = "org.wiremock", name = "wiremock-standalone", version = "3.5.4" } test-arranger = { module = "com.ocadotechnology.gembus:test-arranger", version = "1.5.7.1" } -socks-proxy-server = { module = "com.github.bbottema:java-socks-proxy-server", version = "4.0.0" } +socks-proxy-server = { module = "com.github.bbottema:java-socks-proxy-server", version = "4.1.0" } littleproxy = { module = "xyz.rogfam:littleproxy", version = "2.2.0" } [bundles] From 1441ca48b2eeb49d8968158ac1f2c4b5f74e0735 Mon Sep 17 00:00:00 2001 From: Yuta Kasai Date: Tue, 21 May 2024 11:28:42 +0900 Subject: [PATCH 2/4] NO-ISSUE fix --- .../bot/client/base/ApiClientBuilderTest.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/clients/line-bot-client-base/src/test/java/com/linecorp/bot/client/base/ApiClientBuilderTest.java b/clients/line-bot-client-base/src/test/java/com/linecorp/bot/client/base/ApiClientBuilderTest.java index 77bb791e1..1ad8d5a3a 100644 --- a/clients/line-bot-client-base/src/test/java/com/linecorp/bot/client/base/ApiClientBuilderTest.java +++ b/clients/line-bot-client-base/src/test/java/com/linecorp/bot/client/base/ApiClientBuilderTest.java @@ -32,6 +32,7 @@ import java.util.concurrent.CompletableFuture; import org.bbottema.javasocksproxyserver.SocksServer; +import org.bbottema.javasocksproxyserver.auth.UsernamePasswordAuthenticator; import org.junit.jupiter.api.Test; import org.littleshoot.proxy.HttpProxyServer; import org.littleshoot.proxy.impl.DefaultHttpProxyServer; @@ -77,8 +78,14 @@ protected IOException buildException(Response response, MyErrorResponse errorBod void socksProxy() { int socksPort = 9020; - SocksServer socksServer = new SocksServer(socksPort); - socksServer.start(); + SocksServer socksServer = new SocksServer(socksPort) + .setAuthenticator(new UsernamePasswordAuthenticator(true) { + @Override + public boolean validate(String username, String password) { + return true; + } + }) + .start(); WireMockServer wireMockServer = new WireMockServer(wireMockConfig().dynamicPort()); wireMockServer.start(); @@ -108,6 +115,7 @@ protected IOException buildException(Response response, MyErrorResponse errorBod assertThat(client.get().join().body().message).isEqualTo("OK"); wireMockServer.stop(); + socksServer.stop(); } @Test From 4f610914f844ec50b0407a74de1d06e63cf61216 Mon Sep 17 00:00:00 2001 From: Yuta Kasai Date: Tue, 21 May 2024 12:02:26 +0900 Subject: [PATCH 3/4] NO-ISSUE Use default authenticator --- .../linecorp/bot/client/base/ApiClientBuilderTest.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/clients/line-bot-client-base/src/test/java/com/linecorp/bot/client/base/ApiClientBuilderTest.java b/clients/line-bot-client-base/src/test/java/com/linecorp/bot/client/base/ApiClientBuilderTest.java index 1ad8d5a3a..0d35c8a14 100644 --- a/clients/line-bot-client-base/src/test/java/com/linecorp/bot/client/base/ApiClientBuilderTest.java +++ b/clients/line-bot-client-base/src/test/java/com/linecorp/bot/client/base/ApiClientBuilderTest.java @@ -32,6 +32,7 @@ import java.util.concurrent.CompletableFuture; import org.bbottema.javasocksproxyserver.SocksServer; +import org.bbottema.javasocksproxyserver.auth.DefaultAuthenticator; import org.bbottema.javasocksproxyserver.auth.UsernamePasswordAuthenticator; import org.junit.jupiter.api.Test; import org.littleshoot.proxy.HttpProxyServer; @@ -79,12 +80,7 @@ void socksProxy() { int socksPort = 9020; SocksServer socksServer = new SocksServer(socksPort) - .setAuthenticator(new UsernamePasswordAuthenticator(true) { - @Override - public boolean validate(String username, String password) { - return true; - } - }) + .setAuthenticator(new DefaultAuthenticator()) .start(); WireMockServer wireMockServer = new WireMockServer(wireMockConfig().dynamicPort()); From d4f73b9e6be154149a40e307653f914d2e6a69b7 Mon Sep 17 00:00:00 2001 From: Yuta Kasai Date: Tue, 21 May 2024 12:05:23 +0900 Subject: [PATCH 4/4] NO-ISSUE Delete unused import --- .../java/com/linecorp/bot/client/base/ApiClientBuilderTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/clients/line-bot-client-base/src/test/java/com/linecorp/bot/client/base/ApiClientBuilderTest.java b/clients/line-bot-client-base/src/test/java/com/linecorp/bot/client/base/ApiClientBuilderTest.java index 0d35c8a14..17b2da148 100644 --- a/clients/line-bot-client-base/src/test/java/com/linecorp/bot/client/base/ApiClientBuilderTest.java +++ b/clients/line-bot-client-base/src/test/java/com/linecorp/bot/client/base/ApiClientBuilderTest.java @@ -33,7 +33,6 @@ import org.bbottema.javasocksproxyserver.SocksServer; import org.bbottema.javasocksproxyserver.auth.DefaultAuthenticator; -import org.bbottema.javasocksproxyserver.auth.UsernamePasswordAuthenticator; import org.junit.jupiter.api.Test; import org.littleshoot.proxy.HttpProxyServer; import org.littleshoot.proxy.impl.DefaultHttpProxyServer;