Merge "Restore anonymous repositories browse capability" into stable-2.11
diff --git a/src/main/java/com/googlesource/gerrit/plugins/gitblit/auth/GerritToGitBlitUserService.java b/src/main/java/com/googlesource/gerrit/plugins/gitblit/auth/GerritToGitBlitUserService.java
index 1d0ce9d..a4bbb2c 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/gitblit/auth/GerritToGitBlitUserService.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/gitblit/auth/GerritToGitBlitUserService.java
@@ -142,14 +142,15 @@
String gerritUsername =
(String) httpRequest.getAttribute("gerrit-username");
String gerritToken = (String) httpRequest.getAttribute("gerrit-token");
- if (Strings.isNullOrEmpty(gerritUsername)
- || Strings.isNullOrEmpty(gerritToken)) {
- return null;
- }
-
httpRequest.getSession().setAttribute(Constants.AUTHENTICATION_TYPE,
AuthenticationType.CONTAINER);
- return authenticateSSO(gerritUsername, gerritToken);
+
+ if (Strings.isNullOrEmpty(gerritUsername)
+ || Strings.isNullOrEmpty(gerritToken)) {
+ return GerritToGitBlitUserModel.getAnonymous(projectControl);
+ } else {
+ return authenticateSSO(gerritUsername, gerritToken);
+ }
}
@Override