Skip to content

Commit b19f676

Browse files
heesung-snsrinath-ctds
authored andcommitted
[fix][ws] Implement missing http header data functions in AuthenticationDataSubscription (apache#23638)
(cherry picked from commit 81dfb43) (cherry picked from commit e9c2866)
1 parent bd890c0 commit b19f676

File tree

2 files changed

+63
-0
lines changed

2 files changed

+63
-0
lines changed

pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationDataSubscription.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,21 @@ public String getSubscription() {
7272
return subscription;
7373
}
7474

75+
@Override
76+
public boolean hasDataFromHttp() {
77+
return authData.hasDataFromHttp();
78+
}
79+
80+
@Override
81+
public String getHttpAuthType() {
82+
return authData.getHttpAuthType();
83+
}
84+
85+
@Override
86+
public String getHttpHeader(String name) {
87+
return authData.getHttpHeader(name);
88+
}
89+
7590
public AuthenticationDataSource getAuthData() {
7691
return authData;
7792
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
package org.apache.pulsar.broker.authentication;
20+
21+
import static org.mockito.ArgumentMatchers.eq;
22+
import static org.mockito.Mockito.doReturn;
23+
import static org.mockito.Mockito.mock;
24+
import static org.testng.AssertJUnit.assertEquals;
25+
import javax.servlet.http.HttpServletRequest;
26+
import org.testng.annotations.Test;
27+
28+
public class AuthenticationDataSubscriptionTest {
29+
30+
AuthenticationDataSubscription target;
31+
32+
@Test
33+
public void testTargetFromAuthenticationDataHttp(){
34+
var req = mock(HttpServletRequest.class);
35+
String headerName = "Authorization";
36+
String headerValue = "my-header";
37+
String authType = "my-authType";
38+
doReturn(headerValue).when(req).getHeader(eq(headerName));
39+
doReturn("localhost").when(req).getRemoteAddr();
40+
doReturn(4000).when(req).getRemotePort();
41+
doReturn(authType).when(req).getAuthType();
42+
AuthenticationDataSource authenticationDataSource = new AuthenticationDataHttp(req);
43+
target = new AuthenticationDataSubscription(authenticationDataSource, "my-sub");
44+
assertEquals(headerValue, target.getHttpHeader(headerName));
45+
assertEquals(authType, target.getHttpAuthType());
46+
assertEquals(true, target.hasDataFromHttp());
47+
}
48+
}

0 commit comments

Comments
 (0)