Attachment #157683 for bug #295030




import java.io.InputStream;
import java.io.OutputStream;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URL;
import java.text.DecimalFormat;
import java.util.Date;
import java.util.Map;
import org.eclipse.core.net.proxy.IProxyData;
import org.eclipse.core.net.proxy.IProxyService;
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.IAdapterManager;
import org.eclipse.core.runtime.IPath;

import org.eclipse.ecf.core.identity.Namespace;
import org.eclipse.ecf.core.security.IConnectContext;
import org.eclipse.ecf.core.util.Proxy;
import org.eclipse.ecf.core.util.ProxyAddress;
import org.eclipse.ecf.filetransfer.FileTransferJob;
import org.eclipse.ecf.filetransfer.IFileRangeSpecification;
import org.eclipse.ecf.filetransfer.IFileTransferListener;

import org.eclipse.ecf.filetransfer.service.IRetrieveFileTransfer;
import org.eclipse.ecf.internal.provider.filetransfer.Activator;
import org.eclipse.ecf.internal.provider.filetransfer.Messages;
import org.eclipse.ecf.provider.filetransfer.ProxySetupHelper;
import org.eclipse.ecf.provider.filetransfer.identity.FileTransferNamespace;
import org.eclipse.ecf.provider.filetransfer.util.PollingInputStream;
import org.eclipse.ecf.provider.filetransfer.util.TimeoutInputStream;

		// If it's been set directly (via ECF API) then this overrides platform
		// settings
		if (proxy == null) {
			proxy = ProxySetupHelper.getProxy(getRemoteFileURL().toExternalForm());
				IProxyService proxyService = Activator.getDefault().getProxyService();
				// Only do this if platform service exists
				if (proxyService != null && proxyService.isProxiesEnabled()) {
					// Setup via proxyService entry
					URI target = new URI(getRemoteFileURL().toExternalForm());
					final IProxyData[] proxies = proxyService.select(target);
					IProxyData selectedProxy = selectProxyFromProxies(target.getScheme(), proxies);
					if (selectedProxy != null) {
						proxy = new Proxy(((selectedProxy.getType().equalsIgnoreCase(IProxyData.SOCKS_PROXY_TYPE)) ? Proxy.Type.SOCKS : Proxy.Type.HTTP), new ProxyAddress(selectedProxy.getHost(), selectedProxy.getPort()), selectedProxy.getUserId(), selectedProxy.getPassword());
					}
				}
			} catch (Exception e) {
				// If we don't even have the classes for this (i.e. the
				// org.eclipse.core.net plugin not available)
				// then we simply log and ignore
				Activator.logNoProxyWarning(e);
			} catch (NoClassDefFoundError e) {
				Activator.logNoProxyWarning(e);
			}
		}
		if (proxy != null)
			setupProxy(proxy);




import java.io.InputStream;
import java.io.OutputStream;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URL;
import java.util.Map;
import org.eclipse.core.net.proxy.IProxyData;
import org.eclipse.core.net.proxy.IProxyService;
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.IAdapterManager;
import org.eclipse.core.runtime.IProgressMonitor;

import org.eclipse.ecf.core.identity.Namespace;
import org.eclipse.ecf.core.security.IConnectContext;
import org.eclipse.ecf.core.util.Proxy;
import org.eclipse.ecf.core.util.ProxyAddress;
import org.eclipse.ecf.filetransfer.FileTransferInfo;
import org.eclipse.ecf.filetransfer.FileTransferJob;
import org.eclipse.ecf.filetransfer.IFileTransferInfo;

