NIFI-2574 merging latest kerb changes to adjust for NiFiProperties
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/a5261914 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/a5261914 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/a5261914 Branch: refs/heads/master Commit: a5261914fbb9e83df3d9c164f3ed1993f607715a Parents: 7c99b5e 3f7216a Author: joewitt <[email protected]> Authored: Wed Aug 17 09:06:18 2016 -0700 Committer: joewitt <[email protected]> Committed: Wed Aug 17 09:06:18 2016 -0700 ---------------------------------------------------------------------- .../org/apache/nifi/util/NiFiProperties.java | 34 ++++++++++++++++---- .../src/main/asciidoc/administration-guide.adoc | 16 +++++---- .../nifi-framework/nifi-resources/pom.xml | 6 ++-- .../src/main/resources/conf/nifi.properties | 10 ++++-- .../org/apache/nifi/web/api/AccessResource.java | 2 +- .../test/resources/site-to-site/nifi.properties | 6 ++-- .../spring/KerberosServiceFactoryBean.java | 16 +++++++-- .../apache/nifi/kerberos/KerberosProvider.java | 12 +++++++ .../authorization/RangerNiFiAuthorizer.java | 2 +- .../authorization/TestRangerNiFiAuthorizer.java | 6 ++-- .../test/resources/localhost/nifi.properties | 7 ++-- 11 files changed, 88 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/a5261914/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java ---------------------------------------------------------------------- diff --cc nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java index d381f74,7d8fffb..4a7e5d8 --- a/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java +++ b/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java @@@ -746,17 -808,15 +766,17 @@@ public abstract class NiFiProperties } /** - * Returns true if client certificates are required for REST API. Determined if the following conditions are all true: + * Returns true if client certificates are required for REST API. Determined + * if the following conditions are all true: * - * - login identity provider is not populated - * - Kerberos service support is not enabled + * - login identity provider is not populated - Kerberos service support is + * not enabled * - * @return true if client certificates are required for access to the REST API + * @return true if client certificates are required for access to the REST + * API */ public boolean isClientAuthRequiredForRestApi() { - return StringUtils.isBlank(getProperty(NiFiProperties.SECURITY_USER_LOGIN_IDENTITY_PROVIDER)) && !isKerberosServiceSupportEnabled(); + return StringUtils.isBlank(getProperty(NiFiProperties.SECURITY_USER_LOGIN_IDENTITY_PROVIDER)) && !isKerberosSpnegoSupportEnabled(); } public InetSocketAddress getNodeApiAddress() {
