Squashed commit of the following:

commit cf314a3a8b03157d419df359a3c73d033ac149b4
Author: Bill Shannon <bill.shannon@oracle.com>
Date:   Mon Aug 20 15:22:35 2018 -0700

    Clean up proxy authentication support, improve test - fix #331

commit 3ab2135828f3f2d23652c5297d749ec5c9948075
Merge: de2627a 6e54257
Author: Bill Shannon <bill.shannon@oracle.com>
Date:   Mon Aug 20 14:18:46 2018 -0700

    Merge branch 'proxy-auth-merge' of https://github.com/FWiesner/javamail into FWiesner-proxy-auth-merge

commit 6e54257
Author: Florian Wiesner <florian.wiesner@oracle.com>
Date:   Mon Aug 20 11:28:58 2018 +0200

    Added support for HTTP Proxy Authentication

commit 773ec3b
Merge: c4e604d 32b74ae
Author: Florian Wiesner <fwiesner@gmail.com>
Date:   Mon Aug 20 08:48:35 2018 +0200

    Merge pull request #1 from javaee/master

    Pull from upstream

Author: bshannon

doc/release/CHANGES.txt

@@ -30,7 +30,8 @@ GH  317	use System.lineSeparator() instead of System.getProperty(...)
 GH  321	URLName.getURL() returns incorrect url.
 GH  322	Dots in local part of emails not handled properly
 GH  323	Support loading protocol providers using ServiceLoader
-GH  326	Apply relaxed Content-Disposition parsing to Content-Disposition parameters
+GH  326	Apply relaxed Content-Disposition parsing to Content-Disposition params
+GH  332	http proxy support should support authenticating to the proxy server
 
 
 		  CHANGES IN THE 1.6.1 RELEASE

mail/src/main/java/com/sun/mail/util/SocketFetcher.java

@@ -52,7 +52,6 @@
 import java.security.cert.*;
 import javax.net.*;
 import javax.net.ssl.*;
