This is an automated email from the ASF dual-hosted git repository.
yashmayya pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pinot.git
The following commit(s) were added to refs/heads/master by this push:
new 7430730e92f Fix NPE in StaticTokenAuthProvider and UrlAuthProvider
when required config property is absent (#18456)
7430730e92f is described below
commit 7430730e92fa28e74f862a1000898ed9d69a2718
Author: Akanksha kedia <[email protected]>
AuthorDate: Tue May 12 21:06:28 2026 +0530
Fix NPE in StaticTokenAuthProvider and UrlAuthProvider when required config
property is absent (#18456)
---
.../org/apache/pinot/common/auth/StaticTokenAuthProvider.java | 6 +++++-
.../java/org/apache/pinot/common/auth/UrlAuthProvider.java | 10 +++++++---
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git
a/pinot-common/src/main/java/org/apache/pinot/common/auth/StaticTokenAuthProvider.java
b/pinot-common/src/main/java/org/apache/pinot/common/auth/StaticTokenAuthProvider.java
index 2f4b0f1845b..a01f61dd793 100644
---
a/pinot-common/src/main/java/org/apache/pinot/common/auth/StaticTokenAuthProvider.java
+++
b/pinot-common/src/main/java/org/apache/pinot/common/auth/StaticTokenAuthProvider.java
@@ -43,7 +43,11 @@ public class StaticTokenAuthProvider implements AuthProvider
{
public StaticTokenAuthProvider(AuthConfig authConfig) {
String header = AuthProviderUtils.getOrDefault(authConfig, HEADER,
HttpHeaders.AUTHORIZATION);
String prefix = AuthProviderUtils.getOrDefault(authConfig, PREFIX,
"Basic");
- String userToken = authConfig.getProperties().get(TOKEN).toString();
+ Object tokenValue = authConfig.getProperties().get(TOKEN);
+ if (tokenValue == null) {
+ throw new IllegalArgumentException("Missing required auth config
property: " + TOKEN);
+ }
+ String userToken = tokenValue.toString();
_taskToken = makeToken(prefix, userToken);
_requestHeaders = Collections.singletonMap(header, _taskToken);
diff --git
a/pinot-common/src/main/java/org/apache/pinot/common/auth/UrlAuthProvider.java
b/pinot-common/src/main/java/org/apache/pinot/common/auth/UrlAuthProvider.java
index 721a7435526..ee329a9e769 100644
---
a/pinot-common/src/main/java/org/apache/pinot/common/auth/UrlAuthProvider.java
+++
b/pinot-common/src/main/java/org/apache/pinot/common/auth/UrlAuthProvider.java
@@ -54,10 +54,14 @@ public class UrlAuthProvider implements AuthProvider {
}
public UrlAuthProvider(AuthConfig authConfig) {
+ _header = AuthProviderUtils.getOrDefault(authConfig, HEADER,
HttpHeaders.AUTHORIZATION);
+ _prefix = AuthProviderUtils.getOrDefault(authConfig, PREFIX, "Bearer");
+ Object urlValue = authConfig.getProperties().get(URL);
+ if (urlValue == null) {
+ throw new IllegalArgumentException("Missing required auth config
property: " + URL);
+ }
try {
- _header = AuthProviderUtils.getOrDefault(authConfig, HEADER,
HttpHeaders.AUTHORIZATION);
- _prefix = AuthProviderUtils.getOrDefault(authConfig, PREFIX, "Bearer");
- _url = new URL(authConfig.getProperties().get(URL).toString());
+ _url = new URL(urlValue.toString());
} catch (MalformedURLException e) {
throw new IllegalArgumentException(e);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
