You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by th...@apache.org on 2018/11/09 09:46:57 UTC

svn commit: r1846224 [3/8] - in /jackrabbit/site/live/oak/docs: ./ features/ query/ security/ security/accesscontrol/ security/authentication/ security/authentication/external/ security/authentication/token/ security/authorization/ security/permission/...

Modified: jackrabbit/site/live/oak/docs/security/authentication/external/externallogin_examples.html
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/oak/docs/security/authentication/external/externallogin_examples.html?rev=1846224&r1=1846223&r2=1846224&view=diff
==============================================================================
--- jackrabbit/site/live/oak/docs/security/authentication/external/externallogin_examples.html (original)
+++ jackrabbit/site/live/oak/docs/security/authentication/external/externallogin_examples.html Fri Nov  9 09:46:57 2018
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2018-02-21 
+ | Generated by Apache Maven Doxia Site Renderer 1.8.1 at 2018-11-09 
  | Rendered using Apache Maven Fluido Skin 1.6
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180221" />
+    <meta name="Date-Revision-yyyymmdd" content="20181109" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Jackrabbit Oak &#x2013; Authentication with External Login Module : Examples</title>
     <link rel="stylesheet" href="../../../css/apache-maven-fluido-1.6.min.css" />
@@ -52,6 +52,7 @@
         <a href="#" class="dropdown-toggle" data-toggle="dropdown">Main APIs <b class="caret"></b></a>
         <ul class="dropdown-menu">
             <li><a href="http://www.day.com/specs/jcr/2.0/index.html" title="JCR API">JCR API</a></li>
+            <li><a href="https://jackrabbit.apache.org/jcr/jcr-api.html" title="Jackrabbit API">Jackrabbit API</a></li>
             <li><a href="../../../oak_api/overview.html" title="Oak API">Oak API</a></li>
         </ul>
       </li>
@@ -66,7 +67,12 @@
                   <li><a href="../../../nodestore/compositens.html" title="Composite NodeStore">Composite NodeStore</a></li>
               </ul>
             </li>
-            <li><a href="../../../plugins/blobstore.html" title="Blob Storage">Blob Storage</a></li>
+            <li class="dropdown-submenu">
+<a href="../../../plugins/blobstore.html" title="Blob Storage">Blob Storage</a>
+              <ul class="dropdown-menu">
+                  <li><a href="../../../features/direct-binary-access.html" title="Direct Binary Access">Direct Binary Access</a></li>
+              </ul>
+            </li>
             <li class="dropdown-submenu">
 <a href="../../../query/query.html" title="Query">Query</a>
               <ul class="dropdown-menu">
@@ -136,7 +142,7 @@
 
       <div id="breadcrumbs">
         <ul class="breadcrumb">
-        <li id="publishDate">Last Published: 2018-02-21<span class="divider">|</span>
+        <li id="publishDate">Last Published: 2018-11-09<span class="divider">|</span>
 </li>
           <li id="projectVersion">Version: 1.10-SNAPSHOT</li>
         </ul>
@@ -155,12 +161,14 @@
     <li><a href="../../../architecture/nodestate.html" title="The Node State Model"><span class="none"></span>The Node State Model</a>  </li>
           <li class="nav-header">Main APIs</li>
     <li><a href="http://www.day.com/specs/jcr/2.0/index.html" class="externalLink" title="JCR API"><span class="none"></span>JCR API</a>  </li>
+    <li><a href="https://jackrabbit.apache.org/jcr/jcr-api.html" class="externalLink" title="Jackrabbit API"><span class="none"></span>Jackrabbit API</a>  </li>
     <li><a href="../../../oak_api/overview.html" title="Oak API"><span class="none"></span>Oak API</a>  </li>
           <li class="nav-header">Features and Plugins</li>
     <li><a href="../../../nodestore/overview.html" title="Node Storage"><span class="icon-chevron-down"></span>Node Storage</a>
       <ul class="nav nav-list">
     <li><a href="../../../nodestore/documentmk.html" title="Document NodeStore"><span class="icon-chevron-down"></span>Document NodeStore</a>
       <ul class="nav nav-list">
+    <li><a href="../../../nodestore/document/mongo-document-store.html" title="MongoDB DocumentStore"><span class="none"></span>MongoDB DocumentStore</a>  </li>
     <li><a href="../../../nodestore/document/node-bundling.html" title="Node Bundling"><span class="none"></span>Node Bundling</a>  </li>
     <li><a href="../../../nodestore/document/secondary-store.html" title="Secondary Store"><span class="none"></span>Secondary Store</a>  </li>
     <li><a href="../../../nodestore/persistent-cache.html" title="Persistent Cache"><span class="none"></span>Persistent Cache</a>  </li>
@@ -171,7 +179,11 @@
     <li><a href="../../../nodestore/compositens.html" title="Composite NodeStore"><span class="none"></span>Composite NodeStore</a>  </li>
       </ul>
   </li>
-    <li><a href="../../../plugins/blobstore.html" title="Blob Storage"><span class="none"></span>Blob Storage</a>  </li>
+    <li><a href="../../../plugins/blobstore.html" title="Blob Storage"><span class="icon-chevron-down"></span>Blob Storage</a>
+      <ul class="nav nav-list">
+    <li><a href="../../../features/direct-binary-access.html" title="Direct Binary Access"><span class="none"></span>Direct Binary Access</a>  </li>
+      </ul>
+  </li>
     <li><a href="../../../query/query.html" title="Query"><span class="icon-chevron-down"></span>Query</a>
       <ul class="nav nav-list">
     <li><a href="../../../query/query-engine.html" title="Query Engine"><span class="none"></span>Query Engine</a>  </li>
@@ -239,13 +251,12 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
---><div class="section">
+-->
+<div class="section">
 <h2><a name="Authentication_with_External_Login_Module_:_Examples"></a>Authentication with External Login Module : Examples</h2>
-
 <ul>
-  
+
 <li><a href="#standard">Integration with Standard Oak Authentication</a></li>
-  
 <li><a href="#preauth">Integration with Pre-Authentication and Login Module Chain</a></li>
 </ul>
 <p><a name="standard"></a></p>
@@ -254,120 +265,100 @@
 <div class="section">
 <h4><a name="Example_JAAS_Configuration"></a>Example JAAS Configuration</h4>
 
