RESOLVED - bug 295050: [api] request enhanced support of client-certificates

https://bugs.eclipse.org/bugs/show_bug.cgi?id=295050

4 files changed, 50 insertions, 0 deletions

diff --git a/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/HttpClientTransportFactory.java b/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/HttpClientTransportFactory.java
index 14fef8f9..8a12f67d 100644
--- a/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/HttpClientTransportFactory.java
+++ b/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/HttpClientTransportFactory.java
@@ -39,6 +39,7 @@ import org.apache.xmlrpc.util.HttpUtil;
 import org.apache.xmlrpc.util.XmlRpcIOException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.mylyn.commons.net.AbstractWebLocation;
+import org.eclipse.mylyn.commons.net.SslCertificateException;
 import org.eclipse.mylyn.commons.net.WebUtil;
 import org.xml.sax.SAXException;
 
@@ -223,6 +224,8 @@ class HttpClientTransportFactory implements XmlRpcTransportFactory {
 				} else {
 					throw new XmlRpcException("Unexpected exception: " + t.getMessage(), t); //$NON-NLS-1$
 				}
+			} catch (SslCertificateException e) {
+				throw new XmlRpcSslCertificateException(e);
 			} catch (IOException e) {
 				throw new XmlRpcException("I/O error while communicating with HTTP server: " + e.getMessage(), e); //$NON-NLS-1$
 			}
diff --git a/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/XmlRpcOperation.java b/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/XmlRpcOperation.java
index 05309e04..fc64e40d 100644
--- a/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/XmlRpcOperation.java
+++ b/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/XmlRpcOperation.java
@@ -80,6 +80,13 @@ public abstract class XmlRpcOperation<T> {
 					throw e;
 				}
 				lastException = e;
+			} catch (XmlRpcSslCertificateException e) {
+				try {
+					client.getLocation().requestCredentials(AuthenticationType.CERTIFICATE, null, monitor);
+				} catch (UnsupportedRequestException ignored) {
+					throw e;
+				}
+				lastException = e;
 			}
 		}
 		if (lastException != null) {
diff --git a/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/XmlRpcProxyAuthenticationException.java b/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/XmlRpcProxyAuthenticationException.java
index 3fd5f203..b3391836 100644
--- a/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/XmlRpcProxyAuthenticationException.java
+++ b/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/XmlRpcProxyAuthenticationException.java
@@ -13,6 +13,9 @@ package org.eclipse.mylyn.internal.commons.xmlrpc;
 
 import org.apache.xmlrpc.XmlRpcException;
 
+/**
+ * @author Steffen Pingel
+ */
 public class XmlRpcProxyAuthenticationException extends XmlRpcException {
 
 	private static final long serialVersionUID = 305145749259511429L;
diff --git a/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/XmlRpcSslCertificateException.java b/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/XmlRpcSslCertificateException.java
new file mode 100644
index 00000000..5fa64536
--- /dev/null
+++ b/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/XmlRpcSslCertificateException.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Tasktop Technologies.
+ * 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:
+ *     Tasktop Technologies - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.mylyn.internal.commons.xmlrpc;
+
+import org.apache.xmlrpc.XmlRpcException;
+import org.eclipse.mylyn.commons.net.SslCertificateException;
+
+/**
+ * @author Steffen Pingel
+ */
+public class XmlRpcSslCertificateException extends XmlRpcException {
+
+	private static final long serialVersionUID = 6981133252991248441L;
+
+	public XmlRpcSslCertificateException(String message) {
+		super(message);
+	}
+
+	public XmlRpcSslCertificateException() {
+		super(null);
+	}
+
+	public XmlRpcSslCertificateException(SslCertificateException e) {
+		super(null);
+		initCause(e);
+	}
+
+}