You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2023/03/28 12:35:25 UTC
[nifi] branch main updated (623bcfd500 -> 26400fcbe9)
This is an automated email from the ASF dual-hosted git repository.
mcgilman pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
from 623bcfd500 NIFI-11345 Adjusted Iceberg test to avoid expensive duplicative runs
add 26400fcbe9 NIFI-4890 Refactor OIDC with support for Refresh Tokens (#7013)
No new revisions were added by this update.
Summary of changes:
.../java/org/apache/nifi/util/NiFiProperties.java | 6 +
.../src/main/asciidoc/administration-guide.adoc | 98 ++-
.../nifi-framework/nifi-resources/pom.xml | 1 +
.../src/main/resources/conf/nifi.properties | 1 +
.../apache/nifi/web/NiFiWebApiConfiguration.java | 7 +-
.../apache/nifi/web/NiFiWebApiResourceConfig.java | 1 -
.../apache/nifi/web/api/OIDCAccessResource.java | 578 ----------------
.../src/main/resources/nifi-web-api-context.xml | 6 -
.../nifi/web/api/OIDCAccessResourceTest.java | 159 -----
.../nifi-web/nifi-web-security/pom.xml | 4 +
.../AuthenticationSecurityConfiguration.java | 2 +-
.../JwtAuthenticationSecurityConfiguration.java | 4 +-
.../OidcAuthenticationSecurityConfiguration.java | 49 --
.../configuration/OidcSecurityConfiguration.java | 516 +++++++++++++++
.../configuration/WebSecurityConfiguration.java} | 45 +-
.../StandardLogoutFilter.java} | 13 +-
...points.java => OidcConfigurationException.java} | 26 +-
.../web/security/oidc/OidcIdentityProvider.java | 105 ---
.../apache/nifi/web/security/oidc/OidcService.java | 270 --------
.../{TruststoreStrategy.java => OidcUrlPath.java} | 23 +-
.../oidc/StandardOidcIdentityProvider.java | 631 ------------------
.../web/AuthorizedClientExpirationCommand.java | 79 +++
.../oidc/client/web/OidcAuthorizedClient.java | 52 ++
.../client/web/OidcBearerTokenRefreshFilter.java | 232 +++++++
.../web/OidcRegistrationProperty.java} | 24 +-
.../StandardAuthorizationRequestRepository.java | 137 ++++
.../StandardOidcAuthorizedClientRepository.java | 276 ++++++++
.../web/TrackedAuthorizedClientRepository.java} | 20 +-
.../converter/AuthenticationResultConverter.java | 42 ++
.../client/web/converter/AuthorizedClient.java | 68 ++
.../web/converter/AuthorizedClientConverter.java} | 23 +-
.../oidc/client/web/converter/AuthorizedToken.java | 60 ++
.../StandardAuthorizedClientConverter.java | 170 +++++
.../StandardOAuth2AuthenticationToken.java | 52 ++
.../OidcLogoutFilter.java} | 26 +-
.../oidc/logout/OidcLogoutSuccessHandler.java | 225 +++++++
.../ClientRegistrationProvider.java} | 20 +-
.../DisabledClientRegistrationRepository.java} | 22 +-
.../StandardClientRegistrationProvider.java | 138 ++++
.../StandardTokenRevocationResponseClient.java | 125 ++++
.../TokenRevocationRequest.java} | 33 +-
.../TokenRevocationResponse.java} | 28 +-
.../TokenRevocationResponseClient.java} | 19 +-
.../TokenTypeHint.java} | 25 +-
.../OidcAuthenticationSuccessHandler.java | 201 ++++++
.../logout/Saml2LocalLogoutFilter.java | 40 +-
.../logout/Saml2SingleLogoutFilter.java | 1 +
.../LogoutAuthenticationToken.java | 4 +-
.../web/security/util/IdentityProviderUtils.java | 52 --
.../web/security/oidc/OidcServiceGroovyTest.groovy | 167 -----
.../StandardOidcIdentityProviderGroovyTest.groovy | 732 ---------------------
.../nifi/web/security/oidc/OidcServiceTest.java | 157 -----
.../oidc/StandardOidcIdentityProviderTest.java | 82 ---
.../web/OidcBearerTokenRefreshFilterTest.java | 248 +++++++
...StandardAuthorizationRequestRepositoryTest.java | 144 ++++
...StandardOidcAuthorizedClientRepositoryTest.java | 222 +++++++
.../StandardAuthorizedClientConverterTest.java | 183 ++++++
.../oidc/logout/OidcLogoutSuccessHandlerTest.java | 261 ++++++++
.../StandardClientRegistrationProviderTest.java | 137 ++++
.../StandardTokenRevocationResponseClientTest.java | 129 ++++
.../OidcAuthenticationSuccessHandlerTest.java | 228 +++++++
.../logout/Saml2LocalLogoutFilterTest.java | 4 +-
.../logout/Saml2SingleLogoutFilterTest.java | 1 +
.../org/apache/nifi/web/filter/LoginFilter.java | 25 +-
.../org/apache/nifi/web/filter/LogoutFilter.java | 25 +-
.../src/main/webapp/js/nf/canvas/nf-canvas.js | 33 +-
66 files changed, 4262 insertions(+), 3255 deletions(-)
delete mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/OIDCAccessResource.java
delete mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/web/api/OIDCAccessResourceTest.java
delete mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/configuration/OidcAuthenticationSecurityConfiguration.java
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/configuration/OidcSecurityConfiguration.java
rename nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/{nifi-web-api/src/main/java/org/apache/nifi/web/NiFiWebApiSecurityConfiguration.java => nifi-web-security/src/main/java/org/apache/nifi/web/security/configuration/WebSecurityConfiguration.java} (78%)
copy nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/{saml2/web/authentication/logout/Saml2LocalLogoutFilter.java => logout/StandardLogoutFilter.java} (85%)
rename nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/oidc/{OIDCEndpoints.java => OidcConfigurationException.java} (54%)
delete mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/oidc/OidcIdentityProvider.java
delete mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/oidc/OidcService.java
copy nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/oidc/{TruststoreStrategy.java => OidcUrlPath.java} (73%)
delete mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/oidc/StandardOidcIdentityProvider.java
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/oidc/client/web/AuthorizedClientExpirationCommand.java
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/oidc/client/web/OidcAuthorizedClient.java
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/oidc/client/web/OidcBearerTokenRefreshFilter.java
copy nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/oidc/{TruststoreStrategy.java => client/web/OidcRegistrationProperty.java} (64%)
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/oidc/client/web/StandardAuthorizationRequestRepository.java
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/oidc/client/web/StandardOidcAuthorizedClientRepository.java
copy nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/oidc/{TruststoreStrategy.java => client/web/TrackedAuthorizedClientRepository.java} (69%)
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/oidc/client/web/converter/AuthenticationResultConverter.java
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/oidc/client/web/converter/AuthorizedClient.java
copy nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/oidc/{TruststoreStrategy.java => client/web/converter/AuthorizedClientConverter.java} (54%)
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/oidc/client/web/converter/AuthorizedToken.java
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/oidc/client/web/converter/StandardAuthorizedClientConverter.java
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/oidc/client/web/converter/StandardOAuth2AuthenticationToken.java
copy nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/oidc/{TruststoreStrategy.java => logout/OidcLogoutFilter.java} (55%)
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/oidc/logout/OidcLogoutSuccessHandler.java
copy nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/oidc/{TruststoreStrategy.java => registration/ClientRegistrationProvider.java} (65%)
copy nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/oidc/{TruststoreStrategy.java => registration/DisabledClientRegistrationRepository.java} (59%)
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/oidc/registration/StandardClientRegistrationProvider.java
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/oidc/revocation/StandardTokenRevocationResponseClient.java
copy nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/oidc/{TruststoreStrategy.java => revocation/TokenRevocationRequest.java} (56%)
copy nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/oidc/{TruststoreStrategy.java => revocation/TokenRevocationResponse.java} (60%)
copy nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/oidc/{TruststoreStrategy.java => revocation/TokenRevocationResponseClient.java} (64%)
rename nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/oidc/{TruststoreStrategy.java => revocation/TokenTypeHint.java} (68%)
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/oidc/web/authentication/OidcAuthenticationSuccessHandler.java
rename nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/{saml2/web/authentication/logout => token}/LogoutAuthenticationToken.java (93%)
delete mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/util/IdentityProviderUtils.java
delete mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/test/groovy/org/apache/nifi/web/security/oidc/OidcServiceGroovyTest.groovy
delete mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/test/groovy/org/apache/nifi/web/security/oidc/StandardOidcIdentityProviderGroovyTest.groovy
delete mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/test/java/org/apache/nifi/web/security/oidc/OidcServiceTest.java
delete mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/test/java/org/apache/nifi/web/security/oidc/StandardOidcIdentityProviderTest.java
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/test/java/org/apache/nifi/web/security/oidc/client/web/OidcBearerTokenRefreshFilterTest.java
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/test/java/org/apache/nifi/web/security/oidc/client/web/StandardAuthorizationRequestRepositoryTest.java
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/test/java/org/apache/nifi/web/security/oidc/client/web/StandardOidcAuthorizedClientRepositoryTest.java
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/test/java/org/apache/nifi/web/security/oidc/client/web/converter/StandardAuthorizedClientConverterTest.java
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/test/java/org/apache/nifi/web/security/oidc/logout/OidcLogoutSuccessHandlerTest.java
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/test/java/org/apache/nifi/web/security/oidc/registration/StandardClientRegistrationProviderTest.java
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/test/java/org/apache/nifi/web/security/oidc/revocation/StandardTokenRevocationResponseClientTest.java
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/test/java/org/apache/nifi/web/security/oidc/web/authentication/OidcAuthenticationSuccessHandlerTest.java