This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a change to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/pulsar.git
from a6fd517ee39 [improve][build] Add a default username in the image
(#21695)
new d83c7182a77 Revert "[fix][broker] Fix returns wrong webServiceUrl when
both webServicePort and webServicePortTls are set (#21633)"
new 57b73027a87 [cleanup] Deduplicate test certificates to simplify
management (#20289)
new e9cd566eb56 [cleanup] Consolidate certs used in tests (#20336)
new 8bab1ecd720 Revert "[fix][test][branch-3.0] fix
testCleanupEmptySubscriptionAuthenticationMap (#21744)"
new d510b1d1013 [fix][test] ProxyWithoutServiceDiscoveryTest should enable
authz (#20348)
new e1982bc5151 [cleanup] Consolidate certs in broker (and some proxy)
tests (#20353)
new 8e2eb50d9c9 [fix][broker] Fix PulsarService.getLookupServiceAddress
returns wrong port if TLS is enabled (#21015)
new 1fc5cf14954 [fix][broker] Fix returns wrong webServiceUrl when both
webServicePort and webServicePortTls are set (#21633)
new 5fc4f3d5ace [fix][broker] Fix returns wrong webServiceUrl when both
webServicePort and webServicePortTls are set (#21842)
new 7d28dbf4be1 [fix][broker] Fix leader broker cannot be determined when
the advertised address and advertised listeners are configured (#21894)
new c614e4def0f [fix][broker] Restore the broker id to match the format
used in existing Pulsar releases (#21937)
The 11 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
bouncy-castle/bcfips-include-test/pom.xml | 22 ++
.../pulsar/client/TlsProducerConsumerBase.java | 23 +-
.../resources/authentication/tls/broker-cert.pem | 71 -----
.../resources/authentication/tls/broker-key.pem | 28 --
.../test/resources/authentication/tls/cacert.pem | 78 ------
.../resources/authentication/tls/client-cert.pem | 71 -----
.../resources/authentication/tls/client-key.pem | 28 --
build/regenerate_certs_for_tests.sh | 7 -
.../org/apache/pulsar/broker/PulsarService.java | 34 ++-
.../pulsar/broker/admin/impl/BrokersBase.java | 24 +-
.../pulsar/broker/admin/impl/NamespacesBase.java | 11 +-
.../pulsar/broker/loadbalance/LeaderBroker.java | 18 ++
.../broker/loadbalance/LeaderElectionService.java | 12 +-
.../pulsar/broker/loadbalance/NoopLoadManager.java | 14 +-
.../pulsar/broker/loadbalance/ResourceUnit.java | 2 -
.../loadbalance/extensions/BrokerRegistryImpl.java | 2 +-
.../extensions/ExtensibleLoadManagerImpl.java | 15 +-
.../channel/ServiceUnitStateChannelImpl.java | 38 +--
.../policies/IsolationPoliciesHelper.java | 8 +-
.../reporter/BrokerLoadDataReporter.java | 14 +-
.../reporter/TopBundleLoadDataReporter.java | 14 +-
.../broker/loadbalance/impl/LoadManagerShared.java | 99 +++----
.../loadbalance/impl/ModularLoadManagerImpl.java | 15 +-
.../impl/ModularLoadManagerWrapper.java | 21 +-
.../loadbalance/impl/SimpleLoadManagerImpl.java | 42 ++-
.../pulsar/broker/namespace/NamespaceService.java | 76 ++---
.../pulsar/broker/service/BrokerService.java | 2 +-
.../service/nonpersistent/NonPersistentTopic.java | 2 +-
.../broker/service/persistent/PersistentTopic.java | 2 +-
.../pulsar/broker/web/PulsarWebResource.java | 54 ++--
.../apache/pulsar/broker/PulsarServiceTest.java | 2 +
.../apache/pulsar/broker/SLAMonitoringTest.java | 16 +-
.../apache/pulsar/broker/admin/AdminApi2Test.java | 21 +-
.../broker/admin/AdminApiMultiBrokersTest.java | 5 +-
.../apache/pulsar/broker/admin/AdminApiTest.java | 39 ++-
.../pulsar/broker/admin/AdminApiTlsAuthTest.java | 38 ++-
.../org/apache/pulsar/broker/admin/AdminTest.java | 7 +-
.../broker/admin/BrokerAdminClientTlsAuthTest.java | 20 +-
.../pulsar/broker/admin/v1/V1_AdminApiTest.java | 16 +-
.../broker/auth/MockedPulsarServiceBaseTest.java | 19 +-
...isedListenersMultiBrokerLeaderElectionTest.java | 42 +++
.../loadbalance/AdvertisedListenersTest.java | 2 -
.../AntiAffinityNamespaceGroupTest.java | 4 +-
.../loadbalance/LeaderElectionServiceTest.java | 3 +-
.../broker/loadbalance/LoadBalancerTest.java | 13 +-
.../loadbalance/MultiBrokerLeaderElectionTest.java | 94 +++++--
.../loadbalance/SimpleLoadManagerImplTest.java | 35 +--
.../loadbalance/extensions/BrokerRegistryTest.java | 4 +-
.../extensions/ExtensibleLoadManagerImplTest.java | 48 ++--
.../channel/ServiceUnitStateChannelTest.java | 312 ++++++++++-----------
.../filter/BrokerIsolationPoliciesFilterTest.java | 64 ++---
.../extensions/scheduler/TransferShedderTest.java | 296 +++++++++----------
.../impl/ModularLoadManagerImplTest.java | 137 ++++-----
.../broker/namespace/NamespaceServiceTest.java | 39 ++-
.../OwnerShipForCurrentServerTestBase.java | 2 -
.../broker/service/AdvertisedAddressTest.java | 2 +-
.../pulsar/broker/service/BrokerServiceTest.java | 45 ++-
.../broker/service/ClusterMigrationTest.java | 9 +
.../broker/service/InactiveTopicDeleteTest.java | 4 +-
.../pulsar/broker/service/ReplicatorTest.java | 6 +-
.../systopic/PartitionedSystemTopicTest.java | 12 +-
.../broker/testcontext/PulsarTestContext.java | 48 +++-
.../broker/transaction/TransactionTestBase.java | 2 -
.../apache/pulsar/broker/web/WebServiceTest.java | 30 +-
.../api/AuthenticatedProducerConsumerTest.java | 57 ++--
.../AuthenticationTlsHostnameVerificationTest.java | 26 +-
.../pulsar/client/api/BrokerServiceLookupTest.java | 61 ++--
.../client/api/ClientAuthenticationTlsTest.java | 31 +-
.../pulsar/client/api/ProducerConsumerBase.java | 5 -
.../pulsar/client/api/ProxyProtocolTest.java | 12 +-
.../pulsar/client/api/TlsHostVerificationTest.java | 36 ++-
.../pulsar/client/api/TlsProducerConsumerBase.java | 23 +-
.../pulsar/client/api/TlsProducerConsumerTest.java | 20 +-
.../org/apache/pulsar/client/api/TlsSniTest.java | 6 +-
.../api/TokenExpirationProduceConsumerTest.java | 10 +-
.../apache/pulsar/compaction/CompactionTest.java | 4 +-
.../worker/PulsarFunctionLocalRunTest.java | 16 +-
.../worker/PulsarFunctionPublishTest.java | 16 +-
.../functions/worker/PulsarFunctionTlsTest.java | 16 +-
.../apache/pulsar/io/AbstractPulsarE2ETest.java | 16 +-
.../apache/pulsar/io/PulsarFunctionAdminTest.java | 20 +-
.../apache/pulsar/io/PulsarFunctionTlsTest.java | 21 +-
.../proxy/ProxyPublishConsumeTlsTest.java | 13 +-
.../authentication/tls-http/admin.cert.pem | 26 --
.../authentication/tls-http/admin.key-pk8.pem | 28 --
.../authentication/tls-http/broker.cert.pem | 27 --
.../authentication/tls-http/broker.key-pk8.pem | 28 --
.../resources/authentication/tls-http/ca.cert.pem | 29 --
.../authentication/tls-http/proxy.cert.pem | 26 --
.../authentication/tls-http/proxy.key-pk8.pem | 28 --
.../authentication/tls-http/superproxy.cert.pem | 26 --
.../authentication/tls-http/superproxy.key-pk8.pem | 28 --
.../authentication/tls-http/user1.cert.pem | 26 --
.../authentication/tls-http/user1.key-pk8.pem | 28 --
.../resources/authentication/tls/broker-cert.pem | 117 --------
.../resources/authentication/tls/broker-key.pem | 27 --
.../test/resources/authentication/tls/cacert.pem | 127 ---------
.../resources/authentication/tls/client-cert.pem | 90 ------
.../resources/authentication/tls/client-key.pem | 27 --
.../src/test/resources/certificate/client.crt | 20 --
.../src/test/resources/certificate/client.csr | 17 --
.../src/test/resources/certificate/client.key | 28 --
.../src/test/resources/certificate/server.crt | 20 --
.../src/test/resources/certificate/server.csr | 17 --
.../src/test/resources/certificate/server.key | 28 --
.../org/apache/pulsar/client/admin/Brokers.java | 24 +-
.../pulsar/common/policies/data/BrokerInfo.java | 2 +
.../common/policies/data/impl/BrokerInfoImpl.java | 9 +-
.../pulsar/client/admin/internal/BrokersImpl.java | 8 +-
.../pulsar/client/cli/PulsarClientToolTest.java | 9 +-
.../proxy/server/AuthedAdminProxyHandlerTest.java | 32 +--
.../pulsar/proxy/server/ProxyRefreshAuthTest.java | 1 +
.../proxy/server/ProxyServiceTlsStarterTest.java | 17 +-
.../apache/pulsar/proxy/server/ProxyTlsTest.java | 12 +-
.../pulsar/proxy/server/ProxyTlsTestWithAuth.java | 8 +-
.../server/ProxyWithoutServiceDiscoveryTest.java | 52 ++--
.../SuperUserAuthedAdminProxyHandlerTest.java | 26 +-
.../authentication/tls-admin-proxy/admin.cert.pem | 26 --
.../tls-admin-proxy/admin.key-pk8.pem | 28 --
.../authentication/tls-admin-proxy/broker.cert.pem | 27 --
.../tls-admin-proxy/broker.key-pk8.pem | 28 --
.../authentication/tls-admin-proxy/ca.cert.pem | 29 --
.../authentication/tls-admin-proxy/proxy.cert.pem | 26 --
.../tls-admin-proxy/proxy.key-pk8.pem | 28 --
.../tls-admin-proxy/randouser.cert.pem | 19 --
.../tls-admin-proxy/randouser.key-pk8.pem | 28 --
.../tls-admin-proxy/superproxy.cert.pem | 26 --
.../tls-admin-proxy/superproxy.key-pk8.pem | 28 --
.../authentication/tls-admin-proxy/user1.cert.pem | 26 --
.../tls-admin-proxy/user1.key-pk8.pem | 28 --
tests/certificate-authority/.gitignore | 3 +
tests/certificate-authority/README.md | 24 +-
tests/certificate-authority/index.txt | 2 +
.../certificate-authority/newcerts/1007.pem | 0
tests/certificate-authority/newcerts/1008.pem | 110 ++++++++
tests/certificate-authority/openssl.cnf | 17 +-
tests/certificate-authority/serial | 2 +-
.../server-keys/broker.cert.pem | 134 +++++++--
.../server-keys/broker.csr.pem | 26 +-
.../server-keys/broker.key-pk8.pem | 52 ++--
.../server-keys/broker.key.pem | 50 ++--
.../server-keys/proxy.cert.pem | 133 +++++++--
.../server-keys/proxy.csr.pem | 26 +-
.../server-keys/proxy.key-pk8.pem | 52 ++--
.../server-keys/proxy.key.pem | 50 ++--
.../integration/containers/BrokerContainer.java | 9 +-
.../integration/containers/ProxyContainer.java | 9 +-
.../tests/integration/tls/ClientTlsTest.java | 9 +
.../integration/topologies/PulsarCluster.java | 40 ++-
.../integration/topologies/PulsarClusterSpec.java | 6 +
150 files changed, 1948 insertions(+), 2863 deletions(-)
delete mode 100644
bouncy-castle/bcfips-include-test/src/test/resources/authentication/tls/broker-cert.pem
delete mode 100644
bouncy-castle/bcfips-include-test/src/test/resources/authentication/tls/broker-key.pem
delete mode 100644
bouncy-castle/bcfips-include-test/src/test/resources/authentication/tls/cacert.pem
delete mode 100644
bouncy-castle/bcfips-include-test/src/test/resources/authentication/tls/client-cert.pem
delete mode 100644
bouncy-castle/bcfips-include-test/src/test/resources/authentication/tls/client-key.pem
create mode 100644
pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/AdvertisedListenersMultiBrokerLeaderElectionTest.java
delete mode 100644
pulsar-broker/src/test/resources/authentication/tls-http/admin.cert.pem
delete mode 100644
pulsar-broker/src/test/resources/authentication/tls-http/admin.key-pk8.pem
delete mode 100644
pulsar-broker/src/test/resources/authentication/tls-http/broker.cert.pem
delete mode 100644
pulsar-broker/src/test/resources/authentication/tls-http/broker.key-pk8.pem
delete mode 100644
pulsar-broker/src/test/resources/authentication/tls-http/ca.cert.pem
delete mode 100644
pulsar-broker/src/test/resources/authentication/tls-http/proxy.cert.pem
delete mode 100644
pulsar-broker/src/test/resources/authentication/tls-http/proxy.key-pk8.pem
delete mode 100644
pulsar-broker/src/test/resources/authentication/tls-http/superproxy.cert.pem
delete mode 100644
pulsar-broker/src/test/resources/authentication/tls-http/superproxy.key-pk8.pem
delete mode 100644
pulsar-broker/src/test/resources/authentication/tls-http/user1.cert.pem
delete mode 100644
pulsar-broker/src/test/resources/authentication/tls-http/user1.key-pk8.pem
delete mode 100644
pulsar-broker/src/test/resources/authentication/tls/broker-cert.pem
delete mode 100644
pulsar-broker/src/test/resources/authentication/tls/broker-key.pem
delete mode 100644
pulsar-broker/src/test/resources/authentication/tls/cacert.pem
delete mode 100644
pulsar-broker/src/test/resources/authentication/tls/client-cert.pem
delete mode 100644
pulsar-broker/src/test/resources/authentication/tls/client-key.pem
delete mode 100644 pulsar-broker/src/test/resources/certificate/client.crt
delete mode 100644 pulsar-broker/src/test/resources/certificate/client.csr
delete mode 100644 pulsar-broker/src/test/resources/certificate/client.key
delete mode 100644 pulsar-broker/src/test/resources/certificate/server.crt
delete mode 100644 pulsar-broker/src/test/resources/certificate/server.csr
delete mode 100644 pulsar-broker/src/test/resources/certificate/server.key
delete mode 100644
pulsar-proxy/src/test/resources/authentication/tls-admin-proxy/admin.cert.pem
delete mode 100644
pulsar-proxy/src/test/resources/authentication/tls-admin-proxy/admin.key-pk8.pem
delete mode 100644
pulsar-proxy/src/test/resources/authentication/tls-admin-proxy/broker.cert.pem
delete mode 100644
pulsar-proxy/src/test/resources/authentication/tls-admin-proxy/broker.key-pk8.pem
delete mode 100644
pulsar-proxy/src/test/resources/authentication/tls-admin-proxy/ca.cert.pem
delete mode 100644
pulsar-proxy/src/test/resources/authentication/tls-admin-proxy/proxy.cert.pem
delete mode 100644
pulsar-proxy/src/test/resources/authentication/tls-admin-proxy/proxy.key-pk8.pem
delete mode 100644
pulsar-proxy/src/test/resources/authentication/tls-admin-proxy/randouser.cert.pem
delete mode 100644
pulsar-proxy/src/test/resources/authentication/tls-admin-proxy/randouser.key-pk8.pem
delete mode 100644
pulsar-proxy/src/test/resources/authentication/tls-admin-proxy/superproxy.cert.pem
delete mode 100644
pulsar-proxy/src/test/resources/authentication/tls-admin-proxy/superproxy.key-pk8.pem
delete mode 100644
pulsar-proxy/src/test/resources/authentication/tls-admin-proxy/user1.cert.pem
delete mode 100644
pulsar-proxy/src/test/resources/authentication/tls-admin-proxy/user1.key-pk8.pem
create mode 100644 tests/certificate-authority/.gitignore
copy pulsar-io/elastic-search/src/test/resources/ssl/elasticsearch.crt =>
tests/certificate-authority/newcerts/1007.pem (100%)
create mode 100644 tests/certificate-authority/newcerts/1008.pem
