Trace canonicalWebUrl-related issues explicitly with OAuth
When canonicalWebUrl is not present or misconfigured,
the OAuth protocol may not function properly.
Log the problem and the associated exception to allow
Gerrit admin to identify and resolve the problem by
looking at the related exception in error_log.
Change-Id: Ifb29ba1706335c487a92c4180b1f9ec70d2dae4a
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetOAuthToken.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GetOAuthToken.java
index 8df8c6b..1099d6b 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetOAuthToken.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GetOAuthToken.java
@@ -27,11 +27,14 @@
import com.google.inject.Singleton;
import java.net.URI;
import java.net.URISyntaxException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@Singleton
class GetOAuthToken implements RestReadView<AccountResource> {
private static final String BEARER_TYPE = "bearer";
+ private static final Logger log = LoggerFactory.getLogger(GetOAuthToken.class);
private final Provider<CurrentUser> self;
private final OAuthTokenCache tokenCache;
@@ -69,9 +72,15 @@
}
private static String getHostName(String canonicalWebUrl) {
+ if (canonicalWebUrl == null) {
+ log.error("No canonicalWebUrl defined in gerrit.config, OAuth may not work properly");
+ return null;
+ }
+
try {
return new URI(canonicalWebUrl).getHost();
} catch (URISyntaxException e) {
+ log.error("Invalid canonicalWebUrl '" + canonicalWebUrl + "'", e);
return null;
}
}
