Attachment #180890 for bug #313916

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 13-18 Link Here

(-)META-INF/MANIFEST.MF (+1 lines)
13	org.eclipse.equinox.registry;bundle-version="3.4.0"	13	org.eclipse.equinox.registry;bundle-version="3.4.0"
14	Bundle-ActivationPolicy: lazy	14	Bundle-ActivationPolicy: lazy
15	Export-Package: org.eclipse.core.internal.net;x-friends:="org.eclipse.ui.net",	15	Export-Package: org.eclipse.core.internal.net;x-friends:="org.eclipse.ui.net",
		16	org.eclipse.core.internal.net.auth;x-friends:="org.eclipse.ui.net",
16	org.eclipse.core.net.proxy	17	org.eclipse.core.net.proxy
17	Bundle-RequiredExecutionEnvironment: J2SE-1.4,	18	Bundle-RequiredExecutionEnvironment: J2SE-1.4,
18	CDC-1.1/Foundation-1.1	19	CDC-1.1/Foundation-1.1

Lines 50-56 Link Here

(-)schema/authenticator.exsd (-1 / +1 lines)
50		50
51	</documentation>	51	</documentation>
52	<appInfo>	52	<appInfo>
53	<meta.attribute kind="java" basedOn="java.net.Authenticator"/>	53	<meta.attribute kind="java" basedOn=":org.eclipse.core.internal.net.auth.IAuthenticator"/>
54	</appInfo>	54	</appInfo>
55	</annotation>	55	</annotation>
56	</attribute>	56	</attribute>




import java.util.List;
import java.util.Properties;

import org.eclipse.core.internal.net.auth.ProxyAuthenticator;
import org.eclipse.core.net.proxy.IProxyChangeEvent;
import org.eclipse.core.net.proxy.IProxyChangeListener;
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.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtension;
import org.eclipse.core.runtime.ISafeRunnable;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.ListenerList;
import org.eclipse.core.runtime.RegistryFactory;
import org.eclipse.core.runtime.SafeRunner;
import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener;
import org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent;
import org.eclipse.osgi.util.NLS;
import org.osgi.service.prefs.BackingStoreException;

public class ProxyManager implements IProxyService, IPreferenceChangeListener {

