The Unified and Autonomous Development Platform
Fix the bug that user can merge pull request to unauthorized repositories # Conflicts: # core/src/main/java/io/onedev/server/model/User.java
Robin Shencc1d4cae6abf
diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.javaindex 49abe4b237..31d823ae53 100644--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java@@ -703,15 +703,14 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest}}}-- ProjectFacade project = request.getTargetProject().getFacade();- Permission writeCode = new ProjectPermission(project, ProjectPrivilege.CODE_WRITE);- if (request.getSubmitter() == null || !request.getSubmitter().asSubject().isPermitted(writeCode)) {- Collection<User> writers = new ArrayList<>();- for (UserFacade facade: SecurityUtils.getAuthorizedUsers(project, ProjectPrivilege.CODE_WRITE))- writers.add(userManager.load(facade.getId()));- checkReviews(writers, 1, request.getLatestUpdate());- }+ }+ ProjectFacade project = request.getTargetProject().getFacade();+ Permission writeCode = new ProjectPermission(project, ProjectPrivilege.CODE_WRITE);+ if (request.getSubmitter() == null || !request.getSubmitter().asSubject().isPermitted(writeCode)) {+ Collection<User> writers = new ArrayList<>();+ for (UserFacade facade: SecurityUtils.getAuthorizedUsers(project, ProjectPrivilege.CODE_WRITE))+ writers.add(userManager.load(facade.getId()));+ checkReviews(writers, 1, request.getLatestUpdate());}}diff --git a/core/src/main/java/io/onedev/server/model/Project.java b/core/src/main/java/io/onedev/server/model/Project.javaindex 2f481fbe18..04e5928a4b 100644--- a/core/src/main/java/io/onedev/server/model/Project.java+++ b/core/src/main/java/io/onedev/server/model/Project.java@@ -154,6 +154,9 @@ public class Project extends AbstractEntity {@OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)private Collection<Configuration> configurations = new ArrayList<>();+ @OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)+ private Collection<Build2> build2s = new ArrayList<>();+@Lob@Column(nullable=false, length=65535)@JsonView(DefaultView.class)diff --git a/core/src/main/java/io/onedev/server/model/User.java b/core/src/main/java/io/onedev/server/model/User.javaindex d215a47813..623c69d86a 100644--- a/core/src/main/java/io/onedev/server/model/User.java+++ b/core/src/main/java/io/onedev/server/model/User.java@@ -64,10 +64,10 @@ public class User extends AbstractEntity implements AuthenticationInfo {private long version;@OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)- private Collection<Membership> memberships = new ArrayList<>();+ private Collection<UserAuthorization> authorizations = new ArrayList<>();@OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)- private Collection<UserAuthorization> authorizations = new ArrayList<>();+ private Collection<Membership> memberships = new ArrayList<>();@OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)private Collection<PullRequestReview> reviews = new ArrayList<>();@@ -81,6 +81,9 @@ public class User extends AbstractEntity implements AuthenticationInfo {@OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)private Collection<IssueQuerySetting> issueQuerySettings = new ArrayList<>();+ @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)+ private Collection<Build2> build2s = new ArrayList<>();+@Overridepublic PrincipalCollection getPrincipals() {return new SimplePrincipalCollection(getId(), "");diff --git a/core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.html b/core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.htmlindex 981e4bdf4e..f7ac341d66 100644--- a/core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.html+++ b/core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.html@@ -1,17 +1,17 @@-<wicket:panel>- <div class="project-selector">- <wicket:enclosure child="search">- <div class="search">- <input wicket:id="search" class="form-control" placeholder="Search projects..."></input>- </div>- </wicket:enclosure>- <ul wicket:id="projects" class="list-unstyled projects autosize">- <li wicket:id="projects" class="project selectable">- <a wicket:id="link">- <i class="fa fa-ext fa-repo"></i> <span wicket:id="name"></span>- </a>- </li>- </ul>- <div wicket:id="noProjects" class="alert alert-warning">No projects found</div>- </div>+<wicket:panel>+ <div class="project-selector">+ <wicket:enclosure child="search">+ <div class="search">+ <input wicket:id="search" class="form-control" placeholder="Search projects...">+ </div>+ </wicket:enclosure>+ <ul wicket:id="projects" class="list-unstyled projects autosize">+ <li wicket:id="projects" class="project selectable">+ <a wicket:id="link">+ <img wicket:id="avatar"> <span wicket:id="name"></span>+ </a>+ </li>+ </ul>+ <div wicket:id="noProjects" class="alert alert-warning">No projects found</div>+ </div></wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java b/core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.javaindex 7ed65e4a06..6e9a6496c5 100644--- a/core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java@@ -1,205 +1,215 @@-package io.onedev.server.web.page.project.info;--import java.util.Collection;--import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.markup.ComponentTag;-import org.apache.wicket.markup.head.CssHeaderItem;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.eclipse.jgit.lib.Constants;--import io.onedev.server.OneDev;-import io.onedev.server.cache.CommitInfoManager;-import io.onedev.server.entitymanager.UrlManager;-import io.onedev.server.model.Project;-import io.onedev.server.security.SecurityUtils;-import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;-import io.onedev.server.web.component.floating.FloatingPanel;-import io.onedev.server.web.component.link.DropdownLink;-import io.onedev.server.web.component.link.ViewStateAwarePageLink;-import io.onedev.server.web.component.markdown.MarkdownViewer;-import io.onedev.server.web.component.modal.ModalLink;-import io.onedev.server.web.component.modal.ModalPanel;-import io.onedev.server.web.component.project.selector.ProjectSelector;-import io.onedev.server.web.page.project.blob.ProjectBlobPage;-import io.onedev.server.web.page.project.branches.ProjectBranchesPage;-import io.onedev.server.web.page.project.commits.ProjectCommitsPage;-import io.onedev.server.web.page.project.tags.ProjectTagsPage;--@SuppressWarnings("serial")-public abstract class ProjectInfoPanel extends Panel {-- private final IModel<Project> projectModel;-- public ProjectInfoPanel(String id, IModel<Project> projectModel) {- super(id);- this.projectModel = projectModel;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- if (getProject().getForkedFrom() != null) {- Link<Void> link = new ViewStateAwarePageLink<Void>("forkedFromLink",- ProjectBlobPage.class, ProjectBlobPage.paramsOf(getProject().getForkedFrom()));- link.add(new Label("name", getProject().getForkedFrom().getName()));- add(link);- } else {- WebMarkupContainer link = new WebMarkupContainer("forkedFromLink");- link.add(new Label("name"));- link.setVisible(false);- add(link);- }- add(new Label("name", getProject().getName()));- add(new Label("id", getProject().getId()));-- UrlManager urlManager = OneDev.getInstance(UrlManager.class);- Model<String> cloneUrlModel = Model.of(urlManager.urlFor(getProject()));- add(new TextField<String>("cloneUrl", cloneUrlModel));- add(new WebMarkupContainer("copyUrl").add(new CopyClipboardBehavior(cloneUrlModel)));-- if (getProject().getDescription() != null) {- add(new MarkdownViewer("description", Model.of(getProject().getDescription()), null));- } else {- add(new WebMarkupContainer("description").setVisible(false));- }-- add(new ViewStateAwarePageLink<Void>("commitsLink",- ProjectCommitsPage.class, ProjectCommitsPage.paramsOf(getProject())) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(OneDev.getInstance(CommitInfoManager.class).getCommitCount(getProject()) != 0);- }-- @Override- protected void onInitialize() {- super.onInitialize();- CommitInfoManager commitInfoManager = OneDev.getInstance(CommitInfoManager.class);- add(new Label("count", commitInfoManager.getCommitCount(getProject()) + " commits"));- }-- });-- add(new ViewStateAwarePageLink<Void>("branchesLink",- ProjectBranchesPage.class, ProjectBranchesPage.paramsOf(getProject())) {-- @Override- protected void onInitialize() {- super.onInitialize();- add(new Label("count", getProject().getRefs(Constants.R_HEADS).size() + " branches"));- }-- });-- add(new ViewStateAwarePageLink<Void>("tagsLink",- ProjectTagsPage.class, ProjectTagsPage.paramsOf(getProject())) {-- @Override- protected void onInitialize() {- super.onInitialize();- add(new Label("count", getProject().getRefs(Constants.R_TAGS).size() + " tags"));- }-- });-- if (getProject().getForks().isEmpty()) {- add(new WebMarkupContainer("forks") {-- @Override- protected void onInitialize() {- super.onInitialize();- add(new Label("label", "0 forks"));- }-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- tag.setName("span");- }-- });- } else {- add(new DropdownLink("forks") {-- @Override- protected void onInitialize() {- super.onInitialize();- add(new Label("label", getProject().getForks().size() + " forks <i class='fa fa-caret-down'></i>").setEscapeModelStrings(false));- }-- @Override- protected Component newContent(String id, FloatingPanel dropdown) {- return new ProjectSelector(id, new LoadableDetachableModel<Collection<Project>>() {-- @Override- protected Collection<Project> load() {- return getProject().getForks();- }-- }, Project.idOf(getProject())) {-- @Override- protected void onSelect(AjaxRequestTarget target, Project project) {- setResponsePage(ProjectBlobPage.class, ProjectBlobPage.paramsOf(project));- }-- };- }-- });- }-- add(new ModalLink("forkNow") {-- @Override- public void onClick(AjaxRequestTarget target) {- super.onClick(target);- onPromptForkOption(target);- }-- @Override- protected Component newContent(String id, ModalPanel modal) {- return new ForkOptionPanel(id, projectModel) {-- @Override- protected void onClose(AjaxRequestTarget target) {- modal.close();- }-- };- }-- }.setVisible(SecurityUtils.canCreateProjects()));- }-- private Project getProject() {- return projectModel.getObject();- }-- @Override- protected void onDetach() {- projectModel.detach();- super.onDetach();- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- response.render(CssHeaderItem.forReference(new ProjectInfoResourceReference()));- }-- protected abstract void onPromptForkOption(AjaxRequestTarget target);--}+package io.onedev.server.web.page.project.info;++import java.util.Collection;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.markup.ComponentTag;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.eclipse.jgit.lib.Constants;++import io.onedev.server.OneDev;+import io.onedev.server.cache.CommitInfoManager;+import io.onedev.server.entitymanager.UrlManager;+import io.onedev.server.model.Project;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;+import io.onedev.server.web.component.floating.FloatingPanel;+import io.onedev.server.web.component.link.DropdownLink;+import io.onedev.server.web.component.link.ViewStateAwarePageLink;+import io.onedev.server.web.component.markdown.MarkdownViewer;+import io.onedev.server.web.component.modal.ModalLink;+import io.onedev.server.web.component.modal.ModalPanel;+import io.onedev.server.web.component.project.selector.ProjectSelector;+import io.onedev.server.web.page.project.blob.ProjectBlobPage;+import io.onedev.server.web.page.project.branches.ProjectBranchesPage;+import io.onedev.server.web.page.project.commits.ProjectCommitsPage;+import io.onedev.server.web.page.project.tags.ProjectTagsPage;++@SuppressWarnings("serial")+public abstract class ProjectInfoPanel extends Panel {++ private final IModel<Project> projectModel;++ public ProjectInfoPanel(String id, IModel<Project> projectModel) {+ super(id);+ this.projectModel = projectModel;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ if (getProject().getForkedFrom() != null) {+ Link<Void> link = new ViewStateAwarePageLink<Void>("forkedFromLink",+ ProjectBlobPage.class, ProjectBlobPage.paramsOf(getProject().getForkedFrom())) {++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ if (!isEnabled())+ tag.setName("span");+ }++ };+ link.add(new Label("name", getProject().getForkedFrom().getName()));+ link.setEnabled(SecurityUtils.canReadCode(getProject().getForkedFrom().getFacade()));+ add(link);+ } else {+ WebMarkupContainer link = new WebMarkupContainer("forkedFromLink");+ link.add(new Label("name"));+ link.setVisible(false);+ add(link);+ }+ add(new Label("name", getProject().getName()));+ add(new Label("id", getProject().getId()));++ UrlManager urlManager = OneDev.getInstance(UrlManager.class);+ Model<String> cloneUrlModel = Model.of(urlManager.urlFor(getProject()));+ add(new TextField<String>("cloneUrl", cloneUrlModel));+ add(new WebMarkupContainer("copyUrl").add(new CopyClipboardBehavior(cloneUrlModel)));++ if (getProject().getDescription() != null) {+ add(new MarkdownViewer("description", Model.of(getProject().getDescription()), null));+ } else {+ add(new WebMarkupContainer("description").setVisible(false));+ }++ add(new ViewStateAwarePageLink<Void>("commitsLink",+ ProjectCommitsPage.class, ProjectCommitsPage.paramsOf(getProject())) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(OneDev.getInstance(CommitInfoManager.class).getCommitCount(getProject()) != 0);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ CommitInfoManager commitInfoManager = OneDev.getInstance(CommitInfoManager.class);+ add(new Label("count", commitInfoManager.getCommitCount(getProject()) + " commits"));+ }++ });++ add(new ViewStateAwarePageLink<Void>("branchesLink",+ ProjectBranchesPage.class, ProjectBranchesPage.paramsOf(getProject())) {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(new Label("count", getProject().getRefs(Constants.R_HEADS).size() + " branches"));+ }++ });++ add(new ViewStateAwarePageLink<Void>("tagsLink",+ ProjectTagsPage.class, ProjectTagsPage.paramsOf(getProject())) {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(new Label("count", getProject().getRefs(Constants.R_TAGS).size() + " tags"));+ }++ });++ if (getProject().getForks().isEmpty()) {+ add(new WebMarkupContainer("forks") {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(new Label("label", "0 forks"));+ }++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ tag.setName("span");+ }++ });+ } else {+ add(new DropdownLink("forks") {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(new Label("label", getProject().getForks().size() + " forks <i class='fa fa-caret-down'></i>").setEscapeModelStrings(false));+ }++ @Override+ protected Component newContent(String id, FloatingPanel dropdown) {+ return new ProjectSelector(id, new LoadableDetachableModel<Collection<Project>>() {++ @Override+ protected Collection<Project> load() {+ return getProject().getForks();+ }++ }, Project.idOf(getProject())) {++ @Override+ protected void onSelect(AjaxRequestTarget target, Project project) {+ setResponsePage(ProjectBlobPage.class, ProjectBlobPage.paramsOf(project));+ }++ };+ }++ });+ }++ add(new ModalLink("forkNow") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ super.onClick(target);+ onPromptForkOption(target);+ }++ @Override+ protected Component newContent(String id, ModalPanel modal) {+ return new ForkOptionPanel(id, projectModel) {++ @Override+ protected void onClose(AjaxRequestTarget target) {+ modal.close();+ }++ };+ }++ }.setVisible(SecurityUtils.canCreateProjects()));+ }++ private Project getProject() {+ return projectModel.getObject();+ }++ @Override+ protected void onDetach() {+ projectModel.detach();+ super.onDetach();+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new ProjectInfoResourceReference()));+ }++ protected abstract void onPromptForkOption(AjaxRequestTarget target);++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.javaindex 05dbc1a7df..ad7a439643 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java@@ -135,43 +135,33 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {if (currentUser == null)throw new RestartResponseAtInterceptPageException(LoginPage.class);- PullRequest prevRequest = null;String targetParam = params.get("target").toString();String sourceParam = params.get("source").toString();String suggestedSourceBranch = null;if (targetParam != null) {target = new ProjectAndBranch(targetParam);} else {- prevRequest = OneDev.getInstance(PullRequestManager.class).findLatest(getProject(), getLoginUser());- if (prevRequest != null && prevRequest.getTarget().getObjectId(false) != null) {- target = prevRequest.getTarget();+ suggestedSourceBranch = suggestSourceBranch();+ if (!suggestedSourceBranch.equals(getProject().getDefaultBranch())) {+ target = new ProjectAndBranch(getProject(), getProject().getDefaultBranch());+ } else if (getProject().getForkedFrom() != null && SecurityUtils.canReadCode(getProject().getForkedFrom().getFacade())) {+ target = new ProjectAndBranch(getProject().getForkedFrom(),+ getProject().getForkedFrom().getDefaultBranch());} else {- suggestedSourceBranch = suggestSourceBranch();- if (!suggestedSourceBranch.equals(getProject().getDefaultBranch())) {- target = new ProjectAndBranch(getProject(), getProject().getDefaultBranch());- } else if (getProject().getForkedFrom() != null) {- target = new ProjectAndBranch(getProject().getForkedFrom(),- getProject().getForkedFrom().getDefaultBranch());- } else {- target = new ProjectAndBranch(getProject(), getProject().getDefaultBranch());- }+ target = new ProjectAndBranch(getProject(), getProject().getDefaultBranch());}}if (sourceParam != null) {source = new ProjectAndBranch(sourceParam);} else {- if (prevRequest == null)- prevRequest = OneDev.getInstance(PullRequestManager.class).findLatest(getProject(), getLoginUser());- if (prevRequest != null && prevRequest.getSource().getObjectId(false) != null)- source = prevRequest.getSource();- else if (suggestedSourceBranch != null)- source = new ProjectAndBranch(getProject(), suggestedSourceBranch);- else- source = new ProjectAndBranch(getProject(), getProject().getDefaultBranch());+ if (suggestedSourceBranch == null)+ suggestedSourceBranch = suggestSourceBranch();+ source = new ProjectAndBranch(getProject(), suggestedSourceBranch);}AtomicReference<PullRequest> pullRequestRef = new AtomicReference<>(null);+ PullRequest prevRequest = OneDev.getInstance(PullRequestManager.class).findLatest(getProject(), getLoginUser());if (prevRequest != null && source.equals(prevRequest.getSource()) && target.equals(prevRequest.getTarget()) && prevRequest.isOpen())pullRequestRef.set(prevRequest);else