commit 1e745a8dd0f89579131f4f455dbfe3119ac872e8
author Marc Kriguer <myk@google.com> Fri Apr 11 17:56:06 2014 -0700
committer Marc Kriguer <myk@google.com> Wed Apr 23 11:28:25 2014 -0700
tree c24a5e6f4d0de0bcc34f2e0e9da7b011c6da7752
parent a6dcb7749c9014a7ce4343abea3277f0f6fa83e3

Add a "nicer" exception message when auth fails

This is (part of the fix) for b/6729095; TanMay will make a similar change
to the SharePointUserProfileAdaptor code.

src/com/google/enterprise/adaptor/sharepoint/SharePointAdaptor.java

diff --git a/src/com/google/enterprise/adaptor/sharepoint/SharePointAdaptor.java b/src/com/google/enterprise/adaptor/sharepoint/SharePointAdaptor.java
index 25365d7..4365adc 100644
--- a/src/com/google/enterprise/adaptor/sharepoint/SharePointAdaptor.java
+++ b/src/com/google/enterprise/adaptor/sharepoint/SharePointAdaptor.java
@@ -92,6 +92,7 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.net.UnknownHostException;
 import java.nio.charset.Charset;
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -127,6 +128,7 @@
 import javax.xml.ws.EndpointReference;
 import javax.xml.ws.Holder;
 import javax.xml.ws.Service;
+import javax.xml.ws.WebServiceException;
 import javax.xml.ws.handler.MessageContext;
 import javax.xml.ws.wsaddressing.W3CEndpointReferenceBuilder;
 
@@ -480,9 +482,9 @@
             username, password);
     authenticationHandler = new FormsAuthenticationHandler(username,
         password, scheduledExecutor, authenticationClient);
-    authenticationHandler.start();
-    executor = executorFactory.call();
     try {
+      authenticationHandler.start();
+      executor = executorFactory.call();
       SiteAdaptor vsAdaptor = getSiteAdaptor(virtualServer, virtualServer);
       SiteDataClient virtualServerSiteDataClient =
           vsAdaptor.getSiteDataClient();
@@ -519,7 +521,32 @@
               = vsAdaptor.encodeDocId(siteListing.getURL()).getUniqueId();
           ntlmAuthenticator.addPermitForHost(spUrlToUri(siteString).toURL());
         }
-      }      
+      }
+    } catch (WebServiceException ex) {
+      String warning;
+      Throwable cause = ex.getCause();
+      if (cause instanceof UnknownHostException) {
+        warning = String.format("Cannot find SharePoint server \"%s\" -- "
+            + "please make sure it is specified properly.", virtualServer);
+        //TODO(myk or tvartak): Replace AssertionError with the to-be-introduced
+        // "Permanent configuration error"
+        throw new AssertionError(warning, ex);
+      }
+      if (username.equals("")) {
+        warning = String.format("Cannot connect to server \"%s\" as the "
+            + "current user.  Please make sure the server is specified "
+            + "correctly, and that the user has sufficient permission to "
+            + "access the SharePoint server.  If the SharePoint server is "
+            + "currently down, please try again later.", virtualServer);
+      } else {
+        warning = String.format("Cannot connect to server \"%s\" as user "
+            + "\"%s\" with the specified password.  Please make sure they are "
+            + "specified correctly, and that the user has sufficient "
+            + "permission to access the SharePoint server.  If the SharePoint "
+            + "server is currently down, please try again later.",
+            virtualServer, username);
+      }
+      throw new IOException(warning, ex);
     } catch (Exception e) {
       // Don't leak the executor.
       destroy();