You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by pv...@apache.org on 2020/05/19 08:38:56 UTC
[nifi] branch master updated: NIFI-7331 Fixed grammatical errors in
log output.
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/master by this push:
new 3fec4d8 NIFI-7331 Fixed grammatical errors in log output.
3fec4d8 is described below
commit 3fec4d8c270385e10fab843254ee851614fa4738
Author: mtien <mt...@gmail.com>
AuthorDate: Mon May 18 19:12:22 2020 -0700
NIFI-7331 Fixed grammatical errors in log output.
Signed-off-by: Pierre Villard <pi...@gmail.com>
This closes #4283.
---
.../oidc/StandardOidcIdentityProvider.java | 24 ++++++++++------------
1 file changed, 11 insertions(+), 13 deletions(-)
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/oidc/StandardOidcIdentityProvider.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/oidc/StandardOidcIdentityProvider.java
index 6760cef..d7b7886 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/oidc/StandardOidcIdentityProvider.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/oidc/StandardOidcIdentityProvider.java
@@ -48,15 +48,6 @@ import com.nimbusds.openid.connect.sdk.claims.IDTokenClaimsSet;
import com.nimbusds.openid.connect.sdk.op.OIDCProviderMetadata;
import com.nimbusds.openid.connect.sdk.token.OIDCTokens;
import com.nimbusds.openid.connect.sdk.validators.IDTokenValidator;
-import net.minidev.json.JSONObject;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.nifi.util.FormatUtils;
-import org.apache.nifi.util.NiFiProperties;
-import org.apache.nifi.web.security.jwt.JwtService;
-import org.apache.nifi.web.security.token.LoginAuthenticationToken;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import java.io.IOException;
import java.net.URI;
import java.net.URL;
@@ -65,6 +56,14 @@ import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.concurrent.TimeUnit;
+import net.minidev.json.JSONObject;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.nifi.util.FormatUtils;
+import org.apache.nifi.util.NiFiProperties;
+import org.apache.nifi.web.security.jwt.JwtService;
+import org.apache.nifi.web.security.token.LoginAuthenticationToken;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -129,7 +128,7 @@ public class StandardOidcIdentityProvider implements OidcIdentityProvider {
// client secret
final String rawClientSecret = properties.getOidcClientSecret();
if (StringUtils.isBlank(rawClientSecret)) {
- throw new RuntimeException("Client secret is required when configured an OIDC Provider.");
+ throw new RuntimeException("Client secret is required when configuring an OIDC Provider.");
}
clientSecret = new Secret(rawClientSecret);
@@ -298,9 +297,8 @@ public class StandardOidcIdentityProvider implements OidcIdentityProvider {
String identity = claimsSet.getStringClaim(properties.getOidcClaimIdentifyingUser());
if (StringUtils.isBlank(identity)) {
// explicitly try to get the identity from the UserInfo endpoint with the configured claim
- logger.warn("The identity of the user was tried to get with the claim '" +
- properties.getOidcClaimIdentifyingUser() + "'. The according additional scope is not " +
- "configured correctly. Trying to get it from the UserInfo endpoint.");
+ logger.warn("Failed to obtain the identity of the user with the claim '" +
+ properties.getOidcClaimIdentifyingUser() + "'. The claim is configured incorrectly. Will attempt to obtain the identity from the UserInfo endpoint.");
// extract the bearer access token
final BearerAccessToken bearerAccessToken = oidcTokens.getBearerAccessToken();