Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[3.8.x] FTP: Use restrictions to bypass cert setup issues #6437

Merged
merged 1 commit into from
Sep 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import static org.hamcrest.CoreMatchers.is;

@QuarkusTest
@QuarkusTestResource(FtpTestResource.class)
@QuarkusTestResource(value = FtpTestResource.class, restrictToAnnotatedClass = true)
class FtpTest {
@Test
public void testFtpComponent() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
Format.PKCS12 }, password = "password") })
@Disabled //https://github.com/apache/camel-quarkus/issues/4089
@QuarkusTest
@QuarkusTestResource(FtpsTestResource.class)
@QuarkusTestResource(value = FtpsTestResource.class, restrictToAnnotatedClass = true)
class FtpsTest {
static final String CERTIFICATE_KEYSTORE_FILE = CertificatesUtil.keystoreFile("ftp", "p12");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,6 @@ public FtpsTestResource() {

@Override
protected ListenerFactory createListenerFactory(int port) {
//do not create a factory if keystore file does not exists
//because the test is disabled, but the test resource is "activated", this condition prevents the failure
//for the FtpTest
if (!Path.of(FtpsTest.CERTIFICATE_KEYSTORE_FILE).toFile().exists()) {
return null;
}

SslConfigurationFactory sslConfigFactory = new SslConfigurationFactory();
sslConfigFactory.setKeystoreFile(Path.of(FtpsTest.CERTIFICATE_KEYSTORE_FILE).toFile());
Expand Down
Loading