(pulsar) branch branch-3.3 updated: [fix][ws] Implement missing http header data functions in AuthenticationDataSubscription (#23638)

[he...@apache.org]

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

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


The following commit(s) were added to refs/heads/branch-3.3 by this push:
     new 4e74ed559b2 [fix][ws] Implement missing http header data functions in AuthenticationDataSubscription (#23638)
4e74ed559b2 is described below

commit 4e74ed559b233554e761c76e4816eca7f4273e78
Author: Heesung Sohn <10...@users.noreply.github.com>
AuthorDate: Tue Nov 26 12:43:35 2024 -0800

    [fix][ws] Implement missing http header data functions in AuthenticationDataSubscription (#23638)
    
    (cherry picked from commit 81dfb439aeccb5d2d92b78905fdf400d7d183d18)
---
 .../AuthenticationDataSubscription.java            | 15 +++++++
 .../AuthenticationDataSubscriptionTest.java        | 48 ++++++++++++++++++++++
 2 files changed, 63 insertions(+)

diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationDataSubscription.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationDataSubscription.java
index 9a7324a6d07..96b85989b6f 100644
--- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationDataSubscription.java
+++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationDataSubscription.java
@@ -72,6 +72,21 @@ public class AuthenticationDataSubscription implements AuthenticationDataSource
         return subscription;
     }
 
+    @Override
+    public boolean hasDataFromHttp() {
+        return authData.hasDataFromHttp();
+    }
+
+    @Override
+    public String getHttpAuthType() {
+        return authData.getHttpAuthType();
+    }
+
+    @Override
+    public String getHttpHeader(String name) {
+        return authData.getHttpHeader(name);
+    }
+
     public AuthenticationDataSource getAuthData() {
         return authData;
     }
diff --git a/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/authentication/AuthenticationDataSubscriptionTest.java b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/authentication/AuthenticationDataSubscriptionTest.java
new file mode 100644
index 00000000000..8af7b87fd22
--- /dev/null
+++ b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/authentication/AuthenticationDataSubscriptionTest.java
@@ -0,0 +1,48 @@
+/*
+ * 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;
+
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.testng.AssertJUnit.assertEquals;
+import javax.servlet.http.HttpServletRequest;
+import org.testng.annotations.Test;
+
+public class AuthenticationDataSubscriptionTest {
+
+    AuthenticationDataSubscription target;
+
+    @Test
+    public void testTargetFromAuthenticationDataHttp(){
+        var req = mock(HttpServletRequest.class);
+        String headerName = "Authorization";
+        String headerValue = "my-header";
+        String authType = "my-authType";
+        doReturn(headerValue).when(req).getHeader(eq(headerName));
+        doReturn("localhost").when(req).getRemoteAddr();
+        doReturn(4000).when(req).getRemotePort();
+        doReturn(authType).when(req).getAuthType();
+        AuthenticationDataSource authenticationDataSource = new AuthenticationDataHttp(req);
+        target = new AuthenticationDataSubscription(authenticationDataSource, "my-sub");
+        assertEquals(headerValue, target.getHttpHeader(headerName));
+        assertEquals(authType, target.getHttpAuthType());
+        assertEquals(true, target.hasDataFromHttp());
+    }
+}