			ProxyType type = proxies[i];
			type.initialize();
		}
		Authenticator.setDefault(new ProxyAuthenticator());
	}

	public IProxyData getProxyData(String type) {

		return null;
	}
	
	private void registerAuthenticator() {
		Authenticator a = getPluggedInAuthenticator();
		if (a != null) {
			Authenticator.setDefault(a);
		}
	}
	
	private Authenticator getPluggedInAuthenticator() {
		IExtension[] extensions = RegistryFactory.getRegistry().getExtensionPoint(Activator.ID, Activator.PT_AUTHENTICATOR).getExtensions();
		if (extensions.length == 0)
			return null;
		IExtension extension = extensions[0];
		IConfigurationElement[] configs = extension.getConfigurationElements();
		if (configs.length == 0) {
			Activator.log(IStatus.ERROR, NLS.bind("Authenticator {0} is missing required fields", (new Object[] {extension.getUniqueIdentifier()})), null);//$NON-NLS-1$ 
			return null;
		}
		try {
			IConfigurationElement config = configs[0];
			return (Authenticator) config.createExecutableExtension("class");//$NON-NLS-1$ 
		} catch (CoreException ex) {
			Activator.log(IStatus.ERROR, NLS.bind("Unable to instantiate authenticator {0}", (new Object[] {extension.getUniqueIdentifier()})), ex);//$NON-NLS-1$ 
			return null;
		}
	}
	
	private synchronized void checkMigrated() {
		if (preferenceManager.isMigrated() || !Activator.getInstance().instanceLocationAvailable()) {
			return;




/*******************************************************************************
 * Copyright (c) 2000, 2007 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.core.internal.net.auth;

/**
 * Keeps user and password strings.
 */
public class Authentication {
	protected String user;
	protected String password;
	public Authentication(String user, String password){
		this.user = user;
		this.password = password;
	}

	/**
	 * @return Returns the password.
	 */
	public String getPassword() {
		return password;
	}
	/**
	 * @return Returns the user.
	 */
	public String getUser() {
		return user;
	}
}




/*******************************************************************************
 * Copyright (c) 2010 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.core.internal.net.auth;

public interface IAuthenticator {
	Authentication getAuthentication(String host, String prompt);
}




/*******************************************************************************
 * Copyright (c) 2010 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.core.internal.net.auth;

import java.net.*;

import org.eclipse.core.internal.net.Activator;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtension;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.RegistryFactory;
import org.eclipse.osgi.util.NLS;

public class ProxyAuthenticator extends Authenticator {
	
	private IAuthenticator authenticator;

	/*
	 * @see Authenticator#getPasswordAuthentication()
	 */
	protected PasswordAuthentication getPasswordAuthentication() {
		InetAddress address = getRequestingSite(); // can be null;
		String prompt = getRequestingPrompt(); // realm or message, not documented that can be null

		// get the host name from the address since #getRequestingHost
		// is not available in the foundation 1.0 class libraries
		String hostString = null;
		if (address != null) {
			hostString = address.getHostName();
		}
		if (hostString == null) {
			hostString = ""; //$NON-NLS-1$
		}
		String promptString = prompt;
		if (prompt == null) {
			promptString = ""; //$NON-NLS-1$
		}
		if (hasAuthenticator()) {
			Authentication auth = authenticator.getAuthentication(hostString, promptString);
			if (auth != null) {
				return new PasswordAuthentication(auth.getUser(), auth.getPassword().toCharArray());
			}
		}
		return null;
	}
	
	private boolean hasAuthenticator() {
		if (authenticator != null) {
			return true;
		}
		IExtension[] extensions = RegistryFactory.getRegistry().
				getExtensionPoint(Activator.ID, Activator.PT_AUTHENTICATOR).getExtensions();
		if (extensions.length == 0) {
			return false;
		}
		IExtension extension = extensions[0];
		IConfigurationElement[] configs = extension.getConfigurationElements();
		if (configs.length == 0) {
			Activator.log(IStatus.ERROR, NLS.bind("Authenticator {0} is missing required fields", //$NON-NLS-1$ 
					(new Object[] {extension.getUniqueIdentifier()})), null);
			return false;
		}
		try {
			IConfigurationElement config = configs[0];
			authenticator = (IAuthenticator) config.createExecutableExtension("class");//$NON-NLS-1$ 
			return true;
		} catch (CoreException ex) {
			Activator.log(IStatus.ERROR, NLS.bind("Unable to instantiate authenticator {0}", //$NON-NLS-1$ 
					(new Object[] {extension.getUniqueIdentifier()})), ex);
			return false;
		}
	}
}

Lines 22-28 Link Here

(-)plugin.xml (-1 / +1 lines)
22	<extension	22	<extension
23	point="org.eclipse.core.net.authenticator">	23	point="org.eclipse.core.net.authenticator">
24	<authenticator	24	<authenticator
25	class="org.eclipse.ui.internal.net.auth.NetAuthenticator">	25	class="org.eclipse.ui.internal.net.auth.UIAuthenticator">
26	</authenticator>	26	</authenticator>
27	</extension>	27	</extension>
28		28




/*******************************************************************************
 * Copyright (c) 2000, 2007 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.ui.internal.net.auth;

/**
 * Keeps user and password strings.
 */
public class Authentication {
	protected String user;
	protected String password;
	public Authentication(String user, String password){
		this.user = user;
		this.password = password;
	}

	/**
	 * @return Returns the password.
	 */
	public String getPassword() {
		return password;
	}
	/**
	 * @return Returns the user.
	 */
	public String getUser() {
		return user;
	}
}




/*******************************************************************************
 * Copyright (c) 2000, 2007 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.ui.internal.net.auth;

import java.net.*;

public class NetAuthenticator extends Authenticator {
	
	/*
	 * @see Authenticator#getPasswordAuthentication()
	 */
	protected PasswordAuthentication getPasswordAuthentication() {
		// String protocol = getRequestingProtocol();
		InetAddress address = getRequestingSite(); // can be null;
		// int port = getRequestingPort();
		String prompt = getRequestingPrompt(); // realm or message, not documented that can be null
		// String scheme = getRequestingScheme(); // not documented that can be null

		 // get the host name from the address since #getRequestingHost
		 // is not available in the foundation 1.0 class libraries
		String hostString = null;
		if (address != null) {
			hostString = address.getHostName();
		}
		if (hostString == null) {
			hostString = ""; //$NON-NLS-1$
		}
		String promptString = prompt;
		if (prompt == null) {
			promptString = ""; //$NON-NLS-1$
		}

		Authentication auth = UserValidationDialog.getAuthentication(
				hostString, promptString);
		if (auth != null)
			return new PasswordAuthentication(auth.getUser(), auth
					.getPassword().toCharArray());
		else
			return null;
	}
}




