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

Bc shaded own1 #11

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open
84 changes: 0 additions & 84 deletions bouncy-castle/bc-shaded/pom.xml

This file was deleted.

18 changes: 16 additions & 2 deletions bouncy-castle/bc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,23 @@

<build>
<plugins>

<!-- build a `jar in jar` to avoid break bc signature-->
<plugin>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-maven-plugin</artifactId>
<groupId>de.ntcomputer</groupId>
<artifactId>executable-packer-maven-plugin</artifactId>
<version>1.0.1</version>
<configuration>
<finalName>${project.artifactId}-${project.version}</finalName>
<mainClass>org.apache.pulsar.bcloader.BouncyCastleLoader</mainClass>
</configuration>
<executions>
<execution>
<goals>
<goal>pack-executable-jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
Expand Down
4 changes: 2 additions & 2 deletions bouncy-castle/bcfips-include-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<exclusions>
<exclusion>
<groupId>${project.groupId}</groupId>
<artifactId>bouncy-castle-bc-shaded</artifactId>
<artifactId>bouncy-castle-bc</artifactId>
</exclusion>
</exclusions>
<type>test-jar</type>
Expand All @@ -61,7 +61,7 @@
<exclusions>
<exclusion>
<groupId>${project.groupId}</groupId>
<artifactId>bouncy-castle-bc-shaded</artifactId>
<artifactId>bouncy-castle-bc</artifactId>
</exclusion>
</exclusions>
<scope>test</scope>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,15 @@ public void testTlsClientAuthOverBinaryProtocol() throws Exception {
Assert.fail("Server should have failed the TLS handshake since client didn't .");
} catch (Exception ex) {
// OK
log.info("first test success: without certs set, meet exception {}", ex);
}

// Test 2 - Using TLS on binary protocol - sending certs
internalSetUpForClient(true, pulsar.getBrokerServiceUrlTls());
try {
pulsarClient.newConsumer().topic("persistent://my-property/use/my-ns/my-topic1")
.subscriptionName("my-subscriber-name").subscriptionType(SubscriptionType.Exclusive).subscribe();
log.info("second test success: with certs set, consumer sub success");
} catch (Exception ex) {
Assert.fail("Should not fail since certs are sent.");
}
Expand All @@ -116,13 +118,15 @@ public void testTlsClientAuthOverHTTPProtocol() throws Exception {
Assert.fail("Server should have failed the TLS handshake since client didn't .");
} catch (Exception ex) {
// OK
log.info("first test success: without certs set, meet exception {}", ex);
}

// Test 2 - Using TLS on https - sending certs
internalSetUpForClient(true, pulsar.getWebServiceAddressTls());
try {
pulsarClient.newConsumer().topic("persistent://my-property/use/my-ns/my-topic1")
.subscriptionName("my-subscriber-name").subscriptionType(SubscriptionType.Exclusive).subscribe();
log.info("second test success: with certs set, consumer sub success");
} catch (Exception ex) {
Assert.fail("Should not fail since certs are sent.");
}
Expand Down
102 changes: 0 additions & 102 deletions bouncy-castle/bcfips-nar-test/pom.xml

This file was deleted.

This file was deleted.

Loading