Author: kwright
Date: Mon Jul 6 12:39:28 2015
New Revision: 1689388
URL: http://svn.apache.org/r1689388
Log:
Update documentation for new LDAP auth feature. CONNECTORS-1221.
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/auth/LdapAuthenticator.java
manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml
manifoldcf/trunk/site/src/documentation/content/xdocs/ja_JP/how-to-build-and-deploy.xml
manifoldcf/trunk/site/src/documentation/content/xdocs/zh_CN/how-to-build-and-deploy.xml
Modified: manifoldcf/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1689388&r1=1689387&r2=1689388&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Mon Jul 6 12:39:28 2015
@@ -3,9 +3,14 @@ $Id$
======================= 2.2-dev =====================
+CONNECTORS-1221: Update documentation for properties.xml to
+include new ldap authentication properties.
+(Karl Wright)
+
CONNECTORS-1131: Add infrastructure for controlling individual
user access to parts of the UI and API, also allow this to be
configured via LDAP.
+(Colin Joyce, Karl Wright)
CONNECTORS-1220: User mapping prerequisite choices were broken,
caused a hang when there were more than one.
Modified:
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/auth/LdapAuthenticator.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/auth/LdapAuthenticator.java?rev=1689388&r1=1689387&r2=1689388&view=diff
==============================================================================
---
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/auth/LdapAuthenticator.java
(original)
+++
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/auth/LdapAuthenticator.java
Mon Jul 6 12:39:28 2015
@@ -42,7 +42,7 @@ public class LdapAuthenticator implement
private static final String PROVIDER_URL_PROPERTY =
"org.apache.manifoldcf.login.ldap.providerurl";
private static final String SECURITY_AUTHENTICATION_TYPE =
"org.apache.manifoldcf.login.ldap.securityauthenticationtype";
- private static final String SECURITY_PRINCIPLE =
"org.apache.manifoldcf.login.ldap.securityprinciple";
+ private static final String SECURITY_PRINCIPLE =
"org.apache.manifoldcf.login.ldap.securityprincipal";
private static final String CONTEXT_SEARCH_QUERY =
"org.apache.manifoldcf.login.ldap.contextsearchquery";
private static final String SEARCH_ATTRIBUTE =
"org.apache.manifoldcf.login.ldap.searchattribute";
@@ -55,10 +55,10 @@ public class LdapAuthenticator implement
/** Constructor */
public LdapAuthenticator(final IThreadContext threadContext)
throws ManifoldCFException {
- securityPrincipal =
LockManagerFactory.getStringProperty(threadContext,SECURITY_PRINCIPLE,"???");
+ securityPrincipal =
LockManagerFactory.getStringProperty(threadContext,SECURITY_PRINCIPLE,"");
securityAuthenticationType =
LockManagerFactory.getStringProperty(threadContext,SECURITY_AUTHENTICATION_TYPE,"simple");
providerURLProperty =
LockManagerFactory.getStringProperty(threadContext,PROVIDER_URL_PROPERTY,"");
- contextSearchQuery =
LockManagerFactory.getStringProperty(threadContext,CONTEXT_SEARCH_QUERY,"???");
+ contextSearchQuery =
LockManagerFactory.getStringProperty(threadContext,CONTEXT_SEARCH_QUERY,"");
searchAttribute =
LockManagerFactory.getStringProperty(threadContext,SEARCH_ATTRIBUTE,"uid");
}
Modified:
manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml?rev=1689388&r1=1689387&r2=1689388&view=diff
==============================================================================
---
manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml
(original)
+++
manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml
Mon Jul 6 12:39:28 2015
@@ -1037,12 +1037,18 @@ start[.bat|.sh]
<table>
<caption>property.xml properties</caption>
<tr><th>Property</th><th>Required?</th><th>Function</th></tr>
-
<tr><td>org.apache.manifoldcf.login.name</td><td>No</td><td>Crawler UI login
user ID (defaults to "admin")</td></tr>
-
<tr><td>org.apache.manifoldcf.login.password</td><td>No</td><td>Crawler UI
login user password (defaults to "admin")</td></tr>
-
<tr><td>org.apache.manifoldcf.login.password.obfuscated</td><td>No</td><td>Obfuscated
crawler UI login user password (defaults to "admin")</td></tr>
- <tr><td>org.apache.manifoldcf.apilogin.name</td><td>No</td><td>API
login user ID (defaults to "")</td></tr>
-
<tr><td>org.apache.manifoldcf.apilogin.password</td><td>No</td><td>API login
user password (defaults to "")</td></tr>
-
<tr><td>org.apache.manifoldcf.apilogin.password.obfuscated</td><td>No</td><td>Obfuscated
API login user password (defaults to "")</td></tr>
+
<tr><td>org.apache.manifoldcf.authimplementationclass</td><td>No</td><td>Auth
implementation class (defaults to
"org.apache.manifoldcf.core.auth.DefaultAuthenticator", set to
"org.apache.manifoldcf.core.auth.LdapAuthenticator" for LDAP)</td></tr>
+
<tr><td>org.apache.manifoldcf.login.name</td><td>No</td><td>Default auth
implementation crawler UI login user ID (defaults to "admin")</td></tr>
+
<tr><td>org.apache.manifoldcf.login.password</td><td>No</td><td>Default auth
implementation crawler UI login user password (defaults to "admin")</td></tr>
+
<tr><td>org.apache.manifoldcf.login.password.obfuscated</td><td>No</td><td>Default
auth implementation obfuscated crawler UI login user password (defaults to
"admin")</td></tr>
+
<tr><td>org.apache.manifoldcf.apilogin.name</td><td>No</td><td>Default auth
implementation API login user ID (defaults to "")</td></tr>
+
<tr><td>org.apache.manifoldcf.apilogin.password</td><td>No</td><td>Default auth
implementation API login user password (defaults to "")</td></tr>
+
<tr><td>org.apache.manifoldcf.apilogin.password.obfuscated</td><td>No</td><td>Default
auth implementation obfuscated API login user password (defaults to
"")</td></tr>
+
<tr><td>org.apache.manifoldcf.login.ldap.providerurl</td><td>No</td><td>LDAP
auth implementation provider URL (defaults to "")</td></tr>
+
<tr><td>org.apache.manifoldcf.login.ldap.securityauthenticationtype</td><td>No</td><td>LDAP
auth implementation auth type (defaults to "simple")</td></tr>
+
<tr><td>org.apache.manifoldcf.login.ldap.securityprincipal</td><td>No</td><td>LDAP
auth implementation security principal (defaults to "")</td></tr>
+
<tr><td>org.apache.manifoldcf.login.ldap.contextsearchquery</td><td>No</td><td>LDAP
auth implementation search query (defaults to "")</td></tr>
+
<tr><td>org.apache.manifoldcf.login.ldap.searchattribute</td><td>No</td><td>LDAP
auth implementation search attribute (defaults to "uid")</td></tr>
<tr><td>org.apache.manifoldcf.crawleruiwarpath</td><td>Yes, for
Jetty</td><td>Location of Crawler UI war</td></tr>
<tr><td>org.apache.manifoldcf.authorityservicewarpath</td><td>Yes,
for Jetty</td><td>Location of Authority Service war</td></tr>
<tr><td>org.apache.manifoldcf.apiservicewarpath</td><td>Yes, for
Jetty</td><td>Location of API Service war</td></tr>
Modified:
manifoldcf/trunk/site/src/documentation/content/xdocs/ja_JP/how-to-build-and-deploy.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/site/src/documentation/content/xdocs/ja_JP/how-to-build-and-deploy.xml?rev=1689388&r1=1689387&r2=1689388&view=diff
==============================================================================
---
manifoldcf/trunk/site/src/documentation/content/xdocs/ja_JP/how-to-build-and-deploy.xml
(original)
+++
manifoldcf/trunk/site/src/documentation/content/xdocs/ja_JP/how-to-build-and-deploy.xml
Mon Jul 6 12:39:28 2015
@@ -1037,12 +1037,18 @@ start[.bat|.sh]
<table>
<caption>property.xml properties</caption>
<tr><th>Property</th><th>Required?</th><th>Function</th></tr>
-
<tr><td>org.apache.manifoldcf.login.name</td><td>No</td><td>Crawler UI login
user ID (defaults to "admin")</td></tr>
-
<tr><td>org.apache.manifoldcf.login.password</td><td>No</td><td>Crawler UI
login user password (defaults to "admin")</td></tr>
-
<tr><td>org.apache.manifoldcf.login.password.obfuscated</td><td>No</td><td>Obfuscated
crawler UI login user password (defaults to "admin")</td></tr>
- <tr><td>org.apache.manifoldcf.login.apiname</td><td>No</td><td>API
login user ID (defaults to "")</td></tr>
-
<tr><td>org.apache.manifoldcf.login.apipassword</td><td>No</td><td>API login
user password (defaults to "")</td></tr>
-
<tr><td>org.apache.manifoldcf.login.apipassword.obfuscated</td><td>No</td><td>Obfuscated
API login user password (defaults to "")</td></tr>
+
<tr><td>org.apache.manifoldcf.authimplementationclass</td><td>No</td><td>Auth
implementation class (defaults to
"org.apache.manifoldcf.core.auth.DefaultAuthenticator", set to
"org.apache.manifoldcf.core.auth.LdapAuthenticator" for LDAP)</td></tr>
+
<tr><td>org.apache.manifoldcf.login.name</td><td>No</td><td>Default auth
implementation crawler UI login user ID (defaults to "admin")</td></tr>
+
<tr><td>org.apache.manifoldcf.login.password</td><td>No</td><td>Default auth
implementation crawler UI login user password (defaults to "admin")</td></tr>
+
<tr><td>org.apache.manifoldcf.login.password.obfuscated</td><td>No</td><td>Default
auth implementation obfuscated crawler UI login user password (defaults to
"admin")</td></tr>
+
<tr><td>org.apache.manifoldcf.apilogin.name</td><td>No</td><td>Default auth
implementation API login user ID (defaults to "")</td></tr>
+
<tr><td>org.apache.manifoldcf.apilogin.password</td><td>No</td><td>Default auth
implementation API login user password (defaults to "")</td></tr>
+
<tr><td>org.apache.manifoldcf.apilogin.password.obfuscated</td><td>No</td><td>Default
auth implementation obfuscated API login user password (defaults to
"")</td></tr>
+
<tr><td>org.apache.manifoldcf.login.ldap.providerurl</td><td>No</td><td>LDAP
auth implementation provider URL (defaults to "")</td></tr>
+
<tr><td>org.apache.manifoldcf.login.ldap.securityauthenticationtype</td><td>No</td><td>LDAP
auth implementation auth type (defaults to "simple")</td></tr>
+
<tr><td>org.apache.manifoldcf.login.ldap.securityprincipal</td><td>No</td><td>LDAP
auth implementation security principal (defaults to "")</td></tr>
+
<tr><td>org.apache.manifoldcf.login.ldap.contextsearchquery</td><td>No</td><td>LDAP
auth implementation search query (defaults to "")</td></tr>
+
<tr><td>org.apache.manifoldcf.login.ldap.searchattribute</td><td>No</td><td>LDAP
auth implementation search attribute (defaults to "uid")</td></tr>
<tr><td>org.apache.manifoldcf.crawleruiwarpath</td><td>Yes, for
Jetty</td><td>Location of Crawler UI war</td></tr>
<tr><td>org.apache.manifoldcf.authorityservicewarpath</td><td>Yes,
for Jetty</td><td>Location of Authority Service war</td></tr>
<tr><td>org.apache.manifoldcf.apiservicewarpath</td><td>Yes, for
Jetty</td><td>Location of API Service war</td></tr>
Modified:
manifoldcf/trunk/site/src/documentation/content/xdocs/zh_CN/how-to-build-and-deploy.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/site/src/documentation/content/xdocs/zh_CN/how-to-build-and-deploy.xml?rev=1689388&r1=1689387&r2=1689388&view=diff
==============================================================================
---
manifoldcf/trunk/site/src/documentation/content/xdocs/zh_CN/how-to-build-and-deploy.xml
(original)
+++
manifoldcf/trunk/site/src/documentation/content/xdocs/zh_CN/how-to-build-and-deploy.xml
Mon Jul 6 12:39:28 2015
@@ -1037,12 +1037,18 @@ start[.bat|.sh]
<table>
<caption>property.xml properties</caption>
<tr><th>Property</th><th>Required?</th><th>Function</th></tr>
-
<tr><td>org.apache.manifoldcf.login.name</td><td>No</td><td>Crawler UI login
user ID (defaults to "admin")</td></tr>
-
<tr><td>org.apache.manifoldcf.login.password</td><td>No</td><td>Crawler UI
login user password (defaults to "admin")</td></tr>
-
<tr><td>org.apache.manifoldcf.login.password.obfuscated</td><td>No</td><td>Obfuscated
crawler UI login user password (defaults to "admin")</td></tr>
- <tr><td>org.apache.manifoldcf.login.apiname</td><td>No</td><td>API
login user ID (defaults to "")</td></tr>
-
<tr><td>org.apache.manifoldcf.login.apipassword</td><td>No</td><td>API login
user password (defaults to "")</td></tr>
-
<tr><td>org.apache.manifoldcf.login.apipassword.obfuscated</td><td>No</td><td>Obfuscated
API login user password (defaults to "")</td></tr>
+
<tr><td>org.apache.manifoldcf.authimplementationclass</td><td>No</td><td>Auth
implementation class (defaults to
"org.apache.manifoldcf.core.auth.DefaultAuthenticator", set to
"org.apache.manifoldcf.core.auth.LdapAuthenticator" for LDAP)</td></tr>
+
<tr><td>org.apache.manifoldcf.login.name</td><td>No</td><td>Default auth
implementation crawler UI login user ID (defaults to "admin")</td></tr>
+
<tr><td>org.apache.manifoldcf.login.password</td><td>No</td><td>Default auth
implementation crawler UI login user password (defaults to "admin")</td></tr>
+
<tr><td>org.apache.manifoldcf.login.password.obfuscated</td><td>No</td><td>Default
auth implementation obfuscated crawler UI login user password (defaults to
"admin")</td></tr>
+
<tr><td>org.apache.manifoldcf.apilogin.name</td><td>No</td><td>Default auth
implementation API login user ID (defaults to "")</td></tr>
+
<tr><td>org.apache.manifoldcf.apilogin.password</td><td>No</td><td>Default auth
implementation API login user password (defaults to "")</td></tr>
+
<tr><td>org.apache.manifoldcf.apilogin.password.obfuscated</td><td>No</td><td>Default
auth implementation obfuscated API login user password (defaults to
"")</td></tr>
+
<tr><td>org.apache.manifoldcf.login.ldap.providerurl</td><td>No</td><td>LDAP
auth implementation provider URL (defaults to "")</td></tr>
+
<tr><td>org.apache.manifoldcf.login.ldap.securityauthenticationtype</td><td>No</td><td>LDAP
auth implementation auth type (defaults to "simple")</td></tr>
+
<tr><td>org.apache.manifoldcf.login.ldap.securityprincipal</td><td>No</td><td>LDAP
auth implementation security principal (defaults to "")</td></tr>
+
<tr><td>org.apache.manifoldcf.login.ldap.contextsearchquery</td><td>No</td><td>LDAP
auth implementation search query (defaults to "")</td></tr>
+
<tr><td>org.apache.manifoldcf.login.ldap.searchattribute</td><td>No</td><td>LDAP
auth implementation search attribute (defaults to "uid")</td></tr>
<tr><td>org.apache.manifoldcf.crawleruiwarpath</td><td>Yes, for
Jetty</td><td>Location of Crawler UI war</td></tr>
<tr><td>org.apache.manifoldcf.authorityservicewarpath</td><td>Yes,
for Jetty</td><td>Location of Authority Service war</td></tr>
<tr><td>org.apache.manifoldcf.apiservicewarpath</td><td>Yes, for
Jetty</td><td>Location of API Service war</td></tr>