-import javax.security.auth.x500.X500Principal;
 
 /**
  * This class is used to get Sockets. Depending on the arguments passed
@@ -275,8 +274,10 @@ private static Socket createSocket(InetAddress localaddr, int localport,
 		", host " + host + ", port " + port +
 		", connection timeout " + cto + ", timeout " + to +
 		", socket factory " + sf + ", useSSL " + useSSL);
-		
+
 	String proxyHost = props.getProperty(prefix + ".proxy.host", null);
+	String proxyUser = props.getProperty(prefix + ".proxy.user", null);
+	String proxyPassword = props.getProperty(prefix + ".proxy.password", null);
 	int proxyPort = 80;
 	String socksHost = null;
 	int socksPort = 1080;
@@ -295,8 +296,12 @@ private static Socket createSocket(InetAddress localaddr, int localport,
 	    proxyPort = PropUtil.getIntProperty(props,
 					prefix + ".proxy.port", proxyPort);
 	    err = "Using web proxy host, port: " + proxyHost + ", " + proxyPort;
-	    if (logger.isLoggable(Level.FINER))
+	    if (logger.isLoggable(Level.FINER)) {
 		logger.finer("web proxy host " + proxyHost + ", port " + proxyPort);
+		if (proxyUser != null)
+		    logger.finer("web proxy user " + proxyUser + ", password " +
+			(proxyPassword == null ? "<null>" : "<non-null>"));
+	    }
 	} else if ((socksHost =
 		    props.getProperty(prefix + ".socks.host", null)) != null) {
 	    int i = socksHost.indexOf(':');
@@ -346,7 +351,8 @@ private static Socket createSocket(InetAddress localaddr, int localport,
 	try {
 	    logger.finest("connecting...");
 	    if (proxyHost != null)
-		proxyConnect(socket, proxyHost, proxyPort, host, port, cto);
+		proxyConnect(socket, proxyHost, proxyPort,
+				proxyUser, proxyPassword, host, port, cto);
 	    else if (cto >= 0)
 		socket.connect(new InetSocketAddress(host, port), cto);
 	    else
@@ -407,7 +413,7 @@ private static SocketFactory getSocketFactory(String sfClass)
 	if (sfClass == null || sfClass.length() == 0)
 	    return null;
 
-	// dynamically load the class 
+	// dynamically load the class
 
 	ClassLoader cl = getContextClassLoader();
 	Class<?> clsSockFact = null;
@@ -419,7 +425,7 @@ private static SocketFactory getSocketFactory(String sfClass)
 	if (clsSockFact == null)
 	    clsSockFact = Class.forName(sfClass);
 	// get & invoke the getDefault() method
-	Method mthGetDefault = clsSockFact.getMethod("getDefault", 
+	Method mthGetDefault = clsSockFact.getMethod("getDefault",
 						     new Class<?>[]{});
 	SocketFactory sf = (SocketFactory)
 	    mthGetDefault.invoke(new Object(), new Object[]{});
@@ -662,7 +668,7 @@ private static boolean isRecoverable(Throwable t) {
     /**
      * Check the server from the Socket connection against the server name(s)
      * as expressed in the server certificate (RFC 2595 check).
-     * 
+     *
      * @param	server		name of the server expected
      * @param   sslSocket	SSLSocket connected to the server
      * @exception	IOException	if we can't verify identity of server
@@ -693,7 +699,7 @@ private static void checkServerIdentity(String server, SSLSocket sslSocket)
 
     /**
      * Do any of the names in the cert match the server name?
-     *  
+     *
      * @param	server	name of the server expected
      * @param   cert	X509Certificate to get the subject's name from
      * @return  true if it matches
@@ -714,7 +720,7 @@ private static boolean matchCert(String server, X509Certificate cert) {
 	    // invoke HostnameChecker.getInstance(HostnameChecker.TYPE_LDAP)
 	    // HostnameChecker.TYPE_LDAP == 2
 	    // LDAP requires the same regex handling as we need
-	    Method getInstance = hnc.getMethod("getInstance", 
+	    Method getInstance = hnc.getMethod("getInstance",
 					new Class<?>[] { byte.class });
 	    Object hostnameChecker = getInstance.invoke(new Object(),
 					new Object[] { Byte.valueOf((byte)2) });
@@ -820,6 +826,7 @@ private static boolean matchServer(String server, String name) {
      */
     private static void proxyConnect(Socket socket,
 				String proxyHost, int proxyPort,
+				String proxyUser, String proxyPassword,
 				String host, int port, int cto)
 				throws IOException {
 	if (logger.isLoggable(Level.FINE))
@@ -832,8 +839,22 @@ private static void proxyConnect(Socket socket,
 	    socket.connect(new InetSocketAddress(proxyHost, proxyPort));
 	PrintStream os = new PrintStream(socket.getOutputStream(), false,
 					    StandardCharsets.UTF_8.name());
-	os.print("CONNECT " + host + ":" + port + " HTTP/1.1\r\n");
-	os.print("Host: " + host + ":" + port + "\r\n\r\n");
+	StringBuilder requestBuilder = new StringBuilder();
+	requestBuilder.append("CONNECT ").append(host).append(":").append(port).
+			append(" HTTP/1.1\r\n");
+	requestBuilder.append("Host: ").append(host).append(":").append(port).
+			append("\r\n");
+	if (proxyUser != null && proxyPassword != null) {
+	    byte[] upbytes = (proxyUser + ':' + proxyPassword).
+				getBytes(StandardCharsets.UTF_8);
+	    String proxyHeaderValue = new String(
+		BASE64EncoderStream.encode(upbytes),
+		StandardCharsets.US_ASCII);
+	    requestBuilder.append("Proxy-Authorization: Basic ").
+				append(proxyHeaderValue).append("\r\n");
+	}
+	requestBuilder.append("Proxy-Connection: keep-alive\r\n\r\n");
+	os.print(requestBuilder.toString());
 	os.flush();
 	BufferedReader r = new BufferedReader(new InputStreamReader(
 			    socket.getInputStream(), StandardCharsets.UTF_8));

mail/src/test/java/com/sun/mail/util/SocketFetcherTest.java

@@ -43,6 +43,7 @@
 import java.io.IOException;
 import java.net.Socket;
 import java.util.Properties;
+import java.nio.charset.StandardCharsets;
 
 import com.sun.mail.test.TestServer;
 import com.sun.mail.test.ProtocolHandler;
@@ -71,6 +72,15 @@ public void testProxyHostPort() {
 	assertTrue("proxy host, port", testProxy("proxy", "localhost", "PPPP"));
     }
 
+    /**
+     * Test connecting with proxy host and port and user name and password.
+     */
+    @Test
+    public void testProxyHostPortUserPassword() {
+	assertTrue("proxy host, port, user, password",
+	    testProxyUserPassword("proxy", "localhost", "PPPP", "user", "pwd"));
+    }
+
     /**
      * Test connecting with proxy host:port.
      */
@@ -106,9 +116,16 @@ public void testNoProxy() {
     /**
      */
     public boolean testProxy(String type, String host, String port) {
+	return testProxyUserPassword(type, host, port, null, null);
+    }
+
+    /**
+     */
+    public boolean testProxyUserPassword(String type, String host, String port,
+					String user, String pwd) {
 	TestServer server = null;
 	try {
-	    ProxyHandler handler = new ProxyHandler();
+	    ProxyHandler handler = new ProxyHandler(type.equals("proxy"));
 	    server = new TestServer(handler);
 	    server.start();
 	    String sport = "" + server.getPort();
@@ -122,6 +139,10 @@ public boolean testProxy(String type, String host, String port) {
 	    if (port != null)
 		properties.setProperty("mail.test." + type + ".port",
 				    port.replace("PPPP", sport));
+	    if (user != null)
+		properties.setProperty("mail.test." + type + ".user", user);
+	    if (pwd != null)
+		properties.setProperty("mail.test." + type + ".password", pwd);
 
 	    Socket s = null;
 	    try {
@@ -135,7 +156,12 @@ public boolean testProxy(String type, String host, String port) {
 		if (s != null)
 		    s.close();
 	    }
-	    return handler.getConnected();
+	    if (!handler.getConnected())
+		return false;
+	    if (user != null && pwd != null)
+		return (user + ":" + pwd).equals(handler.getUserPassword());
+	    else
+		return true;
 
 	} catch (final Exception e) {
 	    //e.printStackTrace();
@@ -149,28 +175,56 @@ public boolean testProxy(String type, String host, String port) {
     }
 
     /**
-     * Custom handler.  Remember whether any data was sent.
+     * Custom handler.  Remember whether any data was sent
+     * and save user/password string;
      */
     private static class ProxyHandler extends ProtocolHandler {
+	private boolean http;
+
 	// must be static because handler is cloned for each connection
 	private static volatile boolean connected;
+	private static volatile String userPassword;
 
-	public ProxyHandler() {
+	public ProxyHandler(boolean http) {
+	    this.http = http;
 	    connected = false;
 	}
 
 	@Override
 	public void handleCommand() throws IOException {
-	    int c = in.read();
-	    if (c >= 0) {
+	    if (!http) {
+		int c = in.read();
+		if (c >= 0) {
+		    // any data means a real client connected
+		    connected = true;
+		}
+		exit();
+	    }
+
+	    // else, http...
+	    String line;
+	    while ((line = readLine()) != null) {
 		// any data means a real client connected
 		connected = true;
+		if (line.length() == 0)
+		    break;
+		if (line.startsWith("Proxy-Authorization:")) {
+		    int i = line.indexOf("Basic ") + 6;
+		    String up = line.substring(i);
+		    userPassword = new String(BASE64DecoderStream.decode(
+				    up.getBytes(StandardCharsets.US_ASCII)),
+				    StandardCharsets.UTF_8);
+		}
 	    }
 	    exit();
 	}
 
 	public boolean getConnected() {
 	    return connected;
 	}
+
+	public String getUserPassword() {
+	    return userPassword;
+	}
     }
 }