import org.eclipse.ecf.filetransfer.service.ISendFileTransfer;
import org.eclipse.ecf.internal.provider.filetransfer.Activator;
import org.eclipse.ecf.internal.provider.filetransfer.Messages;
import org.eclipse.ecf.provider.filetransfer.ProxySetupHelper;
import org.eclipse.ecf.provider.filetransfer.identity.FileTransferNamespace;
import org.eclipse.osgi.util.NLS;


	protected void setupProxies() {
		// If it's been set directly (via ECF API) then this overrides platform settings
		if (proxy == null) {
			proxy = ProxySetupHelper.getProxy(getRemoteFileURL().toExternalForm());
				IProxyService proxyService = Activator.getDefault().getProxyService();
				// Only do this if platform service exists
				if (proxyService != null && proxyService.isProxiesEnabled()) {
					// Setup via proxyService entry
					URI target = new URI(getRemoteFileURL().toExternalForm());
					String type = IProxyData.SOCKS_PROXY_TYPE;
					if (target.getScheme().equalsIgnoreCase(IProxyData.HTTP_PROXY_TYPE)) {
						type = IProxyData.HTTP_PROXY_TYPE;
					} else if (target.getScheme().equalsIgnoreCase(IProxyData.HTTPS_PROXY_TYPE)) {
						type = IProxyData.HTTPS_PROXY_TYPE;
					}
					final IProxyData[] proxyDatas = proxyService.select(target);
					final IProxyData proxyData = selectProxyFromProxies(target.getScheme(), proxyDatas);
					if (proxyData != null) {
						proxy = new Proxy(((type.equalsIgnoreCase(IProxyData.SOCKS_PROXY_TYPE)) ? Proxy.Type.SOCKS : Proxy.Type.HTTP), new ProxyAddress(proxyData.getHost(), proxyData.getPort()), proxyData.getUserId(), proxyData.getPassword());
					}
				}
			} catch (Exception e) {
				// If we don't even have the classes for this (i.e. the org.eclipse.core.net plugin not available)
				// then we simply log and ignore
				Activator.logNoProxyWarning(e);
			} catch (NoClassDefFoundError e) {
				Activator.logNoProxyWarning(e);
			}
		}
		if (proxy != null)
			setupProxy(proxy);





package org.eclipse.ecf.provider.filetransfer.browse;

import java.net.URI;
import java.net.URL;
import java.util.Arrays;
import java.util.List;
import org.eclipse.core.net.proxy.IProxyData;
import org.eclipse.core.net.proxy.IProxyService;
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;

import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.ecf.core.security.IConnectContext;
import org.eclipse.ecf.core.util.Proxy;
import org.eclipse.ecf.core.util.ProxyAddress;
import org.eclipse.ecf.filetransfer.IRemoteFile;
import org.eclipse.ecf.filetransfer.IRemoteFileSystemListener;
import org.eclipse.ecf.filetransfer.IRemoteFileSystemRequest;

import org.eclipse.ecf.filetransfer.events.IRemoteFileSystemBrowseEvent;
import org.eclipse.ecf.filetransfer.events.IRemoteFileSystemEvent;
import org.eclipse.ecf.filetransfer.identity.IFileID;
import org.eclipse.ecf.internal.provider.filetransfer.Activator;
import org.eclipse.ecf.internal.provider.filetransfer.Messages;
import org.eclipse.ecf.provider.filetransfer.ProxySetupHelper;

/**
 * Abstract class for browsing an efs file system.


	protected abstract void setupProxy(Proxy proxy);

	/**
	 * Select a single proxy from a set of proxies available for the given host.  This implementation
	 * selects in the following manner:  1) If proxies provided is null or array of 0 length, null 
	 * is returned.  If only one proxy is available (array of length 1) then the entry is returned.
	 * If proxies provided is length > 1, then if the type of a proxy in the array matches the given
	 * protocol (e.g. http, https), then the first matching proxy is returned.  If the protocol does
	 * not match any of the proxies, then the *first* proxy (i.e. proxies[0]) is returned.  Subclasses may
	 * override if desired.
	 * 
	 * @param protocol the target protocol (e.g. http, https, scp, etc).  Will not be <code>null</code>.
	 * @param proxies the proxies to select from.  May be <code>null</code> or array of length 0.
	 * @return proxy data selected from the proxies provided.  
	 */
	protected IProxyData selectProxyFromProxies(String protocol, IProxyData[] proxies) {
		if (proxies == null || proxies.length == 0)
			return null;
		// If only one proxy is available, then use that
		if (proxies.length == 1)
			return proxies[0];
		// If more than one proxy is available, then if http/https protocol then look for that
		// one...if not found then use first
		if (protocol.equalsIgnoreCase("http")) { //$NON-NLS-1$
			for (int i = 0; i < proxies.length; i++) {
				if (proxies[i].getType().equals(IProxyData.HTTP_PROXY_TYPE))
					return proxies[i];
			}
		} else if (protocol.equalsIgnoreCase("https")) { //$NON-NLS-1$
			for (int i = 0; i < proxies.length; i++) {
				if (proxies[i].getType().equals(IProxyData.HTTPS_PROXY_TYPE))
					return proxies[i];
			}
		}
		// If we haven't found it yet, then return the first one.
		return proxies[0];
	}

	protected void setupProxies() {
		// If it's been set directly (via ECF API) then this overrides platform settings
		if (proxy == null) {
			proxy = ProxySetupHelper.getProxy(directoryOrFile.toExternalForm());
				IProxyService proxyService = Activator.getDefault().getProxyService();
				// Only do this if platform service exists
				if (proxyService != null && proxyService.isProxiesEnabled()) {
					// Setup via proxyService entry
					URI target = new URI(directoryOrFile.toExternalForm());
					final IProxyData[] proxies = proxyService.select(target);
					IProxyData selectedProxy = selectProxyFromProxies(target.getScheme(), proxies);
					if (selectedProxy != null) {
						proxy = new Proxy(((selectedProxy.getType().equalsIgnoreCase(IProxyData.SOCKS_PROXY_TYPE)) ? Proxy.Type.SOCKS : Proxy.Type.HTTP), new ProxyAddress(selectedProxy.getHost(), selectedProxy.getPort()), selectedProxy.getUserId(), selectedProxy.getPassword());
					}
				}
			} catch (Exception e) {
				// If we don't even have the classes for this (i.e. the org.eclipse.core.net plugin not available)
				// then we simply log and ignore
				Activator.logNoProxyWarning(e);
			} catch (NoClassDefFoundError e) {
				Activator.logNoProxyWarning(e);
			}
		}
		if (proxy != null)
			setupProxy(proxy);




