Author: buildbot Date: Sun Apr 22 18:26:48 2012 New Revision: 813988 Log: Staging update by buildbot for sling
Added: websites/staging/sling/trunk/content/authentication.png (with props) Modified: websites/staging/sling/trunk/content/ (props changed) websites/staging/sling/trunk/content/authentication---framework.html websites/staging/sling/trunk/content/authentication.html Propchange: websites/staging/sling/trunk/content/ ------------------------------------------------------------------------------ --- cms:source-revision (original) +++ cms:source-revision Sun Apr 22 18:26:48 2012 @@ -1 +1 @@ -1328920 +1328924 Modified: websites/staging/sling/trunk/content/authentication---framework.html ============================================================================== --- websites/staging/sling/trunk/content/authentication---framework.html (original) +++ websites/staging/sling/trunk/content/authentication---framework.html Sun Apr 22 18:26:48 2012 @@ -147,16 +147,36 @@ Core 1.1.0)</li> <p>Extracting the credentials and trying to login to the repository may yield the following results:</p> <table> -<tr><td> Credentials </td><td> Login </td><td> Consequence </td></tr> -<tr><td> present </td><td> successfull </td><td> Continue with an authenticated request </td></tr> -<tr><td> present </td><td> failed </td><td> Select *AuthenticationHandler* and call -*requestCredentials* method </td></tr> -<tr><td> missing </td><td> anonymous allowed </td><td> Continue with a non authenticated request -using anonymous access to the repository </td></tr> -<tr><td> missing </td><td> anonymous forbidden </td><td> Select *AuthenticationHandler* and call -*requestCredentials* method </td></tr> +<thead> +<tr> +<th>Credentials</th> +<th>Login</th> +<th>Consequence</th> +</tr> +</thead> +<tbody> +<tr> +<td>present</td> +<td>successfull</td> +<td>Continue with an authenticated request</td> +</tr> +<tr> +<td>present</td> +<td>failed</td> +<td>Select <code>AuthenticationHandler</code> and call <code>requestCredentials</code> method</td> +</tr> +<tr> +<td>missing</td> +<td>anonymous allowed</td> +<td>Continue with a non authenticated request using anonymous access to the repository</td> +</tr> +<tr> +<td>missing</td> +<td>anonymous forbidden</td> +<td>Select <code>AuthenticationHandler</code> and call <code>requestCredentials</code> method</td> +</tr> +</tbody> </table> - <p>{note} Only one <em>AuthenticationHandler</em> is able to provide credentials for a given request. If the credentials provided by the handler cannot be used to @@ -170,27 +190,35 @@ login to the repository, authentication credentials. If the login is successful, the <em>SlingAuthenticator</em> sets the following request attributes:</p> <table> -<tr><th> Attribute </th><th> Description </th></tr> -<tr><td> *org.osgi.service.http.authentication.remote.user* </td><td> The user ID of the -JCR Session. This attribute is used by the HTTP Service implementation to -implement the *HttpServletRequest.getRemoteUser* method. </td></tr> -<tr><td> *org.osgi.service.http.authentication.type* </td><td> The authentication type -defined by the *AuthenticationHandler*. This attribute is used by the -HTTP Service implementation to implement the -*HttpServletRequest.getAuthType* method. </td></tr> -<tr><td> *org.apache.sling.commons.auth.ResourceResolver* </td><td> The -*ResourceResolver* created from the credentials and the logged in JCR -Session. This attribute may be used by servlets to access the repository. -Namely the *SlingMainServlet* uses this request attribute to provide the -*ResourceResolver* to handle the request. </td></tr> -<tr><td> *javax.jcr.Session* </td><td> The JCR Session. This attribute is for backwards -compatibility only. *Its use is deprecated and the attribute will be -removed in future versions*. </td></tr> -<tr><td> *org.apache.sling.commons.auth.spi.AuthenticationInfo* </td><td> The -*AuthenticationInfo* object produced from the *AuthenticationHandler*. -</td></tr> +<thead> +<tr> +<th>Attribute</th> +<th>Description</th> +</tr> +</thead> +<tbody> +<tr> +<td><code>org.osgi.service.http.authentication.remote.user</code></td> +<td>The user ID of the JCR Session. This attribute is used by the HTTP Service implementation to implement the <code>HttpServletRequest.getRemoteUser</code> method.</td> +</tr> +<tr> +<td><code>org.osgi.service.http.authentication.type</code></td> +<td>The authentication type defined by the <code>AuthenticationHandler</code>. This attribute is used by the HTTP Service implementation to implement the <code>HttpServletRequest.getAuthType</code> method.</td> +</tr> +<tr> +<td><code>org.apache.sling.commons.auth.ResourceResolver</code></td> +<td>The <code>ResourceResolver</code> created from the credentials and the logged in JCR Session. This attribute may be used by servlets to access the repository. Namely the <code>SlingMainServlet</code> uses this request attribute to provide the <code>ResourceResolver</code> to handle the request.</td> +</tr> +<tr> +<td><code>javax.jcr.Session</code></td> +<td>The JCR Session. This attribute is for backwards compatibility only. <em>Its use is deprecated and the attribute will be removed in future versions</em>.</td> +</tr> +<tr> +<td><code>org.apache.sling.commons.auth.spi.AuthenticationInfo</code></td> +<td>The <code>AuthenticationInfo</code> object produced from the <code>AuthenticationHandler</code>.</td> +</tr> +</tbody> </table> - <p><em>NOTE</em>: Do <em>NOT</em> use the <em>javax.jcr.Session</em> request attribute in your Sling applications. This attribute must be considered implementation specific to convey the JCR Session to the <em>SlingMainServlet</em>. In future @@ -237,14 +265,14 @@ setup to certain requests by scheme and/ <ul> <li> <p>The <em>LoginServlet</em> contained in the Commons Auth bundle registers -itself with the service registration property {{sling.auth.requirements = -"-/system/sling/login"}} to ensure the servlet can be accessed without +itself with the service registration property <code>sling.auth.requirements = +"-/system/sling/login"</code> to ensure the servlet can be accessed without requiring authentication.</p> </li> <li> <p>An authentication handler may register itself with the service -registration property {{sling.auth.requirements = -"-/apps/sample/loginform"}} to ensure the login form can be rendered +registration property <code>sling.auth.requirements = +"-/apps/sample/loginform"</code> to ensure the login form can be rendered without requiring authentication.</p> </li> </ul> Modified: websites/staging/sling/trunk/content/authentication.html ============================================================================== --- websites/staging/sling/trunk/content/authentication.html (original) +++ websites/staging/sling/trunk/content/authentication.html Sun Apr 22 18:26:48 2012 @@ -102,6 +102,7 @@ servlet has been selected to handle the the servlet's <em>service</em> method.</p> <p>{section} {column} +<img style="border: 0px solid black" title="Request Processing " src="authentication.png"> !authentication.png|thumbnail! {column} {column} Added: websites/staging/sling/trunk/content/authentication.png ============================================================================== Binary file - no diff available. Propchange: websites/staging/sling/trunk/content/authentication.png ------------------------------------------------------------------------------ svn:mime-type = image/png