/*******************************************************************************
 * Copyright (c) 2010 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.ui.internal.net.auth;

import org.eclipse.core.internal.net.auth.Authentication;
import org.eclipse.core.internal.net.auth.IAuthenticator;

public class UIAuthenticator implements IAuthenticator {

	public Authentication getAuthentication(String host, String prompt) {
		return UserValidationDialog.getAuthentication(host, prompt);
	}

}

Lines 1-5 Link Here

(-)src/org/eclipse/ui/internal/net/auth/UserValidationDialog.java (-1 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2007 IBM Corporation and others.	2	* Copyright (c) 2000, 2010 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 10-15 Link Here
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.ui.internal.net.auth;	11	package org.eclipse.ui.internal.net.auth;
12		12
		13	import org.eclipse.core.internal.net.auth.Authentication;
13	import org.eclipse.jface.dialogs.Dialog;	14	import org.eclipse.jface.dialogs.Dialog;
14	import org.eclipse.jface.dialogs.IDialogConstants;	15	import org.eclipse.jface.dialogs.IDialogConstants;
15	import org.eclipse.osgi.util.NLS;	16	import org.eclipse.osgi.util.NLS;

Return to bug 313916

Lines 18-39 Link Here

(-)src/org/eclipse/core/internal/net/ProxyManager.java (-33 / +2 lines)
18	import java.util.List;	18	import java.util.List;
19	import java.util.Properties;	19	import java.util.Properties;
20		20
		21	import org.eclipse.core.internal.net.auth.ProxyAuthenticator;
21	import org.eclipse.core.net.proxy.IProxyChangeEvent;	22	import org.eclipse.core.net.proxy.IProxyChangeEvent;
22	import org.eclipse.core.net.proxy.IProxyChangeListener;	23	import org.eclipse.core.net.proxy.IProxyChangeListener;
23	import org.eclipse.core.net.proxy.IProxyData;	24	import org.eclipse.core.net.proxy.IProxyData;
24	import org.eclipse.core.net.proxy.IProxyService;	25	import org.eclipse.core.net.proxy.IProxyService;
25	import org.eclipse.core.runtime.Assert;	26	import org.eclipse.core.runtime.Assert;
26	import org.eclipse.core.runtime.CoreException;
27	import org.eclipse.core.runtime.IConfigurationElement;
28	import org.eclipse.core.runtime.IExtension;
29	import org.eclipse.core.runtime.ISafeRunnable;	27	import org.eclipse.core.runtime.ISafeRunnable;
30	import org.eclipse.core.runtime.IStatus;
31	import org.eclipse.core.runtime.ListenerList;	28	import org.eclipse.core.runtime.ListenerList;
32	import org.eclipse.core.runtime.RegistryFactory;
33	import org.eclipse.core.runtime.SafeRunner;	29	import org.eclipse.core.runtime.SafeRunner;
34	import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener;	30	import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener;
35	import org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent;	31	import org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent;
36	import org.eclipse.osgi.util.NLS;
37	import org.osgi.service.prefs.BackingStoreException;	32	import org.osgi.service.prefs.BackingStoreException;
38		33
39	public class ProxyManager implements IProxyService, IPreferenceChangeListener {	34	public class ProxyManager implements IProxyService, IPreferenceChangeListener {
Lines 272-278 Link Here
272	ProxyType type = proxies[i];	267	ProxyType type = proxies[i];
273	type.initialize();	268	type.initialize();
274	}	269	}
275	registerAuthenticator();	270	Authenticator.setDefault(new ProxyAuthenticator());
276	}	271	}
277		272
278	public IProxyData getProxyData(String type) {	273	public IProxyData getProxyData(String type) {
Lines 370-401 Link Here
370	return null;	365	return null;
371	}	366	}
372		367
373	private void registerAuthenticator() {
374	Authenticator a = getPluggedInAuthenticator();
375	if (a != null) {
376	Authenticator.setDefault(a);
377	}
378	}
379
380	private Authenticator getPluggedInAuthenticator() {
381	IExtension[] extensions = RegistryFactory.getRegistry().getExtensionPoint(Activator.ID, Activator.PT_AUTHENTICATOR).getExtensions();
382	if (extensions.length == 0)
383	return null;
384	IExtension extension = extensions[0];
385	IConfigurationElement[] configs = extension.getConfigurationElements();
386	if (configs.length == 0) {
387	Activator.log(IStatus.ERROR, NLS.bind("Authenticator {0} is missing required fields", (new Object[] {extension.getUniqueIdentifier()})), null);//$NON-NLS-1$
388	return null;
389	}
390	try {
391	IConfigurationElement config = configs[0];
392	return (Authenticator) config.createExecutableExtension("class");//$NON-NLS-1$
393	} catch (CoreException ex) {
394	Activator.log(IStatus.ERROR, NLS.bind("Unable to instantiate authenticator {0}", (new Object[] {extension.getUniqueIdentifier()})), ex);//$NON-NLS-1$
395	return null;
396	}
397	}
398
399	private synchronized void checkMigrated() {	368	private synchronized void checkMigrated() {
400	if (preferenceManager.isMigrated() \|\| !Activator.getInstance().instanceLocationAvailable()) {	369	if (preferenceManager.isMigrated() \|\| !Activator.getInstance().instanceLocationAvailable()) {
401	return;	370	return;

Added Link Here

(-)src/org/eclipse/core/internal/net/auth/Authentication.java (+36 lines)
1	/*******************************************************************************
2	* Copyright (c) 2000, 2007 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.core.internal.net.auth;
12
13	/**
14	* Keeps user and password strings.
15	*/
16	public class Authentication {
17	protected String user;
18	protected String password;
19	public Authentication(String user, String password){
20	this.user = user;
21	this.password = password;
22	}
23
24	/**
25	* @return Returns the password.
26	*/
27	public String getPassword() {
28	return password;
29	}
30	/**
31	* @return Returns the user.
32	*/
33	public String getUser() {
34	return user;
35	}
36	}

Added Link Here

(-)src/org/eclipse/core/internal/net/auth/IAuthenticator.java (+15 lines)
1	/*******************************************************************************
2	* Copyright (c) 2010 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.core.internal.net.auth;
12
13	public interface IAuthenticator {
14	Authentication getAuthentication(String host, String prompt);
15	}