-
Notifications
You must be signed in to change notification settings - Fork 820
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request from GHSA-v7wg-cpwc-24m4
* test: Add some SSL helpers to TestUtil * security: verify plugin classes adhere to the expected interface before instantiating the class This ensures arbitrary classes can't be passed instead of SocketFactory, SSLSocketFactory, CallbackHandler, HostnameVerifier Co-authored-by: Sehrope Sarkuni <sehrope@jackdb.com>
- Loading branch information
Showing
6 changed files
with
131 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
100 changes: 100 additions & 0 deletions
100
pgjdbc/src/test/java/org/postgresql/test/util/ObjectFactoryTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| /* | ||
| * Copyright (c) 2022, PostgreSQL Global Development Group | ||
| * See the LICENSE file in the project root for more information. | ||
| */ | ||
|
|
||
| package org.postgresql.test.util; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertThrows; | ||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
| import static org.junit.jupiter.api.Assertions.assertFalse; | ||
|
|
||
| import org.postgresql.PGProperty; | ||
| import org.postgresql.jdbc.SslMode; | ||
| import org.postgresql.test.TestUtil; | ||
| import org.postgresql.util.ObjectFactory; | ||
| import org.postgresql.util.PSQLState; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
| import org.junit.jupiter.api.Assertions; | ||
| import org.opentest4j.MultipleFailuresError; | ||
|
|
||
| import java.sql.SQLException; | ||
| import java.util.Properties; | ||
|
|
||
| import javax.net.SocketFactory; | ||
|
|
||
| public class ObjectFactoryTest { | ||
| Properties props = new Properties(); | ||
|
|
||
| static class BadObject { | ||
| static boolean wasInstantiated = false; | ||
|
|
||
| BadObject() { | ||
| wasInstantiated = true; | ||
| throw new RuntimeException("I should not be instantiated"); | ||
| } | ||
| } | ||
|
|
||
| private void testInvalidInstantiation(PGProperty prop, PSQLState expectedSqlState) { | ||
| prop.set(props, BadObject.class.getName()); | ||
|
|
||
| BadObject.wasInstantiated = false; | ||
| SQLException ex = assertThrows(SQLException.class, () -> { | ||
| TestUtil.openDB(props); | ||
| }); | ||
|
|
||
| try { | ||
| Assertions.assertAll( | ||
| () -> assertFalse(BadObject.wasInstantiated, "ObjectFactory should not have " | ||
| + "instantiated bad object for " + prop), | ||
| () -> assertEquals(expectedSqlState.getState(), ex.getSQLState(), () -> "#getSQLState()"), | ||
| () -> { | ||
| assertThrows( | ||
| ClassCastException.class, | ||
| () -> { | ||
| throw ex.getCause(); | ||
| }, | ||
| () -> "Wrong class specified for " + prop.name() | ||
| + " => ClassCastException is expected in SQLException#getCause()" | ||
| ); | ||
| } | ||
| ); | ||
| } catch (MultipleFailuresError e) { | ||
| // Add the original exception so it is easier to understand the reason for the test to fail | ||
| e.addSuppressed(ex); | ||
| throw e; | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void testInvalidSocketFactory() { | ||
| testInvalidInstantiation(PGProperty.SOCKET_FACTORY, PSQLState.CONNECTION_FAILURE); | ||
| } | ||
|
|
||
| @Test | ||
| public void testInvalidSSLFactory() { | ||
| TestUtil.assumeSslTestsEnabled(); | ||
| // We need at least "require" to trigger SslSockerFactory instantiation | ||
| PGProperty.SSL_MODE.set(props, SslMode.REQUIRE.value); | ||
| testInvalidInstantiation(PGProperty.SSL_FACTORY, PSQLState.CONNECTION_FAILURE); | ||
| } | ||
|
|
||
| @Test | ||
| public void testInvalidSslHostnameVerifier() { | ||
| TestUtil.assumeSslTestsEnabled(); | ||
| // Hostname verification is done at verify-full level only | ||
| PGProperty.SSL_MODE.set(props, SslMode.VERIFY_FULL.value); | ||
| PGProperty.SSL_ROOT_CERT.set(props, TestUtil.getSslTestCertPath("goodroot.crt")); | ||
| testInvalidInstantiation(PGProperty.SSL_HOSTNAME_VERIFIER, PSQLState.CONNECTION_FAILURE); | ||
| } | ||
|
|
||
| @Test | ||
| public void testInstantiateInvalidSocketFactory() { | ||
| Properties props = new Properties(); | ||
| assertThrows(ClassCastException.class, () -> { | ||
| ObjectFactory.instantiate(SocketFactory.class, BadObject.class.getName(), props, | ||
| false, null); | ||
| }); | ||
| } | ||
| } |