Skip to content

Commit 7bb2d0f

Browse files
committed
chore: disable HTTP for HTTPS only config
1 parent 5f24c06 commit 7bb2d0f

File tree

3 files changed

+15
-4
lines changed

3 files changed

+15
-4
lines changed

wiremock-spring-boot/src/main/java/org/wiremock/spring/internal/WireMockServerCreator.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ public WireMockServer createWireMockServer(
4545

4646
final int serverHttpPort = portResolver.getServerHttpPortProperty(options);
4747
final boolean httpEnabled = serverHttpPort != PORT_DISABLED;
48+
serverOptions.httpDisabled(!httpEnabled);
4849
if (httpEnabled) {
4950
serverOptions.port(serverHttpPort);
5051
}

wiremock-spring-boot/src/main/java/org/wiremock/spring/internal/WireMockSpringJunitExtension.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,18 +88,21 @@ private void configureWireMockForDefaultInstance(final ExtensionContext extensio
8888
}
8989
}
9090
if (wiremock != null) {
91+
final boolean isHttps = wiremock.isHttpsEnabled();
92+
final int port = isHttps ? wiremock.httpsPort() : wiremock.port();
93+
9194
LOGGER.info(
9295
"Configuring WireMock for default instance, '"
9396
+ wireMockName
9497
+ "' on '"
95-
+ wiremock.port()
98+
+ port
9699
+ "'.");
97100
final String host = "localhost";
98-
if (wiremock.isHttpsEnabled()) {
101+
if (isHttps) {
99102
WireMock.configureFor(
100-
WireMock.create().https().host(host).port(wiremock.httpsPort()).build());
103+
WireMock.create().https().host(host).port(port).build());
101104
} else {
102-
WireMock.configureFor(WireMock.create().http().host(host).port(wiremock.port()).build());
105+
WireMock.configureFor(WireMock.create().http().host(host).port(port).build());
103106
}
104107
}
105108
}

wiremock-spring-boot/src/test/java/usecases/HttpsOnlyTest.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import static com.github.tomakehurst.wiremock.client.WireMock.anyUrl;
66
import static com.github.tomakehurst.wiremock.client.WireMock.get;
77
import static org.assertj.core.api.Assertions.assertThat;
8+
import static org.assertj.core.api.Assertions.assertThatThrownBy;
89

910
import com.github.tomakehurst.wiremock.WireMockServer;
1011
import com.github.tomakehurst.wiremock.client.WireMock;
@@ -59,4 +60,10 @@ void testDefaultClient() {
5960

6061
assertThat(WireMock.findAll(anyRequestedFor(anyUrl()))).hasSize(1);
6162
}
63+
64+
@Test
65+
void testHttpDisabled() {
66+
assertThat(wiremock.isHttpEnabled()).isFalse();
67+
assertThatThrownBy(() -> wiremock.port()).isExactlyInstanceOf(IllegalStateException.class);
68+
}
6269
}

0 commit comments

Comments
 (0)