inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V3.2E to HEAD

Browse Source 
17246: ETHREEOH-3208: User profiles for users authenticated by immutable subsystems are now read only
         - Introduced MutableAuthenticationService interface, only implemented by Alfresco native authentication service
         - Split out those methods from AuthenticationService that mutate the user store and added isAuthenticationMutable()
         - Now both Alfresco Explorer and Share user profile / password edit link rendering is conditional on isAuthenticationMutable
         - Works with authentication chain containing mixture of internally and externally authenticated users
   17247: Fix failing unit tests
         - rm-public-services-security-context.xml needed to be brought in line with public-services-security-context.xml (and will forever more!)
   17248: ETHREEOH-1593: alfUser cookie value should be base 64 encoded to allow for non-ASCII characters
   17253: *RECORD ONLY* ETHREEOH-2885: web.xml must conform to the schema to work on JBoss

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18098 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2010-01-18 15:32:57 +00:00
parent 0399805772
commit 7f24c8c4e7
59 changed files with 742 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/java/org/alfresco/util/BaseAlfrescoSpringTest.java
View File

@@ -30,7 +30,7 @@ import org.alfresco.service.cmr.repository.ContentService;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.security.AuthenticationService;
import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.alfresco.service.transaction.TransactionService;
/**
@@ -51,7 +51,7 @@ public abstract class BaseAlfrescoSpringTest extends BaseSpringTest
protected ContentService contentService;
/** The authentication service */
protected AuthenticationService authenticationService;
protected MutableAuthenticationService authenticationService;
/** The store reference */
protected StoreRef storeRef;
@@ -74,7 +74,7 @@ public abstract class BaseAlfrescoSpringTest extends BaseSpringTest
// Get a reference to the node service
this.nodeService = (NodeService) this.applicationContext.getBean("nodeService");
this.contentService = (ContentService) this.applicationContext.getBean("contentService");
this.authenticationService = (AuthenticationService) this.applicationContext.getBean("authenticationService");
this.authenticationService = (MutableAuthenticationService) this.applicationContext.getBean("authenticationService");
this.actionService = (ActionService)this.applicationContext.getBean("actionService");
this.transactionService = (TransactionService)this.applicationContext.getBean("transactionComponent");

7
source/java/org/alfresco/util/TestWithUserUtils.java
View File

@@ -32,6 +32,7 @@ import org.alfresco.repo.security.authentication.AuthenticationComponent;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.security.AuthenticationService;
import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName;
@@ -56,7 +57,7 @@ public abstract class TestWithUserUtils
String password,
NodeRef rootNodeRef,
NodeService nodeService,
AuthenticationService authenticationService)
MutableAuthenticationService authenticationService)
{
// ignore if the user's authentication already exists
if (authenticationService.authenticationExists(userName))
@@ -105,7 +106,7 @@ public abstract class TestWithUserUtils
public static void authenticateUser(
String userName,
String password,
AuthenticationService authenticationService,
MutableAuthenticationService authenticationService,
AuthenticationComponent authenticationComponent)
{
// go system
@@ -144,7 +145,7 @@ public abstract class TestWithUserUtils
}
public static void deleteUser(String user_name, String pwd, NodeRef ref, NodeService service, AuthenticationService service2)
public static void deleteUser(String user_name, String pwd, NodeRef ref, NodeService service, MutableAuthenticationService service2)
{
service2.deleteAuthentication(user_name);
}

167
source/java/org/alfresco/util/ValueDerivingMapFactory.java Normal file
View File

@@ -0,0 +1,167 @@
/*
* Copyright (C) 2005-2009 Alfresco Software Limited.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* As a special exception to the terms and conditions of version 2.0 of
* the GPL, you may redistribute this Program in connection with Free/Libre
* and Open Source Software ("FLOSS") applications as described in Alfresco's
* FLOSS exception. You should have received a copy of the text describing
* the FLOSS exception, and it is also available here:
* http://www.alfresco.com/legal/licensing"
*/
package org.alfresco.util;
import java.util.AbstractMap;
import java.util.AbstractSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
/**
* A factory for maps that dynamically derive their looked up values from a given source object.
*
* @author dward
*/
public class ValueDerivingMapFactory<O, K, V>
{
/** A map of value derivers that derive the value of each entry from a given source. */
private final Map<K, ValueDeriver<O, V>> valueDerivers;
/**
* Instantiates a new value deriving map factory.
*
* @param valueDerivers
* a map of value derivers that derive the value of each entry from a given source
*/
public ValueDerivingMapFactory(Map<K, ValueDeriver<O, V>> valueDerivers)
{
this.valueDerivers = valueDerivers;
}
/**
* Gets a map that derives its values from the given source.
*
* @param source
* the source
* @return the map
*/
public Map<K, V> getMap(final O source)
{
return new AbstractMap<K, V>()
{
@Override
public V get(Object key)
{
ValueDeriver<O, V> valueDeriver = ValueDerivingMapFactory.this.valueDerivers.get(key);
return valueDeriver == null ? null : valueDeriver.deriveValue(source);
}
@Override
public boolean containsKey(Object key)
{
return ValueDerivingMapFactory.this.valueDerivers.containsKey(key);
}
@Override
public Set<K> keySet()
{
return ValueDerivingMapFactory.this.valueDerivers.keySet();
}
@Override
public int size()
{
return ValueDerivingMapFactory.this.valueDerivers.size();
}
@Override
public Set<Map.Entry<K, V>> entrySet()
{
final Set<Map.Entry<K, ValueDeriver<O, V>>> entries = ValueDerivingMapFactory.this.valueDerivers
.entrySet();
return new AbstractSet<Entry<K, V>>()
{
@Override
public Iterator<Map.Entry<K, V>> iterator()
{
final Iterator<Map.Entry<K, ValueDeriver<O, V>>> i = entries.iterator();
return new Iterator<Map.Entry<K, V>>()
{
public boolean hasNext()
{
return i.hasNext();
}
public Map.Entry<K, V> next()
{
final Map.Entry<K, ValueDeriver<O, V>> next = i.next();
return new Map.Entry<K, V>()
{
public K getKey()
{
return next.getKey();
}
public V getValue()
{
return get(next.getKey());
}
public V setValue(V value)
{
throw new UnsupportedOperationException();
}
};
}
public void remove()
{
throw new UnsupportedOperationException();
}
};
}
@Override
public int size()
{
return entries.size();
}
};
}
};
}
/**
* An interface for objects that derive the value for a specific entry in the map.
*/
public interface ValueDeriver<O, V>
{
/**
* Derives a value from the given source.
*
* @param source
* the source
* @return the derived value
*/
public V deriveValue(O source);
}
}