package org.eclipse.ecf.provider.filetransfer;

import java.net.URI;
import java.net.URL;
import org.eclipse.core.net.proxy.IProxyData;
import org.eclipse.core.net.proxy.IProxyService;
import org.eclipse.ecf.core.util.Proxy;
import org.eclipse.ecf.core.util.ProxyAddress;
import org.eclipse.ecf.internal.provider.filetransfer.Activator;

public class ProxySetupHelper {
	public static Proxy getProxy(String url) {
		Proxy proxy = null;
		try {
			IProxyService proxyService = Activator.getDefault().getProxyService();
			// Only do this if platform service exists
			if (proxyService != null && proxyService.isProxiesEnabled()) {
				// Setup via proxyService entry
				URI uri = new URI(url);
				final IProxyData[] proxies = proxyService.select(uri);
				IProxyData selectedProxy = selectProxyFromProxies(uri.getScheme(), proxies);
				if (selectedProxy != null) {
					proxy = new Proxy(((selectedProxy.getType().equalsIgnoreCase(IProxyData.SOCKS_PROXY_TYPE)) ? Proxy.Type.SOCKS : Proxy.Type.HTTP), new ProxyAddress(selectedProxy.getHost(), selectedProxy.getPort()), selectedProxy.getUserId(), selectedProxy.getPassword());
				}
			}
		} catch (Exception e) {
			// If we don't even have the classes for this (i.e. the org.eclipse.core.net plugin not available)
			// then we simply log and ignore
			Activator.logNoProxyWarning(e);
		} catch (NoClassDefFoundError e) {
			Activator.logNoProxyWarning(e);
		}
		return proxy;
	}

	public static Proxy getSocksProxy(URL url) {
		String host = url.getHost();
		int port = url.getPort();
		String strURL = IProxyData.SOCKS_PROXY_TYPE + "://" + host; //$NON-NLS-1$
		if (port != -1) {
			strURL += ":" + port; //$NON-NLS-1$
		}
		return ProxySetupHelper.getProxy(strURL);
	}

