opendev/gerrit
Code Issues Proposed changes

Merge "Fix wrong AuthException in GetHead"

Browse Source
This commit is contained in:
Shawn Pearce
2014-01-27 23:40:41 +00:00
committed by Gerrit Code Review
parent 057b3e0ed5 36b26bb4d6
commit 7209c8789a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gerrit-server/src/main/java/com/google/gerrit/server/project/GetHead.java
View File

@@ -14,9 +14,9 @@
package com.google.gerrit.server.project;
import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
import com.google.gerrit.extensions.restapi.RestReadView;
import com.google.gerrit.server.auth.AuthException;
import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.inject.Inject;
@@ -54,7 +54,7 @@ public class GetHead implements RestReadView<ProjectResource> {
if (rsrc.getControl().controlForRef(n).isVisible()) {
return n;
}
throw new AuthException();
throw new AuthException("not allowed to see HEAD");
} else if (head.getObjectId() != null) {
RevWalk rw = new RevWalk(repo);
try {
@@ -62,12 +62,12 @@ public class GetHead implements RestReadView<ProjectResource> {
if (rsrc.getControl().canReadCommit(rw, commit)) {
return head.getObjectId().name();
}
throw new AuthException();
throw new AuthException("not allowed to see HEAD");
} catch (MissingObjectException | IncorrectObjectTypeException e) {
if (rsrc.getControl().isOwner()) {
return head.getObjectId().name();
}
throw new AuthException();
throw new AuthException("not allowed to see HEAD");
} finally {
rw.release();
}