You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by pe...@apache.org on 2021/01/26 11:17:25 UTC

[pulsar] branch branch-2.7 updated (139060b -> e30f3f8)

This is an automated email from the ASF dual-hosted git repository.

penghui pushed a change to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/pulsar.git.


    from 139060b  PLSR-1456: Fix race condition on producer/consumer maps in ServerCnx (#9256)
     new 7c3bbc0  Fix: don't attempt to clean up packages when Source/Sink is builtin (#9289)
     new c6fe7a1  [Functions] Fixes function worker get superuser role (#9259)
     new a1fe129  [Authentication]Add authentication metrics (#9244)
     new e30f3f8  Fix system topic can not auto created (#9272)

The 4 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:
 .../AuthenticationProviderAthenz.java              | 87 ++++++++++++----------
 .../authentication/AuthenticationProviderSasl.java | 16 +++-
 .../AuthenticationProviderBasic.java               | 32 ++++----
 .../authentication/AuthenticationProviderTls.java  | 81 ++++++++++----------
 .../AuthenticationProviderToken.java               | 10 ++-
 .../metrics/AuthenticationMetrics.java             | 53 +++++++++++++
 .../pulsar/broker/service/BrokerService.java       |  6 ++
 .../pulsar/broker/admin/TopicPoliciesTest.java     | 14 ++++
 .../pulsar/broker/stats/PrometheusMetricsTest.java | 79 +++++++++++++++++++-
 .../apache/pulsar/io/PulsarFunctionE2ETest.java    | 36 +++++++--
 .../functions/worker/rest/api/ComponentImpl.java   | 28 ++++++-
 .../worker/rest/api/FunctionsImplTest.java         | 23 +++++-
 .../worker/rest/api/v3/SinkApiV3ResourceTest.java  | 77 +++++++++++++++++++
 .../rest/api/v3/SourceApiV3ResourceTest.java       | 77 +++++++++++++++++++
 14 files changed, 506 insertions(+), 113 deletions(-)
 create mode 100644 pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/metrics/AuthenticationMetrics.java


[pulsar] 01/04: Fix: don't attempt to clean up packages when Source/Sink is builtin (#9289)

Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

penghui pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/pulsar.git

commit 7c3bbc0913bddd188305017b710700e84afe6763
Author: Boyang Jerry Peng <je...@gmail.com>
AuthorDate: Sun Jan 24 18:42:12 2021 -0800

    Fix: don't attempt to clean up packages when Source/Sink is builtin (#9289)
    
    ### Motivation
    
    For Pulsar Functions / IO, don't attempt to clean up packages when Source/Sink is builtin.  Though it doesn't really cause any problems even if we do just a nasty exception gets logged.
    
    
    
    (cherry picked from commit 47b05c45000371ad26f5a197023e34ade7834fb2)
---
 .../functions/worker/rest/api/ComponentImpl.java   |  5 +-
 .../worker/rest/api/v3/SinkApiV3ResourceTest.java  | 77 ++++++++++++++++++++++
 .../rest/api/v3/SourceApiV3ResourceTest.java       | 77 ++++++++++++++++++++++
 3 files changed, 158 insertions(+), 1 deletion(-)

diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/ComponentImpl.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/ComponentImpl.java
index 29766e6..56771f6 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/ComponentImpl.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/ComponentImpl.java
@@ -400,7 +400,10 @@ public abstract class ComponentImpl {
                         ComponentTypeUtils.toString(componentType), tenant, namespace, componentName));
 
         // clean up component files stored in BK
-        if (!functionMetaData.getPackageLocation().getPackagePath().startsWith(Utils.HTTP) && !functionMetaData.getPackageLocation().getPackagePath().startsWith(Utils.FILE)) {
+        String functionPackagePath = functionMetaData.getPackageLocation().getPackagePath();
+        if (!functionPackagePath.startsWith(Utils.HTTP)
+                && !functionPackagePath.startsWith(Utils.FILE)
+                && !functionPackagePath.startsWith(Utils.BUILTIN)) {
             try {
                 WorkerUtils.deleteFromBookkeeper(worker().getDlogNamespace(), functionMetaData.getPackageLocation().getPackagePath());
             } catch (IOException e) {
diff --git a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/v3/SinkApiV3ResourceTest.java b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/v3/SinkApiV3ResourceTest.java
index 6b55106..ed1c116 100644
--- a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/v3/SinkApiV3ResourceTest.java
+++ b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/v3/SinkApiV3ResourceTest.java
@@ -28,6 +28,7 @@ import org.apache.pulsar.client.admin.PulsarAdmin;
 import org.apache.pulsar.client.admin.PulsarAdminException;
 import org.apache.pulsar.client.admin.Tenants;
 import org.apache.pulsar.common.functions.FunctionConfig;
+import org.apache.pulsar.common.functions.Utils;
 import org.apache.pulsar.common.io.SinkConfig;
 import org.apache.pulsar.common.nar.NarClassLoader;
 import org.apache.pulsar.common.policies.data.TenantInfo;
@@ -73,6 +74,7 @@ import static org.mockito.Mockito.anyString;
 import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.when;
 import static org.powermock.api.mockito.PowerMockito.doNothing;
 import static org.powermock.api.mockito.PowerMockito.doReturn;
@@ -1152,6 +1154,81 @@ public class SinkApiV3ResourceTest {
         }
     }
 
+    @Test
+    public void testDeregisterSinkBKPackageCleanup() throws IOException {
+
+        mockStatic(WorkerUtils.class);
+
+        when(mockedManager.containsFunction(eq(tenant), eq(namespace), eq(sink))).thenReturn(true);
+
+        String packagePath = "public/default/test/591541f0-c7c5-40c0-983b-610c722f90b0-pulsar-io-batch-data-generator-2.7.0.nar";
+        when(mockedManager.getFunctionMetaData(eq(tenant), eq(namespace), eq(sink)))
+                .thenReturn(FunctionMetaData.newBuilder().setPackageLocation(
+                        Function.PackageLocationMetaData.newBuilder().setPackagePath(packagePath).build()).build());
+
+        deregisterDefaultSink();
+
+        PowerMockito.verifyStatic(WorkerUtils.class, times(1));
+        WorkerUtils.deleteFromBookkeeper(any(), eq(packagePath));
+    }
+
+    @Test
+    public void testDeregisterBuiltinSinkBKPackageCleanup() throws IOException {
+
+        mockStatic(WorkerUtils.class);
+
+        when(mockedManager.containsFunction(eq(tenant), eq(namespace), eq(sink))).thenReturn(true);
+
+        String packagePath = String.format("%s://data-generator", Utils.BUILTIN);
+        when(mockedManager.getFunctionMetaData(eq(tenant), eq(namespace), eq(sink)))
+                .thenReturn(FunctionMetaData.newBuilder().setPackageLocation(
+                        Function.PackageLocationMetaData.newBuilder().setPackagePath(packagePath).build()).build());
+
+        deregisterDefaultSink();
+
+        // if the sink is a builtin sink we shouldn't try to clean it up
+        PowerMockito.verifyStatic(WorkerUtils.class, times(0));
+        WorkerUtils.deleteFromBookkeeper(any(), eq(packagePath));
+    }
+
+    @Test
+    public void testDeregisterHTTPSinkBKPackageCleanup() throws IOException {
+
+        mockStatic(WorkerUtils.class);
+
+        when(mockedManager.containsFunction(eq(tenant), eq(namespace), eq(sink))).thenReturn(true);
+
+        String packagePath = String.format("http://foo.com/connector.jar", Utils.BUILTIN);
+        when(mockedManager.getFunctionMetaData(eq(tenant), eq(namespace), eq(sink)))
+                .thenReturn(FunctionMetaData.newBuilder().setPackageLocation(
+                        Function.PackageLocationMetaData.newBuilder().setPackagePath(packagePath).build()).build());
+
+        deregisterDefaultSink();
+
+        // if the sink is a is download from a http url, we shouldn't try to clean it up
+        PowerMockito.verifyStatic(WorkerUtils.class, times(0));
+        WorkerUtils.deleteFromBookkeeper(any(), eq(packagePath));
+    }
+
+    @Test
+    public void testDeregisterFileSinkBKPackageCleanup() throws IOException {
+
+        mockStatic(WorkerUtils.class);
+
+        when(mockedManager.containsFunction(eq(tenant), eq(namespace), eq(sink))).thenReturn(true);
+
+        String packagePath = String.format("file://foo/connector.jar", Utils.BUILTIN);
+        when(mockedManager.getFunctionMetaData(eq(tenant), eq(namespace), eq(sink)))
+                .thenReturn(FunctionMetaData.newBuilder().setPackageLocation(
+                        Function.PackageLocationMetaData.newBuilder().setPackagePath(packagePath).build()).build());
+
+        deregisterDefaultSink();
+
+        // if the sink package has a file url, we shouldn't try to clean it up
+        PowerMockito.verifyStatic(WorkerUtils.class, times(0));
+        WorkerUtils.deleteFromBookkeeper(any(), eq(packagePath));
+    }
+
     //
     // Get Sink Info
     //
diff --git a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/v3/SourceApiV3ResourceTest.java b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/v3/SourceApiV3ResourceTest.java
index cf6945f..3569e6a 100644
--- a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/v3/SourceApiV3ResourceTest.java
+++ b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/v3/SourceApiV3ResourceTest.java
@@ -23,6 +23,7 @@ import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.when;
 import static org.powermock.api.mockito.PowerMockito.doNothing;
 import static org.powermock.api.mockito.PowerMockito.doReturn;
@@ -50,6 +51,7 @@ import org.apache.pulsar.client.admin.Namespaces;
 import org.apache.pulsar.client.admin.PulsarAdmin;
 import org.apache.pulsar.client.admin.PulsarAdminException;
 import org.apache.pulsar.client.admin.Tenants;
+import org.apache.pulsar.common.functions.Utils;
 import org.apache.pulsar.common.io.SourceConfig;
 import org.apache.pulsar.common.nar.NarClassLoader;
 import org.apache.pulsar.common.policies.data.TenantInfo;
@@ -1182,6 +1184,81 @@ public class SourceApiV3ResourceTest {
         }
     }
 
+    @Test
+    public void testDeregisterSourceBKPackageCleanup() throws IOException {
+
+        mockStatic(WorkerUtils.class);
+
+        when(mockedManager.containsFunction(eq(tenant), eq(namespace), eq(source))).thenReturn(true);
+
+        String packagePath = "public/default/test/591541f0-c7c5-40c0-983b-610c722f90b0-pulsar-io-batch-data-generator-2.7.0.nar";
+        when(mockedManager.getFunctionMetaData(eq(tenant), eq(namespace), eq(source)))
+                .thenReturn(FunctionMetaData.newBuilder().setPackageLocation(
+                        PackageLocationMetaData.newBuilder().setPackagePath(packagePath).build()).build());
+
+        deregisterDefaultSource();
+
+        PowerMockito.verifyStatic(WorkerUtils.class, times(1));
+        WorkerUtils.deleteFromBookkeeper(any(), eq(packagePath));
+    }
+
+    @Test
+    public void testDeregisterBuiltinSourceBKPackageCleanup() throws IOException {
+
+        mockStatic(WorkerUtils.class);
+
+        when(mockedManager.containsFunction(eq(tenant), eq(namespace), eq(source))).thenReturn(true);
+
+        String packagePath = String.format("%s://data-generator", Utils.BUILTIN);
+        when(mockedManager.getFunctionMetaData(eq(tenant), eq(namespace), eq(source)))
+                .thenReturn(FunctionMetaData.newBuilder().setPackageLocation(
+                        PackageLocationMetaData.newBuilder().setPackagePath(packagePath).build()).build());
+
+        deregisterDefaultSource();
+
+        // if the source is a builtin source we shouldn't try to clean it up
+        PowerMockito.verifyStatic(WorkerUtils.class, times(0));
+        WorkerUtils.deleteFromBookkeeper(any(), eq(packagePath));
+    }
+
+    @Test
+    public void testDeregisterHTTPSourceBKPackageCleanup() throws IOException {
+
+        mockStatic(WorkerUtils.class);
+
+        when(mockedManager.containsFunction(eq(tenant), eq(namespace), eq(source))).thenReturn(true);
+
+        String packagePath = String.format("http://foo.com/connector.jar", Utils.BUILTIN);
+        when(mockedManager.getFunctionMetaData(eq(tenant), eq(namespace), eq(source)))
+                .thenReturn(FunctionMetaData.newBuilder().setPackageLocation(
+                        PackageLocationMetaData.newBuilder().setPackagePath(packagePath).build()).build());
+
+        deregisterDefaultSource();
+
+        // if the source is a is download from a http url, we shouldn't try to clean it up
+        PowerMockito.verifyStatic(WorkerUtils.class, times(0));
+        WorkerUtils.deleteFromBookkeeper(any(), eq(packagePath));
+    }
+
+    @Test
+    public void testDeregisterFileSourceBKPackageCleanup() throws IOException {
+
+        mockStatic(WorkerUtils.class);
+
+        when(mockedManager.containsFunction(eq(tenant), eq(namespace), eq(source))).thenReturn(true);
+
+        String packagePath = String.format("file://foo/connector.jar", Utils.BUILTIN);
+        when(mockedManager.getFunctionMetaData(eq(tenant), eq(namespace), eq(source)))
+                .thenReturn(FunctionMetaData.newBuilder().setPackageLocation(
+                        PackageLocationMetaData.newBuilder().setPackagePath(packagePath).build()).build());
+
+        deregisterDefaultSource();
+
+        // if the source has a file url, we shouldn't try to clean it up
+        PowerMockito.verifyStatic(WorkerUtils.class, times(0));
+        WorkerUtils.deleteFromBookkeeper(any(), eq(packagePath));
+    }
+
     //
     // Get Source Info
     //


[pulsar] 04/04: Fix system topic can not auto created (#9272)

Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

penghui pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/pulsar.git

commit e30f3f88e3e78efd7aa81a297691da03e88e2aa5
Author: feynmanlin <fe...@tencent.com>
AuthorDate: Tue Jan 26 12:06:03 2021 +0800

    Fix system topic can not auto created (#9272)
    
    Fixes #9265
    
    If disabled the topic auto-creation, the system topic under the namespace also not able to be created automatically, this will result in the topic level policy not able to use.
    
    Make the system topic be automatically created at any time
    
    (cherry picked from commit 60c570b87f7b12f91b65e759636d5a710c5dd36d)
---
 .../org/apache/pulsar/broker/service/BrokerService.java    |  6 ++++++
 .../org/apache/pulsar/broker/admin/TopicPoliciesTest.java  | 14 ++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java
index 6330e36..30bd5b2 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java
@@ -127,6 +127,7 @@ import org.apache.pulsar.client.impl.PulsarClientImpl;
 import org.apache.pulsar.client.impl.conf.ClientConfigurationData;
 import org.apache.pulsar.common.allocator.PulsarByteBufAllocator;
 import org.apache.pulsar.common.configuration.FieldContext;
+import org.apache.pulsar.common.events.EventsTopicNames;
 import org.apache.pulsar.common.naming.NamespaceBundle;
 import org.apache.pulsar.common.naming.NamespaceBundleFactory;
 import org.apache.pulsar.common.naming.NamespaceBundles;
@@ -2363,6 +2364,11 @@ public class BrokerService implements Closeable, ZooKeeperCacheListener<Policies
     }
 
     public boolean isAllowAutoTopicCreation(final TopicName topicName) {
+        //System topic can always be created automatically
+        if (EventsTopicNames.NAMESPACE_EVENTS_LOCAL_NAME.equals(topicName.getLocalName())
+                && pulsar.getConfiguration().isSystemTopicEnabled()) {
+            return true;
+        }
         AutoTopicCreationOverride autoTopicCreationOverride = getAutoTopicCreationOverride(topicName);
         if (autoTopicCreationOverride != null) {
             return autoTopicCreationOverride.allowAutoTopicCreation;
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicPoliciesTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicPoliciesTest.java
index aaba1bd..cf7353d 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicPoliciesTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicPoliciesTest.java
@@ -1274,4 +1274,18 @@ public class TopicPoliciesTest extends MockedPulsarServiceBaseTest {
         assertNotNull(messageId);
         producer.close();
     }
+
+    @Test(timeOut = 30000)
+    public void testAutoCreationDisabled() throws Exception {
+        cleanup();
+        conf.setAllowAutoTopicCreation(false);
+        setup();
+        final String topic = testTopic + UUID.randomUUID();
+        admin.topics().createPartitionedTopic(topic, 3);
+        pulsarClient.newProducer().topic(topic).create().close();
+        Awaitility.await().atMost(5, TimeUnit.SECONDS)
+                .until(() -> pulsar.getTopicPoliciesService().cacheIsInitialized(TopicName.get(topic)));
+        //should not fail
+        assertNull(admin.topics().getMessageTTL(topic));
+    }
 }


[pulsar] 02/04: [Functions] Fixes function worker get superuser role (#9259)

Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

penghui pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/pulsar.git

commit c6fe7a1d0c6f6d44fd6da78cf6f508f44cb06587
Author: Yong Zhang <zh...@gmail.com>
AuthorDate: Sat Jan 23 20:37:00 2021 +0800

    [Functions] Fixes function worker get superuser role (#9259)
    
    * Fixes function worker get superuser role
    ---
    
    Fixes #7879
    
    *Motivation*
    
    Function worker should use authorization service to check
    a role if a superuser.
    
    *Modifications*
    
    - Fix the isSuperuser method in the function
    
    *Verify this change*
    
    Please pick either of following options.
    
    - Adjust the original test case to verify it
    
    * Fix the tests
    
    (cherry picked from commit d3f8440e06691736e686a76127680779b9dabfa8)
---
 .../apache/pulsar/io/PulsarFunctionE2ETest.java    | 36 +++++++++++++++++-----
 .../functions/worker/rest/api/ComponentImpl.java   | 23 ++++++++++++--
 .../worker/rest/api/FunctionsImplTest.java         | 23 +++++++++++---
 3 files changed, 68 insertions(+), 14 deletions(-)

diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarFunctionE2ETest.java b/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarFunctionE2ETest.java
index 4649b3d..316b10b 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarFunctionE2ETest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarFunctionE2ETest.java
@@ -22,12 +22,17 @@ import static com.google.common.base.Preconditions.checkArgument;
 import static org.apache.commons.lang3.StringUtils.isNotBlank;
 import static org.apache.pulsar.broker.auth.MockedPulsarServiceBaseTest.retryStrategically;
 import static org.apache.pulsar.functions.utils.functioncache.FunctionCacheEntry.JAVA_INSTANCE_JAR_PROPERTY;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNotEquals;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
@@ -54,6 +59,7 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.TreeMap;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -67,6 +73,7 @@ import org.apache.pulsar.broker.PulsarService;
 import org.apache.pulsar.broker.ServiceConfiguration;
 import org.apache.pulsar.broker.ServiceConfigurationUtils;
 import org.apache.pulsar.broker.authentication.AuthenticationProviderTls;
+import org.apache.pulsar.broker.authorization.AuthorizationService;
 import org.apache.pulsar.broker.authorization.PulsarAuthorizationProvider;
 import org.apache.pulsar.broker.loadbalance.impl.SimpleLoadManagerImpl;
 import org.apache.pulsar.client.admin.BrokerStats;
@@ -1512,15 +1519,30 @@ public class PulsarFunctionE2ETest {
         propAdmin.setAllowedClusters(Sets.newHashSet(Lists.newArrayList("use")));
         admin.tenants().updateTenant(tenant, propAdmin);
 
-        String jarFilePathUrl = Utils.FILE + ":" + getClass().getClassLoader().getResource("pulsar-functions-api-examples.jar").getFile();
+        String jarFilePathUrl = Utils.FILE + ":" + getClass().getClassLoader()
+            .getResource("pulsar-functions-api-examples.jar").getFile();
         FunctionConfig functionConfig = createFunctionConfig(tenant, namespacePortion, functionName,
                 "my.*", sinkTopic, subscriptionName);
-        try {
-            admin.functions().createFunctionWithUrl(functionConfig, jarFilePathUrl);
-            assertTrue(validRoleName);
-        } catch (org.apache.pulsar.client.admin.PulsarAdminException.NotAuthorizedException ne) {
-            assertFalse(validRoleName);
+        if (!validRoleName) {
+            // create a non-superuser admin to test the api
+            admin = spy(
+                PulsarAdmin.builder().serviceHttpUrl(pulsar.getWebServiceAddressTls())
+                    .tlsTrustCertsFilePath(TLS_TRUST_CERT_FILE_PATH)
+                    .allowTlsInsecureConnection(true).build());
+            try {
+                admin.functions().createFunctionWithUrl(functionConfig, jarFilePathUrl);
+            } catch (org.apache.pulsar.client.admin.PulsarAdminException.NotAuthorizedException ne) {
+                assertFalse(validRoleName);
+            }
+        } else {
+            try {
+                admin.functions().createFunctionWithUrl(functionConfig, jarFilePathUrl);
+                assertTrue(validRoleName);
+            } catch (org.apache.pulsar.client.admin.PulsarAdminException.NotAuthorizedException ne) {
+                fail();
+            }
         }
+
     }
 
     @Test(timeOut = 20000)
@@ -1812,4 +1834,4 @@ public class PulsarFunctionE2ETest {
         double value;
     }
 
-}
\ No newline at end of file
+}
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/ComponentImpl.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/ComponentImpl.java
index 56771f6..3bcea1b 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/ComponentImpl.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/ComponentImpl.java
@@ -96,6 +96,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Supplier;
 
@@ -1513,9 +1514,25 @@ public abstract class ComponentImpl {
     }
 
     public boolean isSuperUser(String clientRole) {
-        return clientRole != null
-                && worker().getWorkerConfig().getSuperUserRoles() != null
-                && worker().getWorkerConfig().getSuperUserRoles().contains(clientRole);
+        if (clientRole != null) {
+            try {
+                if ((worker().getWorkerConfig().getSuperUserRoles() != null
+                    && worker().getWorkerConfig().getSuperUserRoles().contains(clientRole))) {
+                    return true;
+                }
+                return worker().getAuthorizationService().isSuperUser(clientRole, null)
+                    .get(worker().getWorkerConfig().getZooKeeperOperationTimeoutSeconds(), SECONDS);
+            } catch (InterruptedException e) {
+                log.warn("Time-out {} sec while checking the role {} is a super user role ",
+                    worker().getWorkerConfig().getZooKeeperOperationTimeoutSeconds(), clientRole);
+                throw new RestException(Status.INTERNAL_SERVER_ERROR, e.getMessage());
+            } catch (Exception e) {
+                log.warn("Admin-client with Role - failed to check the role {} is a super user role {} ", clientRole,
+                    e.getMessage(), e);
+                throw new RestException(Status.INTERNAL_SERVER_ERROR, e.getMessage());
+            }
+        }
+        return false;
     }
 
     public boolean allowFunctionOps(NamespaceName namespaceName, String role,
diff --git a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/FunctionsImplTest.java b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/FunctionsImplTest.java
index bd65a0b..d1cf95b 100644
--- a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/FunctionsImplTest.java
+++ b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/FunctionsImplTest.java
@@ -44,7 +44,6 @@ import org.apache.pulsar.functions.worker.FunctionRuntimeInfo;
 import org.apache.pulsar.functions.worker.FunctionRuntimeManager;
 import org.apache.pulsar.functions.worker.WorkerUtils;
 import org.apache.pulsar.functions.worker.WorkerConfig;
-import org.apache.pulsar.functions.worker.WorkerService;
 import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PowerMockIgnore;
@@ -63,6 +62,7 @@ import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.anyInt;
 import static org.mockito.Mockito.eq;
@@ -247,6 +247,12 @@ public class FunctionsImplTest {
         // test super user
         assertTrue(functionImpl.isAuthorizedRole("test-tenant", "test-ns", superUser, authenticationDataSource));
 
+        // test pulsar super user
+        final String pulsarSuperUser = "pulsarSuperUser";
+        when(authorizationService.isSuperUser(pulsarSuperUser, null)).thenReturn(CompletableFuture.completedFuture(true));
+        assertTrue(functionImpl.isAuthorizedRole("test-tenant", "test-ns", pulsarSuperUser, authenticationDataSource));
+        assertTrue(functionImpl.isSuperUser(pulsarSuperUser));
+
         // test normal user
         functionImpl = spy(new FunctionsImpl(() -> mockedWorkerService));
         doReturn(false).when(functionImpl).allowFunctionOps(any(), any(), any());
@@ -256,6 +262,7 @@ public class FunctionsImplTest {
         when(admin.tenants()).thenReturn(tenants);
         when(this.mockedWorkerService.getBrokerAdmin()).thenReturn(admin);
         when(authorizationService.isTenantAdmin("test-tenant", "test-user", tenantInfo, authenticationDataSource)).thenReturn(CompletableFuture.completedFuture(false));
+        when(authorizationService.isSuperUser("test-user", null)).thenReturn(CompletableFuture.completedFuture(false));
         assertFalse(functionImpl.isAuthorizedRole("test-tenant", "test-ns", "test-user", authenticationDataSource));
 
         // if user is tenant admin
@@ -269,6 +276,7 @@ public class FunctionsImplTest {
         when(admin.tenants()).thenReturn(tenants);
         when(this.mockedWorkerService.getBrokerAdmin()).thenReturn(admin);
         when(authorizationService.isTenantAdmin("test-tenant", "test-user", tenantInfo, authenticationDataSource)).thenReturn(CompletableFuture.completedFuture(true));
+        when(authorizationService.isSuperUser("test-user", authenticationDataSource)).thenReturn(CompletableFuture.completedFuture(false));
         assertTrue(functionImpl.isAuthorizedRole("test-tenant", "test-ns", "test-user", authenticationDataSource));
 
         // test user allow function action
@@ -300,10 +308,17 @@ public class FunctionsImplTest {
     public void testIsSuperUser() throws PulsarAdminException {
 
         FunctionsImpl functionImpl = spy(new FunctionsImpl(() -> mockedWorkerService));
+        AuthorizationService authorizationService = mock(AuthorizationService.class);
+        doReturn(authorizationService).when(mockedWorkerService).getAuthorizationService();
         WorkerConfig workerConfig = new WorkerConfig();
         workerConfig.setAuthorizationEnabled(true);
         workerConfig.setSuperUserRoles(Collections.singleton(superUser));
         doReturn(workerConfig).when(mockedWorkerService).getWorkerConfig();
+        when(authorizationService.isSuperUser(anyString(), any()))
+            .thenAnswer((invocationOnMock) -> {
+                String role = invocationOnMock.getArgument(0, String.class);
+                return CompletableFuture.completedFuture(superUser.equals(role));
+            });
 
         AuthenticationDataSource authenticationDataSource = mock(AuthenticationDataSource.class);
         assertTrue(functionImpl.isSuperUser(superUser));
@@ -311,13 +326,13 @@ public class FunctionsImplTest {
         assertFalse(functionImpl.isSuperUser("normal-user"));
         assertFalse(functionImpl.isSuperUser( null));
 
-        // test super roles is null
-
+        // test super roles is null and it's not a pulsar super user
+        when(authorizationService.isSuperUser(superUser, null))
+            .thenReturn(CompletableFuture.completedFuture(false));
         functionImpl = spy(new FunctionsImpl(() -> mockedWorkerService));
         workerConfig = new WorkerConfig();
         workerConfig.setAuthorizationEnabled(true);
         doReturn(workerConfig).when(mockedWorkerService).getWorkerConfig();
-
         assertFalse(functionImpl.isSuperUser(superUser));
     }
 


[pulsar] 03/04: [Authentication]Add authentication metrics (#9244)

Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

penghui pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/pulsar.git

commit a1fe1299a1b22fb21d3852c1e575f8b80ae7d086
Author: Zike Yang <Ro...@outlook.com>
AuthorDate: Tue Jan 26 09:15:11 2021 +0800

    [Authentication]Add authentication metrics (#9244)
    
    ### Motivation
    Currently, if many clients are failing to authenticate, it might not be clear as to the reason why. For JWT auth for example, it could be because the JWT failed to validate, or that a token is expired. In a busy system, these messages are too noisy to log, so we should instead consider metrics that provide info on successful vs failed auths, as well as auth failure reasons
    
    ### Modifications
    
    * Implement `AuthenticationMetrics` API that allows for instrumenting auth success, and auth failures, with a Prometheus compatible attribute used to distinguish failure reasons.
    * Add auth metrics instrument to the `basic auth`, `jwt auth`, `tls auth`, `athenz auth` and `sasl auth`.
    
    (cherry picked from commit f89dbb6d7604051945359034f9a3e922c78f62da)
---
 .../AuthenticationProviderAthenz.java              | 87 ++++++++++++----------
 .../authentication/AuthenticationProviderSasl.java | 16 +++-
 .../AuthenticationProviderBasic.java               | 32 ++++----
 .../authentication/AuthenticationProviderTls.java  | 81 ++++++++++----------
 .../AuthenticationProviderToken.java               | 10 ++-
 .../metrics/AuthenticationMetrics.java             | 53 +++++++++++++
 .../pulsar/broker/stats/PrometheusMetricsTest.java | 79 +++++++++++++++++++-
 7 files changed, 260 insertions(+), 98 deletions(-)

diff --git a/pulsar-broker-auth-athenz/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderAthenz.java b/pulsar-broker-auth-athenz/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderAthenz.java
index 955a96d..7a164b0 100644
--- a/pulsar-broker-auth-athenz/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderAthenz.java
+++ b/pulsar-broker-auth-athenz/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderAthenz.java
@@ -26,8 +26,7 @@ import java.security.PublicKey;
 import javax.naming.AuthenticationException;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.pulsar.broker.authentication.AuthenticationDataSource;
-import org.apache.pulsar.broker.authentication.AuthenticationProvider;
+import org.apache.pulsar.broker.authentication.metrics.AuthenticationMetrics;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -85,53 +84,59 @@ public class AuthenticationProviderAthenz implements AuthenticationProvider {
     public String authenticate(AuthenticationDataSource authData) throws AuthenticationException {
         SocketAddress clientAddress;
         String roleToken;
+        try {
 
-        if (authData.hasDataFromPeer()) {
-            clientAddress = authData.getPeerAddress();
-        } else {
-            throw new AuthenticationException("Authentication data source does not have a client address");
-        }
-
-        if (authData.hasDataFromCommand()) {
-            roleToken = authData.getCommandData();
-        } else if (authData.hasDataFromHttp()) {
-            roleToken = authData.getHttpHeader(AuthZpeClient.ZPE_TOKEN_HDR);
-        } else {
-            throw new AuthenticationException("Authentication data source does not have a role token");
-        }
-
-        if (roleToken == null) {
-            throw new AuthenticationException("Athenz token is null, can't authenticate");
-        }
-        if (roleToken.isEmpty()) {
-            throw new AuthenticationException("Athenz RoleToken is empty, Server is Using Athenz Authentication");
-        }
-        if (log.isDebugEnabled()) {
-            log.debug("Athenz RoleToken : [{}] received from Client: {}", roleToken, clientAddress);
-        }
+            if (authData.hasDataFromPeer()) {
+                clientAddress = authData.getPeerAddress();
+            } else {
+                throw new AuthenticationException("Authentication data source does not have a client address");
+            }
 
-        RoleToken token = new RoleToken(roleToken);
+            if (authData.hasDataFromCommand()) {
+                roleToken = authData.getCommandData();
+            } else if (authData.hasDataFromHttp()) {
+                roleToken = authData.getHttpHeader(AuthZpeClient.ZPE_TOKEN_HDR);
+            } else {
+                throw new AuthenticationException("Authentication data source does not have a role token");
+            }
 
-        if (!domainNameList.contains(token.getDomain())) {
-            throw new AuthenticationException(
-                    String.format("Athenz RoleToken Domain mismatch, Expected: %s, Found: %s", domainNameList.toString(), token.getDomain()));
-        }
+            if (roleToken == null) {
+                throw new AuthenticationException("Athenz token is null, can't authenticate");
+            }
+            if (roleToken.isEmpty()) {
+                throw new AuthenticationException("Athenz RoleToken is empty, Server is Using Athenz Authentication");
+            }
+            if (log.isDebugEnabled()) {
+                log.debug("Athenz RoleToken : [{}] received from Client: {}", roleToken, clientAddress);
+            }
 
-        // Synchronize for non-thread safe static calls inside athenz library
-        synchronized (this) {
-            PublicKey ztsPublicKey = AuthZpeClient.getZtsPublicKey(token.getKeyId());
+            RoleToken token = new RoleToken(roleToken);
 
-            if (ztsPublicKey == null) {
-                throw new AuthenticationException("Unable to retrieve ZTS Public Key");
+            if (!domainNameList.contains(token.getDomain())) {
+                throw new AuthenticationException(
+                        String.format("Athenz RoleToken Domain mismatch, Expected: %s, Found: %s", domainNameList.toString(), token.getDomain()));
             }
 
-            if (token.validate(ztsPublicKey, allowedOffset, false, null)) {
-                log.debug("Athenz Role Token : {}, Authenticated for Client: {}", roleToken, clientAddress);
-                return token.getPrincipal();
-            } else {
-                throw new AuthenticationException(
-                        String.format("Athenz Role Token Not Authenticated from Client: %s", clientAddress));
+            // Synchronize for non-thread safe static calls inside athenz library
+            synchronized (this) {
+                PublicKey ztsPublicKey = AuthZpeClient.getZtsPublicKey(token.getKeyId());
+
+                if (ztsPublicKey == null) {
+                    throw new AuthenticationException("Unable to retrieve ZTS Public Key");
+                }
+
+                if (token.validate(ztsPublicKey, allowedOffset, false, null)) {
+                    log.debug("Athenz Role Token : {}, Authenticated for Client: {}", roleToken, clientAddress);
+                    AuthenticationMetrics.authenticateSuccess(getClass().getSimpleName(), getAuthMethodName());
+                    return token.getPrincipal();
+                } else {
+                    throw new AuthenticationException(
+                            String.format("Athenz Role Token Not Authenticated from Client: %s", clientAddress));
+                }
             }
+        } catch (AuthenticationException exception) {
+            AuthenticationMetrics.authenticateFailure(getClass().getSimpleName(), getAuthMethodName(), exception.getMessage());
+            throw exception;
         }
     }
 
diff --git a/pulsar-broker-auth-sasl/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderSasl.java b/pulsar-broker-auth-sasl/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderSasl.java
index 32ab71c..1791ea2 100644
--- a/pulsar-broker-auth-sasl/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderSasl.java
+++ b/pulsar-broker-auth-sasl/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderSasl.java
@@ -53,6 +53,7 @@ import com.google.common.collect.Maps;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.pulsar.broker.ServiceConfiguration;
+import org.apache.pulsar.broker.authentication.metrics.AuthenticationMetrics;
 import org.apache.pulsar.common.api.AuthData;
 import org.apache.pulsar.common.sasl.JAASCredentialsContainer;
 import org.apache.pulsar.common.sasl.SaslConstants;
@@ -100,11 +101,18 @@ public class AuthenticationProviderSasl implements AuthenticationProvider {
 
     @Override
     public String authenticate(AuthenticationDataSource authData) throws AuthenticationException {
-        if (authData instanceof SaslAuthenticationDataSource) {
-            return ((SaslAuthenticationDataSource)authData).getAuthorizationID();
-        } else {
-            throw new AuthenticationException("Not support authDataSource type, expect sasl.");
+        try {
+            if (authData instanceof SaslAuthenticationDataSource) {
+                AuthenticationMetrics.authenticateSuccess(getClass().getSimpleName(), getAuthMethodName());
+                return ((SaslAuthenticationDataSource) authData).getAuthorizationID();
+            } else {
+                throw new AuthenticationException("Not support authDataSource type, expect sasl.");
+            }
+        } catch (AuthenticationException exception) {
+            AuthenticationMetrics.authenticateFailure(getClass().getSimpleName(), getAuthMethodName(), exception.getMessage());
+            throw exception;
         }
+
     }
 
     @Override
diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderBasic.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderBasic.java
index faa8718..48d867f 100644
--- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderBasic.java
+++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderBasic.java
@@ -25,6 +25,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.pulsar.broker.ServiceConfiguration;
 
 import lombok.Cleanup;
+import org.apache.pulsar.broker.authentication.metrics.AuthenticationMetrics;
 
 import javax.naming.AuthenticationException;
 import java.io.BufferedReader;
@@ -75,24 +76,29 @@ public class AuthenticationProviderBasic implements AuthenticationProvider {
         String password = authParams.getPassword();
         String msg = "Unknown user or invalid password";
 
-        if (users.get(userId) == null) {
-            throw new AuthenticationException(msg);
-        }
+        try {
+            if (users.get(userId) == null) {
+                throw new AuthenticationException(msg);
+            }
 
-        String encryptedPassword = users.get(userId);
+            String encryptedPassword = users.get(userId);
 
-        // For md5 algorithm
-        if ((users.get(userId).startsWith("$apr1"))) {
-            List<String> splitEncryptedPassword = Arrays.asList(encryptedPassword.split("\\$"));
-            if (splitEncryptedPassword.size() != 4 || !encryptedPassword
-                    .equals(Md5Crypt.apr1Crypt(password.getBytes(), splitEncryptedPassword.get(2)))) {
+            // For md5 algorithm
+            if ((users.get(userId).startsWith("$apr1"))) {
+                List<String> splitEncryptedPassword = Arrays.asList(encryptedPassword.split("\\$"));
+                if (splitEncryptedPassword.size() != 4 || !encryptedPassword
+                        .equals(Md5Crypt.apr1Crypt(password.getBytes(), splitEncryptedPassword.get(2)))) {
+                    throw new AuthenticationException(msg);
+                }
+                // For crypt algorithm
+            } else if (!encryptedPassword.equals(Crypt.crypt(password.getBytes(), encryptedPassword.substring(0, 2)))) {
                 throw new AuthenticationException(msg);
             }
-        // For crypt algorithm
-        } else if (!encryptedPassword.equals(Crypt.crypt(password.getBytes(), encryptedPassword.substring(0, 2)))) {
-            throw new AuthenticationException(msg);
+        } catch (AuthenticationException exception) {
+            AuthenticationMetrics.authenticateFailure(getClass().getSimpleName(), getAuthMethodName(), exception.getMessage());
+            throw exception;
         }
-
+        AuthenticationMetrics.authenticateSuccess(getClass().getSimpleName(), getAuthMethodName());
         return userId;
     }
 
diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderTls.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderTls.java
index de04c8a..5747a82 100644
--- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderTls.java
+++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderTls.java
@@ -25,6 +25,7 @@ import java.security.cert.X509Certificate;
 import javax.naming.AuthenticationException;
 
 import org.apache.pulsar.broker.ServiceConfiguration;
+import org.apache.pulsar.broker.authentication.metrics.AuthenticationMetrics;
 
 public class AuthenticationProviderTls implements AuthenticationProvider {
 
@@ -46,49 +47,53 @@ public class AuthenticationProviderTls implements AuthenticationProvider {
     @Override
     public String authenticate(AuthenticationDataSource authData) throws AuthenticationException {
         String commonName = null;
+        try {
+            if (authData.hasDataFromTls()) {
+                /**
+                 * Maybe authentication type should be checked if it is an HTTPS session. However this check fails actually
+                 * because authType is null.
+                 *
+                 * This check is not necessarily needed, because an untrusted certificate is not passed to
+                 * HttpServletRequest.
+                 *
+                 * <code>
+                 * if (authData.hasDataFromHttp()) {
+                 *     String authType = authData.getHttpAuthType();
+                 *     if (!HttpServletRequest.CLIENT_CERT_AUTH.equals(authType)) {
+                 *         throw new AuthenticationException(
+                 *              String.format( "Authentication type mismatch, Expected: %s, Found: %s",
+                 *                       HttpServletRequest.CLIENT_CERT_AUTH, authType));
+                 *     }
+                 * }
+                 * </code>
+                 */
 
-        if (authData.hasDataFromTls()) {
-            /**
-             * Maybe authentication type should be checked if it is an HTTPS session. However this check fails actually
-             * because authType is null.
-             *
-             * This check is not necessarily needed, because an untrusted certificate is not passed to
-             * HttpServletRequest.
-             *
-             * <code>
-             * if (authData.hasDataFromHttp()) {
-             *     String authType = authData.getHttpAuthType();
-             *     if (!HttpServletRequest.CLIENT_CERT_AUTH.equals(authType)) {
-             *         throw new AuthenticationException(
-             *              String.format( "Authentication type mismatch, Expected: %s, Found: %s",
-             *                       HttpServletRequest.CLIENT_CERT_AUTH, authType));
-             *     }
-             * }
-             * </code>
-             */
-
-            // Extract CommonName
-            // The format is defined in RFC 2253.
-            // Example:
-            // CN=Steve Kille,O=Isode Limited,C=GB
-            Certificate[] certs = authData.getTlsCertificates();
-            if (null == certs) {
-                throw new AuthenticationException("Failed to get TLS certificates from client");
-            }
-            String distinguishedName = ((X509Certificate) certs[0]).getSubjectX500Principal().getName();
-            for (String keyValueStr : distinguishedName.split(",")) {
-                String[] keyValue = keyValueStr.split("=", 2);
-                if (keyValue.length == 2 && "CN".equals(keyValue[0]) && !keyValue[1].isEmpty()) {
-                    commonName = keyValue[1];
-                    break;
+                // Extract CommonName
+                // The format is defined in RFC 2253.
+                // Example:
+                // CN=Steve Kille,O=Isode Limited,C=GB
+                Certificate[] certs = authData.getTlsCertificates();
+                if (null == certs) {
+                    throw new AuthenticationException("Failed to get TLS certificates from client");
+                }
+                String distinguishedName = ((X509Certificate) certs[0]).getSubjectX500Principal().getName();
+                for (String keyValueStr : distinguishedName.split(",")) {
+                    String[] keyValue = keyValueStr.split("=", 2);
+                    if (keyValue.length == 2 && "CN".equals(keyValue[0]) && !keyValue[1].isEmpty()) {
+                        commonName = keyValue[1];
+                        break;
+                    }
                 }
             }
-        }
 
-        if (commonName == null) {
-            throw new AuthenticationException("Client unable to authenticate with TLS certificate");
+            if (commonName == null) {
+                throw new AuthenticationException("Client unable to authenticate with TLS certificate");
+            }
+            AuthenticationMetrics.authenticateSuccess(getClass().getSimpleName(), getAuthMethodName());
+        } catch (AuthenticationException exception) {
+            AuthenticationMetrics.authenticateFailure(getClass().getSimpleName(), getAuthMethodName(), exception.getMessage());
+            throw exception;
         }
-
         return commonName;
     }
 
diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderToken.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderToken.java
index 66971e3..f2e366f 100644
--- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderToken.java
+++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderToken.java
@@ -30,6 +30,7 @@ import javax.net.ssl.SSLSession;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.pulsar.broker.ServiceConfiguration;
+import org.apache.pulsar.broker.authentication.metrics.AuthenticationMetrics;
 import org.apache.pulsar.broker.authentication.utils.AuthTokenUtils;
 import org.apache.pulsar.common.api.AuthData;
 
@@ -121,7 +122,14 @@ public class AuthenticationProviderToken implements AuthenticationProvider {
     @Override
     public String authenticate(AuthenticationDataSource authData) throws AuthenticationException {
         // Get Token
-        String token = getToken(authData);
+        String token;
+        try {
+            token = getToken(authData);
+            AuthenticationMetrics.authenticateSuccess(getClass().getSimpleName(), getAuthMethodName());
+        } catch (AuthenticationException exception) {
+            AuthenticationMetrics.authenticateFailure(getClass().getSimpleName(), getAuthMethodName(), exception.getMessage());
+            throw exception;
+        }
 
         // Parse Token by validating
         return getPrincipal(authenticateToken(token));
diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/metrics/AuthenticationMetrics.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/metrics/AuthenticationMetrics.java
new file mode 100644
index 0000000..1fd803f
--- /dev/null
+++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/metrics/AuthenticationMetrics.java
@@ -0,0 +1,53 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.broker.authentication.metrics;
+
+import io.prometheus.client.Counter;
+
+public class AuthenticationMetrics {
+    private static final Counter authSuccessMetrics = Counter.build()
+            .name("pulsar_authentication_success_count")
+            .help("Pulsar authentication success")
+            .labelNames("provider_name", "auth_method")
+            .register();
+    private static final Counter authFailuresMetrics = Counter.build()
+            .name("pulsar_authentication_failures_count")
+            .help("Pulsar authentication failures")
+            .labelNames("provider_name", "auth_method", "reason")
+            .register();
+
+    /**
+     * Log authenticate success event to the authentication metrics
+     * @param providerName The short class name of the provider
+     * @param authMethod Authentication method name
+     */
+    public static void authenticateSuccess(String providerName, String authMethod) {
+        authSuccessMetrics.labels(providerName, authMethod).inc();
+    }
+
+    /**
+     * Log authenticate failure event to the authentication metrics.
+     * @param providerName The short class name of the provider
+     * @param authMethod Authentication method name.
+     * @param reason Failure reason.
+     */
+    public static void authenticateFailure(String providerName, String authMethod, String reason) {
+        authFailuresMetrics.labels(providerName, authMethod, reason).inc();
+    }
+}
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/PrometheusMetricsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/PrometheusMetricsTest.java
index cba6d1e..58ed618 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/PrometheusMetricsTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/PrometheusMetricsTest.java
@@ -24,21 +24,40 @@ import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
 
+import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.StringWriter;
 import java.lang.reflect.Field;
 import java.math.RoundingMode;
 import java.text.NumberFormat;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
+import java.util.Optional;
+import java.util.Properties;
+import java.util.Set;
 import java.util.TreeMap;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
+import io.jsonwebtoken.SignatureAlgorithm;
+import io.prometheus.client.CollectorRegistry;
+import io.prometheus.client.exporter.common.TextFormat;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.pulsar.broker.ServiceConfiguration;
+import org.apache.pulsar.broker.authentication.AuthenticationDataSource;
+import org.apache.pulsar.broker.authentication.AuthenticationProviderToken;
+import org.apache.pulsar.broker.authentication.utils.AuthTokenUtils;
 import org.apache.pulsar.broker.service.BrokerTestBase;
 import org.apache.pulsar.broker.service.Topic;
 import org.apache.pulsar.broker.service.persistent.PersistentMessageExpiryMonitor;
@@ -57,6 +76,9 @@ import com.google.common.base.Splitter;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
 
+import javax.crypto.SecretKey;
+import javax.naming.AuthenticationException;
+
 public class PrometheusMetricsTest extends BrokerTestBase {
 
     @BeforeMethod
@@ -694,6 +716,61 @@ public class PrometheusMetricsTest extends BrokerTestBase {
         p2.close();
     }
 
+    @Test
+    public void testAuthMetrics() throws IOException, AuthenticationException {
+        SecretKey secretKey = AuthTokenUtils.createSecretKey(SignatureAlgorithm.HS256);
+
+        AuthenticationProviderToken provider = new AuthenticationProviderToken();
+
+        Properties properties = new Properties();
+        properties.setProperty("tokenSecretKey", AuthTokenUtils.encodeKeyBase64(secretKey));
+
+        ServiceConfiguration conf = new ServiceConfiguration();
+        conf.setProperties(properties);
+        provider.initialize(conf);
+
+        String authExceptionMessage = "";
+
+        try {
+            provider.authenticate(new AuthenticationDataSource() {
+            });
+            fail("Should have failed");
+        } catch (AuthenticationException e) {
+            // expected, no credential passed
+            authExceptionMessage = e.getMessage();
+        }
+
+        String token = AuthTokenUtils.createToken(secretKey, "subject", Optional.empty());
+
+        // Pulsar protocol auth
+        String subject = provider.authenticate(new AuthenticationDataSource() {
+            @Override
+            public boolean hasDataFromCommand() {
+                return true;
+            }
+
+            @Override
+            public String getCommandData() {
+                return token;
+            }
+        });
+
+        ByteArrayOutputStream statsOut = new ByteArrayOutputStream();
+        PrometheusMetricsGenerator.generate(pulsar, false, false, statsOut);
+        String metricsStr = new String(statsOut.toByteArray());
+        Multimap<String, Metric> metrics = parseMetrics(metricsStr);
+        List<Metric> cm = (List<Metric>) metrics.get("pulsar_authentication_success_count");
+        Metric metric = cm.get(cm.size() - 1);
+        assertEquals(metric.tags.get("auth_method"), "token");
+        assertEquals(metric.tags.get("provider_name"), provider.getClass().getSimpleName());
+
+        cm = (List<Metric>) metrics.get("pulsar_authentication_failures_count");
+        metric = cm.get(cm.size() - 1);
+        assertEquals(metric.tags.get("auth_method"), "token");
+        assertEquals(metric.tags.get("reason"), authExceptionMessage);
+        assertEquals(metric.tags.get("provider_name"), provider.getClass().getSimpleName());
+    }
+
     /**
      * Hacky parsing of Prometheus text format. Sould be good enough for unit tests
      */