	/**
	 * Select a single proxy from a set of proxies available for the given host.  This implementation
	 * selects in the following manner:  1) If proxies provided is null or array of 0 length, null 
	 * is returned.  If only one proxy is available (array of length 1) then the entry is returned.
	 * If proxies provided is length > 1, then if the type of a proxy in the array matches the given
	 * protocol (e.g. http, https), then the first matching proxy is returned.  If the protocol does
	 * not match any of the proxies, then the *first* proxy (i.e. proxies[0]) is returned.  Subclasses may
	 * override if desired.
	 * 
	 * @param protocol the target protocol (e.g. http, https, scp, etc).  Will not be <code>null</code>.
	 * @param proxies the proxies to select from.  May be <code>null</code> or array of length 0.
	 * @return proxy data selected from the proxies provided.  
	 */
	private static IProxyData selectProxyFromProxies(String protocol, IProxyData[] proxies) {
		if (proxies == null || proxies.length == 0)
			return null;
		// If only one proxy is available, then use that
		if (proxies.length == 1)
			return proxies[0];
		// If more than one proxy is available, then if http/https protocol then look for that
		// one...if not found then use first
		if (protocol.equalsIgnoreCase("http")) { //$NON-NLS-1$
			for (int i = 0; i < proxies.length; i++) {
				if (proxies[i].getType().equals(IProxyData.HTTP_PROXY_TYPE))
					return proxies[i];
			}
		} else if (protocol.equalsIgnoreCase("https")) { //$NON-NLS-1$
			for (int i = 0; i < proxies.length; i++) {
				if (proxies[i].getType().equals(IProxyData.HTTPS_PROXY_TYPE))
					return proxies[i];
			}
		}
		// If we haven't found it yet, then return the first one.
		return proxies[0];
	}

}

Lines 72-77 Link Here

(-)src/org/eclipse/ecf/provider/filetransfer/httpclient/HttpClientRetrieveFileTransfer.java (+9 lines)
72	import org.eclipse.ecf.internal.provider.filetransfer.httpclient.HttpClientProxyCredentialProvider;	72	import org.eclipse.ecf.internal.provider.filetransfer.httpclient.HttpClientProxyCredentialProvider;
73	import org.eclipse.ecf.internal.provider.filetransfer.httpclient.ISSLSocketFactoryModifier;	73	import org.eclipse.ecf.internal.provider.filetransfer.httpclient.ISSLSocketFactoryModifier;
74	import org.eclipse.ecf.internal.provider.filetransfer.httpclient.Messages;	74	import org.eclipse.ecf.internal.provider.filetransfer.httpclient.Messages;
		75	import org.eclipse.ecf.provider.filetransfer.ProxySetupHelper;
75	import org.eclipse.ecf.provider.filetransfer.events.socket.SocketEventSource;	76	import org.eclipse.ecf.provider.filetransfer.events.socket.SocketEventSource;
76	import org.eclipse.ecf.provider.filetransfer.identity.FileTransferID;	77	import org.eclipse.ecf.provider.filetransfer.identity.FileTransferID;
77	import org.eclipse.ecf.provider.filetransfer.retrieve.AbstractRetrieveFileTransfer;	78	import org.eclipse.ecf.provider.filetransfer.retrieve.AbstractRetrieveFileTransfer;
Lines 415-420 Link Here
415	return new UsernamePasswordCredentials(username, password);	416	return new UsernamePasswordCredentials(username, password);
416	}	417	}
417		418
		419	protected void setupProxies() {
		420	super.setupProxies();
		421	Proxy socksProxy = ProxySetupHelper.getSocksProxy(getRemoteFileURL());
		422	if (socksProxy != null) {
		423	setupProxy(socksProxy);
		424	}
		425	}
		426