-<div class="source">
-<div class="source"><pre class="prettyprint">  Example {
+<div>
+<div>
+<pre class="source">  Example {
      org.apache.jackrabbit.oak.security.authentication.token.TokenLoginModule sufficient;
      org.apache.jackrabbit.oak.security.authentication.user.LoginModuleImpl sufficient;
      org.apache.jackrabbit.oak.spi.security.authentication.external.impl.ExternalLoginModule required
                      sync.handlerName=&quot;your-synchandler_name&quot;
                      idp.name=&quot;your_idp_name&quot;;
    };
-</pre></div></div></div>
+</pre></div></div>
+</div>
 <div class="section">
 <h4><a name="Understanding_the_Configuration"></a>Understanding the Configuration</h4>
 <div class="section">
 <h5><a name="The_LoginModule_Sequence"></a>The LoginModule Sequence</h5>
-
 <ul>
-  
+
 <li>
-<p>The <tt>TokenLoginModule</tt> is in charge of handling repository authentication  request with <tt>TokenCredentials</tt>:</p>
-  
+
+<p>The <tt>TokenLoginModule</tt> is in charge of handling repository authentication request with <tt>TokenCredentials</tt>:</p>
 <ul>
-    
+
 <li><i>Login Success</i>: If token-login succeeds the <i>sufficient</i> flag makes sure authentication does not proceed down the <tt>LoginModule</tt> list. This means that it will not hit the <tt>ExternalIdentityProvider</tt> and will not re-sync an external user as long as the login token is valid.</li>
-    
 <li><i>Login Failure</i>: If it fails (e.g. other type of <tt>Credentials</tt>) the authentication will proceed down the <tt>LoginModule</tt> list.</li>
-    
 <li><i>Commit</i>: If the login failed the login module will test if the <tt>Credentials</tt> passed to the login ask for generation of a new login token. If this login succeeded it will populate the <tt>Subject</tt> with <tt>Principal</tt>s, <tt>Credentials</tt> and <tt>AuthInfo</tt>.</li>
-  </ul>
+</ul>
 <p>NOTE: In this setup the <tt>TokenLoginModule</tt> is expected to only handle subsequent authentication request after having issued a login token. The latter is achieved by providing <tt>Credentials</tt> attributes that force the <tt>TokenLoginModule</tt> to generate a new login token in the <i>commit</i> phase. The application should then use that login toke for subsequent requests.</p>
-<p>See <a href="../tokenmanagement.html">Token Authentication and Token Management</a> for details and for a description of the default implementation.</p></li>
-  
+<p>See <a href="../tokenmanagement.html">Token Authentication and Token Management</a> for details and for a description of the default implementation.</p>
+</li>
 <li>
-<p>The <tt>LoginModuleImpl</tt> is in charge of handling authentication request for  users managed and created through the repository&#x2019;s user management API;  i.e. users that are not defined by an <tt>ExternalIdentityProvider</tt>. This  includes built-in system users like the administrator, the guest-user  (aka anonymous) or <tt>SystemUsers</tt>. It also handles impersonation logins.</p>
-  
+
+<p>The <tt>LoginModuleImpl</tt> is in charge of handling authentication request for users managed and created through the repository&#x2019;s user management API; i.e. users that are not defined by an <tt>ExternalIdentityProvider</tt>. This includes built-in system users like the administrator, the guest-user (aka anonymous) or <tt>SystemUsers</tt>. It also handles impersonation logins.</p>
 <ul>
-    
-<li><i>Login Success</i>: If regular user authentication (or impersonation) succeeds  the <i>sufficient</i> flag makes sure authentication does not proceed  down the <tt>LoginModule</tt> list i.e. omits unnecessarily trying to  authenticate a local user against the external IDP.</li>
-    
-<li><i>Login Failure</i>: If the authentication fails (e.g. no local user that  could have uid/pw matching the passed <tt>Credentials</tt>), it will  continue down the <tt>LoginModule</tt> list.</li>
-    
-<li><i>Commit</i>: If the login succeeded the login module will populate the  <tt>Subject</tt> with <tt>Principal</tt>s, <tt>Credentials</tt> and <tt>AuthInfo</tt>.</li>
-  </ul>
-<p>NOTE: if no login token is generated upon first login, any subsequent  login for <i>local</i> users will end up being handled by this module or fail.</p></li>
-  
+
+<li><i>Login Success</i>: If regular user authentication (or impersonation) succeeds the <i>sufficient</i> flag makes sure authentication does not proceed down the <tt>LoginModule</tt> list i.e. omits unnecessarily trying to authenticate a local user against the external IDP.</li>
+<li><i>Login Failure</i>: If the authentication fails (e.g. no local user that could have uid/pw matching the passed <tt>Credentials</tt>), it will continue down the <tt>LoginModule</tt> list.</li>
+<li><i>Commit</i>: If the login succeeded the login module will populate the <tt>Subject</tt> with <tt>Principal</tt>s, <tt>Credentials</tt> and <tt>AuthInfo</tt>.</li>
+</ul>
+<p>NOTE: if no login token is generated upon first login, any subsequent login for <i>local</i> users will end up being handled by this module or fail.</p>
+</li>
 <li>
-<p>The <tt>ExternalLoginModule</tt> is in charge of handling authentication request for  users managed by an <tt>ExternalIdentityProvider</tt>.</p>
-  
+
+<p>The <tt>ExternalLoginModule</tt> is in charge of handling authentication request for users managed by an <tt>ExternalIdentityProvider</tt>.</p>
 <ul>
-    
-<li><i>Login Success</i>: If user authentication against the IDP succeeds  the module synchronizes the external user into the repository according  to the logic defined in the configure <tt>SyncHandler</tt>. If the user  has been synced before it might be updated. If and how often a user  gets re-synced is an implementation detail of the <tt>SyncHandler</tt>.</li>
-    
-<li><i>Login Failure</i>: If the authentication fails (e.g. wrong IDP or invalid  <tt>Credentials</tt>), the whole login will fail because the <tt>ExternalLoginModule</tt>  is configured to be <i>required</i> and the last module in the chain.</li>
-    
-<li><i>Commit</i>: If the login succeeded the login module will populate the  <tt>Subject</tt> with <tt>Principal</tt>s, <tt>Credentials</tt> and <tt>AuthInfo</tt>.</li>
-  </ul>
-<p>NOTE: if no login token is generated upon first login, any subsequent  login for <i>external</i> users will end up being handled by this module  (including connection to the IDP) or fail.</p></li>
+
+<li><i>Login Success</i>: If user authentication against the IDP succeeds the module synchronizes the external user into the repository according to the logic defined in the configure <tt>SyncHandler</tt>. If the user has been synced before it might be updated. If and how often a user gets re-synced is an implementation detail of the <tt>SyncHandler</tt>.</li>
+<li><i>Login Failure</i>: If the authentication fails (e.g. wrong IDP or invalid <tt>Credentials</tt>), the whole login will fail because the <tt>ExternalLoginModule</tt> is configured to be <i>required</i> and the last module in the chain.</li>
+<li><i>Commit</i>: If the login succeeded the login module will populate the <tt>Subject</tt> with <tt>Principal</tt>s, <tt>Credentials</tt> and <tt>AuthInfo</tt>.</li>
+</ul>
+<p>NOTE: if no login token is generated upon first login, any subsequent login for <i>external</i> users will end up being handled by this module (including connection to the IDP) or fail.</p>
+</li>
 </ul></div>
 <div class="section">
 <h5><a name="Login_with_Different_Credentials"></a>Login with Different Credentials</h5>
 <div class="section">
 <h6><a name="GuestCredentials"></a>GuestCredentials</h6>
-
 <ul>
-  
+
 <li><tt>TokenLoginModule</tt> will ignore</li>
-  
-<li><tt>LoginModuleImpl</tt> by default supports <tt>GuestCredentials</tt>; success depends  on the existence of a valid guest user in the repository. If it succeeds  authentication doesn&#x2019;t move down to <tt>ExternalLoginModule</tt>.</li>
-  
-<li><tt>ExternalLoginModule</tt> by default doesn&#x2019;t support <tt>GuestCredentials</tt>  but may do if a suitable <tt>CredentialsSupport</tt> is configured.</li>
+<li><tt>LoginModuleImpl</tt> by default supports <tt>GuestCredentials</tt>; success depends on the existence of a valid guest user in the repository. If it succeeds authentication doesn&#x2019;t move down to <tt>ExternalLoginModule</tt>.</li>
+<li><tt>ExternalLoginModule</tt> by default doesn&#x2019;t support <tt>GuestCredentials</tt> but may do if a suitable <tt>CredentialsSupport</tt> is configured.</li>
 </ul></div>
 <div class="section">
 <h6><a name="SimpleCredentials"></a>SimpleCredentials</h6>
-
 <ul>
-  
+
 <li><tt>TokenLoginModule</tt> will ignore</li>
-  
-<li><tt>LoginModuleImpl</tt> by default supports <tt>SimpleCredentials</tt> and it  will succeed if the credentials are successfully validated against a  local repository user. It is not expected to succeed for synced  external users,which should not have their password synced. If it succeeds  authentication doesn&#x2019;t move down to <tt>ExternalLoginModule</tt>.</li>
-  
-<li><tt>ExternalLoginModule</tt> by default support <tt>SimpleCredentials</tt> and will  succeed if authenticating an external against the external IDP including  sync is successful. If none of the other modules succeeded the  <tt>ExternalLoginModule</tt> is required to succeed.</li>
+<li><tt>LoginModuleImpl</tt> by default supports <tt>SimpleCredentials</tt> and it will succeed if the credentials are successfully validated against a local repository user. It is not expected to succeed for synced external users,which should not have their password synced. If it succeeds authentication doesn&#x2019;t move down to <tt>ExternalLoginModule</tt>.</li>
+<li><tt>ExternalLoginModule</tt> by default support <tt>SimpleCredentials</tt> and will succeed if authenticating an external against the external IDP including sync is successful. If none of the other modules succeeded the <tt>ExternalLoginModule</tt> is required to succeed.</li>
 </ul></div>
 <div class="section">
 <h6><a name="TokenCredentials"></a>TokenCredentials</h6>
-
 <ul>
-  
-<li><tt>TokenLoginModule</tt> supports <tt>TokenCredentials</tt> and will succeed if the  credentials are valid. If it succeeds authentication doesn&#x2019;t move down  the module list. If it fails overall authentication is expected to fail  as the subsequent modules are not expected to support <tt>TokenCredentials</tt>.</li>
-  
-<li><tt>LoginModuleImpl</tt> does not support <tt>TokenCredentials</tt> and will fail.</li>
-  
-<li><tt>ExternalLoginModule</tt> is not expected to support <tt>TokenCredentials</tt> and  thus overall authentication is expected to fail if <tt>TokenLoginModule</tt>  failed.</li>
+
+<li><tt>TokenLoginModule</tt> supports <tt>TokenCredentials</tt> and will succeed if the credentials are valid. If it succeeds authentication doesn&#x2019;t move down the module list. If it fails overall authentication is expected to fail as the subsequent modules are not expected to support <tt>TokenCredentials</tt>.</li>
+<li><tt>LoginModuleImpl</tt> does not support  <tt>TokenCredentials</tt> and will fail.</li>
+<li><tt>ExternalLoginModule</tt> is not expected to support <tt>TokenCredentials</tt> and thus overall authentication is expected to fail if <tt>TokenLoginModule</tt> failed.</li>
 </ul></div>
 <div class="section">
 <h6><a name="ImpersonationCredentials"></a>ImpersonationCredentials</h6>
-
 <ul>
-  
+
 <li><tt>TokenLoginModule</tt> will ignore</li>
-  
-<li><tt>LoginModuleImpl</tt> by default supports <tt>ImpersonationCredentials</tt> and it  will succeed if impersonation for the target user is allowed. If it succeeds  authentication doesn&#x2019;t move down to <tt>ExternalLoginModule</tt>.</li>
-  
-<li><tt>ExternalLoginModule</tt> by default doesn&#x2019;t support <tt>ImpersonationCredentials</tt>  but may do if a suitable <tt>CredentialsSupport</tt> is configured.</li>
+<li><tt>LoginModuleImpl</tt> by default supports <tt>ImpersonationCredentials</tt> and it will succeed if impersonation for the target user is allowed. If it succeeds authentication doesn&#x2019;t move down to <tt>ExternalLoginModule</tt>.</li>
+<li><tt>ExternalLoginModule</tt> by default doesn&#x2019;t support <tt>ImpersonationCredentials</tt> but may do if a suitable <tt>CredentialsSupport</tt> is configured.</li>
 </ul></div>
 <div class="section">
 <h6><a name="Other_Credentials"></a>Other Credentials</h6>
-
 <ul>
-  
+
 <li>Overall login success only if the <tt>ExternalLoginModule</tt> supports these credentials</li>
-  
 <li><tt>TokenLoginModule</tt> will ignore</li>
-  
 <li><tt>LoginModuleImpl</tt> will ignore</li>
-  
-<li><tt>ExternalLoginModule</tt> will only succeed if configured with a suitable  <tt>CredentialsSupport</tt> that ensures that authentication against the external  IDP is successful.</li>
+<li><tt>ExternalLoginModule</tt> will only succeed if configured with a suitable <tt>CredentialsSupport</tt> that ensures that authentication against the external IDP is successful.</li>
 </ul>
 <p><a name="preauth"></a></p></div></div></div></div>
 <div class="section">
@@ -375,8 +366,9 @@
 <div class="section">
 <h4><a name="Example_JAAS_Configuration"></a>Example JAAS Configuration</h4>
 
-<div class="source">
-<div class="source"><pre class="prettyprint">  Example {
+<div>
+<div>
+<pre class="source">  Example {
      your.org.PreAuthenticationLoginModule optional;
      org.apache.jackrabbit.oak.security.authentication.user.LoginModuleImpl optional;
      org.apache.jackrabbit.oak.spi.security.authentication.external.impl.ExternalLoginModule sufficient
@@ -384,131 +376,105 @@
                      idp.name=&quot;your_idp_name&quot;;
    };
 </pre></div></div>
+
 <p>See <a href="../preauthentication.html#withloginchain">Pre-Authenticated Login</a> for an example <tt>LoginModule</tt> that illustrates how the pre-authentication is being pushed to the shared stated.</p>
 <p><i>Note:</i> This configuration has been slightly adjusted from the example in <a class="externalLink" href="https://issues.apache.org/jira/browse/OAK-3508">OAK-3508</a> marking the pre-auth login to be <i>optional</i>. This highlights the fact that subsequent <tt>LoginModule</tt>s are in charge of respecting the <tt>PreAuthenticatedLogin</tt> marker and properly populating the <tt>Subject</tt> in the second <i>commit</i> phase.</p>
-<p>Also, in the example implementation the login never succeeds (in which case <i>sufficient</i> would actually work as well). However, if it ever succeeded the <tt>PreAuthenticatedLogin</tt> marker would be meaningless and the pre-auth module in fact would have to populate the <tt>Subject</tt> i.e. relying on details defined and handled by other <tt>LoginModule</tt>s. </p></div>
+<p>Also, in the example implementation the login never succeeds (in which case <i>sufficient</i> would actually work as well). However, if it ever succeeded the <tt>PreAuthenticatedLogin</tt> marker would be meaningless and the pre-auth module in fact would have to populate the  <tt>Subject</tt> i.e. relying on details defined and handled by other <tt>LoginModule</tt>s.</p></div>
 <div class="section">
 <h4><a name="Understanding_the_Configuration"></a>Understanding the Configuration</h4>
 <div class="section">
 <h5><a name="The_LoginModule_Sequence"></a>The LoginModule Sequence</h5>
-
 <ul>
-  
+
 <li>
-<p>The custom pre-auth module is in charge of handling custom pre-auth <tt>Credentials</tt>  shared between the code performing the authentication outside of the  scope of the repository and this module.  It&#x2019;s only task is to create the <tt>PreAuthenticatedLogin</tt> marker and push  it to the shared stated to inform subsequent modules, which will always  be consulted due to the <i>optional</i> flag.</p>
-  
+
+<p>The custom pre-auth module is in charge of handling custom pre-auth <tt>Credentials</tt> shared between the code performing the authentication outside of the scope of the repository and this module. It&#x2019;s only task is to create the <tt>PreAuthenticatedLogin</tt> marker and push it to the shared stated to inform subsequent modules, which will always be consulted due to the <i>optional</i> flag.</p>
 <ul>
-    
-<li><i>Login Success</i>: not desired as we want subsequent modules to verify if  there is a matching identity for the <tt>PreAuthenticatedLogin</tt> and later on  populate the subject.</li>
-    
-<li><i>Login Failure</i>: the default passing over the responsibility the  other modules in the chain.</li>
-    
+
+<li><i>Login Success</i>: not desired as we want subsequent modules to verify if there is a matching identity for the <tt>PreAuthenticatedLogin</tt> and later on populate the subject.</li>
+<li><i>Login Failure</i>: the default passing over the responsibility the other modules in the chain.</li>
 <li><i>Commit</i>: Nothing to do.</li>
-  </ul></li>
-  
+</ul>
+</li>
 <li>
-<p>The <tt>LoginModuleImpl</tt> will try to resolve the repository user associated  with the <tt>PreAuthenticatedLogin</tt> or perform regular login with the login  <tt>Credentials</tt> if no <tt>PreAuthenticatedLogin</tt> is present. </p>
-  
+
+<p>The <tt>LoginModuleImpl</tt> will try to resolve the repository user associated with the  <tt>PreAuthenticatedLogin</tt> or perform regular login with the login <tt>Credentials</tt> if no <tt>PreAuthenticatedLogin</tt> is present.</p>
 <ul>
-    
-<li><i>Login Success</i>: If there exists a valid user for the given <tt>PreAuthenticatedLogin</tt>  or <tt>Credentials</tt> login will always succeed in case of a pre-auth login.  Otherwise credentials are regularly evaluated (e.g. password validation).  The authentication will continue down the chain due to the <i>optional</i> flag.</li>
-    
-<li><i>Login Failure</i>: If no matching user exists or if the user is not valid  (e.g. disabled). In case of regular authentication it will fail if the  <tt>Credentials</tt> cannot be validated. Then authentication it will again  continue down the <tt>LoginModule</tt> list.</li>
-    
+
+<li><i>Login Success</i>: If there exists a valid user for the given <tt>PreAuthenticatedLogin</tt> or <tt>Credentials</tt> login will always succeed in case of a pre-auth login. Otherwise credentials are regularly evaluated (e.g. password validation). The authentication will continue down the chain due to the <i>optional</i> flag.</li>
+<li><i>Login Failure</i>: If no matching user exists or if the user is not valid (e.g. disabled). In case of regular authentication it will fail if the <tt>Credentials</tt> cannot be validated. Then authentication it will again continue down the <tt>LoginModule</tt> list.</li>
 <li><i>Commit</i>: If the login succeeded the login module will populate the <tt>Subject</tt> with <tt>Principal</tt>s, <tt>Credentials</tt> and <tt>AuthInfo</tt>.</li>
-  </ul></li>
-  
+</ul>
+</li>
 <li>
-<p>The <tt>ExternalLoginModule</tt> will try to resolve the <tt>PreAuthenticatedLogin</tt> or  alternatively the <tt>Credentials</tt> to a <tt>SyncedIdentity</tt>.</p>
-  
+
+<p>The <tt>ExternalLoginModule</tt> will try to resolve the <tt>PreAuthenticatedLogin</tt> or alternatively the <tt>Credentials</tt> to a <tt>SyncedIdentity</tt>.</p>
 <ul>
-    
-<li>If no <tt>SyncedIdentity</tt> exists the user is retrieved from external IDP  and eventually synced into the repository. In case no <tt>PreAuthenticatedLogin</tt>  is present retrieving identity additionally includes credentials validation.</li>
-    
-<li>If there exists a <tt>SyncedIdentity</tt> the module will validate it.  In case of <tt>PreAuthenticatedLogin</tt> it checks if the identity needs to  be synced again.</li>
-    
-<li><i>Login Success</i>: If there exists a valid external identity on the  IDP and it has be synced with the repository.</li>
-    
-<li><i>Login Failure</i>: If no matching/valid identity exists on the IDP or  if there exists a <tt>SyncedIdentity</tt> that doesn&#x2019;t belong to the IDP or  we have a <tt>PreAuthenticatedLogin</tt> marker and the <tt>SyncedIdentity</tt> doesn&#x2019;t  need a re-sync.</li>
-    
-<li><i>Commit</i>: If the login succeeded the login module will populate the  <tt>Subject</tt> with <tt>Principal</tt>s, <tt>Credentials</tt> and <tt>AuthInfo</tt>.</li>
-  </ul></li>
+
+<li>If no <tt>SyncedIdentity</tt> exists the user is retrieved from external IDP and eventually synced into the repository. In case no <tt>PreAuthenticatedLogin</tt> is present retrieving identity additionally includes credentials validation.</li>
+<li>If there exists a <tt>SyncedIdentity</tt> the module will validate it. In case of <tt>PreAuthenticatedLogin</tt> it checks if the identity needs to be synced again.</li>
+<li><i>Login Success</i>: If there exists a valid external identity on the IDP and it has be synced with the repository.</li>
+<li><i>Login Failure</i>: If no matching/valid identity exists on the IDP or if there exists a <tt>SyncedIdentity</tt> that doesn&#x2019;t belong to the IDP or we have a <tt>PreAuthenticatedLogin</tt> marker and the <tt>SyncedIdentity</tt> doesn&#x2019;t need a re-sync.</li>
+<li><i>Commit</i>: If the login succeeded the login module will populate the <tt>Subject</tt> with <tt>Principal</tt>s, <tt>Credentials</tt> and <tt>AuthInfo</tt>.</li>
+</ul>
+</li>
 </ul></div>
 <div class="section">
 <h5><a name="Login_with_Different_Credentials"></a>Login with Different Credentials</h5>
 <div class="section">
 <h6><a name="Custom_Pre-Auth_Credentials"></a>Custom Pre-Auth Credentials</h6>
-
 <ul>
-  
+
 <li>Custom pre-auth module will push <tt>PreAuthenticatedLogin</tt> on the shared state</li>
-  
-<li>Overall login suceeds if any of the subsequent modules is able to deal  with the <tt>PreAuthenticatedLogin</tt>.</li>
+<li>Overall login suceeds if any of the subsequent modules is able to deal with the <tt>PreAuthenticatedLogin</tt>.</li>
 </ul></div>
 <div class="section">
 <h6><a name="GuestCredentials"></a>GuestCredentials</h6>
-
 <ul>
-  
+
 <li>Custom pre-auth module will ignore</li>
-  
 <li>Overall login success if the subsequent modules allow for login with <tt>GuestCredentials</tt></li>
-  
-<li><tt>LoginModuleImpl</tt> by default supports <tt>GuestCredentials</tt>; success depends  on the existence of a valid guest user in the repository.</li>
-  
-<li><tt>ExternalLoginModule</tt> by default doesn&#x2019;t support <tt>GuestCredentials</tt>  but may do if a suitable <tt>CredentialsSupport</tt> is configured.</li>
+<li><tt>LoginModuleImpl</tt> by default supports <tt>GuestCredentials</tt>; success depends on the existence of a valid guest user in the repository.</li>
+<li><tt>ExternalLoginModule</tt> by default doesn&#x2019;t support <tt>GuestCredentials</tt> but may do if a suitable <tt>CredentialsSupport</tt> is configured.</li>
 </ul></div>
 <div class="section">
 <h6><a name="SimpleCredentials"></a>SimpleCredentials</h6>
-
 <ul>
-  
+
 <li>Custom pre-auth module will ignore</li>
-  
 <li>Overall login success if the subsequent modules allow for login with <tt>SimpleCredentials</tt></li>
-  
-<li><tt>LoginModuleImpl</tt> by default supports <tt>SimpleCredentials</tt> and it  will succeed if the credentials are successfully validated against a  local repository user.</li>
-  
-<li><tt>ExternalLoginModule</tt> by default support <tt>SimpleCredentials</tt> and will  succeed if authentication against the external IDP including sync is successful.</li>
+<li><tt>LoginModuleImpl</tt> by default supports <tt>SimpleCredentials</tt> and it will succeed if the credentials are successfully validated against a local repository user.</li>
+<li><tt>ExternalLoginModule</tt> by default support <tt>SimpleCredentials</tt> and will succeed if authentication against the external IDP including sync is successful.</li>
 </ul></div>
 <div class="section">
 <h6><a name="ImpersonationCredentials"></a>ImpersonationCredentials</h6>
-
 <ul>
-  
+
 <li>Custom pre-auth module will ignore</li>
-  
 <li>Overall login success if the subsequent modules allow for login with <tt>ImpersonationCredentials</tt></li>
-  
-<li><tt>LoginModuleImpl</tt> by default supports <tt>ImpersonationCredentials</tt> and it  will succeed if impersonation for the target user is allowed.</li>
-  
-<li><tt>ExternalLoginModule</tt> by default doesn&#x2019;t support <tt>ImpersonationCredentials</tt>  but may do if a suitable <tt>CredentialsSupport</tt> is configured.</li>
+<li><tt>LoginModuleImpl</tt> by default supports <tt>ImpersonationCredentials</tt> and it will succeed if impersonation for the target user is allowed.</li>
+<li><tt>ExternalLoginModule</tt> by default doesn&#x2019;t support <tt>ImpersonationCredentials</tt> but may do if a suitable <tt>CredentialsSupport</tt> is configured.</li>
 </ul></div>
 <div class="section">
 <h6><a name="Other_Credentials"></a>Other Credentials</h6>
-
 <ul>
-  
+
 <li>Overall login success only if the <tt>ExternalLoginModule</tt> supports these credentials</li>
-  
 <li>Custom pre-auth module will ignore</li>
-  
 <li><tt>LoginModuleImpl</tt> will ignore</li>
-  
-<li><tt>ExternalLoginModule</tt> will only succeed if configured with a suitable  <tt>CredentialsSupport</tt> that ensures that authentication against the external  IDP is successful.</li>
+<li><tt>ExternalLoginModule</tt> will only succeed if configured with a suitable <tt>CredentialsSupport</tt> that ensures that authentication against the external IDP is successful.</li>
 </ul></div></div>
 <div class="section">
 <h5><a name="FAQ"></a>FAQ</h5>
 <div class="section">
 <h6><a name="Why_are_the_custom_PreAuthCredentials_not_public"></a>Why are the custom &#x2018;PreAuthCredentials&#x2019; not public?</h6>
-<p>The custom <tt>Credentials</tt> shared between the code performing the authentication (outside of the repository) and the custom <i>PreAuthenticationLoginModule</i> implementation must neither be public nor shared with other implementations in order to prevent un-authenticated login.</p></div>
+<p>The custom <tt>Credentials</tt> shared between the code performing the authentication (outside of the repository) and the custom  <i>PreAuthenticationLoginModule</i> implementation must neither be public nor shared with other implementations in order to prevent un-authenticated login.</p></div>
 <div class="section">
 <h6><a name="Why_is_the_LoginModuleImpl_not_flagged_SUFFICIENT"></a>Why is the &#x2018;LoginModuleImpl&#x2019; not flagged SUFFICIENT?</h6>
 <p>If <tt>LoginModuleImpl</tt> was defined to be <i>sufficient</i> external identities would never be synced again if the <tt>PreAuthenticatedLogin</tt> marker is present in the shared state.</p></div>
 <div class="section">
 <h6><a name="Why_is_the_ExternalLoginModule_not_flagged_REQUIRED"></a>Why is the &#x2018;ExternalLoginModule&#x2019; not flagged REQUIRED?</h6>
-<p>If <tt>ExternalLoginModule</tt> was required to succeed, login for <i>local</i> users was no longer possible. It also would mean that pre-authenticated login for a <tt>SyncedIdentity</tt> that doesn&#x2019;t needs a re-sync would not longer be possible and would ultimately fail the repository authentication.</p>
-<!-- references --></div></div></div></div></div>
+<p>If <tt>ExternalLoginModule</tt> was required to succeed, login for <i>local</i> users was no longer possible. It also would mean that pre-authenticated login for a <tt>SyncedIdentity</tt> that doesn&#x2019;t needs a re-sync would not longer be possible and would ultimately fail the repository authentication.</p><!-- references --></div></div></div></div></div>
         </div>
       </div>
     </div>

Modified: jackrabbit/site/live/oak/docs/security/authentication/externalloginmodule.html
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/oak/docs/security/authentication/externalloginmodule.html?rev=1846224&r1=1846223&r2=1846224&view=diff
==============================================================================
--- jackrabbit/site/live/oak/docs/security/authentication/externalloginmodule.html (original)
+++ jackrabbit/site/live/oak/docs/security/authentication/externalloginmodule.html Fri Nov  9 09:46:57 2018
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2018-02-21 
+ | Generated by Apache Maven Doxia Site Renderer 1.8.1 at 2018-11-09 
  | Rendered using Apache Maven Fluido Skin 1.6
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180221" />
+    <meta name="Date-Revision-yyyymmdd" content="20181109" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Jackrabbit Oak &#x2013; Authentication with the External Login Module</title>
     <link rel="stylesheet" href="../../css/apache-maven-fluido-1.6.min.css" />
@@ -52,6 +52,7 @@
         <a href="#" class="dropdown-toggle" data-toggle="dropdown">Main APIs <b class="caret"></b></a>
         <ul class="dropdown-menu">
             <li><a href="http://www.day.com/specs/jcr/2.0/index.html" title="JCR API">JCR API</a></li>
+            <li><a href="https://jackrabbit.apache.org/jcr/jcr-api.html" title="Jackrabbit API">Jackrabbit API</a></li>
             <li><a href="../../oak_api/overview.html" title="Oak API">Oak API</a></li>
         </ul>
       </li>
@@ -66,7 +67,12 @@
                   <li><a href="../../nodestore/compositens.html" title="Composite NodeStore">Composite NodeStore</a></li>
               </ul>
             </li>
-            <li><a href="../../plugins/blobstore.html" title="Blob Storage">Blob Storage</a></li>
+            <li class="dropdown-submenu">
+<a href="../../plugins/blobstore.html" title="Blob Storage">Blob Storage</a>
+              <ul class="dropdown-menu">
+                  <li><a href="../../features/direct-binary-access.html" title="Direct Binary Access">Direct Binary Access</a></li>
+              </ul>
+            </li>
             <li class="dropdown-submenu">
 <a href="../../query/query.html" title="Query">Query</a>
               <ul class="dropdown-menu">
@@ -136,7 +142,7 @@
 
       <div id="breadcrumbs">
         <ul class="breadcrumb">
-        <li id="publishDate">Last Published: 2018-02-21<span class="divider">|</span>
+        <li id="publishDate">Last Published: 2018-11-09<span class="divider">|</span>
 </li>
           <li id="projectVersion">Version: 1.10-SNAPSHOT</li>
         </ul>
@@ -155,12 +161,14 @@
     <li><a href="../../architecture/nodestate.html" title="The Node State Model"><span class="none"></span>The Node State Model</a>  </li>
           <li class="nav-header">Main APIs</li>
     <li><a href="http://www.day.com/specs/jcr/2.0/index.html" class="externalLink" title="JCR API"><span class="none"></span>JCR API</a>  </li>
+    <li><a href="https://jackrabbit.apache.org/jcr/jcr-api.html" class="externalLink" title="Jackrabbit API"><span class="none"></span>Jackrabbit API</a>  </li>
     <li><a href="../../oak_api/overview.html" title="Oak API"><span class="none"></span>Oak API</a>  </li>
           <li class="nav-header">Features and Plugins</li>
     <li><a href="../../nodestore/overview.html" title="Node Storage"><span class="icon-chevron-down"></span>Node Storage</a>
       <ul class="nav nav-list">
     <li><a href="../../nodestore/documentmk.html" title="Document NodeStore"><span class="icon-chevron-down"></span>Document NodeStore</a>
       <ul class="nav nav-list">
+    <li><a href="../../nodestore/document/mongo-document-store.html" title="MongoDB DocumentStore"><span class="none"></span>MongoDB DocumentStore</a>  </li>
     <li><a href="../../nodestore/document/node-bundling.html" title="Node Bundling"><span class="none"></span>Node Bundling</a>  </li>
     <li><a href="../../nodestore/document/secondary-store.html" title="Secondary Store"><span class="none"></span>Secondary Store</a>  </li>
     <li><a href="../../nodestore/persistent-cache.html" title="Persistent Cache"><span class="none"></span>Persistent Cache</a>  </li>
@@ -171,7 +179,11 @@
     <li><a href="../../nodestore/compositens.html" title="Composite NodeStore"><span class="none"></span>Composite NodeStore</a>  </li>
       </ul>
   </li>
-    <li><a href="../../plugins/blobstore.html" title="Blob Storage"><span class="none"></span>Blob Storage</a>  </li>
+    <li><a href="../../plugins/blobstore.html" title="Blob Storage"><span class="icon-chevron-down"></span>Blob Storage</a>
+      <ul class="nav nav-list">
+    <li><a href="../../features/direct-binary-access.html" title="Direct Binary Access"><span class="none"></span>Direct Binary Access</a>  </li>
+      </ul>
+  </li>
     <li><a href="../../query/query.html" title="Query"><span class="icon-chevron-down"></span>Query</a>
       <ul class="nav nav-list">
     <li><a href="../../query/query-engine.html" title="Query Engine"><span class="none"></span>Query Engine</a>  </li>
@@ -239,40 +251,33 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
---><div class="section">
+-->
+<div class="section">
 <h2><a name="Authentication_with_the_External_Login_Module"></a>Authentication with the External Login Module</h2>
 <div class="section">
 <h3><a name="Overview"></a>Overview</h3>
 <p>The purpose of the external login module is to provide a base implementation that allows easy integration of 3rd party authentication and identity systems, such as <a href="ldap.html">LDAP</a>. The general mode of the external login module is to use the external system as authentication source and as a provider for users and groups that may also be synchronized into the repository.</p>
-<p>what it does:</p>
-
+<p>What it does:</p>
 <ul>
-  
+
 <li>facilitate the use of a 3rd party system for authentication</li>
-  
 <li>simplify populating the oak user manager with identities from a 3rd party system</li>
 </ul>
-<p>what it does not:</p>
-
+<p>What it does not:</p>
 <ul>
-  
+
 <li>provide a transparent oak user manager</li>
-  
 <li>provide a transparent oak principal provider.</li>
-  
 <li>offer services for background synchronization of users and groups</li>
 </ul>
 <p><a name="details"></a></p></div>
 <div class="section">
 <h3><a name="Implementation_Details"></a>Implementation Details</h3>
 <p>The external identity and login handling is split into 3 parts:</p>
-
 <ul>
-  
+
 <li><b>External Login Module</b>: LoginModule implementation that represents the connection between JAAS login mechanism, the external identity provider and the synchronization handler.</li>
-  
 <li><b>External Identity Provider</b> (IDP): This is a service implementing the <tt>ExternalIdentityProvider</tt> interface and is responsible to retrieve and authenticate identities towards an external system (e.g. LDAP).</li>
-  
 <li><b>User and Group Synchronization</b>: This is a service implementing the <tt>SyncHandler</tt> interface and is responsible to actually managing the external identities within the Oak user management. A very trivial implementation might just create users and groups for external ones on demand.</li>
 </ul>
 <p>This modularization allows to reuse the same external login module for different combinations of IDPs and synchronization handlers. Although in practice, systems usually have 1 of each.</p>
@@ -292,41 +297,31 @@
 <h5><a name="Authentication_in_Detail"></a>Authentication in Detail</h5>
 <p>The details of the external authentication are as follows:</p>
 <p><i>Phase 1: Login</i></p>
-
 <ul>
-  
+
 <li>if the user exists in the repository and any of the following conditions is met <b>return <tt>false</tt></b>
-  
 <ul>
-    
+
 <li>user is not an externally synced <i>or</i></li>
-    
 <li>user belongs to a different IDP than configured for the <tt>ExternalLoginModule</tt> <i>or</i></li>
-    
 <li><a href="preauthentication.html"><tt>PreAuthenticatedLogin</tt></a> is present on the shared state <i>and</i> the external user doesn&#x2019;t require an updating sync (<a class="externalLink" href="https://issues.apache.org/jira/browse/OAK-3508">OAK-3508</a>)</li>
-  </ul></li>
-  
+</ul>
+</li>
 <li>if the user exists in the 3rd party system but the credentials don&#x2019;t match it <b>throws <tt>LoginException</tt></b></li>
-  
 <li>if the user exists in the 3rd party system and the credentials match
-  
 <ul>
-    
+
 <li>put the credentials in the shared and private state</li>
-    
 <li>possibly sync the user</li>
-    
 <li>and <b>returns <tt>true</tt></b></li>
-  </ul></li>
-  
+</ul>
+</li>
 <li>if the user does not exist in the 3rd party system, checks if it needs to remove the user and then it <b>returns <tt>false</tt></b></li>
 </ul>
 <p><i>Phase 2: Commit</i></p>
-
 <ul>
-  
+
 <li>if there is no credentials in the private state, it <b>returns <tt>false</tt></b></li>
-  
 <li>if there are credentials in the private state propagate the subject and <b>return <tt>true</tt></b></li>
 </ul>
 <p>See section <a href="external/externallogin_examples.html">Example Configurations</a> for some common setup scenarios.</p></div></div>
@@ -343,101 +338,53 @@
 <h3><a name="Configuration"></a>Configuration</h3>
 <div class="section">
 <h4><a name="Configuration_Parameters"></a>Configuration Parameters</h4>
-<p>The external authentication module comes with the following configuration parameters for the <a href="/oak/docs/apidocs/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleFactory.html">ExternalLoginModuleFactory</a>/[ExternalLoginModule].</p>
-
+<p>The external authentication module comes with the following configuration parameters for the <a href="/oak/docs/apidocs/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleFactory.html">ExternalLoginModuleFactory</a>/<a href="/oak/docs/apidocs/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.html">ExternalLoginModule</a>.</p>
 <table border="0" class="table table-striped">
-  <thead>
-    
+<thead>
+
 <tr class="a">
-      
-<th>Parameter </th>
-      
-<th>Type </th>
-      
-<th>Default </th>
-      
-<th>Description </th>
-    </tr>
-  </thead>
-  <tbody>
-    
+<th> Parameter                 </th>
+<th> Type     </th>
+<th> Default    </th>
+<th> Description </th></tr>
+</thead><tbody>
+
 <tr class="b">
-      
-<td><tt>PARAM_IDP_NAME</tt> </td>
-      
-<td>String </td>
-      
-<td>- </td>
-      
-<td>Name of the external IDP to be retrieved from the <tt>ExternalIdentityProviderManager</tt> </td>
-    </tr>
-    
+<td> <tt>PARAM_IDP_NAME</tt>          </td>
+<td> String   </td>
+<td> -         </td>
+<td> Name of the external IDP to be retrieved from the <tt>ExternalIdentityProviderManager</tt> </td></tr>
 <tr class="a">
-      
-<td><tt>PARAM_SYNC_HANDLER_NAME</tt> </td>
-      
-<td>String </td>
-      
-<td>- </td>
-      
-<td>Name of the sync handler to be retrieved from the <tt>SyncManager</tt> </td>
-    </tr>
-    
+<td> <tt>PARAM_SYNC_HANDLER_NAME</tt> </td>
+<td> String   </td>
+<td> -         </td>
+<td> Name of the sync handler to be retrieved from the <tt>SyncManager</tt> </td></tr>
 <tr class="b">
-      
-<td> </td>
-      
-<td> </td>
-      
-<td> </td>
-      
-<td> </td>
-    </tr>
-    
+<td>                           </td>
+<td>          </td>
+<td>            </td>
+<td>                          </td></tr>
 <tr class="a">
-      
-<td><i>Optional (OSGi-setup)</i> </td>
-      
-<td> </td>
-      
-<td> </td>
-      
-<td> </td>
-    </tr>
-    
+<td> <i>Optional (OSGi-setup)</i>   </td>
+<td>          </td>
+<td>            </td>
+<td>                          </td></tr>
 <tr class="b">
-      
-<td><tt>JAAS_RANKING</tt> </td>
-      
-<td>int </td>
-      
-<td>50 </td>
-      
-<td>Ranking of the <tt>ExternalLoginModule</tt> in the JAAS configuration, see <a class="externalLink" href="http://svn.apache.org/repos/asf/felix/trunk/jaas/src/main/java/org/apache/felix/jaas/LoginModuleFactory.java">LoginModuleFactory</a> </td>
-    </tr>
-    
+<td> <tt>JAAS_RANKING</tt>            </td>
+<td> int      </td>
+<td> 150         </td>
+<td> Ranking of the <tt>ExternalLoginModule</tt> in the JAAS configuration, see <a class="externalLink" href="http://svn.apache.org/repos/asf/felix/trunk/jaas/src/main/java/org/apache/felix/jaas/LoginModuleFactory.java">LoginModuleFactory</a> </td></tr>
 <tr class="a">
-      
-<td><tt>JAAS_CONTROL_FLAG</tt> </td>
-      
-<td>String </td>
-      
-<td>SUFFICIENT </td>
-      
-<td>See <a class="externalLink" href="https://docs.oracle.com/javase/7/docs/api/javax/security/auth/login/AppConfigurationEntry.LoginModuleControlFlag.html">LoginModuleControlFlag</a> for supported values. </td>
-    </tr>
-    
+<td> <tt>JAAS_CONTROL_FLAG</tt>       </td>
+<td> String   </td>
+<td> SUFFICIENT </td>
+<td> See <a class="externalLink" href="https://docs.oracle.com/javase/7/docs/api/javax/security/auth/login/AppConfigurationEntry.LoginModuleControlFlag.html">LoginModuleControlFlag</a> for supported values. </td></tr>
 <tr class="b">
-      
-<td><tt>JAAS_REALM_NAME</tt> </td>
-      
-<td>String </td>
-      
-<td>- </td>
-      
-<td>See <a class="externalLink" href="http://svn.apache.org/repos/asf/felix/trunk/jaas/src/main/java/org/apache/felix/jaas/LoginModuleFactory.java">LoginModuleFactory</a> </td>
-    </tr>
-  </tbody>
+<td> <tt>JAAS_REALM_NAME</tt>         </td>
+<td> String   </td>
+<td> -         </td>
+<td> See <a class="externalLink" href="http://svn.apache.org/repos/asf/felix/trunk/jaas/src/main/java/org/apache/felix/jaas/LoginModuleFactory.java">LoginModuleFactory</a> </td></tr>
+</tbody>
 </table>
 <div class="section">
 <h5><a name="Examples"></a>Examples</h5>
@@ -445,24 +392,24 @@
 <h6><a name="Example_JAAS_Configuration"></a>Example JAAS Configuration</h6>
 <p>The following JAAS configuration shows how the <tt>ExternalLoginModule</tt> could be used in a setup that not solely uses third party login (Note: JAAS configuration equivalents of the parameters defined by <tt>org.apache.felix.jaas.LoginModuleFactory</tt> are omitted):</p>
 
-<div class="source">
-<div class="source"><pre class="prettyprint">jackrabbit.oak {
+<div>
+<div>
+<pre class="source">jackrabbit.oak {
      org.apache.jackrabbit.oak.security.authentication.token.TokenLoginModule sufficient;
-     org.apache.jackrabbit.oak.security.authentication.user.LoginModuleImpl sufficient;
-     org.apache.jackrabbit.oak.spi.security.authentication.external.impl.ExternalLoginModule required
+     org.apache.jackrabbit.oak.spi.security.authentication.external.impl.ExternalLoginModule sufficient
         sync.handlerName=&quot;default&quot;
         idp.name=&quot;ldap&quot;;
+     org.apache.jackrabbit.oak.security.authentication.user.LoginModuleImpl sufficient;
  };
 </pre></div></div>
+
 <p><a name="pluggability"></a></p></div></div></div></div>
 <div class="section">
 <h3><a name="Pluggability"></a>Pluggability</h3>
 <p>The design of the <tt>ExternalLoginModule</tt> allows for customization of the key features associated with third party authentication. In an OSGi-based setup these are covered by references within the <tt>ExternalLoginModuleFactory</tt>:</p>
-
 <ul>
-  
+
 <li><a href="/oak/docs/apidocs/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalIdentityProviderManager.html">ExternalIdentityProviderManager</a>: Mandatory, unary reference for the <tt>ExternalIdentityProvider</tt> lookup; see <a href="identitymanagement.html">External Identity Management</a> for details.</li>
-  
 <li><a href="/oak/docs/apidocs/org/apache/jackrabbit/oak/spi/security/authentication/external/SyncManager.html">SyncManager</a>: Mandatory, unary reference for the <tt>SyncHandler</tt> lookup; see <a href="usersync.html">User/Group Synchronization</a> for details.</li>
 </ul>
 <p>The default implementations (<a href="/oak/docs/apidocs/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalIDPManagerImpl.html">ExternalIDPManagerImpl</a> and <a href="/oak/docs/apidocs/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/SyncManagerImpl.html">SyncManagerImpl</a>) extend <tt>AbstractServiceTracker</tt> and will automatically keep track of new <a href="/oak/docs/apidocs/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalIdentityProvider.html">ExternalIdentityProvider</a> and <a href="/oak/docs/apidocs/org/apache/jackrabbit/oak/spi/security/authentication/external/SyncHandler.html">SyncHandler</a> services, respectively.</p>
@@ -470,9 +417,8 @@
 <div class="section">
 <h4><a name="Supported_Credentials"></a>Supported Credentials</h4>
 <p>The following steps are required in order to change or extend the set credential classes supported by the <tt>ExternalLoginModule</tt>:</p>
-
 <ul>
-  
+
 <li>Extend your <tt>ExternalIdentityProvider</tt> to additionally implement the <a href="/oak/docs/apidocs/org/apache/jackrabbit/oak/spi/security/authentication/credentials/CredentialsSupport.html">CredentialsSupport</a> interface.</li>
 </ul>
 <p>Don&#x2019;t forget to make sure that <tt>ExternalIdentityProvider.authenticate(Credentials)</tt> handles the same set of supported credentials!</p>
@@ -481,8 +427,9 @@
 <div class="section">
 <h6><a name="Example_CredentialsSupport"></a>Example CredentialsSupport</h6>
 
-<div class="source">
-<div class="source"><pre class="prettyprint">  @Component()
+<div>
+<div>
+<pre class="source">  @Component()
   @Service(ExternalIdentityProvider.class, CredentialsSupport.class)
   public class MyIdentityProvider implements ExternalIdentityProvider, CredentialsSupport {
 
@@ -511,9 +458,9 @@
           // our credentials never contain additional attributes
           return ImmutableMap.of();
       }
-
+      
       //-------------------------------------&lt; ExternalIdentityProvider &gt;---
-
+      
       @CheckForNull
       @Override
       public ExternalUser authenticate(@Nonnull Credentials credentials) {
@@ -530,7 +477,7 @@
       }
 
       [...]
-
+      
       //----------------------------------------------&lt; SCR Integration &gt;---
       @Activate
       private void activate() {

Modified: jackrabbit/site/live/oak/docs/security/authentication/preauthentication.html
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/oak/docs/security/authentication/preauthentication.html?rev=1846224&r1=1846223&r2=1846224&view=diff
==============================================================================
--- jackrabbit/site/live/oak/docs/security/authentication/preauthentication.html (original)
+++ jackrabbit/site/live/oak/docs/security/authentication/preauthentication.html Fri Nov  9 09:46:57 2018
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2018-02-21 
+ | Generated by Apache Maven Doxia Site Renderer 1.8.1 at 2018-11-09 
  | Rendered using Apache Maven Fluido Skin 1.6
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180221" />
+    <meta name="Date-Revision-yyyymmdd" content="20181109" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Jackrabbit Oak &#x2013; Pre-Authenticated Login</title>
     <link rel="stylesheet" href="../../css/apache-maven-fluido-1.6.min.css" />
@@ -52,6 +52,7 @@
         <a href="#" class="dropdown-toggle" data-toggle="dropdown">Main APIs <b class="caret"></b></a>
         <ul class="dropdown-menu">
             <li><a href="http://www.day.com/specs/jcr/2.0/index.html" title="JCR API">JCR API</a></li>
+            <li><a href="https://jackrabbit.apache.org/jcr/jcr-api.html" title="Jackrabbit API">Jackrabbit API</a></li>
             <li><a href="../../oak_api/overview.html" title="Oak API">Oak API</a></li>
         </ul>
       </li>
@@ -66,7 +67,12 @@
                   <li><a href="../../nodestore/compositens.html" title="Composite NodeStore">Composite NodeStore</a></li>
               </ul>
             </li>
-            <li><a href="../../plugins/blobstore.html" title="Blob Storage">Blob Storage</a></li>
+            <li class="dropdown-submenu">
+<a href="../../plugins/blobstore.html" title="Blob Storage">Blob Storage</a>
+              <ul class="dropdown-menu">
+                  <li><a href="../../features/direct-binary-access.html" title="Direct Binary Access">Direct Binary Access</a></li>
+              </ul>
+            </li>
             <li class="dropdown-submenu">
 <a href="../../query/query.html" title="Query">Query</a>
               <ul class="dropdown-menu">
@@ -136,7 +142,7 @@
 
       <div id="breadcrumbs">
         <ul class="breadcrumb">
-        <li id="publishDate">Last Published: 2018-02-21<span class="divider">|</span>
+        <li id="publishDate">Last Published: 2018-11-09<span class="divider">|</span>
 </li>
           <li id="projectVersion">Version: 1.10-SNAPSHOT</li>
         </ul>
@@ -155,12 +161,14 @@
     <li><a href="../../architecture/nodestate.html" title="The Node State Model"><span class="none"></span>The Node State Model</a>  </li>
           <li class="nav-header">Main APIs</li>
     <li><a href="http://www.day.com/specs/jcr/2.0/index.html" class="externalLink" title="JCR API"><span class="none"></span>JCR API</a>  </li>
+    <li><a href="https://jackrabbit.apache.org/jcr/jcr-api.html" class="externalLink" title="Jackrabbit API"><span class="none"></span>Jackrabbit API</a>  </li>
     <li><a href="../../oak_api/overview.html" title="Oak API"><span class="none"></span>Oak API</a>  </li>
           <li class="nav-header">Features and Plugins</li>
     <li><a href="../../nodestore/overview.html" title="Node Storage"><span class="icon-chevron-down"></span>Node Storage</a>
       <ul class="nav nav-list">
     <li><a href="../../nodestore/documentmk.html" title="Document NodeStore"><span class="icon-chevron-down"></span>Document NodeStore</a>
       <ul class="nav nav-list">
+    <li><a href="../../nodestore/document/mongo-document-store.html" title="MongoDB DocumentStore"><span class="none"></span>MongoDB DocumentStore</a>  </li>
     <li><a href="../../nodestore/document/node-bundling.html" title="Node Bundling"><span class="none"></span>Node Bundling</a>  </li>
     <li><a href="../../nodestore/document/secondary-store.html" title="Secondary Store"><span class="none"></span>Secondary Store</a>  </li>
     <li><a href="../../nodestore/persistent-cache.html" title="Persistent Cache"><span class="none"></span>Persistent Cache</a>  </li>
@@ -171,7 +179,11 @@
     <li><a href="../../nodestore/compositens.html" title="Composite NodeStore"><span class="none"></span>Composite NodeStore</a>  </li>
       </ul>
   </li>
-    <li><a href="../../plugins/blobstore.html" title="Blob Storage"><span class="none"></span>Blob Storage</a>  </li>
+    <li><a href="../../plugins/blobstore.html" title="Blob Storage"><span class="icon-chevron-down"></span>Blob Storage</a>
+      <ul class="nav nav-list">
+    <li><a href="../../features/direct-binary-access.html" title="Direct Binary Access"><span class="none"></span>Direct Binary Access</a>  </li>
+      </ul>
+  </li>
     <li><a href="../../query/query.html" title="Query"><span class="icon-chevron-down"></span>Query</a>
       <ul class="nav nav-list">
     <li><a href="../../query/query-engine.html" title="Query Engine"><span class="none"></span>Query Engine</a>  </li>
@@ -239,14 +251,13 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
---><div class="section">
+-->
+<div class="section">
 <h2><a name="Pre-Authenticated_Login"></a>Pre-Authenticated Login</h2>
 <p>Oak provides two different mechanisms to create pre-authentication that doesn&#x2019;t involve the repositories internal authentication mechanism for credentials validation.</p>
-
 <ul>
-  
+
 <li><a href="#withloginchain">Pre-Authentication combined with Login Module Chain</a></li>
-  
 <li><a href="#withoutrepository">Pre-Authentication without Repository Involvement</a></li>
 </ul>
 <p><a name="withloginchain"></a></p>
@@ -258,23 +269,20 @@
 <div class="section">
 <h4><a name="How_it_works"></a>How it works</h4>
 <p>The basic steps of the pre-authentication in combination with regular JAAS login module chain are outlined as follows:</p>
-
 <ol style="list-style-type: decimal">
-  
+
 <li>verify the identity in the layer on top of the JCR repository (e.g. in a custom Sling Authentication Handler)</li>
-  
 <li>pass a custom, non-public Credentials implementation to the repository login</li>
-  
-<li>create a custom login module that only supports these dedicated credentials and  pushes both a new instance of <tt>PreAuthenticatedLogin</tt> and other information  required and processed by subsequent login modules (e.g. credentials and  user name).</li>
-  
-<li>make sure the subsequent login modules in the JAAS configuration are capable  to deal with the <tt>PreAuthenticatedLogin</tt> and the additional information and  will properly populate the subject and optionally synchronize user information  or create login tokens.</li>
+<li>create a custom login module that only supports these dedicated credentials and pushes both a new instance of <tt>PreAuthenticatedLogin</tt> and other information required and processed by subsequent login modules (e.g. credentials and user name).</li>
+<li>make sure the subsequent login modules in the JAAS configuration are capable to deal with the <tt>PreAuthenticatedLogin</tt> and the additional information and will properly populate the subject and optionally synchronize user information or create login tokens.</li>
 </ol>
 <div class="section">
 <h5><a name="Example"></a>Example</h5>
 <p>Example implementation of <tt>LoginModule#login</tt> that pushes the <tt>PreAuthenticatedLogin</tt> marker to the shared state:</p>
 
-<div class="source">
-<div class="source"><pre class="prettyprint">public class PreAuthLoginModule extends AbstractLoginModule {
+<div>
+<div>
+<pre class="source">public class PreAuthLoginModule extends AbstractLoginModule {
 
 [...]
 
@@ -294,11 +302,11 @@
         }
 
         [...]
-
+        
         // subsequent login modules need to succeed and process the 'PreAuthenticatedLogin'
         return false;
     }
-
+    
     @Overwrite
     public boolean commit() {
         // this module leaves subject population to the subsequent modules 
@@ -307,6 +315,7 @@
     }
 }
 </pre></div></div>
+
 <p><a name="withoutrepository"></a></p></div></div></div>
 <div class="section">
 <h3><a name="Pre-Authentication_without_Repository_Involvement"></a>Pre-Authentication without Repository Involvement</h3>
@@ -315,21 +324,19 @@
 <div class="section">
 <h4><a name="Options_to_modify_the_default_behavior"></a>Options to modify the default behavior</h4>
 <p>Since the <tt>LoginContextProvider</tt> is a configurable with the authentication setup OAK users also have the following options by providing a custom <tt>LoginContextProvider</tt>:</p>
-
 <ul>
-  
+
 <li>Disable pre-authentication by not trying to retrieve a pre-authenticated <tt>Subject</tt>.</li>
-  
 <li>Add support for extending the pre-authenticated subject by always passing writable subjects to the <tt>JaasLoginContext</tt></li>
-  
-<li>Dropping JAAS altogether by providing a custom implementation of the  <tt>org.apache.jackrabbit.oak.spi.security.authentication.LoginContext</tt> [2] interface.</li>
+<li>Dropping JAAS altogether by providing a custom implementation of the <tt>org.apache.jackrabbit.oak.spi.security.authentication.LoginContext</tt> [2] interface.</li>
 </ul>
 <div class="section">
 <h5><a name="Example"></a>Example</h5>
 <p>Example how to use this type of pre-authentication:</p>
 
-<div class="source">
-<div class="source"><pre class="prettyprint">String userId = &quot;test&quot;;
+<div>
+<div>
+<pre class="source">String userId = &quot;test&quot;;
 /**
  * Retrive valid principals e.g. by using Jackrabbit or Oak API:
  * - PrincipalManager#getPrincipal and/or #getGroupMembership

Modified: jackrabbit/site/live/oak/docs/security/authentication/token/default.html
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/oak/docs/security/authentication/token/default.html?rev=1846224&r1=1846223&r2=1846224&view=diff
==============================================================================
--- jackrabbit/site/live/oak/docs/security/authentication/token/default.html (original)
+++ jackrabbit/site/live/oak/docs/security/authentication/token/default.html Fri Nov  9 09:46:57 2018
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2018-02-21 
+ | Generated by Apache Maven Doxia Site Renderer 1.8.1 at 2018-11-09 
  | Rendered using Apache Maven Fluido Skin 1.6
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180221" />
+    <meta name="Date-Revision-yyyymmdd" content="20181109" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Jackrabbit Oak &#x2013; Token Management : The Default Implementation</title>
     <link rel="stylesheet" href="../../../css/apache-maven-fluido-1.6.min.css" />
@@ -52,6 +52,7 @@
         <a href="#" class="dropdown-toggle" data-toggle="dropdown">Main APIs <b class="caret"></b></a>
         <ul class="dropdown-menu">
             <li><a href="http://www.day.com/specs/jcr/2.0/index.html" title="JCR API">JCR API</a></li>
+            <li><a href="https://jackrabbit.apache.org/jcr/jcr-api.html" title="Jackrabbit API">Jackrabbit API</a></li>
             <li><a href="../../../oak_api/overview.html" title="Oak API">Oak API</a></li>
         </ul>
       </li>
@@ -66,7 +67,12 @@
                   <li><a href="../../../nodestore/compositens.html" title="Composite NodeStore">Composite NodeStore</a></li>
               </ul>
             </li>
-            <li><a href="../../../plugins/blobstore.html" title="Blob Storage">Blob Storage</a></li>
+            <li class="dropdown-submenu">
+<a href="../../../plugins/blobstore.html" title="Blob Storage">Blob Storage</a>
+              <ul class="dropdown-menu">
+                  <li><a href="../../../features/direct-binary-access.html" title="Direct Binary Access">Direct Binary Access</a></li>
+              </ul>
+            </li>
             <li class="dropdown-submenu">
 <a href="../../../query/query.html" title="Query">Query</a>
               <ul class="dropdown-menu">
@@ -136,7 +142,7 @@
 
       <div id="breadcrumbs">
         <ul class="breadcrumb">
-        <li id="publishDate">Last Published: 2018-02-21<span class="divider">|</span>
+        <li id="publishDate">Last Published: 2018-11-09<span class="divider">|</span>
 </li>
           <li id="projectVersion">Version: 1.10-SNAPSHOT</li>
         </ul>
@@ -155,12 +161,14 @@
     <li><a href="../../../architecture/nodestate.html" title="The Node State Model"><span class="none"></span>The Node State Model</a>  </li>
           <li class="nav-header">Main APIs</li>
     <li><a href="http://www.day.com/specs/jcr/2.0/index.html" class="externalLink" title="JCR API"><span class="none"></span>JCR API</a>  </li>
+    <li><a href="https://jackrabbit.apache.org/jcr/jcr-api.html" class="externalLink" title="Jackrabbit API"><span class="none"></span>Jackrabbit API</a>  </li>
     <li><a href="../../../oak_api/overview.html" title="Oak API"><span class="none"></span>Oak API</a>  </li>
           <li class="nav-header">Features and Plugins</li>
     <li><a href="../../../nodestore/overview.html" title="Node Storage"><span class="icon-chevron-down"></span>Node Storage</a>
       <ul class="nav nav-list">
     <li><a href="../../../nodestore/documentmk.html" title="Document NodeStore"><span class="icon-chevron-down"></span>Document NodeStore</a>
       <ul class="nav nav-list">
+    <li><a href="../../../nodestore/document/mongo-document-store.html" title="MongoDB DocumentStore"><span class="none"></span>MongoDB DocumentStore</a>  </li>
     <li><a href="../../../nodestore/document/node-bundling.html" title="Node Bundling"><span class="none"></span>Node Bundling</a>  </li>
     <li><a href="../../../nodestore/document/secondary-store.html" title="Secondary Store"><span class="none"></span>Secondary Store</a>  </li>
     <li><a href="../../../nodestore/persistent-cache.html" title="Persistent Cache"><span class="none"></span>Persistent Cache</a>  </li>
@@ -171,7 +179,11 @@
     <li><a href="../../../nodestore/compositens.html" title="Composite NodeStore"><span class="none"></span>Composite NodeStore</a>  </li>
       </ul>
   </li>
-    <li><a href="../../../plugins/blobstore.html" title="Blob Storage"><span class="none"></span>Blob Storage</a>  </li>
+    <li><a href="../../../plugins/blobstore.html" title="Blob Storage"><span class="icon-chevron-down"></span>Blob Storage</a>
+      <ul class="nav nav-list">
+    <li><a href="../../../features/direct-binary-access.html" title="Direct Binary Access"><span class="none"></span>Direct Binary Access</a>  </li>
+      </ul>
+  </li>
     <li><a href="../../../query/query.html" title="Query"><span class="icon-chevron-down"></span>Query</a>
       <ul class="nav nav-list">
     <li><a href="../../../query/query-engine.html" title="Query Engine"><span class="none"></span>Query Engine</a>  </li>
@@ -239,7 +251,8 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
---><div class="section">
+-->
+<div class="section">
 <h2><a name="Token_Management_:_The_Default_Implementation"></a>Token Management : The Default Implementation</h2>
 <div class="section">
 <h3><a name="General_Notes"></a>General Notes</h3>
@@ -251,15 +264,17 @@
 <p>The creation of a new token is triggered by valid and supported <tt>Credentials</tt> passed to the login module chain that contain an additional, empty <tt>.token</tt> attribute.</p>
 <p>The <a href="/oak/docs/apidocs/org/apache/jackrabbit/oak/security/authentication/token/TokenLoginModule.html">TokenLoginModule</a> will obtain these <tt>Credentials</tt> from the shared state during the commit phase (i.e. phase 2 of the JAAS authentication) and will pass them to the configured <a href="/oak/docs/apidocs/org/apache/jackrabbit/oak/spi/security/authentication/token/TokenProvider.html">TokenProvider</a> implementation the following sequence:</p>
 
-<div class="source">
-<div class="source"><pre class="prettyprint">Credentials shared = getSharedCredentials();
+<div>
+<div>
+<pre class="source">Credentials shared = getSharedCredentials();
 if (shared != null &amp;&amp; tokenProvider.doCreateToken(shared)) {
     [...]
     TokenInfo ti = tokenProvider.createToken(shared);
     [...]
 }
 </pre></div></div>
-<p>In case of success these steps will have generated a new token and stored it&#x2019;s hash along with all mandatory and informative attributes to the new content node representing the token.</p>
+
+<p>In case of success these steps will have generated a new token and stored it&#x2019;s hash along with all mandatory and informative attributes to the new content node  representing the token.</p>
 <div class="section">
 <h5><a name="Supported_Credentials_for_Token_Creation"></a>Supported Credentials for Token Creation</h5>
 <p>By default the implementation deals with shared <tt>SimpleCredentials</tt>.</p>
@@ -269,11 +284,9 @@ if (shared != null &amp;&amp; tokenProvi
 <h4><a name="Token_Validation"></a>Token Validation</h4>
 <p>Once a token has been created it can be used for subsequent repository logins with <a class="externalLink" href="http://svn.apache.org/repos/asf/jackrabbit/trunk/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/authentication/token/TokenCredentials.java">TokenCredentials</a>. This time the <a href="/oak/docs/apidocs/org/apache/jackrabbit/oak/security/authentication/token/TokenLoginModule.html">TokenLoginModule</a> will attempt to perform the login phase (i.e. phase 1 of the JAAS authentication).</p>
 <p>This includes resolving the login token (<tt>TokenProvider.getTokenInfo</tt>) and asserting it&#x2019;s validity in case it exists. The validation consists of following steps:</p>
-
 <ul>
-  
+
 <li>check that the token has not expired (<tt>TokenInfo.isExpired</tt>)</li>
-  
 <li>verify that all mandatory attributes are present and match the expectations (<tt>TokenInfo.matches</tt>)</li>
 </ul>
 <p>Only if these steps have been successfully completed the login of the <a href="/oak/docs/apidocs/org/apache/jackrabbit/oak/security/authentication/token/TokenLoginModule.html">TokenLoginModule</a> will succeed.</p></div>
@@ -283,8 +296,7 @@ if (shared != null &amp;&amp; tokenProvi
 <div class="section">
 <h4><a name="Resetting_Expiration_Time"></a>Resetting Expiration Time</h4>
 <p>The default <tt>TokenProvider</tt> implementation will automatically reset the expiration time of a given token upon successful authentication.</p>
-<p>This behavior can be disabled by setting the <tt>tokenRefresh</tt> configuration parameter to <tt>false</tt> (see <tt>PARAM_TOKEN_REFRESH</tt> below). In this case expiration time will not be reset and an attempt to do so using the API (e.g. calling <tt>
-TokenInfo.resetExpiration(long loginTime)</tt>) will return <tt>false</tt> indicating that the expiration time has not been reset. The token will consequently expire and the user will need to login again using the configured login mechanism (e.g. using the credentials support for token creation).</p></div>
+<p>This behavior can be disabled by setting the <tt>tokenRefresh</tt> configuration parameter to <tt>false</tt> (see <tt>PARAM_TOKEN_REFRESH</tt> below). In this case expiration time will not be reset and an attempt to do so using the API (e.g. calling <tt>TokenInfo.resetExpiration(long loginTime)</tt>) will return <tt>false</tt> indicating that the expiration time has not been reset. The token will consequently expire and the user will need to login again using the configured login mechanism (e.g. using the credentials support for token creation).</p></div>
 <div class="section">
 <h4><a name="Token_Cleanup"></a>Token Cleanup</h4>
 <p>Automatic token cleanup can be enabled by setting the <tt>tokenCleanupThreshold</tt> parameter to a value larger than <tt>0</tt> (<tt>0</tt> means disabled). This will trigger a cleanup call if the number of tokens under a user exceeds this value. (As an implementation detail a throttling method was introduced to only allow the call to go through 1/8 times).</p>
@@ -296,8 +308,9 @@ TokenInfo.resetExpiration(long loginTime
 <h4><a name="Content_Structure"></a>Content Structure</h4>
 <p>The login tokens issued for a given user are all located underneath a node named <tt>.tokens</tt> that will be created by the <tt>TokenProvider</tt> once the first token is created. The default implementation creates a distinct node for each login token as described below</p>
 
-<div class="source">
-<div class="source"><pre class="prettyprint">testUser {
+<div>
+<div>
+<pre class="source">testUser {
     &quot;jcr:primaryType&quot;: &quot;rep:User&quot;,
     ...
     &quot;.tokens&quot; {
@@ -315,32 +328,33 @@ TokenInfo.resetExpiration(long loginTime
         }
     }
 }
-</pre></div></div></div>
+</pre></div></div>
+</div>
 <div class="section">
 <h4><a name="Token_Nodes"></a>Token Nodes</h4>
 <p>As of Oak 1.0 the login token are represented in the repository as follows:</p>
-
 <ul>
-  
+
 <li>the token node is referenceable with the dedicated node type <tt>rep:Token</tt> (used to be unstructured in Jackrabbit 2.x)</li>
-  
 <li>expiration and key properties are defined to be mandatory and protected</li>
-  
-<li>expiration time is obtained from <tt>PARAM_TOKEN_EXPIRATION</tt> specified in the  login attributes and falls back to the configuration parameter with the same  name as specified in the configuration options of the <tt>TokenConfiguration</tt>.</li>
+<li>expiration time is obtained from <tt>PARAM_TOKEN_EXPIRATION</tt> specified in the login attributes and falls back to the configuration parameter with the same name as specified in the configuration options of the <tt>TokenConfiguration</tt>.</li>
 </ul>
 <p>The definition of the new built-in node type <tt>rep:Token</tt>:</p>
 
-<div class="source">
-<div class="source"><pre class="prettyprint">[rep:Token] &gt; mix:referenceable
+<div>
+<div>
+<pre class="source">[rep:Token] &gt; mix:referenceable
 - rep:token.key (STRING) protected mandatory
 - rep:token.exp (DATE) protected mandatory
 - * (UNDEFINED) protected
 - * (UNDEFINED) multiple protected
 </pre></div></div>
+
 <p>The following example illustrates the token nodes resulting from this node type definition:</p>
 
-<div class="source">
-<div class="source"><pre class="prettyprint">testUser {
+<div>
+<div>
+<pre class="source">testUser {
         &quot;jcr:primaryType&quot;: &quot;rep:User&quot;,
         ...
         &quot;.tokens&quot; {
@@ -365,93 +379,50 @@ TokenInfo.resetExpiration(long loginTime
     }
 }
 </pre></div></div>
+
 <p><a name="validation"></a></p></div></div>
 <div class="section">
 <h3><a name="Validation"></a>Validation</h3>
 <p>The consistency of this content structure both on creation and modification is asserted by a dedicated <tt>TokenValidator</tt>. The corresponding errors are all of type <tt>Constraint</tt> with the following codes:</p>
-
 <table border="0" class="table table-striped">
-  <thead>
-    
+<thead>
+
 <tr class="a">
-      
-<th>Code </th>
-      
-<th>Message </th>
-    </tr>
-  </thead>
-  <tbody>
-    
+<th> Code              </th>
+<th> Message                                                  </th></tr>
+</thead><tbody>
+
 <tr class="b">
-      
-<td>0060 </td>
-      
-<td>Attempt to create reserved token property in other ctx </td>
-    </tr>
-    
+<td> 0060              </td>
+<td> Attempt to create reserved token property in other ctx   </td></tr>
 <tr class="a">
-      
-<td>0061 </td>
-      
-<td>Attempt to change existing token key </td>
-    </tr>
-    
+<td> 0061              </td>
+<td> Attempt to change existing token key                     </td></tr>
 <tr class="b">
-      
-<td>0062 </td>
-      
-<td>Change primary type of existing node to rep:Token </td>
-    </tr>
-    
+<td> 0062              </td>
+<td> Change primary type of existing node to rep:Token        </td></tr>
 <tr class="a">
-      
-<td>0063 </td>
-      
-<td>Creation/Manipulation of tokens without using provider </td>
-    </tr>
-    
+<td> 0063              </td>
+<td> Creation/Manipulation of tokens without using provider   </td></tr>
 <tr class="b">
-      
-<td>0064 </td>
-      
-<td>Create a token outside of configured scope </td>
-    </tr>
-    
+<td> 0064              </td>
+<td> Create a token outside of configured scope               </td></tr>
 <tr class="a">
-      
-<td>0065 </td>
-      
-<td>Invalid location of token node </td>
-    </tr>
-    
+<td> 0065              </td>
+<td> Invalid location of token node                           </td></tr>
 <tr class="b">
-      
-<td>0066 </td>
-      
-<td>Invalid token key </td>
-    </tr>
-    
+<td> 0066              </td>
+<td> Invalid token key                                        </td></tr>
 <tr class="a">
-      
-<td>0067 </td>
-      
-<td>Mandatory token expiration missing </td>
-    </tr>
-    
+<td> 0067              </td>
+<td> Mandatory token expiration missing                       </td></tr>
 <tr class="b">
-      
-<td>0068 </td>
-      
-<td>Invalid location of .tokens node </td>
-    </tr>
-    
+<td> 0068              </td>
+<td> Invalid location of .tokens node                         </td></tr>
 <tr class="a">
-      
-<td>0069 </td>
-      
-<td>Change type of .tokens parent node </td>
-    </tr>
-  </tbody>
+<td> 0069              </td>
+<td> Change type of .tokens parent node                       </td></tr>
+</tbody>
 </table>
 <p><a name="configuration"></a></p></div>
 <div class="section">
@@ -459,93 +430,48 @@ TokenInfo.resetExpiration(long loginTime
 <p>The default Oak <tt>TokenConfiguration</tt> allows to define the following configuration options for the <tt>TokenProvider</tt>:</p>
 <div class="section">
 <h4><a name="Configuration_Parameters"></a>Configuration Parameters</h4>
-
 <table border="0" class="table table-striped">
-  <thead>
-    
+<thead>
+
 <tr class="a">
-      
-<th>Parameter </th>
-      
-<th>Type </th>
-      
-<th>Default </th>
-    </tr>
-  </thead>
-  <tbody>
-    
+<th> Parameter                           </th>
+<th> Type    </th>
+<th> Default                  </th></tr>
+</thead><tbody>
+
 <tr class="b">
-      
-<td>PARAM_TOKEN_EXPIRATION </td>
-      
-<td>long </td>
-      
-<td>2 * 3600 * 1000 (2 hours)</td>
-    </tr>
-    
-<tr class="a">
-      
-<td>PARAM_TOKEN_LENGTH </td>
-      
-<td>int </td>
-      
-<td>8 </td>
-    </tr>
-    
+<td> PARAM_TOKEN_EXPIRATION              </td>
+<td> long    </td>
+<td> 2 * 3600 * 1000 (2 hours)</td></tr>
+<tr class="a">
+<td> PARAM_TOKEN_LENGTH                  </td>
+<td> int     </td>
+<td> 8                        </td></tr>
 <tr class="b">
-      
-<td>PARAM_TOKEN_REFRESH </td>
-      
-<td>boolean </td>
-      
-<td>true </td>
-    </tr>
-    
-<tr class="a">
-      
-<td>PARAM_PASSWORD_HASH_ALGORITHM </td>
-      
-<td>String </td>
-      
-<td>SHA-256 </td>
-    </tr>
-    
+<td> PARAM_TOKEN_REFRESH                 </td>
+<td> boolean </td>
+<td> true                     </td></tr>
+<tr class="a">
+<td> PARAM_PASSWORD_HASH_ALGORITHM       </td>
+<td> String  </td>
+<td> SHA-256                  </td></tr>
 <tr class="b">
-      
-<td>PARAM_PASSWORD_HASH_ITERATIONS </td>
-      
-<td>int </td>
-      
-<td>1000 </td>
-    </tr>
-    
-<tr class="a">
-      
-<td>PARAM_PASSWORD_SALT_SIZE </td>
-      
-<td>int </td>
-      
-<td>8 </td>
-    </tr>
-    
+<td> PARAM_PASSWORD_HASH_ITERATIONS      </td>
+<td> int     </td>
+<td> 1000                     </td></tr>
+<tr class="a">
+<td> PARAM_PASSWORD_SALT_SIZE            </td>
+<td> int     </td>
+<td> 8                        </td></tr>
 <tr class="b">
-      
-<td>PARAM_TOKEN_CLEANUP_THRESHOLD </td>
-      
-<td>long </td>
-      
-<td>0 (no cleanup) </td>
-    </tr>
-    
+<td> PARAM_TOKEN_CLEANUP_THRESHOLD       </td>
+<td> long    </td>
+<td> 0 (no cleanup)           </td></tr>
 <tr class="a">
-      
-<td> </td>
-      
 <td> </td>
-      
 <td> </td>
-    </tr>
-  </tbody>
+<td> </td></tr>
+</tbody>
 </table>
 <p><a name="pluggability"></a></p></div></div>
 <div class="section">
@@ -553,11 +479,9 @@ TokenInfo.resetExpiration(long loginTime
 <p>In an OSGi-based setup the default <tt>TokenConfiguration</tt> you can bind a custom implementation of the <a href="/oak/docs/apidocs/org/apache/jackrabbit/oak/spi/security/authentication/credentials/CredentialsSupport.html">CredentialsSupport</a> interface. Doing so allows to support any type of custom credentials, which do not reveal the ID of the user logging into repository.</p>
 <p>In particular when chaining the <tt>TokenLoginModule</tt> and the <tt>ExternalLoginModule</tt> the <a href="/oak/docs/apidocs/org/apache/jackrabbit/oak/spi/security/authentication/credentials/CredentialsSupport.html">CredentialsSupport</a> can be used to authenticate and synchronize users provided by third party systems during phase 1 (login) and generate a login token during phase 2 (commit). See section <a href="../externalloginmodule.html">Authentication with the External Login Module</a> for additional details. For this to work the same <a href="/oak/docs/apidocs/org/apache/jackrabbit/oak/spi/security/authentication/credentials/CredentialsSupport.html">CredentialsSupport</a> must be configured with the <a href="/oak/docs/apidocs/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalIdentityProvider.html">ExternalIdentityProvider</a> and the <tt>TokenConfiguration</tt> and <tt>CredentialsSupport.getUserId</tt> must reveal the ID of the synced user (i.e. <tt>Ex
 ternalUser.getId</tt>).</p>
 <p>In general the following steps are required in order to plug a different <tt>CredentialsSupport</tt> into the default <tt>TokenConfiguration</tt>:</p>
-
 <ul>
-  
+
 <li>implement the <tt>CredentialsSupport</tt> interface (e.g. as extension to the <tt>ExternalIdentityProvider</tt>)</li>
-  
 <li>make sure the implementation is an OSGi service and deploy it to the Oak repository.</li>
 </ul>
 <div class="section">
@@ -567,8 +491,9 @@ TokenInfo.resetExpiration(long loginTime
 <h6><a name="Example_CredentialsSupport"></a>Example CredentialsSupport</h6>
 <p>In an OSGi-based setup it&#x2019;s sufficient to make the service available to the repository in order to enable a custom <tt>CredentialsSupport</tt>.</p>
 
-<div class="source">
-<div class="source"><pre class="prettyprint">@Component
+<div>
+<div>
+<pre class="source">@Component
 @Service(value = {CredentialsSupport.class})
 /**
  * Custom implementation of the {@code CredentialsSupport} interface.
@@ -604,14 +529,14 @@ final class MyCredentialsSupport impleme
        // TODO: optional implementation
        return false;
     }
-
+    
     [...]
 }
-</pre></div></div></div>
+</pre></div></div>
+</div>
 <div class="section">
 <h6><a name="Example_CredentialsSupport_in_Combination_with_External_Authentication"></a>Example CredentialsSupport in Combination with External Authentication</h6>
-<p>See section <a href="../externalloginmodule.html#pluggability">Authentication with the External Login Module</a> for an example.</p>
-<!-- references --></div></div></div></div></div>
+<p>See section <a href="../externalloginmodule.html#pluggability">Authentication with the External Login Module</a> for an example.</p><!-- references --></div></div></div></div></div>
         </div>
       </div>
     </div>