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 2014/01/16 11:58:57 UTC
svn commit: r1558752 - in /manifoldcf/branches/release-1.5-branch: ./
CHANGES.txt
framework/authority-servlet/src/main/java/org/apache/manifoldcf/authorityservlet/UserACLServlet.java
Author: kwright
Date: Thu Jan 16 10:58:56 2014
New Revision: 1558752
URL: http://svn.apache.org/r1558752
Log:
Pull up fix for CONNECTORS-859 from trunk.
Modified:
manifoldcf/branches/release-1.5-branch/ (props changed)
manifoldcf/branches/release-1.5-branch/CHANGES.txt
manifoldcf/branches/release-1.5-branch/framework/authority-servlet/src/main/java/org/apache/manifoldcf/authorityservlet/UserACLServlet.java
Propchange: manifoldcf/branches/release-1.5-branch/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk:r1558751
Modified: manifoldcf/branches/release-1.5-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.5-branch/CHANGES.txt?rev=1558752&r1=1558751&r2=1558752&view=diff
==============================================================================
--- manifoldcf/branches/release-1.5-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.5-branch/CHANGES.txt Thu Jan 16 10:58:56 2014
@@ -3,6 +3,10 @@ $Id$
======================= Release 1.5 =====================
+CONNECTORS-859: Authority tokens should be prefixed with the group name,
+not the connection name.
+(Fran Alvarez, Karl Wright)
+
CONNECTORS-840: Add ability to suppress all non-specified metadata
fields in Solr connector.
(Alessandro Benedetti, Karl Wright)
Modified: manifoldcf/branches/release-1.5-branch/framework/authority-servlet/src/main/java/org/apache/manifoldcf/authorityservlet/UserACLServlet.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.5-branch/framework/authority-servlet/src/main/java/org/apache/manifoldcf/authorityservlet/UserACLServlet.java?rev=1558752&r1=1558751&r2=1558752&view=diff
==============================================================================
--- manifoldcf/branches/release-1.5-branch/framework/authority-servlet/src/main/java/org/apache/manifoldcf/authorityservlet/UserACLServlet.java (original)
+++ manifoldcf/branches/release-1.5-branch/framework/authority-servlet/src/main/java/org/apache/manifoldcf/authorityservlet/UserACLServlet.java Thu Jan 16 10:58:56 2014
@@ -363,6 +363,8 @@ public class UserACLServlet extends Http
return;
}
+ String authGroup = ar.getAuthorityConnection().getAuthGroup();
+
// A null reply means the same as USERNOTFOUND; it occurs because a user mapping failed somewhere.
if (reply == null)
{
@@ -400,7 +402,7 @@ public class UserACLServlet extends Http
{
if (Logging.authorityService.isDebugEnabled())
Logging.authorityService.debug(" User '"+ar.getUserID()+"' has Acl = '"+acl[j]+"' from authority '"+ar.getIdentifyingString()+"'");
- sb.append(TOKEN_PREFIX).append(java.net.URLEncoder.encode(connectionName,"UTF-8")).append(":").append(java.net.URLEncoder.encode(acl[j++],"UTF-8")).append("\n");
+ sb.append(TOKEN_PREFIX).append(java.net.URLEncoder.encode(authGroup,"UTF-8")).append(":").append(java.net.URLEncoder.encode(acl[j++],"UTF-8")).append("\n");
}
}
}