procyberian/gcc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

decl.c (init_decl_processing): Add new class "protectionDomain" field.

Browse source 
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
This commit is contained in:
Bryce McKinlay 2001-04-25 16:45:15 +01:00
parent 744cfa53c3
commit 28f7d9d05a
115 changed files with 11887 additions and 1549 deletions
Download patch file Download diff file Expand all files Collapse all files

359
libjava/java/security/Security.java
View file

@ -1,107 +1,322 @@
/* Copyright (C) 2000 Free Software Foundation
/* Security.java --- Java base security class implmentation
Copyright (C) 1999, 2001 Free Software Foundation, Inc.
This file is part of libgcj.
This file is part of GNU Classpath.
This software is copyrighted work licensed under the terms of the
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */
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.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.FileNotFoundException;
import java.security.Provider;
import java.util.Vector;
import java.util.Enumeration;
import java.util.Properties;
import java.util.Vector;
/**
* @author Tom Tromey <tromey@cygnus.com>
* @date February 8, 2000.
Security class that loads the Providers and provides an
interface to security properties.
@author Mark Benvenuto <ivymccough@worldnet.att.net>
*/
/**
* Written using on-line Java Platform 1.2 API Specification.
* Status: Still missing the deprecated getAlgorithmProperty method.
*/
public final class Security
public final class Security extends Object
{
public static int insertProviderAt (Provider provider, int position)
private static Vector providers = new Vector();
private static int providerCount = 0;
private static Properties secprops;
static
{
SecurityManager sm = System.getSecurityManager ();
if (sm != null)
loadProviders();
}
private static void loadProviders()
{
String separator = System.getProperty("file.separator");
String secfilestr = System.getProperty("java.home") +
separator + "lib" + separator + "security" + separator +
"classpath.security";
providerCount = 0;
try
{
// FIXME: need SecurityPermission.
// sm.checkSecurityAccess ("insertProvider." + provider.getName ());
File secFile = new File(secfilestr);
FileInputStream fin = new FileInputStream(secFile);
secprops = new Properties();
secprops.load(fin);
int i = 1;
String name;
StringBuffer pname = new StringBuffer("security.provider.");
while ((name = secprops.getProperty(pname.append(i).toString())) !=
null)
{
Exception exception = null;
try
{
providers.addElement(Class.forName(name).newInstance());
providerCount++;
i++;
}
catch (ClassNotFoundException x)
{
exception = x;
}
catch (InstantiationException x)
{
exception = x;
}
catch (IllegalAccessException x)
{
exception = x;
}
if (exception != null)
System.err.println ("Error loading security provider " + name
+ ": " + exception);
}
}
if (providers.indexOf (provider) != -1)
return -1;
if (position > providers.size ())
position = providers.size ();
providers.insertElementAt (provider, position);
return providers.indexOf (provider);
}
public static int addProvider (Provider provider)
{
return insertProviderAt (provider, providers.size ());
}
public static void removeProvider (String name)
{
SecurityManager sm = System.getSecurityManager ();
if (sm != null)
catch (FileNotFoundException ignored)
{
// FIXME: need SecurityPermission.
// sm.checkSecurityAccess ("removeProvider." + name);
// Actually we probibly shouldn't ignore these, once the security
// properties file is actually installed somewhere.
}
Provider p = getProvider (name);
if (p != null)
providers.removeElement (p);
}
public static Provider[] getProviders ()
{
Provider[] r = new Provider[providers.size ()];
providers.copyInto (r);
return r;
}
public static Provider getProvider (String name)
{
Enumeration e = providers.elements ();
while (e.hasMoreElements ())
catch (IOException ignored)
{
Provider p = (Provider) e.nextElement ();
if (name.equals (p.getName ()))
return p;
}
}
/**
Gets a specific property for an algorithm. This is used to produce specialized
algorithm parsers.
@deprecated it used to a return the value of a propietary property
for the "SUN" Cryptographic Service Provider to obtain
algorithm-specific parameters. Used AlogorithmParameters and
KeyFactory instead.
@param algName name of algorithm to get property of
@param propName name of property to check
@return a string containing the value of the property
*/
public static String getAlgorithmProperty(String algName, String propName)
{
/* TODO: Figure out what this actually does */
return null;
}
public static String getProperty (String key)
/**
Adds a new provider at the specified position. This allows dynamic loading
of providers. It will check for duplication of providers.
This class checks the security manager with the call checkSecurityAccess
with "insertProvider."+provider.getName() to see if the user can add this
provider.
@param provider the provider to add
@param position position to add the provider at
@return the position the provider was added at, or -1 if a duplicate provider
was found
@throws SecurityException - if the security manager denies access to add a
new provider
*/
public static int insertProviderAt(Provider provider, int position)
{
SecurityManager sm = System.getSecurityManager ();
SecurityManager sm = System.getSecurityManager();
if (sm != null)
sm.checkSecurityAccess("insertProvider." + provider.getName());
for (int i = 0; i < providerCount; i++)
{
// FIXME: need SecurityPermission.
// sm.checkSecurityAccess ("getProperty." + key);
if (((Provider) providers.elementAt(i)).getName() ==
provider.getName())
return -1;
}
return props.getProperty (key);
if (position < 0)
position = 0;
if (position > providerCount)
position = providerCount;
providers.insertElementAt(provider, position);
providerCount++;
return position;
}
public static void setProperty (String key, String value)
/**
Adds a new provider. This allows dynamic loading
of providers. It will check for duplication of providers.
This method checks the security manager with the call checkSecurityAccess
with "insertProvider."+provider.getName() to see if the user can add this
provider.
@param provider the provider to add
@return the position the provider was added at, or -1 if a duplicate provider
was found
@throws SecurityException - if the security manager denies access to add a
new provider
*/
public static int addProvider(Provider provider)
{
SecurityManager sm = System.getSecurityManager ();
SecurityManager sm = System.getSecurityManager();
if (sm != null)
sm.checkSecurityAccess("insertProvider." + provider.getName());
for (int i = 0; i < providerCount; i++)
{
// FIXME: need SecurityPermission.
// sm.checkSecurityAccess ("setProperty." + key);
if (((Provider) providers.elementAt(i)).getName() ==
provider.getName())
return -1;
}
props.setProperty (key, value);
providers.addElement(provider);
providerCount++;
return providerCount - 1;
}
// The providers we list.
private static Vector providers = new Vector ();
/**
Removes a provider. This allows dynamic unloading
of providers. It will automatically shift up providers to a higher
ranking. If the provider is not installed, it fails silently.
// Security propertiesl
private static Properties props = new Properties ();
This method checks the security manager with the call checkSecurityAccess
with "removeProvider."+provider.getName() to see if the user can remove this
provider.
@param name name of the provider to add
@throws SecurityException - if the security manager denies access to remove a
new provider
*/
public static void removeProvider(String name)
{
SecurityManager sm = System.getSecurityManager();
if (sm != null)
sm.checkSecurityAccess("removeProvider." + name);
Provider p = null;
for (int i = 0; i < providerCount; i++)
{
if (((Provider) providers.elementAt(i)).getName() == name)
{
p = (Provider) providers.elementAt(i);
break;
}
}
if (p != null)
if (providers.removeElement(p))
providerCount--;
}
/**
Returns array containing all the providers. It is in the preference order
of the providers.
@return an array of installed providers
*/
public static Provider[] getProviders()
{
Provider array[] = new Provider[providerCount];
for (int i = 0; i < providerCount; i++)
array[i] = (Provider) providers.elementAt(i);
return array;
}
/**
Returns the provider with the specified name. It will return null
if the provider cannot be found.
@param name name of the requested provider
@return requested provider
*/
public static Provider getProvider(String name)
{
Provider p = null;
for (int i = 0; i < providerCount; i++)
{
p = (Provider) providers.elementAt(i);
if (p.getName() == name)
break;
}
return p;
}
/**
Gets the value of a security property.
This method checks the security manager with the call checkSecurityAccess
with "getProperty."+key to see if the user can get this property.
@param key property to get
@return value of the property
@throws SecurityException - if the security manager denies access to
getting a property
*/
public static String getProperty(String key)
{
SecurityManager sm = System.getSecurityManager();
if (sm != null)
sm.checkSecurityAccess("getProperty." + key);
return secprops.getProperty(key);
}
/**
Sets the value of a security property.
This method checks the security manager with the call checkSecurityAccess
with "setProperty."+key to see if the user can get this property.
@param key property to set
@param datnum new value of property
@throws SecurityException - if the security manager denies access to
setting a property
*/
public static void setProperty(String key, String datnum)
{
SecurityManager sm = System.getSecurityManager();
if (sm != null)
sm.checkSecurityAccess("setProperty." + key);
secprops.put(key, datnum);
}
}