418	protected void setupAuthentication(String urlString) throws UnsupportedCallbackException, IOException {	427	protected void setupAuthentication(String urlString) throws UnsupportedCallbackException, IOException {
419	Credentials credentials = null;	428	Credentials credentials = null;
420	if (username == null) {	429	if (username == null) {

Lines 47-52 Link Here

(-)src/org/eclipse/ecf/provider/filetransfer/httpclient/HttpClientFileSystemBrowser.java (+9 lines)
47	import org.eclipse.ecf.internal.provider.filetransfer.httpclient.DebugOptions;	47	import org.eclipse.ecf.internal.provider.filetransfer.httpclient.DebugOptions;
48	import org.eclipse.ecf.internal.provider.filetransfer.httpclient.HttpClientProxyCredentialProvider;	48	import org.eclipse.ecf.internal.provider.filetransfer.httpclient.HttpClientProxyCredentialProvider;
49	import org.eclipse.ecf.internal.provider.filetransfer.httpclient.Messages;	49	import org.eclipse.ecf.internal.provider.filetransfer.httpclient.Messages;
		50	import org.eclipse.ecf.provider.filetransfer.ProxySetupHelper;
50	import org.eclipse.ecf.provider.filetransfer.browse.AbstractFileSystemBrowser;	51	import org.eclipse.ecf.provider.filetransfer.browse.AbstractFileSystemBrowser;
51	import org.eclipse.ecf.provider.filetransfer.browse.URLRemoteFile;	52	import org.eclipse.ecf.provider.filetransfer.browse.URLRemoteFile;
52	import org.eclipse.ecf.provider.filetransfer.events.socket.SocketEventSource;	53	import org.eclipse.ecf.provider.filetransfer.events.socket.SocketEventSource;
Lines 158-163 Link Here
158	return (System.getProperties().getProperty(HttpClientOptions.FORCE_NTLM_PROP) != null);	159	return (System.getProperties().getProperty(HttpClientOptions.FORCE_NTLM_PROP) != null);
159	}	160	}
160		161
		162	protected void setupProxies() {
		163	super.setupProxies();
		164	Proxy socksProxy = ProxySetupHelper.getSocksProxy(directoryOrFile);
		165	if (socksProxy != null) {
		166	setupProxy(socksProxy);
		167	}
		168	}
		169
161	/* (non-Javadoc)	170	/* (non-Javadoc)
162	* @see org.eclipse.ecf.provider.filetransfer.browse.AbstractFileSystemBrowser#runRequest()	171	* @see org.eclipse.ecf.provider.filetransfer.browse.AbstractFileSystemBrowser#runRequest()
163	*/	172	*/

Return to bug 295030

Lines 18-30 Link Here

(-)src/org/eclipse/ecf/provider/filetransfer/retrieve/AbstractRetrieveFileTransfer.java (-23 / +2 lines)
18	import java.io.InputStream;	18	import java.io.InputStream;
19	import java.io.OutputStream;	19	import java.io.OutputStream;
20	import java.net.MalformedURLException;	20	import java.net.MalformedURLException;
21	import java.net.URI;
22	import java.net.URL;	21	import java.net.URL;
23	import java.text.DecimalFormat;	22	import java.text.DecimalFormat;
24	import java.util.Date;	23	import java.util.Date;
25	import java.util.Map;	24	import java.util.Map;
26	import org.eclipse.core.net.proxy.IProxyData;	25	import org.eclipse.core.net.proxy.IProxyData;
27	import org.eclipse.core.net.proxy.IProxyService;
28	import org.eclipse.core.runtime.Assert;	26	import org.eclipse.core.runtime.Assert;
29	import org.eclipse.core.runtime.IAdapterManager;	27	import org.eclipse.core.runtime.IAdapterManager;
30	import org.eclipse.core.runtime.IPath;	28	import org.eclipse.core.runtime.IPath;
Lines 39-45 Link Here
39	import org.eclipse.ecf.core.identity.Namespace;	37	import org.eclipse.ecf.core.identity.Namespace;
40	import org.eclipse.ecf.core.security.IConnectContext;	38	import org.eclipse.ecf.core.security.IConnectContext;
41	import org.eclipse.ecf.core.util.Proxy;	39	import org.eclipse.ecf.core.util.Proxy;
42	import org.eclipse.ecf.core.util.ProxyAddress;
43	import org.eclipse.ecf.filetransfer.FileTransferJob;	40	import org.eclipse.ecf.filetransfer.FileTransferJob;
44	import org.eclipse.ecf.filetransfer.IFileRangeSpecification;	41	import org.eclipse.ecf.filetransfer.IFileRangeSpecification;
45	import org.eclipse.ecf.filetransfer.IFileTransferListener;	42	import org.eclipse.ecf.filetransfer.IFileTransferListener;
Lines 57-62 Link Here
57	import org.eclipse.ecf.filetransfer.service.IRetrieveFileTransfer;	54	import org.eclipse.ecf.filetransfer.service.IRetrieveFileTransfer;
58	import org.eclipse.ecf.internal.provider.filetransfer.Activator;	55	import org.eclipse.ecf.internal.provider.filetransfer.Activator;
59	import org.eclipse.ecf.internal.provider.filetransfer.Messages;	56	import org.eclipse.ecf.internal.provider.filetransfer.Messages;
		57	import org.eclipse.ecf.provider.filetransfer.ProxySetupHelper;
60	import org.eclipse.ecf.provider.filetransfer.identity.FileTransferNamespace;	58	import org.eclipse.ecf.provider.filetransfer.identity.FileTransferNamespace;
61	import org.eclipse.ecf.provider.filetransfer.util.PollingInputStream;	59	import org.eclipse.ecf.provider.filetransfer.util.PollingInputStream;
62	import org.eclipse.ecf.provider.filetransfer.util.TimeoutInputStream;	60	import org.eclipse.ecf.provider.filetransfer.util.TimeoutInputStream;
Lines 918-943 Link Here
918	// If it's been set directly (via ECF API) then this overrides platform	916	// If it's been set directly (via ECF API) then this overrides platform
919	// settings	917	// settings
920	if (proxy == null) {	918	if (proxy == null) {
921	try {	919	proxy = ProxySetupHelper.getProxy(getRemoteFileURL().toExternalForm());
922	IProxyService proxyService = Activator.getDefault().getProxyService();
923	// Only do this if platform service exists
924	if (proxyService != null && proxyService.isProxiesEnabled()) {
925	// Setup via proxyService entry
926	URI target = new URI(getRemoteFileURL().toExternalForm());
927	final IProxyData[] proxies = proxyService.select(target);
928	IProxyData selectedProxy = selectProxyFromProxies(target.getScheme(), proxies);
929	if (selectedProxy != null) {
930	proxy = new Proxy(((selectedProxy.getType().equalsIgnoreCase(IProxyData.SOCKS_PROXY_TYPE)) ? Proxy.Type.SOCKS : Proxy.Type.HTTP), new ProxyAddress(selectedProxy.getHost(), selectedProxy.getPort()), selectedProxy.getUserId(), selectedProxy.getPassword());
931	}
932	}
933	} catch (Exception e) {
934	// If we don't even have the classes for this (i.e. the
935	// org.eclipse.core.net plugin not available)
936	// then we simply log and ignore
937	Activator.logNoProxyWarning(e);
938	} catch (NoClassDefFoundError e) {
939	Activator.logNoProxyWarning(e);
940	}
941	}	920	}
942	if (proxy != null)	921	if (proxy != null)
943	setupProxy(proxy);	922	setupProxy(proxy);

Lines 12-23 Link Here

(-)src/org/eclipse/ecf/provider/filetransfer/browse/AbstractFileSystemBrowser.java (-60 / +2 lines)
12		12
13	package org.eclipse.ecf.provider.filetransfer.browse;	13	package org.eclipse.ecf.provider.filetransfer.browse;
14		14
15	import java.net.URI;
16	import java.net.URL;	15	import java.net.URL;
17	import java.util.Arrays;	16	import java.util.Arrays;
18	import java.util.List;	17	import java.util.List;
19	import org.eclipse.core.net.proxy.IProxyData;
20	import org.eclipse.core.net.proxy.IProxyService;
21	import org.eclipse.core.runtime.Assert;	18	import org.eclipse.core.runtime.Assert;
22	import org.eclipse.core.runtime.IProgressMonitor;	19	import org.eclipse.core.runtime.IProgressMonitor;
23	import org.eclipse.core.runtime.IStatus;	20	import org.eclipse.core.runtime.IStatus;
Lines 25-31 Link Here
25	import org.eclipse.core.runtime.jobs.Job;	22	import org.eclipse.core.runtime.jobs.Job;
26	import org.eclipse.ecf.core.security.IConnectContext;	23	import org.eclipse.ecf.core.security.IConnectContext;
27	import org.eclipse.ecf.core.util.Proxy;	24	import org.eclipse.ecf.core.util.Proxy;
28	import org.eclipse.ecf.core.util.ProxyAddress;
29	import org.eclipse.ecf.filetransfer.IRemoteFile;	25	import org.eclipse.ecf.filetransfer.IRemoteFile;
30	import org.eclipse.ecf.filetransfer.IRemoteFileSystemListener;	26	import org.eclipse.ecf.filetransfer.IRemoteFileSystemListener;
31	import org.eclipse.ecf.filetransfer.IRemoteFileSystemRequest;	27	import org.eclipse.ecf.filetransfer.IRemoteFileSystemRequest;
Lines 33-40 Link Here
33	import org.eclipse.ecf.filetransfer.events.IRemoteFileSystemBrowseEvent;	29	import org.eclipse.ecf.filetransfer.events.IRemoteFileSystemBrowseEvent;
34	import org.eclipse.ecf.filetransfer.events.IRemoteFileSystemEvent;	30	import org.eclipse.ecf.filetransfer.events.IRemoteFileSystemEvent;
35	import org.eclipse.ecf.filetransfer.identity.IFileID;	31	import org.eclipse.ecf.filetransfer.identity.IFileID;
36	import org.eclipse.ecf.internal.provider.filetransfer.Activator;
37	import org.eclipse.ecf.internal.provider.filetransfer.Messages;	32	import org.eclipse.ecf.internal.provider.filetransfer.Messages;
		33	import org.eclipse.ecf.provider.filetransfer.ProxySetupHelper;
38		34
39	/**	35	/**
40	* Abstract class for browsing an efs file system.	36	* Abstract class for browsing an efs file system.
Lines 197-260 Link Here
197		193
198	protected abstract void setupProxy(Proxy proxy);	194	protected abstract void setupProxy(Proxy proxy);
199		195
200	/**
201	* Select a single proxy from a set of proxies available for the given host. This implementation
202	* selects in the following manner: 1) If proxies provided is null or array of 0 length, null
203	* is returned. If only one proxy is available (array of length 1) then the entry is returned.
204	* If proxies provided is length > 1, then if the type of a proxy in the array matches the given
205	* protocol (e.g. http, https), then the first matching proxy is returned. If the protocol does
206	* not match any of the proxies, then the first proxy (i.e. proxies[0]) is returned. Subclasses may
207	* override if desired.
208	*
209	* @param protocol the target protocol (e.g. http, https, scp, etc). Will not be <code>null</code>.
210	* @param proxies the proxies to select from. May be <code>null</code> or array of length 0.
211	* @return proxy data selected from the proxies provided.
212	*/
213	protected IProxyData selectProxyFromProxies(String protocol, IProxyData[] proxies) {
214	if (proxies == null \|\| proxies.length == 0)
215	return null;
216	// If only one proxy is available, then use that
217	if (proxies.length == 1)
218	return proxies[0];
219	// If more than one proxy is available, then if http/https protocol then look for that
220	// one...if not found then use first
221	if (protocol.equalsIgnoreCase("http")) { //$NON-NLS-1$
222	for (int i = 0; i < proxies.length; i++) {
223	if (proxies[i].getType().equals(IProxyData.HTTP_PROXY_TYPE))
224	return proxies[i];
225	}
226	} else if (protocol.equalsIgnoreCase("https")) { //$NON-NLS-1$
227	for (int i = 0; i < proxies.length; i++) {
228	if (proxies[i].getType().equals(IProxyData.HTTPS_PROXY_TYPE))
229	return proxies[i];
230	}
231	}
232	// If we haven't found it yet, then return the first one.
233	return proxies[0];
234	}
235
236	protected void setupProxies() {	196	protected void setupProxies() {
237	// If it's been set directly (via ECF API) then this overrides platform settings	197	// If it's been set directly (via ECF API) then this overrides platform settings
238	if (proxy == null) {	198	if (proxy == null) {
239	try {	199	proxy = ProxySetupHelper.getProxy(directoryOrFile.toExternalForm());
240	IProxyService proxyService = Activator.getDefault().getProxyService();
241	// Only do this if platform service exists
242	if (proxyService != null && proxyService.isProxiesEnabled()) {
243	// Setup via proxyService entry
244	URI target = new URI(directoryOrFile.toExternalForm());
245	final IProxyData[] proxies = proxyService.select(target);
246	IProxyData selectedProxy = selectProxyFromProxies(target.getScheme(), proxies);
247	if (selectedProxy != null) {
248	proxy = new Proxy(((selectedProxy.getType().equalsIgnoreCase(IProxyData.SOCKS_PROXY_TYPE)) ? Proxy.Type.SOCKS : Proxy.Type.HTTP), new ProxyAddress(selectedProxy.getHost(), selectedProxy.getPort()), selectedProxy.getUserId(), selectedProxy.getPassword());
249	}
250	}
251	} catch (Exception e) {
252	// If we don't even have the classes for this (i.e. the org.eclipse.core.net plugin not available)
253	// then we simply log and ignore
254	Activator.logNoProxyWarning(e);
255	} catch (NoClassDefFoundError e) {
256	Activator.logNoProxyWarning(e);
257	}
258	}	200	}
259	if (proxy != null)	201	if (proxy != null)
260	setupProxy(proxy);	202	setupProxy(proxy);