diff --git a/docs/antora.yml b/docs/antora.yml index 4bb53235cd..f1d4fefedb 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -8,7 +8,6 @@ asciidoc: idprefix: '' idseparator: '-' apacheds-core-version: 1.5.5 - figures: servlet/architecture gh-old-samples-url: https://github.com/spring-projects/spring-security/tree/5.4.x/samples gh-samples-url: https://github.com/spring-projects/spring-security-samples/tree/main gh-url: https://github.com/spring-projects/spring-security/tree/main diff --git a/docs/modules/ROOT/images/Authentication.gif b/docs/modules/ROOT/assets/images/Authentication.gif similarity index 100% rename from docs/modules/ROOT/images/Authentication.gif rename to docs/modules/ROOT/assets/images/Authentication.gif diff --git a/docs/modules/ROOT/images/icons/number_1.png b/docs/modules/ROOT/assets/images/icons/number_1.png similarity index 100% rename from docs/modules/ROOT/images/icons/number_1.png rename to docs/modules/ROOT/assets/images/icons/number_1.png diff --git a/docs/modules/ROOT/images/icons/number_10.png b/docs/modules/ROOT/assets/images/icons/number_10.png similarity index 100% rename from docs/modules/ROOT/images/icons/number_10.png rename to docs/modules/ROOT/assets/images/icons/number_10.png diff --git a/docs/modules/ROOT/images/icons/number_2.png b/docs/modules/ROOT/assets/images/icons/number_2.png similarity index 100% rename from docs/modules/ROOT/images/icons/number_2.png rename to docs/modules/ROOT/assets/images/icons/number_2.png diff --git a/docs/modules/ROOT/images/icons/number_3.png b/docs/modules/ROOT/assets/images/icons/number_3.png similarity index 100% rename from docs/modules/ROOT/images/icons/number_3.png rename to docs/modules/ROOT/assets/images/icons/number_3.png diff --git a/docs/modules/ROOT/images/icons/number_4.png b/docs/modules/ROOT/assets/images/icons/number_4.png similarity index 100% rename from docs/modules/ROOT/images/icons/number_4.png rename to docs/modules/ROOT/assets/images/icons/number_4.png diff --git a/docs/modules/ROOT/images/icons/number_5.png b/docs/modules/ROOT/assets/images/icons/number_5.png similarity index 100% rename from docs/modules/ROOT/images/icons/number_5.png rename to docs/modules/ROOT/assets/images/icons/number_5.png diff --git a/docs/modules/ROOT/images/icons/number_6.png b/docs/modules/ROOT/assets/images/icons/number_6.png similarity index 100% rename from docs/modules/ROOT/images/icons/number_6.png rename to docs/modules/ROOT/assets/images/icons/number_6.png diff --git a/docs/modules/ROOT/images/icons/number_7.png b/docs/modules/ROOT/assets/images/icons/number_7.png similarity index 100% rename from docs/modules/ROOT/images/icons/number_7.png rename to docs/modules/ROOT/assets/images/icons/number_7.png diff --git a/docs/modules/ROOT/images/icons/number_8.png b/docs/modules/ROOT/assets/images/icons/number_8.png similarity index 100% rename from docs/modules/ROOT/images/icons/number_8.png rename to docs/modules/ROOT/assets/images/icons/number_8.png diff --git a/docs/modules/ROOT/images/icons/number_9.png b/docs/modules/ROOT/assets/images/icons/number_9.png similarity index 100% rename from docs/modules/ROOT/images/icons/number_9.png rename to docs/modules/ROOT/assets/images/icons/number_9.png diff --git a/docs/modules/ROOT/images/icons/numbers.odg b/docs/modules/ROOT/assets/images/icons/numbers.odg similarity index 100% rename from docs/modules/ROOT/images/icons/numbers.odg rename to docs/modules/ROOT/assets/images/icons/numbers.odg diff --git a/docs/modules/ROOT/images/note.png b/docs/modules/ROOT/assets/images/note.png similarity index 100% rename from docs/modules/ROOT/images/note.png rename to docs/modules/ROOT/assets/images/note.png diff --git a/docs/modules/ROOT/images/palette.otg b/docs/modules/ROOT/assets/images/palette.otg similarity index 100% rename from docs/modules/ROOT/images/palette.otg rename to docs/modules/ROOT/assets/images/palette.otg diff --git a/docs/modules/ROOT/images/s2-banner-rhs.png b/docs/modules/ROOT/assets/images/s2-banner-rhs.png similarity index 100% rename from docs/modules/ROOT/images/s2-banner-rhs.png rename to docs/modules/ROOT/assets/images/s2-banner-rhs.png diff --git a/docs/modules/ROOT/images/s2_box_logo.png b/docs/modules/ROOT/assets/images/s2_box_logo.png similarity index 100% rename from docs/modules/ROOT/images/s2_box_logo.png rename to docs/modules/ROOT/assets/images/s2_box_logo.png diff --git a/docs/modules/ROOT/images/security-interception.graffle b/docs/modules/ROOT/assets/images/security-interception.graffle similarity index 100% rename from docs/modules/ROOT/images/security-interception.graffle rename to docs/modules/ROOT/assets/images/security-interception.graffle diff --git a/docs/modules/ROOT/images/security-interception.png b/docs/modules/ROOT/assets/images/security-interception.png similarity index 100% rename from docs/modules/ROOT/images/security-interception.png rename to docs/modules/ROOT/assets/images/security-interception.png diff --git a/docs/modules/ROOT/images/servlet/architecture/delegatingfilterproxy.odg b/docs/modules/ROOT/assets/images/servlet/architecture/delegatingfilterproxy.odg similarity index 100% rename from docs/modules/ROOT/images/servlet/architecture/delegatingfilterproxy.odg rename to docs/modules/ROOT/assets/images/servlet/architecture/delegatingfilterproxy.odg diff --git a/docs/modules/ROOT/images/servlet/architecture/delegatingfilterproxy.png b/docs/modules/ROOT/assets/images/servlet/architecture/delegatingfilterproxy.png similarity index 100% rename from docs/modules/ROOT/images/servlet/architecture/delegatingfilterproxy.png rename to docs/modules/ROOT/assets/images/servlet/architecture/delegatingfilterproxy.png diff --git a/docs/modules/ROOT/images/servlet/architecture/exceptiontranslationfilter.odg b/docs/modules/ROOT/assets/images/servlet/architecture/exceptiontranslationfilter.odg similarity index 100% rename from docs/modules/ROOT/images/servlet/architecture/exceptiontranslationfilter.odg rename to docs/modules/ROOT/assets/images/servlet/architecture/exceptiontranslationfilter.odg diff --git a/docs/modules/ROOT/images/servlet/architecture/exceptiontranslationfilter.png b/docs/modules/ROOT/assets/images/servlet/architecture/exceptiontranslationfilter.png similarity index 100% rename from docs/modules/ROOT/images/servlet/architecture/exceptiontranslationfilter.png rename to docs/modules/ROOT/assets/images/servlet/architecture/exceptiontranslationfilter.png diff --git a/docs/modules/ROOT/images/servlet/architecture/filterchain.gif b/docs/modules/ROOT/assets/images/servlet/architecture/filterchain.gif similarity index 100% rename from docs/modules/ROOT/images/servlet/architecture/filterchain.gif rename to docs/modules/ROOT/assets/images/servlet/architecture/filterchain.gif diff --git a/docs/modules/ROOT/images/servlet/architecture/filterchain.odg b/docs/modules/ROOT/assets/images/servlet/architecture/filterchain.odg similarity index 100% rename from docs/modules/ROOT/images/servlet/architecture/filterchain.odg rename to docs/modules/ROOT/assets/images/servlet/architecture/filterchain.odg diff --git a/docs/modules/ROOT/images/servlet/architecture/filterchain.png b/docs/modules/ROOT/assets/images/servlet/architecture/filterchain.png similarity index 100% rename from docs/modules/ROOT/images/servlet/architecture/filterchain.png rename to docs/modules/ROOT/assets/images/servlet/architecture/filterchain.png diff --git a/docs/modules/ROOT/images/servlet/architecture/filterchainproxy.odg b/docs/modules/ROOT/assets/images/servlet/architecture/filterchainproxy.odg similarity index 100% rename from docs/modules/ROOT/images/servlet/architecture/filterchainproxy.odg rename to docs/modules/ROOT/assets/images/servlet/architecture/filterchainproxy.odg diff --git a/docs/modules/ROOT/images/servlet/architecture/filterchainproxy.png b/docs/modules/ROOT/assets/images/servlet/architecture/filterchainproxy.png similarity index 100% rename from docs/modules/ROOT/images/servlet/architecture/filterchainproxy.png rename to docs/modules/ROOT/assets/images/servlet/architecture/filterchainproxy.png diff --git a/docs/modules/ROOT/images/servlet/architecture/multi-securityfilterchain.odg b/docs/modules/ROOT/assets/images/servlet/architecture/multi-securityfilterchain.odg similarity index 100% rename from docs/modules/ROOT/images/servlet/architecture/multi-securityfilterchain.odg rename to docs/modules/ROOT/assets/images/servlet/architecture/multi-securityfilterchain.odg diff --git a/docs/modules/ROOT/images/servlet/architecture/multi-securityfilterchain.png b/docs/modules/ROOT/assets/images/servlet/architecture/multi-securityfilterchain.png similarity index 100% rename from docs/modules/ROOT/images/servlet/architecture/multi-securityfilterchain.png rename to docs/modules/ROOT/assets/images/servlet/architecture/multi-securityfilterchain.png diff --git a/docs/modules/ROOT/images/servlet/architecture/securityfilterchain.odg b/docs/modules/ROOT/assets/images/servlet/architecture/securityfilterchain.odg similarity index 100% rename from docs/modules/ROOT/images/servlet/architecture/securityfilterchain.odg rename to docs/modules/ROOT/assets/images/servlet/architecture/securityfilterchain.odg diff --git a/docs/modules/ROOT/images/servlet/architecture/securityfilterchain.png b/docs/modules/ROOT/assets/images/servlet/architecture/securityfilterchain.png similarity index 100% rename from docs/modules/ROOT/images/servlet/architecture/securityfilterchain.png rename to docs/modules/ROOT/assets/images/servlet/architecture/securityfilterchain.png diff --git a/docs/modules/ROOT/images/servlet/authentication/architecture/abstractauthenticationprocessingfilter.odg b/docs/modules/ROOT/assets/images/servlet/authentication/architecture/abstractauthenticationprocessingfilter.odg similarity index 100% rename from docs/modules/ROOT/images/servlet/authentication/architecture/abstractauthenticationprocessingfilter.odg rename to docs/modules/ROOT/assets/images/servlet/authentication/architecture/abstractauthenticationprocessingfilter.odg diff --git a/docs/modules/ROOT/images/servlet/authentication/architecture/abstractauthenticationprocessingfilter.png b/docs/modules/ROOT/assets/images/servlet/authentication/architecture/abstractauthenticationprocessingfilter.png similarity index 100% rename from docs/modules/ROOT/images/servlet/authentication/architecture/abstractauthenticationprocessingfilter.png rename to docs/modules/ROOT/assets/images/servlet/authentication/architecture/abstractauthenticationprocessingfilter.png diff --git a/docs/modules/ROOT/images/servlet/authentication/architecture/providermanager-parent.odg b/docs/modules/ROOT/assets/images/servlet/authentication/architecture/providermanager-parent.odg similarity index 100% rename from docs/modules/ROOT/images/servlet/authentication/architecture/providermanager-parent.odg rename to docs/modules/ROOT/assets/images/servlet/authentication/architecture/providermanager-parent.odg diff --git a/docs/modules/ROOT/images/servlet/authentication/architecture/providermanager-parent.png b/docs/modules/ROOT/assets/images/servlet/authentication/architecture/providermanager-parent.png similarity index 100% rename from docs/modules/ROOT/images/servlet/authentication/architecture/providermanager-parent.png rename to docs/modules/ROOT/assets/images/servlet/authentication/architecture/providermanager-parent.png diff --git a/docs/modules/ROOT/images/servlet/authentication/architecture/providermanager.odg b/docs/modules/ROOT/assets/images/servlet/authentication/architecture/providermanager.odg similarity index 100% rename from docs/modules/ROOT/images/servlet/authentication/architecture/providermanager.odg rename to docs/modules/ROOT/assets/images/servlet/authentication/architecture/providermanager.odg diff --git a/docs/modules/ROOT/images/servlet/authentication/architecture/providermanager.png b/docs/modules/ROOT/assets/images/servlet/authentication/architecture/providermanager.png similarity index 100% rename from docs/modules/ROOT/images/servlet/authentication/architecture/providermanager.png rename to docs/modules/ROOT/assets/images/servlet/authentication/architecture/providermanager.png diff --git a/docs/modules/ROOT/images/servlet/authentication/architecture/providermanagers-parent.odg b/docs/modules/ROOT/assets/images/servlet/authentication/architecture/providermanagers-parent.odg similarity index 100% rename from docs/modules/ROOT/images/servlet/authentication/architecture/providermanagers-parent.odg rename to docs/modules/ROOT/assets/images/servlet/authentication/architecture/providermanagers-parent.odg diff --git a/docs/modules/ROOT/images/servlet/authentication/architecture/providermanagers-parent.png b/docs/modules/ROOT/assets/images/servlet/authentication/architecture/providermanagers-parent.png similarity index 100% rename from docs/modules/ROOT/images/servlet/authentication/architecture/providermanagers-parent.png rename to docs/modules/ROOT/assets/images/servlet/authentication/architecture/providermanagers-parent.png diff --git a/docs/modules/ROOT/images/servlet/authentication/architecture/securitycontextholder.odg b/docs/modules/ROOT/assets/images/servlet/authentication/architecture/securitycontextholder.odg similarity index 100% rename from docs/modules/ROOT/images/servlet/authentication/architecture/securitycontextholder.odg rename to docs/modules/ROOT/assets/images/servlet/authentication/architecture/securitycontextholder.odg diff --git a/docs/modules/ROOT/images/servlet/authentication/architecture/securitycontextholder.png b/docs/modules/ROOT/assets/images/servlet/authentication/architecture/securitycontextholder.png similarity index 100% rename from docs/modules/ROOT/images/servlet/authentication/architecture/securitycontextholder.png rename to docs/modules/ROOT/assets/images/servlet/authentication/architecture/securitycontextholder.png diff --git a/docs/modules/ROOT/images/servlet/authentication/unpwd/basicauthenticationentrypoint.odg b/docs/modules/ROOT/assets/images/servlet/authentication/unpwd/basicauthenticationentrypoint.odg similarity index 100% rename from docs/modules/ROOT/images/servlet/authentication/unpwd/basicauthenticationentrypoint.odg rename to docs/modules/ROOT/assets/images/servlet/authentication/unpwd/basicauthenticationentrypoint.odg diff --git a/docs/modules/ROOT/images/servlet/authentication/unpwd/basicauthenticationentrypoint.png b/docs/modules/ROOT/assets/images/servlet/authentication/unpwd/basicauthenticationentrypoint.png similarity index 100% rename from docs/modules/ROOT/images/servlet/authentication/unpwd/basicauthenticationentrypoint.png rename to docs/modules/ROOT/assets/images/servlet/authentication/unpwd/basicauthenticationentrypoint.png diff --git a/docs/modules/ROOT/images/servlet/authentication/unpwd/basicauthenticationfilter.odg b/docs/modules/ROOT/assets/images/servlet/authentication/unpwd/basicauthenticationfilter.odg similarity index 100% rename from docs/modules/ROOT/images/servlet/authentication/unpwd/basicauthenticationfilter.odg rename to docs/modules/ROOT/assets/images/servlet/authentication/unpwd/basicauthenticationfilter.odg diff --git a/docs/modules/ROOT/images/servlet/authentication/unpwd/basicauthenticationfilter.png b/docs/modules/ROOT/assets/images/servlet/authentication/unpwd/basicauthenticationfilter.png similarity index 100% rename from docs/modules/ROOT/images/servlet/authentication/unpwd/basicauthenticationfilter.png rename to docs/modules/ROOT/assets/images/servlet/authentication/unpwd/basicauthenticationfilter.png diff --git a/docs/modules/ROOT/images/servlet/authentication/unpwd/daoauthenticationprovider.odg b/docs/modules/ROOT/assets/images/servlet/authentication/unpwd/daoauthenticationprovider.odg similarity index 100% rename from docs/modules/ROOT/images/servlet/authentication/unpwd/daoauthenticationprovider.odg rename to docs/modules/ROOT/assets/images/servlet/authentication/unpwd/daoauthenticationprovider.odg diff --git a/docs/modules/ROOT/images/servlet/authentication/unpwd/daoauthenticationprovider.png b/docs/modules/ROOT/assets/images/servlet/authentication/unpwd/daoauthenticationprovider.png similarity index 100% rename from docs/modules/ROOT/images/servlet/authentication/unpwd/daoauthenticationprovider.png rename to docs/modules/ROOT/assets/images/servlet/authentication/unpwd/daoauthenticationprovider.png diff --git a/docs/modules/ROOT/images/servlet/authentication/unpwd/loginurlauthenticationentrypoint.odg b/docs/modules/ROOT/assets/images/servlet/authentication/unpwd/loginurlauthenticationentrypoint.odg similarity index 100% rename from docs/modules/ROOT/images/servlet/authentication/unpwd/loginurlauthenticationentrypoint.odg rename to docs/modules/ROOT/assets/images/servlet/authentication/unpwd/loginurlauthenticationentrypoint.odg diff --git a/docs/modules/ROOT/images/servlet/authentication/unpwd/loginurlauthenticationentrypoint.png b/docs/modules/ROOT/assets/images/servlet/authentication/unpwd/loginurlauthenticationentrypoint.png similarity index 100% rename from docs/modules/ROOT/images/servlet/authentication/unpwd/loginurlauthenticationentrypoint.png rename to docs/modules/ROOT/assets/images/servlet/authentication/unpwd/loginurlauthenticationentrypoint.png diff --git a/docs/modules/ROOT/images/servlet/authentication/unpwd/usernamepasswordauthenticationfilter.odg b/docs/modules/ROOT/assets/images/servlet/authentication/unpwd/usernamepasswordauthenticationfilter.odg similarity index 100% rename from docs/modules/ROOT/images/servlet/authentication/unpwd/usernamepasswordauthenticationfilter.odg rename to docs/modules/ROOT/assets/images/servlet/authentication/unpwd/usernamepasswordauthenticationfilter.odg diff --git a/docs/modules/ROOT/images/servlet/authentication/unpwd/usernamepasswordauthenticationfilter.png b/docs/modules/ROOT/assets/images/servlet/authentication/unpwd/usernamepasswordauthenticationfilter.png similarity index 100% rename from docs/modules/ROOT/images/servlet/authentication/unpwd/usernamepasswordauthenticationfilter.png rename to docs/modules/ROOT/assets/images/servlet/authentication/unpwd/usernamepasswordauthenticationfilter.png diff --git a/docs/modules/ROOT/images/access-decision-voting.graffle b/docs/modules/ROOT/assets/images/servlet/authorization/access-decision-voting.graffle similarity index 100% rename from docs/modules/ROOT/images/access-decision-voting.graffle rename to docs/modules/ROOT/assets/images/servlet/authorization/access-decision-voting.graffle diff --git a/docs/modules/ROOT/images/access-decision-voting.png b/docs/modules/ROOT/assets/images/servlet/authorization/access-decision-voting.png similarity index 100% rename from docs/modules/ROOT/images/access-decision-voting.png rename to docs/modules/ROOT/assets/images/servlet/authorization/access-decision-voting.png diff --git a/docs/modules/ROOT/images/after-invocation.graffle b/docs/modules/ROOT/assets/images/servlet/authorization/after-invocation.graffle similarity index 100% rename from docs/modules/ROOT/images/after-invocation.graffle rename to docs/modules/ROOT/assets/images/servlet/authorization/after-invocation.graffle diff --git a/docs/modules/ROOT/images/after-invocation.png b/docs/modules/ROOT/assets/images/servlet/authorization/after-invocation.png similarity index 100% rename from docs/modules/ROOT/images/after-invocation.png rename to docs/modules/ROOT/assets/images/servlet/authorization/after-invocation.png diff --git a/docs/modules/ROOT/images/servlet/authorization/filtersecurityinterceptor.odg b/docs/modules/ROOT/assets/images/servlet/authorization/filtersecurityinterceptor.odg similarity index 100% rename from docs/modules/ROOT/images/servlet/authorization/filtersecurityinterceptor.odg rename to docs/modules/ROOT/assets/images/servlet/authorization/filtersecurityinterceptor.odg diff --git a/docs/modules/ROOT/images/servlet/authorization/filtersecurityinterceptor.png b/docs/modules/ROOT/assets/images/servlet/authorization/filtersecurityinterceptor.png similarity index 100% rename from docs/modules/ROOT/images/servlet/authorization/filtersecurityinterceptor.png rename to docs/modules/ROOT/assets/images/servlet/authorization/filtersecurityinterceptor.png diff --git a/docs/modules/ROOT/images/servlet/oauth2/beareraccessdeniedhandler.odg b/docs/modules/ROOT/assets/images/servlet/oauth2/beareraccessdeniedhandler.odg similarity index 100% rename from docs/modules/ROOT/images/servlet/oauth2/beareraccessdeniedhandler.odg rename to docs/modules/ROOT/assets/images/servlet/oauth2/beareraccessdeniedhandler.odg diff --git a/docs/modules/ROOT/images/servlet/oauth2/bearerauthenticationentrypoint.odg b/docs/modules/ROOT/assets/images/servlet/oauth2/bearerauthenticationentrypoint.odg similarity index 100% rename from docs/modules/ROOT/images/servlet/oauth2/bearerauthenticationentrypoint.odg rename to docs/modules/ROOT/assets/images/servlet/oauth2/bearerauthenticationentrypoint.odg diff --git a/docs/modules/ROOT/images/servlet/oauth2/bearerauthenticationentrypoint.png b/docs/modules/ROOT/assets/images/servlet/oauth2/bearerauthenticationentrypoint.png similarity index 100% rename from docs/modules/ROOT/images/servlet/oauth2/bearerauthenticationentrypoint.png rename to docs/modules/ROOT/assets/images/servlet/oauth2/bearerauthenticationentrypoint.png diff --git a/docs/modules/ROOT/images/servlet/oauth2/bearertokenauthenticationfilter.odg b/docs/modules/ROOT/assets/images/servlet/oauth2/bearertokenauthenticationfilter.odg similarity index 100% rename from docs/modules/ROOT/images/servlet/oauth2/bearertokenauthenticationfilter.odg rename to docs/modules/ROOT/assets/images/servlet/oauth2/bearertokenauthenticationfilter.odg diff --git a/docs/modules/ROOT/images/servlet/oauth2/bearertokenauthenticationfilter.png b/docs/modules/ROOT/assets/images/servlet/oauth2/bearertokenauthenticationfilter.png similarity index 100% rename from docs/modules/ROOT/images/servlet/oauth2/bearertokenauthenticationfilter.png rename to docs/modules/ROOT/assets/images/servlet/oauth2/bearertokenauthenticationfilter.png diff --git a/docs/modules/ROOT/images/servlet/oauth2/jwtauthenticationprovider.odg b/docs/modules/ROOT/assets/images/servlet/oauth2/jwtauthenticationprovider.odg similarity index 100% rename from docs/modules/ROOT/images/servlet/oauth2/jwtauthenticationprovider.odg rename to docs/modules/ROOT/assets/images/servlet/oauth2/jwtauthenticationprovider.odg diff --git a/docs/modules/ROOT/images/servlet/oauth2/jwtauthenticationprovider.png b/docs/modules/ROOT/assets/images/servlet/oauth2/jwtauthenticationprovider.png similarity index 100% rename from docs/modules/ROOT/images/servlet/oauth2/jwtauthenticationprovider.png rename to docs/modules/ROOT/assets/images/servlet/oauth2/jwtauthenticationprovider.png diff --git a/docs/modules/ROOT/images/servlet/oauth2/opaquetokenauthenticationprovider.odg b/docs/modules/ROOT/assets/images/servlet/oauth2/opaquetokenauthenticationprovider.odg similarity index 100% rename from docs/modules/ROOT/images/servlet/oauth2/opaquetokenauthenticationprovider.odg rename to docs/modules/ROOT/assets/images/servlet/oauth2/opaquetokenauthenticationprovider.odg diff --git a/docs/modules/ROOT/images/servlet/oauth2/opaquetokenauthenticationprovider.png b/docs/modules/ROOT/assets/images/servlet/oauth2/opaquetokenauthenticationprovider.png similarity index 100% rename from docs/modules/ROOT/images/servlet/oauth2/opaquetokenauthenticationprovider.png rename to docs/modules/ROOT/assets/images/servlet/oauth2/opaquetokenauthenticationprovider.png diff --git a/docs/modules/ROOT/images/servlet/saml2/opensamlauthenticationprovider.odg b/docs/modules/ROOT/assets/images/servlet/saml2/opensamlauthenticationprovider.odg similarity index 100% rename from docs/modules/ROOT/images/servlet/saml2/opensamlauthenticationprovider.odg rename to docs/modules/ROOT/assets/images/servlet/saml2/opensamlauthenticationprovider.odg diff --git a/docs/modules/ROOT/images/servlet/saml2/opensamlauthenticationprovider.png b/docs/modules/ROOT/assets/images/servlet/saml2/opensamlauthenticationprovider.png similarity index 100% rename from docs/modules/ROOT/images/servlet/saml2/opensamlauthenticationprovider.png rename to docs/modules/ROOT/assets/images/servlet/saml2/opensamlauthenticationprovider.png diff --git a/docs/modules/ROOT/images/servlet/saml2/saml2webssoauthenticationfilter.odg b/docs/modules/ROOT/assets/images/servlet/saml2/saml2webssoauthenticationfilter.odg similarity index 100% rename from docs/modules/ROOT/images/servlet/saml2/saml2webssoauthenticationfilter.odg rename to docs/modules/ROOT/assets/images/servlet/saml2/saml2webssoauthenticationfilter.odg diff --git a/docs/modules/ROOT/images/servlet/saml2/saml2webssoauthenticationfilter.png b/docs/modules/ROOT/assets/images/servlet/saml2/saml2webssoauthenticationfilter.png similarity index 100% rename from docs/modules/ROOT/images/servlet/saml2/saml2webssoauthenticationfilter.png rename to docs/modules/ROOT/assets/images/servlet/saml2/saml2webssoauthenticationfilter.png diff --git a/docs/modules/ROOT/images/servlet/saml2/saml2webssoauthenticationrequestfilter.odg b/docs/modules/ROOT/assets/images/servlet/saml2/saml2webssoauthenticationrequestfilter.odg similarity index 100% rename from docs/modules/ROOT/images/servlet/saml2/saml2webssoauthenticationrequestfilter.odg rename to docs/modules/ROOT/assets/images/servlet/saml2/saml2webssoauthenticationrequestfilter.odg diff --git a/docs/modules/ROOT/images/servlet/saml2/saml2webssoauthenticationrequestfilter.png b/docs/modules/ROOT/assets/images/servlet/saml2/saml2webssoauthenticationrequestfilter.png similarity index 100% rename from docs/modules/ROOT/images/servlet/saml2/saml2webssoauthenticationrequestfilter.png rename to docs/modules/ROOT/assets/images/servlet/saml2/saml2webssoauthenticationrequestfilter.png diff --git a/docs/modules/ROOT/images/tip.png b/docs/modules/ROOT/assets/images/tip.png similarity index 100% rename from docs/modules/ROOT/images/tip.png rename to docs/modules/ROOT/assets/images/tip.png diff --git a/docs/modules/ROOT/pages/servlet/architecture/index.adoc b/docs/modules/ROOT/pages/servlet/architecture/index.adoc index ec5b4bc4d8..c107f82fbd 100644 --- a/docs/modules/ROOT/pages/servlet/architecture/index.adoc +++ b/docs/modules/ROOT/pages/servlet/architecture/index.adoc @@ -1,7 +1,6 @@ [[servlet-architecture]] = Servlet Security: The Big Picture -:figures: images/servlet/architecture -:icondir: images/icons +:figures: servlet/architecture This section discusses Spring Security's high level architecture within Servlet based applications. We build on this high level understanding within <>, <>, <> sections of the reference. diff --git a/docs/modules/ROOT/pages/servlet/authentication/architecture/index.adoc b/docs/modules/ROOT/pages/servlet/authentication/architecture/index.adoc index 9b0305bc5f..a688d41272 100644 --- a/docs/modules/ROOT/pages/servlet/authentication/architecture/index.adoc +++ b/docs/modules/ROOT/pages/servlet/authentication/architecture/index.adoc @@ -1,7 +1,6 @@ [[servlet-authentication-architecture]] = Servlet Authentication Architecture -:figures: images/servlet/authentication/architecture -:icondir: images/icons +:figures: servlet/authentication/architecture This discussion expands on <> to describe the main architectural components of Spring Security's used in Servlet authentication. If you need concrete flows that explain how these pieces fit together, look at the <> specific sections. @@ -20,6 +19,7 @@ This also gives a good idea of the high level flow of authentication and how pie [[servlet-authentication-securitycontextholder]] == SecurityContextHolder +Hi {figures} there At the heart of Spring Security's authentication model is the `SecurityContextHolder`. It contains the <>. diff --git a/docs/modules/ROOT/pages/servlet/authentication/unpwd/basic.adoc b/docs/modules/ROOT/pages/servlet/authentication/unpwd/basic.adoc index 411fefcb13..b03716b085 100644 --- a/docs/modules/ROOT/pages/servlet/authentication/unpwd/basic.adoc +++ b/docs/modules/ROOT/pages/servlet/authentication/unpwd/basic.adoc @@ -1,5 +1,6 @@ [[servlet-authentication-basic]] = Basic Authentication +:figures: servlet/authentication/unpwd This section provides details on how Spring Security provides support for https://tools.ietf.org/html/rfc7617[Basic HTTP Authentication] for servlet based applications. // FIXME: describe authenticationentrypoint, authenticationfailurehandler, authenticationsuccesshandler diff --git a/docs/modules/ROOT/pages/servlet/authentication/unpwd/dao-authentication-provider.adoc b/docs/modules/ROOT/pages/servlet/authentication/unpwd/dao-authentication-provider.adoc index 3818a019ac..f7283e58ee 100644 --- a/docs/modules/ROOT/pages/servlet/authentication/unpwd/dao-authentication-provider.adoc +++ b/docs/modules/ROOT/pages/servlet/authentication/unpwd/dao-authentication-provider.adoc @@ -1,5 +1,6 @@ [[servlet-authentication-daoauthenticationprovider]] = DaoAuthenticationProvider +:figures: servlet/authentication/unpwd {security-api-url}org/springframework/security/authentication/dao/DaoAuthenticationProvider.html[`DaoAuthenticationProvider`] is an <> implementation that leverages a <> and <> to authenticate a username and password. diff --git a/docs/modules/ROOT/pages/servlet/authentication/unpwd/form.adoc b/docs/modules/ROOT/pages/servlet/authentication/unpwd/form.adoc index f8745f89ab..f22ebdd992 100644 --- a/docs/modules/ROOT/pages/servlet/authentication/unpwd/form.adoc +++ b/docs/modules/ROOT/pages/servlet/authentication/unpwd/form.adoc @@ -1,5 +1,6 @@ [[servlet-authentication-form]] = Form Login +:figures: servlet/authentication/unpwd Spring Security provides support for username and password being provided through an html form. This section provides details on how form based authentication works within Spring Security. diff --git a/docs/modules/ROOT/pages/servlet/authorization/architecture.adoc b/docs/modules/ROOT/pages/servlet/authorization/architecture.adoc index 25bf39f375..2be495a653 100644 --- a/docs/modules/ROOT/pages/servlet/authorization/architecture.adoc +++ b/docs/modules/ROOT/pages/servlet/authorization/architecture.adoc @@ -2,7 +2,7 @@ [[authz-arch]] = Authorization Architecture - +:figures: servlet/authorization [[authz-authorities]] == Authorities @@ -70,7 +70,7 @@ Whilst users can implement their own `AccessDecisionManager` to control all aspe [[authz-access-voting]] .Voting Decision Manager -image::images/access-decision-voting.png[] +image::{figures}/access-decision-voting.png[] @@ -140,7 +140,7 @@ Whilst you could easily implement your own AOP concern to achieve this, Spring S [[authz-after-invocation]] .After Invocation Implementation -image::images/after-invocation.png[] +image::{figures}/after-invocation.png[] Like many other parts of Spring Security, `AfterInvocationManager` has a single concrete implementation, `AfterInvocationProviderManager`, which polls a list of ``AfterInvocationProvider``s. Each `AfterInvocationProvider` is allowed to modify the return object or throw an `AccessDeniedException`. diff --git a/docs/modules/ROOT/pages/servlet/authorization/authorize-requests.adoc b/docs/modules/ROOT/pages/servlet/authorization/authorize-requests.adoc index 31ce88ecee..055ab80c20 100644 --- a/docs/modules/ROOT/pages/servlet/authorization/authorize-requests.adoc +++ b/docs/modules/ROOT/pages/servlet/authorization/authorize-requests.adoc @@ -1,7 +1,6 @@ [[servlet-authorization-filtersecurityinterceptor]] = Authorize HttpServletRequest with FilterSecurityInterceptor -:figures: images/servlet/authorization -:icondir: images/icons +:figures: servlet/authorization This section builds on <> by digging deeper into how <> works within Servlet based applications. diff --git a/docs/modules/ROOT/pages/servlet/oauth2/oauth2-resourceserver.adoc b/docs/modules/ROOT/pages/servlet/oauth2/oauth2-resourceserver.adoc index 2919b251ba..b4565b3300 100644 --- a/docs/modules/ROOT/pages/servlet/oauth2/oauth2-resourceserver.adoc +++ b/docs/modules/ROOT/pages/servlet/oauth2/oauth2-resourceserver.adoc @@ -1,7 +1,6 @@ [[oauth2resourceserver]] = OAuth 2.0 Resource Server -:figures: images/servlet/oauth2 -:icondir: images/icons +:figures: servlet/oauth2 Spring Security supports protecting endpoints using two forms of OAuth 2.0 https://tools.ietf.org/html/rfc6750.html[Bearer Tokens]: diff --git a/docs/modules/ROOT/pages/servlet/saml2/index.adoc b/docs/modules/ROOT/pages/servlet/saml2/index.adoc index e0adeaf0c7..ec19543759 100644 --- a/docs/modules/ROOT/pages/servlet/saml2/index.adoc +++ b/docs/modules/ROOT/pages/servlet/saml2/index.adoc @@ -1,13 +1,12 @@ [[servlet-saml2]] = SAML2 +:figures: servlet/saml2 Spring Security provides comprehensive SAML 2 support. This section discusses how to integrate SAML 2 into your servlet based application. [[servlet-saml2login]] == SAML 2.0 Login -:figures: images/servlet/saml2 -:icondir: images/icons The SAML 2.0 Login feature provides an application with the capability to act as a SAML 2.0 Relying Party, having users https://wiki.shibboleth.net/confluence/display/CONCEPT/FlowsAndConfig[log in] to the application by using their existing account at a SAML 2.0 Asserting Party (Okta, ADFS, etc).