Update of
/var/cvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext
In directory
james.mmbase.org:/tmp/cvs-serv24037/src/org/mmbase/security/implementation/cloudcontext
Modified Files:
BasicContextProvider.java BasicUserProvider.java
Log Message:
The encoding property is actually not needed, because pleonastic. The processor
or the password field suffices to define it.
See also:
http://cvs.mmbase.org/viewcvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext
Index: BasicContextProvider.java
===================================================================
RCS file:
/var/cvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/BasicContextProvider.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- BasicContextProvider.java 5 Jan 2009 16:35:39 -0000 1.8
+++ BasicContextProvider.java 6 Jan 2009 11:42:10 -0000 1.9
@@ -35,7 +35,7 @@
* This is a basic implemention of {...@link ContextProvider} that implements
all the methods in a default way.
*
* @author Michiel Meeuwissen
- * @version $Id: BasicContextProvider.java,v 1.8 2009/01/05 16:35:39 michiel
Exp $
+ * @version $Id: BasicContextProvider.java,v 1.9 2009/01/06 11:42:10 michiel
Exp $
* @since MMBase-1.9.1
*/
public class BasicContextProvider implements ContextProvider {
@@ -444,10 +444,8 @@
if (groupsAndUsers.contains(userNode)) return true;
}
- Iterator<MMObjectNode> iter = groupsAndUsers.iterator();
- // now checking if this user is in one of these groups.
- while (iter.hasNext()) {
- MMObjectNode group = iter.next();
+
+ for (MMObjectNode group : groupsAndUsers) {
if (! (group.getBuilder() instanceof Groups)) continue;
if (log.isTraceEnabled()) {
log.trace("checking group " + group);
Index: BasicUserProvider.java
===================================================================
RCS file:
/var/cvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/BasicUserProvider.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- BasicUserProvider.java 23 Dec 2008 17:30:42 -0000 1.1
+++ BasicUserProvider.java 6 Jan 2009 11:42:10 -0000 1.2
@@ -14,6 +14,7 @@
import java.util.*;
import org.mmbase.util.transformers.*;
import org.mmbase.module.core.*;
+import org.mmbase.datatypes.DataType;
import org.mmbase.core.CoreField;
import org.mmbase.security.SecurityException;
import org.mmbase.security.Rank;
@@ -27,14 +28,13 @@
* This is a basic implemention of {...@link Provider} that implements all the
methods in a default way.
*
* @author Michiel Meeuwissen
- * @version $Id: BasicUserProvider.java,v 1.1 2008/12/23 17:30:42 michiel Exp $
+ * @version $Id: BasicUserProvider.java,v 1.2 2009/01/06 11:42:10 michiel Exp $
* @since MMBase-1.9.1
*/
public abstract class BasicUserProvider implements UserProvider {
private static final Logger log =
Logging.getLoggerInstance(BasicUserProvider.class);
- private static final CharTransformer md5 = new MD5();
protected String statusField = Users.FIELD_STATUS;
protected String userNameField = Users.FIELD_USERNAME;
@@ -112,7 +112,7 @@
if (log.isDebugEnabled()) {
log.debug("username: '" + userName + "' found in node #" +
user.getNumber() + " --> PASSWORDS NOT EQUAL (" + encodedPassword + " != " +
dbPassword + ")");
}
- return null;
+ throw new SecurityException("password for '" + userName + "'
incorrect");
}
}
@@ -278,7 +278,8 @@
public String encode(String e) {
- return md5.transform(e);
+ org.mmbase.bridge.Field field =
getUserBuilder().getField(getPasswordField());
+ return
org.mmbase.util.Casting.toString(field.getDataType().getProcessor(DataType.PROCESS_SET).process(null,
field, e));
}
public MMObjectBuilder getUserBuilder() {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
