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 2f4b0f1845b2..a01f61dd7937 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 StaticTokenAuthProvider(String token) { 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 721a7435526f..ee329a9e7693 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 UrlAuthProvider(String url) { } 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); }