Skip to content

Commit 74365c7

Browse files
authored
Merge pull request #366 from digipost/only-noop-hostname-verifier
Ensure only NOOP hostname verifier is used for TLS
2 parents 81a836d + de9f01f commit 74365c7

3 files changed

Lines changed: 17 additions & 15 deletions

File tree

lib/pom.xml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<dependency>
2929
<groupId>org.junit</groupId>
3030
<artifactId>junit-bom</artifactId>
31-
<version>5.13.0-M2</version>
31+
<version>5.14.2</version>
3232
<type>pom</type>
3333
<scope>import</scope>
3434
</dependency>
@@ -74,18 +74,18 @@
7474
<dependency>
7575
<groupId>org.apache.httpcomponents.client5</groupId>
7676
<artifactId>httpclient5</artifactId>
77-
<version>5.4.4</version>
77+
<version>5.6</version>
7878
</dependency>
7979
<dependency>
8080
<groupId>org.apache.httpcomponents.core5</groupId>
8181
<artifactId>httpcore5</artifactId>
82-
<version>5.3.4</version>
82+
<version>5.4</version>
8383
</dependency>
8484

8585
<dependency>
8686
<groupId>commons-io</groupId>
8787
<artifactId>commons-io</artifactId>
88-
<version>2.19.0</version>
88+
<version>2.21.0</version>
8989
<scope>test</scope>
9090
</dependency>
9191

@@ -183,12 +183,12 @@
183183
<plugins>
184184
<plugin>
185185
<artifactId>maven-compiler-plugin</artifactId>
186-
<version>3.14.0</version>
186+
<version>3.14.1</version>
187187
</plugin>
188188
<plugin>
189189
<groupId>com.github.siom79.japicmp</groupId>
190190
<artifactId>japicmp-maven-plugin</artifactId>
191-
<version>0.23.1</version>
191+
<version>0.24.2</version>
192192
<configuration>
193193
<parameter>
194194
<includes>
@@ -202,7 +202,7 @@
202202
</plugin>
203203
<plugin>
204204
<artifactId>maven-shade-plugin</artifactId>
205-
<version>3.6.0</version>
205+
<version>3.6.1</version>
206206
<configuration>
207207
<minimizeJar>true</minimizeJar>
208208
<artifactSet>
@@ -228,23 +228,23 @@
228228
</plugin>
229229
<plugin>
230230
<artifactId>maven-surefire-plugin</artifactId>
231-
<version>3.5.3</version>
231+
<version>3.5.4</version>
232232
</plugin>
233233
<plugin>
234234
<artifactId>maven-resources-plugin</artifactId>
235-
<version>3.3.1</version>
235+
<version>3.4.0</version>
236236
</plugin>
237237
<plugin>
238238
<artifactId>maven-javadoc-plugin</artifactId>
239-
<version>3.11.2</version>
239+
<version>3.12.0</version>
240240
</plugin>
241241
<plugin>
242242
<artifactId>maven-jar-plugin</artifactId>
243243
<version>3.4.2</version>
244244
</plugin>
245245
<plugin>
246246
<artifactId>maven-enforcer-plugin</artifactId>
247-
<version>3.6.1</version>
247+
<version>3.6.2</version>
248248
<configuration>
249249
<rules>
250250
<bannedDependencies>

lib/src/main/java/no/digipost/signature/client/core/internal/configuration/ApacheHttpClientSslConfigurer.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import no.digipost.signature.client.security.OrganizationNumberValidation;
1010
import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;
1111
import org.apache.hc.client5.http.ssl.DefaultClientTlsStrategy;
12+
import org.apache.hc.client5.http.ssl.HostnameVerificationPolicy;
1213
import org.apache.hc.client5.http.ssl.NoopHostnameVerifier;
1314
import org.apache.hc.core5.ssl.SSLContexts;
1415

@@ -40,7 +41,8 @@ public ApacheHttpClientSslConfigurer certificatChainValidation(CertificateChainV
4041

4142
@Override
4243
public void applyTo(PoolingHttpClientConnectionManagerBuilder connectionManager) {
43-
connectionManager.setTlsSocketStrategy(new DefaultClientTlsStrategy(sslContext(), NoopHostnameVerifier.INSTANCE));
44+
connectionManager.setTlsSocketStrategy(
45+
new DefaultClientTlsStrategy(sslContext(), HostnameVerificationPolicy.CLIENT, NoopHostnameVerifier.INSTANCE));
4446
}
4547

4648

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>no.digipost</groupId>
2424
<artifactId>digipost-open-super-pom</artifactId>
25-
<version>14</version>
25+
<version>15</version>
2626
</parent>
2727

2828
<groupId>no.digipost.signature</groupId>
@@ -68,7 +68,7 @@
6868
</plugin>
6969
<plugin>
7070
<artifactId>maven-dependency-plugin</artifactId>
71-
<version>3.8.1</version>
71+
<version>3.9.0</version>
7272
</plugin>
7373
<plugin>
7474
<artifactId>maven-install-plugin</artifactId>
@@ -77,7 +77,7 @@
7777
<plugin>
7878
<groupId>org.codehaus.mojo</groupId>
7979
<artifactId>versions-maven-plugin</artifactId>
80-
<version>2.18.0</version>
80+
<version>2.20.1</version>
8181
</plugin>
8282
</plugins>
8383
</pluginManagement>

0 commit comments

Comments
 (0)