Merge in ant and update from origin/masterv20120405-1314N20120417-1633N20120417-1307N20120416-1918I20120417-1000I20120417-0800I20120417-0334I20120417-0255I20120417-0235I20120417-0211I20120417-0142I20120416-2327I20120416-1738I20120416-1719I20120416-1643I20120416-1623I20120416-1600I20120416-1508I20120413-1800I20120411-2034I20120411-1737I20120411-0906I20120411-0258I20120410-2330I20120410-2037I20120410-1710I20120410-0633I20120410-0320I20120410-0304I20120410-0252I20120410-0238I20120410-0216I20120410-0152I20120410-0136I20120410-0122I20120410-0102I20120410-0049I20120410-0027I20120409-2358I20120409-2119I20120409-2018I20120409-1957I20120409-1911I20120409-1708I20120409-1622I20120409-1353I20120409-0926I20120409-0904I20120409-0315I20120409-0131I20120408-2304I20120408-2000I20120408-1521I20120408-1324I20120408-1214I20120408-1110I20120408-0330I20120408-0246I20120408-0231I20120408-0216I20120408-0152I20120408-0036I20120408-0012I20120407-2339I20120407-2245I20120407-2106I20120407-1941I20120407-1904I20120407-1840I20120407-1826I20120407-1732I20120407-1717I20120407-1631I20120407-0358I20120407-0346I20120407-0329I20120407-0305I20120407-0217I20120407-0205I20120407-0138I20120407-0103I20120407-0040I20120407-0024I20120406-2327I20120406-0935I20120406-0915I20120406-0250I20120406-0231I20120406-0006I20120405-2131I20120405-1735I20120405-1114

1 files changed, 373 insertions, 0 deletions

