You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2016/05/15 17:50:41 UTC
svn commit: r1743926 - in /manifoldcf/integration/elasticsearch-1.5/trunk:
CHANGES.txt
src/main/java/org/apache/manifoldcf/elasticsearch/MCFAuthorizer.java
Author: kwright
Date: Sun May 15 17:50:40 2016
New Revision: 1743926
URL: http://svn.apache.org/viewvc?rev=1743926&view=rev
Log:
Fix for CONNECTORS-1314. Warning: non backwards compatible change!
Modified:
manifoldcf/integration/elasticsearch-1.5/trunk/CHANGES.txt
manifoldcf/integration/elasticsearch-1.5/trunk/src/main/java/org/apache/manifoldcf/elasticsearch/MCFAuthorizer.java
Modified: manifoldcf/integration/elasticsearch-1.5/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/integration/elasticsearch-1.5/trunk/CHANGES.txt?rev=1743926&r1=1743925&r2=1743926&view=diff
==============================================================================
--- manifoldcf/integration/elasticsearch-1.5/trunk/CHANGES.txt (original)
+++ manifoldcf/integration/elasticsearch-1.5/trunk/CHANGES.txt Sun May 15 17:50:40 2016
@@ -3,9 +3,11 @@ $Id$
======================= 2.1-SNAPSHOT =====================
-CONNECTORS-1228: Fix default values so they are correct.
-
======================= Release 2.0 =====================
+CONNECTORS-1314: Use ":" as mcf user name / mcf domain name separator instead of "@".
+
+CONNECTORS-1228: Fix default values so they are correct.
+
Initial commit.
(Karl Wright, on behalf of Bartłomiej Superson)
Modified: manifoldcf/integration/elasticsearch-1.5/trunk/src/main/java/org/apache/manifoldcf/elasticsearch/MCFAuthorizer.java
URL: http://svn.apache.org/viewvc/manifoldcf/integration/elasticsearch-1.5/trunk/src/main/java/org/apache/manifoldcf/elasticsearch/MCFAuthorizer.java?rev=1743926&r1=1743925&r2=1743926&view=diff
==============================================================================
--- manifoldcf/integration/elasticsearch-1.5/trunk/src/main/java/org/apache/manifoldcf/elasticsearch/MCFAuthorizer.java (original)
+++ manifoldcf/integration/elasticsearch-1.5/trunk/src/main/java/org/apache/manifoldcf/elasticsearch/MCFAuthorizer.java Sun May 15 17:50:40 2016
@@ -116,14 +116,14 @@ public class MCFAuthorizer
}
/** Main method for building a filter representing appropriate security.
- *@param authenticatedUserNamesAndDomains is a list of user names and its domains in the form "user@domain".
+ *@param authenticatedUserNamesAndDomains is a list of user names and its domains in the form "user:mcfdomain".
*@return the filter builder.
*/
public FilterBuilder buildAuthorizationFilter(String[] authenticatedUserNamesAndDomains)
throws MCFAuthorizerException{
Map<String,String> domainMap = new HashMap<String,String>();
for(String buffer : authenticatedUserNamesAndDomains){
- String[] authenticatedUserNameAndDomain = buffer.split("@", 2);
+ String[] authenticatedUserNameAndDomain = buffer.split(":", 2);
String authenticatedUserName = authenticatedUserNameAndDomain[0];
String authenticatedUserDomain;
if(authenticatedUserNameAndDomain.length<2) authenticatedUserDomain="";
@@ -166,7 +166,7 @@ public class MCFAuthorizer
}
/** Main method for building a filter representing appropriate security.
- *@param authenticatedUserName is a user name in the form "user@domain".
+ *@param authenticatedUserName is a user name in the form "user:mcfdomain".
*@return the filter builder.
*/
public FilterBuilder buildAuthorizationFilter(String authenticatedUserName)
@@ -176,7 +176,7 @@ public class MCFAuthorizer
}
/** Main method for building a filter representing appropriate security.
- *@param authenticatedUserName is a user name in the form "user@domain".
+ *@param authenticatedUserName is a user name in the form "user".
*@param authenticatedUserDomain is the corresponding MCF authorization domain.
*@return the filter builder.
*/