gcc/libjava/java/security/Permissions.java
Bryce McKinlay 28f7d9d05a decl.c (init_decl_processing): Add new class "protectionDomain" field.
gcc/java:

2001-04-25  Bryce McKinlay  <bryce@waitaki.otago.ac.nz>

	* decl.c (init_decl_processing): Add new class "protectionDomain"
	field.
	* class.c (make_class_data): Set initial value for "protectionDomain".

libjava:

2001-04-25  Bryce McKinlay  <bryce@albatross.co.nz>

	java.security merge and ClassLoader compliance fixes.

	* java/lang/Class.h (Class): Include ProtectionDomain.h.
	New protectionDomain field.
	(forName): Add initialize parameter. Fixes declaration to comply with
	JDK spec.
	* java/lang/natClass.cc (forName): Correct declaration of the three-arg
	variant. Honour	"initialize" flag.
	(getProtectionDomain0): New method.
	* java/lang/Class.java: Fix forName() declaration.
	(getPackage): New method based on Classpath implementation.
	(getProtectionDomain0): New native method decl.
	(getProtectionDomain): New method.
	* java/lang/ClassLoader.java (getParent): Now final.
	(definedPackages): New field.
	(getPackage): New.
	(defineClass): New variant with protectionDomain argument.
	(definePackage): New.
	(getPackages): New.
	(findSystemClass): Now final.
	(getSystemResourceAsStream): Remove redundant "final" modifier.
	(getSystemResource): Remove redundant "final" modifier.
	(getResources): Now final.
	(protectionDomainPermission): New static field.
	(unknownProtectionDomain): Ditto.
	(defaultProtectionDomain): Ditto.
	(getSystemClassLoader): Now non-native.
	* java/util/ResourceBundle.java (tryGetSomeBundle): Use the correct
	arguments for Class.forName().
	* java/lang/Package.java: New file.
	* gnu/gcj/runtime/VMClassLoader.java (getVMClassLoader): Removed.
	(instance): Static initialize singleton.
	(findClass): Override this, not findSystemClass.
	* java/lang/natClassLoader.cc (defineClass0): Set class's
	protectionDomain field as specified.
	(getSystemClassLoader): Removed.
	(findClass): Renamed from findSystemClass. Call the interpreter via
	URLClassLoader.findClass if loading class via dlopen fails.

	* java/security/*.java: java.security import/merge with Classpath.
	* java/security/acl/*.java: Likewise.
	* java/security/interfaces/*.java: Likewise.
	* java/security/spec/*.java: Likewise.
	* java/net/NetPermission.java: Likewise.
	* java/net/SocketPermission.java: Likewise.
	* gnu/java/security/provider/DefaultPolicy.java: Likewise.

	* Makefile.am: Add new classes.
	* Makefile.in: Rebuilt.
	* gcj/javaprims.h: CNI namespace rebuild.

From-SVN: r41543
2001-04-25 16:45:15 +01:00

258 lines
7.2 KiB
Java

/* Permissions.java -- A collection of permission collections
Copyright (C) 1998 Free Software Foundation, Inc.
This file is part of GNU Classpath.
GNU Classpath 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, or (at your option)
any later version.
GNU Classpath 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 GNU Classpath; see the file COPYING. If not, write to the
Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA.
As a special exception, if you link this library with other files to
produce an executable, this library does not by itself cause the
resulting executable to be covered by the GNU General Public License.
This exception does not however invalidate any other reasons why the
executable file might be covered by the GNU General Public License. */
package java.security;
import java.io.Serializable;
import java.util.Hashtable;
import java.util.Enumeration;
import java.util.NoSuchElementException;
/**
* This class is a heterogeneous collection of permissions. It is
* organized as a collection of <code>PermissionCollection</code>'s stored
* in a hashtable. Each individual <code>PermissionCollection</code>
* contains permissions of a single type. If a specific type of
* <code>Permission</code> does not provide a collection type to use
* via its <code>newPermissionCollection</code> method, then a default
* collection type which stores its permissions in a hash table will be
* used.
*
* @version 0.0
*
* @author Aaron M. Renn (arenn@urbanophile.com)
*/
public class Permissions extends PermissionCollection implements Serializable
{
/**
* Holds instances of <code>AllPermission</code>.
*/
private PermissionCollection allPermission;
/**
* This is the <code>Hashtable</code> that contains our collections.
*/
Hashtable perms = new Hashtable();
/**
* This method initializes a new instance of <code>Permissions</code>.
*/
public Permissions()
{
}
/**
* This method adds a new <code>Permission</code> to this collection. It
* will be stored in a <code>PermissionCollection</code> of the appropriate
* type, as determined by calling <code>newPermissionCollection</code> on
* the specified permission (if an appropriate collection does not already
* exist). If this object does not specify a particular type of collection,
* a default collection which stores in permissions in a hash table will
* be used.
*
* @param perm The <code>Permission</code> object to be added to this collection.
*
* @exception SecurityException If this collection is marked as read only.
* @exception IllegalArgumentException If the specified <code>Permission</code> cannot be added to this collection
*/
public void add(Permission perm)
throws SecurityException, IllegalArgumentException
{
if (isReadOnly())
throw new SecurityException("PermissionCollection is read only");
if (perm instanceof AllPermission)
{
if (allPermission == null)
{
allPermission = new
DefaultPermissionCollection("java.security.AllPermission");
perms.put("java.security.AllPermission", allPermission);
}
}
else
{
Object obj = perms.get(perm.getClass().getName());
if (obj != null)
{
if (!(obj instanceof PermissionCollection))
throw new RuntimeException("Internal error in Permissions");
((PermissionCollection) obj).add(perm);
}
else
{
PermissionCollection pc = perm.newPermissionCollection();
if (pc == null)
pc = new DefaultPermissionCollection(perm.getClass().getName());
pc.add(perm);
perms.put(perm.getClass().getName(), pc);
}
}
}
/**
* This method tests whether or not the specified <code>Permission</code>
* is implied by this <code>PermissionCollection</code>.
*
* @param perm The <code>Permission</code> to test.
*
* @return <code>true</code> if the specified permission is implied by this <code>PermissionCollection</code>, or <code>false</code> otherwise.
*/
public boolean implies(Permission perm)
{
if (allPermission != null)
return (true);
Object obj = perms.get(perm.getClass().getName());
if (obj == null)
return (false);
if (!(obj instanceof PermissionCollection))
return (false);
return (((PermissionCollection) obj).implies(perm));
}
/**
* This method returns an <code>Enumeration</code> which contains a
* list of all <code>Permission</code> objects contained in this
* collection.
*
* @return An <code>Enumeration</code> of this collection's elements.
*/
public Enumeration elements()
{
return new Enumeration()
{
Enumeration main_enum = perms.elements();
Enumeration sub_enum;
public boolean hasMoreElements()
{
if (sub_enum == null)
if (main_enum == null)
return (false);
else
{
if (!main_enum.hasMoreElements())
return (false);
else
{
try
{
PermissionCollection pc =
(PermissionCollection) main_enum.nextElement();
sub_enum = pc.elements();
}
catch (NoSuchElementException e)
{
return (false);
}
}
}
else if (!sub_enum.hasMoreElements())
{
sub_enum = null;
return (hasMoreElements());
}
return (true);
}
public Object nextElement() throws NoSuchElementException
{
if (!hasMoreElements())
throw new NoSuchElementException();
return (sub_enum.nextElement());
}
};
}
static class DefaultPermissionCollection extends PermissionCollection
implements Serializable
{
// Type of Permission we can store
private Class permcls;
// Hashtable where we store permissions.
private Hashtable perms = new Hashtable();
DefaultPermissionCollection(String permtype) throws IllegalArgumentException
{
try
{
permcls = Class.forName(permtype);
}
catch(ClassNotFoundException e)
{
throw new IllegalArgumentException(e.getMessage());
}
}
public void add(Permission perm)
throws SecurityException, IllegalArgumentException
{
if (isReadOnly())
throw new SecurityException("PermissionCollection is read only");
if (!permcls.isInstance(perm))
throw new IllegalArgumentException("Wrong permission type: " +
perm.getClass().getName());
if (perms.get(perm.getName()) != null)
throw new IllegalArgumentException("Duplicate permission: " +
perm.getName());
perms.put(perm.getName(), perm);
}
public boolean implies(Permission perm)
{
Object obj = perms.get(perm.getName());
if (obj == null)
return(false);
if (!(obj instanceof Permission))
return(false);
Permission p = (Permission)obj;
return(p.implies(perm));
}
public Enumeration elements()
{
return(perms.elements());
}
}
}