You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by re...@apache.org on 2001/02/27 08:29:25 UTC
cvs commit: jakarta-slide/src/share/org/apache/slide/structure GroupNode.java
remm 01/02/26 23:29:25
Modified: src/share/org/apache/slide/security SecurityImpl.java
Added: src/share/org/apache/slide/structure GroupNode.java
Log:
- Add permission group functionality, contributed by David McDonnell
<David.McDonnell at csu.edu.au>.
- Add a new GroupNode node type. That group node contain links which are
then use to "expand" permissions.
Revision Changes Path
1.21 +59 -4 jakarta-slide/src/share/org/apache/slide/security/SecurityImpl.java
Index: SecurityImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/security/SecurityImpl.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- SecurityImpl.java 2001/02/26 12:52:00 1.20
+++ SecurityImpl.java 2001/02/27 07:29:25 1.21
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/security/SecurityImpl.java,v 1.20 2001/02/26 12:52:00 juergen Exp $
- * $Revision: 1.20 $
- * $Date: 2001/02/26 12:52:00 $
+ * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/security/SecurityImpl.java,v 1.21 2001/02/27 07:29:25 remm Exp $
+ * $Revision: 1.21 $
+ * $Date: 2001/02/27 07:29:25 $
*
* ====================================================================
*
@@ -75,7 +75,7 @@
* Security helper.
*
* @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
- * @version $Revision: 1.20 $
+ * @version $Revision: 1.21 $
*/
public final class SecurityImpl implements Security {
@@ -450,6 +450,61 @@
.startsWith(permission.getSubjectUri()))
&& (actionUri.toString()
.startsWith(permission.getActionUri()));
+
+ } else if (permissionSubject.startsWith("+")) {
+
+ // Permission group which needs to be expanded
+ Uri permissionSubjectUri =
+ namespace.getUri(permissionSubject.substring(1));
+ ObjectNode group =
+ permissionSubjectUri.getStore().retrieveObject
+ (permissionSubjectUri);
+ // if the node is a GroupNode, expand it out to
+ // normal permissions
+ if (group instanceof
+ org.apache.slide.structure.GroupNode ) {
+ if (group.hasChildren()) {
+ Enumeration groupMembers =
+ group.enumerateChildren();
+ // parse thru the children of the group and
+ // check permissions on each
+ while (groupMembers.hasMoreElements()) {
+
+ oldGranted = granted;
+ oldDenied = denied;
+
+ Uri childUri =
+ namespace.getUri
+ ((String)
+ groupMembers.nextElement());
+ ObjectNode childNode =
+ childUri.getStore().retrieveObject
+ (childUri);
+ String childSubjectUri = childNode
+ instanceof LinkNode ?
+ ((LinkNode) childNode)
+ .getLinkedUri() :
+ childNode.getUri() ;
+
+ granted = (!permission.isNegative())
+ && (subjectUri.toString()
+ .startsWith(childSubjectUri))
+ && (actionUri.toString()
+ .startsWith
+ (permission.getActionUri()));
+ denied = (permission.isNegative())
+ && (subjectUri.toString()
+ .startsWith(childSubjectUri))
+ && (actionUri.toString()
+ .startsWith
+ (permission.getActionUri()));
+
+ granted = granted | oldGranted;
+ denied = denied | oldDenied;
+
+ }
+ }
+ }
} else {
1.1 jakarta-slide/src/share/org/apache/slide/structure/GroupNode.java
Index: GroupNode.java
===================================================================
/*
* $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/structure/GroupNode.java,v 1.1 2001/02/27 07:29:25 remm Exp $
* $Revision: 1.1 $
* $Date: 2001/02/27 07:29:25 $
*
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
* [Additional notices, if required by prior licensing conditions]
*
*/
package org.apache.slide.structure;
import java.util.Vector;
/**
* GroupNode class
*
* @author <a href="mailto:david.mcdonnell@csu.edu.au">Dave McDonnell</a>
* @version $Revision: 1.1 $
*/
public class GroupNode extends ObjectNode {
/**
* Constructor.
*/
public GroupNode() {
super();
}
/**
* Default constructor.
*/
public GroupNode(String uri) {
super(uri);
}
/**
* Default constructor.
*/
public GroupNode(String uri, Vector children, Vector links) {
super(uri, children, links);
}
}