diff --git a/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/AntSecurityManager.java b/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/AntSecurityManager.java
new file mode 100644
index 000000000..fd79ddeea
--- /dev/null
+++ b/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/AntSecurityManager.java
@@ -0,0 +1,373 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.ant.internal.core;
+
+
+import java.io.FileDescriptor;
+import java.net.InetAddress;
+import java.net.SocketPermission;
+import java.security.Permission;
+import java.util.PropertyPermission;
+import org.eclipse.ant.core.AntSecurityException;
+
+/**
+ * A security manager that always throws an <code>AntSecurityException</code>
+ * if the calling thread attempts to cause the Java Virtual Machine to 
+ * exit/halt or if the restricted thread attempts to set a System property.
+ * Otherwise this manager just delegates to the pre-existing manager
+ * passed in the constructor or mimics the default security manager behavior
+ */
+public class AntSecurityManager extends SecurityManager {
+
+	private SecurityManager fSecurityManager= null;
+	private Thread fRestrictedThread= null;
+	//ensure that the PropertyPermission class is loaded before we 
+	//start checking permissions: bug 85908
+	private static final PropertyPermission fgPropertyPermission= new PropertyPermission("*", "write"); //$NON-NLS-1$ //$NON-NLS-2$
+	
+	private boolean fAllowSettingSystemProperties= true;
+	
+	public AntSecurityManager(SecurityManager securityManager, Thread restrictedThread, boolean allowSettingProperties) {
+		fSecurityManager= securityManager;
+		fRestrictedThread= restrictedThread;
+		fAllowSettingSystemProperties= allowSettingProperties;
+	}
+	
+	public AntSecurityManager(SecurityManager securityManager, Thread restrictedThread) {
+		this(securityManager, restrictedThread, true);
+	}
+	
+	/* (non-Javadoc)
+	 * @see java.lang.SecurityManager#checkExit(int)
+	 */
+	public void checkExit(int status) {
+		//no exit allowed from the restricted thread...System.exit is being called
+		//by some ant task...do not want Eclipse to exit if
+		//in the same VM.
+		if (Thread.currentThread() == fRestrictedThread) {
+			throw new AntSecurityException();
+		}
+		if (fSecurityManager != null) {
+			fSecurityManager.checkExit(status);
+		}
+	}
+	/* (non-Javadoc)
+	 * @see java.lang.SecurityManager#checkAccept(java.lang.String, int)
+	 */
+	public void checkAccept(String host, int port) {
+		if (fSecurityManager != null) {
+			fSecurityManager.checkAccept(host, port);
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.SecurityManager#checkAccess(java.lang.Thread)
+	 */
+	public void checkAccess(Thread t) {
+		if (fSecurityManager != null) {
+			fSecurityManager.checkAccess(t);
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.SecurityManager#checkAccess(java.lang.ThreadGroup)
+	 */
+	public void checkAccess(ThreadGroup g) {
+		if (fSecurityManager != null) {
+			fSecurityManager.checkAccess(g);
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.SecurityManager#checkAwtEventQueueAccess()
+	 */
+	public void checkAwtEventQueueAccess() {
+		if (fSecurityManager != null) {
+			fSecurityManager.checkAwtEventQueueAccess();
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.SecurityManager#checkConnect(java.lang.String, int, java.lang.Object)
+	 */
+	public void checkConnect(String host, int port, Object context) {
+		if (fSecurityManager != null) {
+			fSecurityManager.checkConnect(host, port, context);
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.SecurityManager#checkConnect(java.lang.String, int)
+	 */
+	public void checkConnect(String host, int port) {
+		if (fSecurityManager != null) {
+			fSecurityManager.checkConnect(host, port);
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.SecurityManager#checkCreateClassLoader()
+	 */
+	public void checkCreateClassLoader() {
+		if (fSecurityManager != null) {
+			fSecurityManager.checkCreateClassLoader();
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.SecurityManager#checkDelete(java.lang.String)
+	 */
+	public void checkDelete(String file) {
+		if (fSecurityManager != null) {
+			fSecurityManager.checkDelete(file);
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.SecurityManager#checkExec(java.lang.String)
+	 */
+	public void checkExec(String cmd) {
+		if (fSecurityManager != null) {
+			fSecurityManager.checkExec(cmd);
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.SecurityManager#checkLink(java.lang.String)
+	 */
+	public void checkLink(String lib) {
+		if (fSecurityManager != null) {
+			fSecurityManager.checkLink(lib);
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.SecurityManager#checkListen(int)
+	 */
+	public void checkListen(int port) {
+		if (fSecurityManager != null) {
+			fSecurityManager.checkListen(port);
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.SecurityManager#checkMemberAccess(java.lang.Class, int)
+	 */
+	public void checkMemberAccess(Class clazz, int which) {
+		if (fSecurityManager != null) {
+			fSecurityManager.checkMemberAccess(clazz, which);
+		}
+	}
+
+	/**
+	 * @see java.lang.SecurityManager#checkMulticast(java.net.InetAddress, byte)
+	 * @deprecated
+	 */
+	public void checkMulticast(InetAddress maddr, byte ttl) {
+		if (fSecurityManager != null) {
+			String host = maddr.getHostAddress();
+			if (!host.startsWith("[") && host.indexOf(':') != -1) { //$NON-NLS-1$
+	   			host = "[" + host + "]"; //$NON-NLS-1$ //$NON-NLS-2$
+			}
+	    	checkPermission(new SocketPermission(host, "accept,connect")); //$NON-NLS-1$
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.SecurityManager#checkMulticast(java.net.InetAddress)
+	 */
+	public void checkMulticast(InetAddress maddr) {
+		if (fSecurityManager != null) {
+			fSecurityManager.checkMulticast(maddr);
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.SecurityManager#checkPackageAccess(java.lang.String)
+	 */
+	public void checkPackageAccess(String pkg) {
+		if (fSecurityManager != null) {
+			fSecurityManager.checkPackageAccess(pkg);
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.SecurityManager#checkPackageDefinition(java.lang.String)
+	 */
+	public void checkPackageDefinition(String pkg) {
+		if (fSecurityManager != null) {
+			fSecurityManager.checkPackageDefinition(pkg);
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.SecurityManager#checkPermission(java.security.Permission, java.lang.Object)
+	 */
+	public void checkPermission(Permission perm, Object context) {
+		if (fSecurityManager != null) {
+			fSecurityManager.checkPermission(perm, context);
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.SecurityManager#checkPermission(java.security.Permission)
+	 */
+	public void checkPermission(Permission perm) {
+		if (!fAllowSettingSystemProperties && fgPropertyPermission.implies(perm) && fRestrictedThread == Thread.currentThread()) {
+			//attempting to write a system property
+			throw new AntSecurityException();
+		}
+		if (fSecurityManager != null) {
+			fSecurityManager.checkPermission(perm);
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.SecurityManager#checkPrintJobAccess()
+	 */
+	public void checkPrintJobAccess() {
+		if (fSecurityManager != null) {
+			fSecurityManager.checkPrintJobAccess();
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.SecurityManager#checkPropertiesAccess()
+	 */
+	public void checkPropertiesAccess() {
+		if (fSecurityManager != null) {
+			fSecurityManager.checkPropertiesAccess();
+		}
+		super.checkPropertiesAccess();
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.SecurityManager#checkPropertyAccess(java.lang.String)
+	 */
+	public void checkPropertyAccess(String key) {
+		if (fSecurityManager != null) {
+			fSecurityManager.checkPropertyAccess(key);
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.SecurityManager#checkRead(java.io.FileDescriptor)
+	 */
+	public void checkRead(FileDescriptor fd) {
+		if (fSecurityManager != null) {
+			fSecurityManager.checkRead(fd);
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.SecurityManager#checkRead(java.lang.String, java.lang.Object)
+	 */
+	public void checkRead(String file, Object context) {
+		if (fSecurityManager != null) {
+			fSecurityManager.checkRead(file, context);
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.SecurityManager#checkRead(java.lang.String)
+	 */
+	public void checkRead(String file) {
+		if (fSecurityManager != null) {
+			fSecurityManager.checkRead(file);
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.SecurityManager#checkSecurityAccess(java.lang.String)
+	 */
+	public void checkSecurityAccess(String target) {
+		if (fSecurityManager != null) {
+			fSecurityManager.checkSecurityAccess(target);
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.SecurityManager#checkSetFactory()
+	 */
+	public void checkSetFactory() {
+		if (fSecurityManager != null) {
+			fSecurityManager.checkSetFactory();
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.SecurityManager#checkSystemClipboardAccess()
+	 */
+	public void checkSystemClipboardAccess() {
+		if (fSecurityManager != null) {
+			fSecurityManager.checkSystemClipboardAccess();
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.SecurityManager#checkTopLevelWindow(java.lang.Object)
+	 */
+	public boolean checkTopLevelWindow(Object window) {
+		if (fSecurityManager != null) {
+			return fSecurityManager.checkTopLevelWindow(window);
+		}
+		return super.checkTopLevelWindow(window);
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.SecurityManager#checkWrite(java.io.FileDescriptor)
+	 */
+	public void checkWrite(FileDescriptor fd) {
+		if (fSecurityManager != null) {
+			fSecurityManager.checkWrite(fd);
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.SecurityManager#checkWrite(java.lang.String)
+	 */
+	public void checkWrite(String file) {
+		if (fSecurityManager != null) {
+			fSecurityManager.checkWrite(file);
+		}
+	}
+
+	/**
+	 * @see java.lang.SecurityManager#getInCheck()
+	 * @deprecated
+	 */
+	public boolean getInCheck() {
+		if (fSecurityManager != null) {
+			return fSecurityManager.getInCheck();
+		}
+		return super.getInCheck();
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.SecurityManager#getSecurityContext()
+	 */
+	public Object getSecurityContext() {
+		if (fSecurityManager != null) {
+			return fSecurityManager.getSecurityContext();
+		}
+		return super.getSecurityContext();
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.SecurityManager#getThreadGroup()
+	 */
+	public ThreadGroup getThreadGroup() {
+		if (fSecurityManager != null) {
+			fSecurityManager.getThreadGroup();
+		}
+		return super.getThreadGroup();
+	}
+}