Skip to content

Commit

Permalink
issue-545: Enforce repository permissions in patch page
Browse files Browse the repository at this point in the history
  • Loading branch information
gitblit committed Feb 26, 2015
1 parent 7a30680 commit c2b425d
Showing 1 changed file with 17 additions and 4 deletions.
21 changes: 17 additions & 4 deletions src/main/java/com/gitblit/wicket/pages/PatchPage.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;

import com.gitblit.models.RepositoryModel;
import com.gitblit.models.UserModel;
import com.gitblit.utils.DiffUtils;
import com.gitblit.utils.JGitUtils;
import com.gitblit.utils.StringUtils;
Expand All @@ -31,23 +33,33 @@
@CacheControl(LastModified.BOOT)
public class PatchPage extends SessionPage {

public PatchPage(PageParameters params) {
public PatchPage(final PageParameters params) {
super(params);

if (!params.containsKey("r")) {
GitBlitWebSession.get().cacheErrorMessage(getString("gb.repositoryNotSpecified"));
error(getString("gb.repositoryNotSpecified"));
redirectToInterceptPage(new RepositoriesPage());
return;
}

final String repositoryName = WicketUtils.getRepositoryName(params);
final String baseObjectId = WicketUtils.getBaseObjectId(params);
final String objectId = WicketUtils.getObject(params);
final String blobPath = WicketUtils.getPath(params);

GitBlitWebSession session = GitBlitWebSession.get();
UserModel user = session.getUser();

RepositoryModel model = app().repositories().getRepositoryModel(user, repositoryName);
if (model == null) {
// user does not have permission
error(getString("gb.canNotLoadRepository") + " " + repositoryName);
redirectToInterceptPage(new RepositoriesPage());
return;
}

Repository r = app().repositories().getRepository(repositoryName);
if (r == null) {
GitBlitWebSession.get().cacheErrorMessage(getString("gb.canNotLoadRepository") + " " + repositoryName);
error(getString("gb.canNotLoadRepository") + " " + repositoryName);
redirectToInterceptPage(new RepositoriesPage());
return;
}
Expand All @@ -67,4 +79,5 @@ public PatchPage(PageParameters params) {
add(new Label("patchText", patch));
r.close();
}

}

0 comments on commit c2b425d

Please sign in to comment.