Skip to content

The Unified and Autonomous Development Platform

feat: add project maintenance mode

Robin Shen9284ae2b64c8
diff --git a/server-core/src/main/java/io/onedev/server/ai/CodeCommentHelper.java b/server-core/src/main/java/io/onedev/server/ai/CodeCommentHelper.java
index 2b4f8e6b61..cadf935450 100644
--- a/server-core/src/main/java/io/onedev/server/ai/CodeCommentHelper.java
+++ b/server-core/src/main/java/io/onedev/server/ai/CodeCommentHelper.java
@@ -34,6 +34,7 @@ public class CodeCommentHelper {
if (!SecurityUtils.canReadCode(subject, comment.getProject()))
throw new UnauthorizedException();
+ SecurityUtils.checkWorkOnProject(subject, comment.getProject());
var reply = new CodeCommentReply();
reply.setComment(comment);
diff --git a/server-core/src/main/java/io/onedev/server/ai/IssueHelper.java b/server-core/src/main/java/io/onedev/server/ai/IssueHelper.java
index 87f266239c..d00107510f 100644
--- a/server-core/src/main/java/io/onedev/server/ai/IssueHelper.java
+++ b/server-core/src/main/java/io/onedev/server/ai/IssueHelper.java
@@ -267,6 +267,7 @@ public class IssueHelper {
@SuppressWarnings("unchecked")
public static Issue createIssue(Subject subject, Project project, Map<String, Serializable> data) {
+ SecurityUtils.checkWorkOnProject(subject, project);
normalizeData(data);
var issueSetting = OneDev.getInstance(SettingService.class).getIssueSetting();
diff --git a/server-core/src/main/java/io/onedev/server/ai/TodResource.java b/server-core/src/main/java/io/onedev/server/ai/TodResource.java
index e2f30e97ba..1c3a02cd77 100644
--- a/server-core/src/main/java/io/onedev/server/ai/TodResource.java
+++ b/server-core/src/main/java/io/onedev/server/ai/TodResource.java
@@ -538,6 +538,7 @@ public class TodResource {
var currentProject = currentProjectPath != null? getProject(currentProjectPath): null;
var issue = getIssue(currentProject, issueReference);
+ SecurityUtils.checkWorkOnProject(issue.getProject());
var comment = new IssueComment();
comment.setIssue(issue);
comment.setContent(commentContent);
@@ -792,6 +793,7 @@ public class TodResource {
throw new NotAcceptableException("Time tracking needs to be enabled for the project");
if (!SecurityUtils.canAccessIssue(issue))
throw new UnauthorizedException("No permission to access issue: " + issueReference);
+ SecurityUtils.checkWorkOnProject(issue.getProject());
var work = new IssueWork();
work.setIssue(issue);
@@ -1151,6 +1153,7 @@ public class TodResource {
var target = createPullRequestEssentialInfo.target;
var source = createPullRequestEssentialInfo.source;
var submitter = createPullRequestEssentialInfo.submitter;
+ SecurityUtils.checkWorkOnProject(target.getProject());
var mergeStrategyName = (String) data.remove("mergeStrategy");
var mergeStrategy = getMergeStrategy(target.getProject(), mergeStrategyName);
@@ -1498,6 +1501,7 @@ public class TodResource {
var currentProject = currentProjectPath != null? getProject(currentProjectPath): null;
var pullRequest = getPullRequest(currentProject, pullRequestReference);
+ SecurityUtils.checkWorkOnProject(pullRequest.getProject());
pullRequestReviewService.review(user, pullRequest, true, trimToNull(comment));
return PullRequestHelper.getIdentity(currentProject, pullRequest);
}
@@ -1516,6 +1520,7 @@ public class TodResource {
var currentProject = currentProjectPath != null? getProject(currentProjectPath): null;
var pullRequest = getPullRequest(currentProject, pullRequestReference);
+ SecurityUtils.checkWorkOnProject(pullRequest.getProject());
pullRequestReviewService.review(user, pullRequest, false, trimToNull(comment));
return PullRequestHelper.getIdentity(currentProject, pullRequest);
}
@@ -1645,6 +1650,7 @@ public class TodResource {
var currentProject = currentProjectPath != null? getProject(currentProjectPath): null;
var pullRequest = getPullRequest(currentProject, pullRequestReference);
+ SecurityUtils.checkWorkOnProject(pullRequest.getProject());
var comment = new PullRequestComment();
comment.setRequest(pullRequest);
comment.setContent(commentContent);
@@ -1672,6 +1678,7 @@ public class TodResource {
var currentProject = currentProjectPath != null? getProject(currentProjectPath): null;
var pullRequest = getPullRequest(currentProject, pullRequestReference);
+ SecurityUtils.checkWorkOnProject(pullRequest.getProject());
var comment = PullRequestHelper.addCodeComment(pullRequest, user, filePath, fromLineNumber, toLineNumber, commentContent);
return CodeCommentHelper.getIdentity(comment);
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunProjectJobAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunProjectJobAction.java
index 206aa29453..8d9ac31705 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunProjectJobAction.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunProjectJobAction.java
@@ -14,7 +14,7 @@ import jakarta.validation.constraints.NotEmpty;
import jakarta.ws.rs.NotAcceptableException;
import org.apache.shiro.authz.UnauthorizedException;
-import org.apache.shiro.util.ThreadContext;
+import org.apache.shiro.subject.support.SubjectThreadState;
import org.jspecify.annotations.Nullable;
import io.onedev.commons.codeassist.InputSuggestion;
@@ -205,8 +205,9 @@ public class RunProjectJobAction extends PostBuildAction implements Validatable
throw new UnauthorizedException();
var user = SecurityUtils.getUser(subject);
- ThreadContext.bind(subject);
+ var threadState = new SubjectThreadState(subject);
try {
+ threadState.bind();
String refName;
if (branch != null) {
refName = GitUtils.branch2ref(branch);
@@ -230,7 +231,7 @@ public class RunProjectJobAction extends PostBuildAction implements Validatable
getJobService().submit(user, project, commit.copy(), jobName, jobParamMap, refName, null, null,
"Triggered via post build action of job '" + build.getJobName() + "' in project '" + build.getProject().getPath() + "'");
} finally {
- ThreadContext.unbindSubject();
+ threadState.restore();
}
}
diff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
index 6c43b7a541..bf5764c824 100644
--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
@@ -9632,4 +9632,15 @@ public class DataMigrator {
}
}
+ private void migrate254(File dataDir, Stack<Integer> versions) {
+ for (File file : Objects.requireNonNull(dataDir.listFiles())) {
+ if (file.getName().startsWith("Projects.xml") || file.getName().startsWith("Roles.xml")) {
+ var dom = VersionedXmlDoc.fromFile(file);
+ for (Element element : dom.getRootElement().elements())
+ element.addElement("maintenance").setText("false");
+ dom.writeToFile(file, false);
+ }
+ }
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/mail/DefaultMailService.java b/server-core/src/main/java/io/onedev/server/mail/DefaultMailService.java
index 7a04c20ab8..388279abe6 100644
--- a/server-core/src/main/java/io/onedev/server/mail/DefaultMailService.java
+++ b/server-core/src/main/java/io/onedev/server/mail/DefaultMailService.java
@@ -547,7 +547,7 @@ public class DefaultMailService implements MailService, Serializable {
sendMailAsync(newArrayList(fromInternetAddress.getAddress()), newArrayList(), newArrayList(),
subject, htmlBody, textBody, null, null, threadingReferences);
} else {
- if (!SecurityUtils.canReadCode(involvedPullRequest.getProject())) {
+ if (SecurityUtils.canReadCode(fromUser.asSubject(), involvedPullRequest.getProject())) {
addComment(involvedPullRequest, message, fromInternetAddress, fromUser, receiverInternetAddresses);
} else {
throw new UnauthorizedException("Code read permission required for project: %s"
@@ -689,6 +689,8 @@ public class DefaultMailService implements MailService, Serializable {
private void addComment(Issue issue, Message message, InternetAddress authorInternetAddress, @Nullable User author,
Collection<InternetAddress> receiverInternetAddresses) {
+ if (issue.getProject().isMaintenance() && !SecurityUtils.canWorkOnProject(SecurityUtils.asSubject(author), issue.getProject()))
+ throw new UnauthorizedException("Project is in maintenance mode");
String messageId = getMessageId(message);
if (messageId != null && issueCommentService.findByMessageId(messageId) != null) {
logger.warn("Ignored creating issue comment from message as comment with same message id already exists");
@@ -718,6 +720,8 @@ public class DefaultMailService implements MailService, Serializable {
private void addComment(PullRequest pullRequest, Message message, InternetAddress authorInternetAddress,
User author, Collection<InternetAddress> receiverInternetAddresses) {
+ if (pullRequest.getProject().isMaintenance() && !SecurityUtils.canWorkOnProject(SecurityUtils.asSubject(author), pullRequest.getProject()))
+ throw new UnauthorizedException("Project is in maintenance mode");
String messageId = getMessageId(message);
if (messageId != null && pullRequestCommentService.findByMessageId(messageId) != null) {
logger.warn("Ignored creating pull request comment from message as comment with same message id already exists");
@@ -725,6 +729,7 @@ public class DefaultMailService implements MailService, Serializable {
}
PullRequestComment comment = new PullRequestComment();
+ comment.setRequest(pullRequest);
comment.setUser(author);
if (messageId != null)
comment.setMessageId(messageId);
@@ -740,6 +745,8 @@ public class DefaultMailService implements MailService, Serializable {
private Issue openIssue(Message message, Project project, InternetAddress submitterInternetAddress,
@Nullable User submitter, ParsedEmailAddress parsedSystemAddress,
Collection<InternetAddress> receiverInternetAddresses) {
+ if (project.isMaintenance() && !SecurityUtils.canWorkOnProject(SecurityUtils.asSubject(submitter), project))
+ throw new UnauthorizedException("Project is in maintenance mode");
String messageId = getMessageId(message);
if (messageId != null) {
var existingIssue = issueService.findByMessageId(messageId);
diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.java
index 5f62d27a30..6c6c3989a7 100644
--- a/server-core/src/main/java/io/onedev/server/model/Project.java
+++ b/server-core/src/main/java/io/onedev/server/model/Project.java
@@ -203,6 +203,8 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel
public static final String NAME_DESCRIPTION = "Description";
public static final String PROP_DESCRIPTION = "description";
+
+ public static final String PROP_MAINTENANCE = "maintenance";
public static final String PROP_FORKED_FROM = "forkedFrom";
@@ -291,6 +293,8 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel
@Column(length=MAX_DESCRIPTION_LEN)
private String description;
+
+ private boolean maintenance;
@OneToMany(mappedBy="project")
private Collection<Build> builds = new ArrayList<>();
@@ -565,6 +569,25 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel
this.description = StringUtils.abbreviate(description, MAX_DESCRIPTION_LEN);
}
+ @Editable(order=225, descriptionProvider="getMaintenanceDescription")
+ @SubscriptionRequired
+ public boolean isMaintenance() {
+ return maintenance;
+ }
+
+ public void setMaintenance(boolean maintenance) {
+ this.maintenance = maintenance;
+ }
+
+ @SuppressWarnings("unused")
+ private static String getMaintenanceDescription() {
+ var description = _T("If enabled, only project managers and users with maintenance permission can work on this project");
+ if (!OneDev.getInstance(SubscriptionService.class).isSubscriptionActive()) {
+ description += ". " + _T("<b class='text-warning'>NOTE: </b>Maintenance mode is an enterprise feature. <a href='${website}/pricing' target='_blank'>Try free</a> for 30 days");
+ }
+ return description;
+ }
+
public ArrayList<BranchProtection> getBranchProtections() {
return branchProtections;
}
@@ -1110,11 +1133,11 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel
@SuppressWarnings("unused")
private static String getTimeTrackingDescription() {
+ var description = _T("Enable <a href='${docsite}/tutorials/issue/time-tracking' target='_blank'>time tracking</a> for this project to track progress and generate timesheets");
if (!OneDev.getInstance(SubscriptionService.class).isSubscriptionActive()) {
- return _T("<b class='text-warning'>NOTE: </b><a href='${docsite}/tutorials/issue/time-tracking' target='_blank'>Time tracking</a> is an enterprise feature. <a href='${website}/pricing' target='_blank'>Try free</a> for 30 days");
- } else {
- return _T("Enable <a href='${docsite}/tutorials/issue/time-tracking' target='_blank'>time tracking</a> for this project to track progress and generate timesheets");
+ description += ". " + _T("<b class='text-warning'>NOTE: </b><a href='${docsite}/tutorials/issue/time-tracking' target='_blank'>Time tracking</a> is an enterprise feature. <a href='${website}/pricing' target='_blank'>Try free</a> for 30 days");
}
+ return description;
}
@Editable(order=400, name="Package Management", descriptionProvider = "getPackManagementDescription")
diff --git a/server-core/src/main/java/io/onedev/server/model/Role.java b/server-core/src/main/java/io/onedev/server/model/Role.java
index d987156dd2..c5cade7afc 100644
--- a/server-core/src/main/java/io/onedev/server/model/Role.java
+++ b/server-core/src/main/java/io/onedev/server/model/Role.java
@@ -58,6 +58,7 @@ import io.onedev.server.security.permission.ManageCodeComments;
import io.onedev.server.security.permission.ManageIssues;
import io.onedev.server.security.permission.ManageJob;
import io.onedev.server.security.permission.ManageProject;
+import io.onedev.server.security.permission.MaintainProject;
import io.onedev.server.security.permission.ManagePullRequests;
import io.onedev.server.security.permission.ManageWorkspaces;
import io.onedev.server.security.permission.ReadCode;
@@ -138,6 +139,8 @@ public class Role extends AbstractEntity implements BasePermission {
private boolean manageWorkspaces;
private boolean createWorkspaces;
+
+ private boolean maintenance;
@OneToMany(mappedBy="role", cascade=CascadeType.REMOVE)
@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)
@@ -421,6 +424,18 @@ public class Role extends AbstractEntity implements BasePermission {
this.createWorkspaces = createWorkspaces;
}
+ @Editable(order=1000, name="Work while Maintenance", description="""
+ Allow to work on a project while in maintenance mode. Permission for each action is still required""")
+ @DependsOn(property="manageProject", value="false")
+ @ShowCondition("isSubscriptionActive")
+ public boolean isMaintenance() {
+ return maintenance;
+ }
+
+ public void setMaintenance(boolean maintenance) {
+ this.maintenance = maintenance;
+ }
+
public Collection<BaseAuthorization> getBaseAuthorizations() {
return baseAuthorizations;
}
@@ -449,6 +464,8 @@ public class Role extends AbstractEntity implements BasePermission {
private Collection<BasePermission> getPermissions() {
Collection<BasePermission> permissions = Lists.newArrayList(new AccessProject());
+ if (maintenance)
+ permissions.add(new MaintainProject());
if (manageProject)
permissions.add(new ManageProject());
if (createChildren)
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitionspec/ManualSpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitionspec/ManualSpec.java
index f52fdc3b04..a0544619d9 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitionspec/ManualSpec.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitionspec/ManualSpec.java
@@ -119,6 +119,8 @@ public class ManualSpec extends TransitionSpec {
}
public boolean canTransit(Subject subject, Issue issue, @Nullable String state) {
+ if (!SecurityUtils.canWorkOnProject(subject, issue.getProject()))
+ return false;
if ((state == null || getToStates().isEmpty() || getToStates().contains(state))
&& (getFromStates().isEmpty() || getFromStates().contains(issue.getState()))
&& isAuthorized(subject, issue)) {
diff --git a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
index a44143720a..e57efa7d0f 100644
--- a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
@@ -7,6 +7,7 @@ import static io.onedev.server.util.EmailAddressUtils.describe;
import static org.unbescape.html.HtmlEscape.escapeHtml5;
import java.io.ObjectStreamException;
+import java.io.Serial;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
@@ -157,7 +158,7 @@ public class IssueNotificationManager implements Serializable {
@Override
protected Collection<? extends QueryPersonalization<?>> getQueryPersonalizations() {
- return userService.query().stream().map(it -> it.getIssueQueryPersonalization()).collect(Collectors.toList());
+ return userService.query().stream().map(User::getIssueQueryPersonalization).collect(Collectors.toList());
}
@Override
@@ -296,9 +297,8 @@ public class IssueNotificationManager implements Serializable {
}
}
- if (event.getCommentText() instanceof MarkdownText) {
- MarkdownText markdown = (MarkdownText) event.getCommentText();
- for (String userName: new MentionParser().parseMentions(markdown.getRendered())) {
+ if (event.getCommentText() instanceof MarkdownText markdown) {
+ for (String userName: new MentionParser().parseMentions(markdown.getRendered())) {
User mentionedUser = userService.findByName(userName);
if (mentionedUser != null) {
mentionService.mention(issue, mentionedUser);
@@ -509,14 +509,8 @@ public class IssueNotificationManager implements Serializable {
}
private TaskFailedCallback newTaskFailedCallback(Long aiId, Long issueId) {
- return new TaskFailedCallback() {
-
- public void onTaskFailed(String workspaceReference) {
- createComment(userService.load(aiId), issueService.load(issueId),
- "Failed to do the job, please open workspace %s for details".formatted(workspaceReference));
- }
-
- };
+ return workspaceReference -> createComment(userService.load(aiId), issueService.load(issueId),
+ "Failed to do the job, please open workspace %s for details".formatted(workspaceReference));
}
@Transactional
@@ -564,7 +558,7 @@ public class IssueNotificationManager implements Serializable {
var url = urlService.urlFor(issue, true);
String textDetail = "" +
- "Previous project: " + event.getSourceProject().getPath() +
+ "Previous project: " + event.getSourceProject().getPath() +
"\n" +
"Current project: " + event.getTargetProject().getPath() +
"\n";
@@ -623,7 +617,8 @@ public class IssueNotificationManager implements Serializable {
}
}
- public Object writeReplace() throws ObjectStreamException {
+ @Serial
+ public Object writeReplace() throws ObjectStreamException {
return new ManagedSerializedForm(IssueNotificationManager.class);
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/CodeCommentReplyResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/CodeCommentReplyResource.java
index a4dc348d6b..d670662628 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/CodeCommentReplyResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/CodeCommentReplyResource.java
@@ -64,6 +64,7 @@ public class CodeCommentReplyResource {
var comment = commentService.load(data.getCommentId());
if (!SecurityUtils.canReadCode(comment.getProject()))
throw new UnauthorizedException();
+ SecurityUtils.checkWorkOnProject(comment.getProject());
var reply = new CodeCommentReply();
reply.setComment(comment);
reply.setUser(user);
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/CodeCommentResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/CodeCommentResource.java
index 2adfeb2c35..c53df52a59 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/CodeCommentResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/CodeCommentResource.java
@@ -160,6 +160,7 @@ public class CodeCommentResource {
var project = RestProjectUtils.loadProject(projectService, data.getProjectId());
if (!SecurityUtils.canReadCode(project))
throw new UnauthorizedException();
+ SecurityUtils.checkWorkOnProject(project);
var mark = data.getMark().toMark();
var contextData = data.getCompareContext();
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/IssueCommentResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/IssueCommentResource.java
index 9d0fe7f057..4e4eb647e6 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/IssueCommentResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/IssueCommentResource.java
@@ -55,6 +55,7 @@ public class IssueCommentResource {
if (!canAccessIssue(comment.getIssue()) || !isAdministrator() && !comment.getUser().equals(getUser())) {
throw new UnauthorizedException();
}
+ SecurityUtils.checkWorkOnProject(comment.getIssue().getProject());
commentService.create(comment);
return comment.getId();
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/IssueLinkResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/IssueLinkResource.java
index 3173fead52..1c25905b8e 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/IssueLinkResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/IssueLinkResource.java
@@ -21,6 +21,7 @@ import org.apache.shiro.authz.UnauthorizedException;
import io.onedev.server.service.IssueLinkService;
import io.onedev.server.model.IssueLink;
import io.onedev.server.rest.annotation.Api;
+import io.onedev.server.security.SecurityUtils;
@Path("/issue-links")
@Consumes(MediaType.APPLICATION_JSON)
@@ -70,6 +71,8 @@ public class IssueLinkResource {
&& !canEditIssueLink(link.getTarget().getProject(), link.getSpec())) {
throw new UnauthorizedException();
}
+ SecurityUtils.checkWorkOnProject(link.getSource().getProject());
+ SecurityUtils.checkWorkOnProject(link.getTarget().getProject());
linkService.delete(link);
return Response.ok().build();
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/IssueResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/IssueResource.java
index c4226c2e0b..4b9233ade2 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/IssueResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/IssueResource.java
@@ -326,6 +326,7 @@ public class IssueResource {
Project project = RestProjectUtils.loadProject(projectService, data.getProjectId());
if (!SecurityUtils.canAccessProject(project))
throw new UnauthorizedException();
+ SecurityUtils.checkWorkOnProject(project);
if (data.getIterationIds() != null && !data.getIterationIds().isEmpty() && !SecurityUtils.canScheduleIssues(project))
throw new UnauthorizedException("No permission to schedule issue. Remove iterationIds if you want to create issue without scheduling it.");
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/IssueVoteResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/IssueVoteResource.java
index c70ff41cd8..b04eb6512e 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/IssueVoteResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/IssueVoteResource.java
@@ -45,6 +45,7 @@ public class IssueVoteResource {
|| !SecurityUtils.isAdministrator() && !vote.getUser().equals(SecurityUtils.getAuthUser())) {
throw new UnauthorizedException();
}
+ SecurityUtils.checkWorkOnProject(vote.getIssue().getProject());
voteService.create(vote);
return vote.getId();
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/IssueWatchResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/IssueWatchResource.java
index 1712264f93..6377378645 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/IssueWatchResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/IssueWatchResource.java
@@ -45,6 +45,7 @@ public class IssueWatchResource {
|| !SecurityUtils.isAdministrator() && !watch.getUser().equals(SecurityUtils.getAuthUser())) {
throw new UnauthorizedException();
}
+ SecurityUtils.checkWorkOnProject(watch.getIssue().getProject());
watchService.createOrUpdate(watch);
return watch.getId();
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/IssueWorkResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/IssueWorkResource.java
index dec56ed1d7..ce5359a72d 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/IssueWorkResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/IssueWorkResource.java
@@ -64,6 +64,7 @@ public class IssueWorkResource {
|| !SecurityUtils.isAdministrator() && !work.getUser().equals(SecurityUtils.getAuthUser())) {
throw new UnauthorizedException();
}
+ SecurityUtils.checkWorkOnProject(work.getIssue().getProject());
workService.createOrUpdate(work);
return work.getId();
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java
index be6844e531..a278fa9067 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java
@@ -475,6 +475,9 @@ public class ProjectResource {
@Api(order = 500, description="May be empty")
private String description;
+ @Api(order = 525)
+ private boolean maintenance;
+
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
@Api(order = 550)
private Date createDate;
@@ -560,6 +563,14 @@ public class ProjectResource {
this.description = description;
}
+ public boolean isMaintenance() {
+ return maintenance;
+ }
+
+ public void setMaintenance(boolean maintenance) {
+ this.maintenance = maintenance;
+ }
+
public Date getCreateDate() {
return createDate;
}
@@ -648,6 +659,7 @@ public class ProjectResource {
project.setName(getName());
project.setKey(getKey());
project.setDescription(getDescription());
+ project.setMaintenance(isMaintenance());
project.setCodeManagement(isCodeManagement());
project.setWikiManagement(isWikiManagement());
project.setPackManagement(isPackManagement());
@@ -667,6 +679,7 @@ public class ProjectResource {
data.setKey(project.getKey());
data.setPath(project.getPath());
data.setDescription(project.getDescription());
+ data.setMaintenance(project.isMaintenance());
data.setCreateDate(project.getCreateDate());
data.setCodeManagement(project.isCodeManagement());
data.setWikiManagement(project.isWikiManagement());
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestCommentResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestCommentResource.java
index af1a44b42a..82f57a49a2 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestCommentResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestCommentResource.java
@@ -53,6 +53,7 @@ public class PullRequestCommentResource {
|| !SecurityUtils.isAdministrator() && !comment.getUser().equals(SecurityUtils.getUser())) {
throw new UnauthorizedException();
}
+ SecurityUtils.checkWorkOnProject(comment.getProject());
commentService.create(comment, new ArrayList<>());
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java
index e8f3add3ec..6e5a616284 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java
@@ -285,6 +285,7 @@ public class PullRequestResource {
if (!SecurityUtils.canReadCode(target.getProject()) || !SecurityUtils.canReadCode(source.getProject()))
throw new UnauthorizedException();
+ SecurityUtils.checkWorkOnProject(target.getProject());
PullRequest request = new PullRequest();
request.setSubmitter(user);
@@ -414,6 +415,7 @@ public class PullRequestResource {
if (user == null)
throw new UnauthorizedException();
+ SecurityUtils.checkWorkOnProject(request.getProject());
pullRequestReviewService.review(user, request, true, note);
return Response.ok().build();
@@ -430,6 +432,7 @@ public class PullRequestResource {
if (user == null)
throw new UnauthorizedException();
+ SecurityUtils.checkWorkOnProject(request.getProject());
pullRequestReviewService.review(user, request, false, note);
return Response.ok().build();
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestWatchResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestWatchResource.java
index a3ab24e03f..5d5a9c2c11 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestWatchResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestWatchResource.java
@@ -43,6 +43,7 @@ public class PullRequestWatchResource {
|| !SecurityUtils.isAdministrator() && !watch.getUser().equals(SecurityUtils.getAuthUser())) {
throw new UnauthorizedException();
}
+ SecurityUtils.checkWorkOnProject(watch.getRequest().getProject());
watchService.createOrUpdate(watch);
return watch.getId();
}
diff --git a/server-core/src/main/java/io/onedev/server/security/DefaultAuthorizingService.java b/server-core/src/main/java/io/onedev/server/security/DefaultAuthorizingService.java
index 3a38c8fc5a..8a9d812f56 100644
--- a/server-core/src/main/java/io/onedev/server/security/DefaultAuthorizingService.java
+++ b/server-core/src/main/java/io/onedev/server/security/DefaultAuthorizingService.java
@@ -27,11 +27,13 @@ import org.apache.wicket.request.cycle.RequestCycle;
import com.google.common.collect.Lists;
import io.onedev.commons.loader.ManagedSerializedForm;
+import io.onedev.server.SubscriptionService;
import io.onedev.server.model.Group;
import io.onedev.server.model.Project;
import io.onedev.server.model.UserAuthorization;
import io.onedev.server.persistence.SessionService;
import io.onedev.server.security.permission.BasePermission;
+import io.onedev.server.security.permission.MaintainProject;
import io.onedev.server.security.permission.ConfidentialIssuesPermission;
import io.onedev.server.security.permission.ProjectPermission;
import io.onedev.server.security.permission.SystemAdministration;
@@ -52,6 +54,9 @@ public class DefaultAuthorizingService extends AuthorizingRealm implements Autho
@Inject
private IssueAuthorizationService issueAuthorizationService;
+
+ @Inject
+ private SubscriptionService subscriptionService;
private final MetaDataKey<Map<String, AuthorizationInfo>> AUTHORIZATION_INFOS = new MetaDataKey<>() {};
@@ -141,6 +146,14 @@ public class DefaultAuthorizingService extends AuthorizingRealm implements Autho
if (!basePermission.isApplicable(result.getLeft()))
return false;
}
+ if (permission instanceof ProjectPermission projectPermission
+ && projectPermission.getProject().isMaintenance()
+ && subscriptionService.isSubscriptionActive()
+ && projectPermission.isWrite()) {
+ var maintenance = new ProjectPermission(projectPermission.getProject(), new MaintainProject());
+ if (result.getRight().stream().noneMatch(it -> it.implies(maintenance)))
+ return false;
+ }
return result.getRight().stream().anyMatch(it -> it.implies(permission));
});
}
diff --git a/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java b/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java
index 07aa45c341..ad5738d182 100644
--- a/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java
+++ b/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java
@@ -75,6 +75,7 @@ import io.onedev.server.security.permission.ManageCodeComments;
import io.onedev.server.security.permission.ManageIssues;
import io.onedev.server.security.permission.ManageJob;
import io.onedev.server.security.permission.ManageProject;
+import io.onedev.server.security.permission.MaintainProject;
import io.onedev.server.security.permission.ManagePullRequests;
import io.onedev.server.security.permission.ManageWorkspaces;
import io.onedev.server.security.permission.ProjectPermission;
@@ -359,6 +360,8 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
* @return
*/
public static boolean canOpenTerminal(Subject subject, Build build) {
+ if (!canWorkOnProject(subject, build.getProject()))
+ return false;
var user = getAuthUser(subject);
if (user == null)
return false;
@@ -401,6 +404,8 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
}
public static boolean canEditIssueFields(Subject subject, Issue issue) {
+ if (!canWorkOnProject(subject, issue.getProject()))
+ return false;
return issue.getSubmitter().equals(getAuthUser(subject))
|| subject.isPermitted(new ProjectPermission(issue.getProject(), new EditFieldsOfOtherIssues()));
}
@@ -493,6 +498,26 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
|| !issue.isConfidential() && canAccessProject(subject, issue.getProject());
}
+ /** Checks the maintenance restriction only; the action's normal permission is still required. */
+ public static boolean canWorkOnProject(Subject subject, Project project) {
+ return !project.isMaintenance()
+ || !OneDev.getInstance(SubscriptionService.class).isSubscriptionActive()
+ || subject.isPermitted(new ProjectPermission(project, new MaintainProject()));
+ }
+
+ public static boolean canWorkOnProject(Project project) {
+ return canWorkOnProject(getSubject(), project);
+ }
+
+ public static void checkWorkOnProject(Project project) {
+ checkWorkOnProject(getSubject(), project);
+ }
+
+ public static void checkWorkOnProject(Subject subject, Project project) {
+ if (!canWorkOnProject(subject, project))
+ throw new UnauthorizedException("Project is in maintenance mode");
+ }
+
public static boolean canCreateChildren(Project project) {
return canCreateChildren(getSubject(), project);
}
@@ -644,11 +669,15 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
}
public static boolean canModifyOrDelete(Subject subject, Workspace workspace) {
+ if (!canWorkOnProject(subject, workspace.getProject()))
+ return false;
return canManageWorkspaces(subject, workspace.getProject())
|| workspace.getUser().equals(getAuthUser(subject));
}
public static boolean canChangeStatus(Subject subject, CodeComment comment) {
+ if (!canWorkOnProject(subject, comment.getProject()))
+ return false;
var user = getAuthUser(subject);
if (user == null)
return false;
@@ -672,53 +701,71 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
}
public static boolean canModifyOrDelete(Subject subject, CodeComment comment) {
+ if (!canWorkOnProject(subject, comment.getProject()))
+ return false;
return canManageCodeComments(subject, comment.getProject())
|| comment.getUser().equals(getAuthUser(subject));
}
public static boolean canModifyOrDelete(CodeCommentReply reply) {
+ if (!canWorkOnProject(reply.getComment().getProject()))
+ return false;
var subject = getSubject();
return canManageCodeComments(subject, reply.getComment().getProject())
|| reply.getUser().equals(getAuthUser(subject));
}
public static boolean canModifyOrDelete(PullRequestComment comment) {
+ if (!canWorkOnProject(comment.getProject()))
+ return false;
var subject = getSubject();
return canManagePullRequests(subject, comment.getRequest().getTargetProject())
|| comment.getUser().equals(getAuthUser(subject));
}
public static boolean canModifyOrDelete(IssueComment comment) {
+ if (!canWorkOnProject(comment.getIssue().getProject()))
+ return false;
var subject = getSubject();
return canManageIssues(subject, comment.getIssue().getProject())
|| comment.getUser().equals(getAuthUser(subject));
}
public static boolean canModifyOrDelete(IssueWork work) {
+ if (!canWorkOnProject(work.getIssue().getProject()))
+ return false;
var subject = getSubject();
return canManageIssues(subject, work.getIssue().getProject())
|| work.getUser().equals(getAuthUser(subject));
}
public static boolean canModifyOrDelete(IssueVote vote) {
+ if (!canWorkOnProject(vote.getIssue().getProject()))
+ return false;
var subject = getSubject();
return canManageIssues(subject, vote.getIssue().getProject())
|| vote.getUser().equals(getAuthUser(subject));
}
public static boolean canModifyOrDelete(IssueWatch watch) {
+ if (!canWorkOnProject(watch.getIssue().getProject()))
+ return false;
var subject = getSubject();
return canManageIssues(subject, watch.getIssue().getProject())
|| watch.getUser().equals(getAuthUser(subject));
}
public static boolean canModifyOrDelete(PullRequestWatch watch) {
+ if (!canWorkOnProject(watch.getRequest().getProject()))
+ return false;
var subject = getSubject();
return canManagePullRequests(subject, watch.getRequest().getProject())
|| watch.getUser().equals(getAuthUser(subject));
}
public static boolean canModifyOrDelete(PullRequestReview review) {
+ if (!canWorkOnProject(review.getRequest().getProject()))
+ return false;
var subject = getSubject();
return canModifyPullRequest(review.getRequest()) || review.getUser().equals(getAuthUser(subject));
}
@@ -728,6 +775,8 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
}
public static boolean canModifyPullRequest(Subject subject, PullRequest request) {
+ if (!canWorkOnProject(subject, request.getTargetProject()))
+ return false;
var user = getAuthUser(subject);
return canManagePullRequests(subject, request.getTargetProject())
|| user != null && (user.equals(request.getSubmitter()) || request.getAssignees().contains(user));
@@ -738,6 +787,8 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
}
public static boolean canModifyIssue(Subject subject, Issue issue) {
+ if (!canWorkOnProject(subject, issue.getProject()))
+ return false;
return canManageIssues(subject, issue.getProject())
|| issue.getSubmitter().equals(getAuthUser(subject));
}
@@ -868,15 +919,17 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
if (!isAnonymous(principal) || getSettingService().getSecuritySetting().isEnableAnonymousAccess())
addIdsPermittedByDefaultRole(cache, authorizedProjectIds, permission);
- return authorizedProjectIds.stream().map(projectService::load).collect(toSet());
+ return authorizedProjectIds.stream().map(projectService::load)
+ .filter(it -> !permission.isWrite() || canWorkOnProject(subject, it)).collect(toSet());
} else {
return new HashSet<>();
}
}
}
- private static Collection<User> filterApplicableUsers(Collection<User> users, BasePermission permission) {
- return users.stream().filter(it -> permission.isApplicable(it.getFacade())).collect(toList());
+ private static Collection<User> filterApplicableUsers(Collection<User> users, Project project, BasePermission permission) {
+ return users.stream().filter(it -> permission.isApplicable(it.getFacade())
+ && (!permission.isWrite() || !project.isMaintenance() || canWorkOnProject(it.asSubject(), project))).collect(toList());
}
public static Collection<User> getAuthorizedUsers(Project project, BasePermission permission) {
@@ -891,7 +944,7 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
Project current = project;
do {
if (current.isPermittedByLoginUser(permission))
- return filterApplicableUsers(cache.getUsers(), permission);
+ return filterApplicableUsers(cache.getUsers(), project, permission);
for (UserAuthorization authorization: current.getUserAuthorizations()) {
if (authorization.getRole().implies(permission))
@@ -912,7 +965,7 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
authorizedUsers.add(authorization.getUser());
}
- return filterApplicableUsers(authorizedUsers, permission);
+ return filterApplicableUsers(authorizedUsers, project, permission);
}
private static void populateAccessibleReportNames(Map<String, Collection<String>> accessibleReportNames,
diff --git a/server-core/src/main/java/io/onedev/server/security/permission/BasePermission.java b/server-core/src/main/java/io/onedev/server/security/permission/BasePermission.java
index 5c4b6bcee9..ae15b7e71b 100644
--- a/server-core/src/main/java/io/onedev/server/security/permission/BasePermission.java
+++ b/server-core/src/main/java/io/onedev/server/security/permission/BasePermission.java
@@ -8,5 +8,9 @@ import org.jspecify.annotations.Nullable;
public interface BasePermission extends Permission {
boolean isApplicable(@Nullable UserFacade user);
+
+ default boolean isWrite() {
+ return false;
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/security/permission/CreateChildren.java b/server-core/src/main/java/io/onedev/server/security/permission/CreateChildren.java
index 9d200b6f17..a84dbe0eea 100644
--- a/server-core/src/main/java/io/onedev/server/security/permission/CreateChildren.java
+++ b/server-core/src/main/java/io/onedev/server/security/permission/CreateChildren.java
@@ -4,7 +4,7 @@ import io.onedev.server.util.facade.UserFacade;
import org.apache.shiro.authz.Permission;
import org.jetbrains.annotations.Nullable;
-public class CreateChildren implements BasePermission {
+public class CreateChildren implements WritePermission {
@Override
public boolean implies(Permission p) {
diff --git a/server-core/src/main/java/io/onedev/server/security/permission/CreateWorkspaces.java b/server-core/src/main/java/io/onedev/server/security/permission/CreateWorkspaces.java
index 3369bc0b45..fec1041dd7 100644
--- a/server-core/src/main/java/io/onedev/server/security/permission/CreateWorkspaces.java
+++ b/server-core/src/main/java/io/onedev/server/security/permission/CreateWorkspaces.java
@@ -4,7 +4,7 @@ import io.onedev.server.util.facade.UserFacade;
import org.apache.shiro.authz.Permission;
import org.jetbrains.annotations.Nullable;
-public class CreateWorkspaces implements BasePermission {
+public class CreateWorkspaces implements WritePermission {
@Override
public boolean implies(Permission p) {
diff --git a/server-core/src/main/java/io/onedev/server/security/permission/EditFieldsOfOtherIssues.java b/server-core/src/main/java/io/onedev/server/security/permission/EditFieldsOfOtherIssues.java
index e8b3d1174c..4971234b1e 100644
--- a/server-core/src/main/java/io/onedev/server/security/permission/EditFieldsOfOtherIssues.java
+++ b/server-core/src/main/java/io/onedev/server/security/permission/EditFieldsOfOtherIssues.java
@@ -5,7 +5,7 @@ import org.jetbrains.annotations.Nullable;
import io.onedev.server.util.facade.UserFacade;
-public class EditFieldsOfOtherIssues implements BasePermission {
+public class EditFieldsOfOtherIssues implements WritePermission {
@Override
public boolean implies(Permission p) {
diff --git a/server-core/src/main/java/io/onedev/server/security/permission/EditIssueField.java b/server-core/src/main/java/io/onedev/server/security/permission/EditIssueField.java
index 7c374a9ff8..977bdebf6c 100644
--- a/server-core/src/main/java/io/onedev/server/security/permission/EditIssueField.java
+++ b/server-core/src/main/java/io/onedev/server/security/permission/EditIssueField.java
@@ -6,7 +6,7 @@ import org.apache.shiro.authz.Permission;
import org.jspecify.annotations.Nullable;
import java.util.Collection;
-public class EditIssueField implements BasePermission {
+public class EditIssueField implements WritePermission {
private final Collection<String> fields;
diff --git a/server-core/src/main/java/io/onedev/server/security/permission/EditIssueLink.java b/server-core/src/main/java/io/onedev/server/security/permission/EditIssueLink.java
index e41b2c8d84..4d088b7def 100644
--- a/server-core/src/main/java/io/onedev/server/security/permission/EditIssueLink.java
+++ b/server-core/src/main/java/io/onedev/server/security/permission/EditIssueLink.java
@@ -6,7 +6,7 @@ import org.apache.shiro.authz.Permission;
import org.jspecify.annotations.Nullable;
-public class EditIssueLink implements BasePermission {
+public class EditIssueLink implements WritePermission {
private final LinkSpec link;
diff --git a/server-core/src/main/java/io/onedev/server/security/permission/JobPermission.java b/server-core/src/main/java/io/onedev/server/security/permission/JobPermission.java
index 6c9bc43ac1..9081b76eff 100644
--- a/server-core/src/main/java/io/onedev/server/security/permission/JobPermission.java
+++ b/server-core/src/main/java/io/onedev/server/security/permission/JobPermission.java
@@ -35,6 +35,11 @@ public class JobPermission implements BasePermission {
return false;
}
+ @Override
+ public boolean isWrite() {
+ return privilege.isWrite();
+ }
+
@Override
public boolean isApplicable(@Nullable UserFacade user) {
return privilege.isApplicable(user);
diff --git a/server-core/src/main/java/io/onedev/server/security/permission/MaintainProject.java b/server-core/src/main/java/io/onedev/server/security/permission/MaintainProject.java
new file mode 100644
index 0000000000..f5efb4dc3f
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/security/permission/MaintainProject.java
@@ -0,0 +1,20 @@
+package io.onedev.server.security.permission;
+
+import org.apache.shiro.authz.Permission;
+import org.jspecify.annotations.Nullable;
+
+import io.onedev.server.util.facade.UserFacade;
+
+/** Allows otherwise authorized changes while a project is in maintenance mode. */
+public class MaintainProject implements BasePermission {
+
+ @Override
+ public boolean implies(Permission permission) {
+ return permission instanceof MaintainProject;
+ }
+
+ @Override
+ public boolean isApplicable(@Nullable UserFacade user) {
+ return user != null;
+ }
+}
diff --git a/server-core/src/main/java/io/onedev/server/security/permission/ManageBuilds.java b/server-core/src/main/java/io/onedev/server/security/permission/ManageBuilds.java
index f5c16dc876..0cc34969e4 100644
--- a/server-core/src/main/java/io/onedev/server/security/permission/ManageBuilds.java
+++ b/server-core/src/main/java/io/onedev/server/security/permission/ManageBuilds.java
@@ -4,7 +4,7 @@ import io.onedev.server.util.facade.UserFacade;
import org.apache.shiro.authz.Permission;
import org.jetbrains.annotations.Nullable;
-public class ManageBuilds implements BasePermission {
+public class ManageBuilds implements WritePermission {
@Override
public boolean implies(Permission p) {
diff --git a/server-core/src/main/java/io/onedev/server/security/permission/ManageCodeComments.java b/server-core/src/main/java/io/onedev/server/security/permission/ManageCodeComments.java
index 849e2474a9..b8a31d2b21 100644
--- a/server-core/src/main/java/io/onedev/server/security/permission/ManageCodeComments.java
+++ b/server-core/src/main/java/io/onedev/server/security/permission/ManageCodeComments.java
@@ -4,7 +4,7 @@ import io.onedev.server.util.facade.UserFacade;
import org.apache.shiro.authz.Permission;
import org.jetbrains.annotations.Nullable;
-public class ManageCodeComments implements BasePermission {
+public class ManageCodeComments implements WritePermission {
@Override
public boolean implies(Permission p) {
diff --git a/server-core/src/main/java/io/onedev/server/security/permission/ManageIssues.java b/server-core/src/main/java/io/onedev/server/security/permission/ManageIssues.java
index e8f4000212..4acd64df13 100644
--- a/server-core/src/main/java/io/onedev/server/security/permission/ManageIssues.java
+++ b/server-core/src/main/java/io/onedev/server/security/permission/ManageIssues.java
@@ -4,7 +4,7 @@ import io.onedev.server.util.facade.UserFacade;
import org.apache.shiro.authz.Permission;
import org.jetbrains.annotations.Nullable;
-public class ManageIssues implements BasePermission {
+public class ManageIssues implements WritePermission {
@Override
public boolean implies(Permission p) {
diff --git a/server-core/src/main/java/io/onedev/server/security/permission/ManageJob.java b/server-core/src/main/java/io/onedev/server/security/permission/ManageJob.java
index 589133da9d..a8a75e13a0 100644
--- a/server-core/src/main/java/io/onedev/server/security/permission/ManageJob.java
+++ b/server-core/src/main/java/io/onedev/server/security/permission/ManageJob.java
@@ -4,7 +4,7 @@ import io.onedev.server.util.facade.UserFacade;
import org.apache.shiro.authz.Permission;
import org.jetbrains.annotations.Nullable;
-public class ManageJob implements BasePermission {
+public class ManageJob implements WritePermission {
@Override
public boolean implies(Permission p) {
diff --git a/server-core/src/main/java/io/onedev/server/security/permission/ManageProject.java b/server-core/src/main/java/io/onedev/server/security/permission/ManageProject.java
index 053c820cb5..eff466f6ed 100644
--- a/server-core/src/main/java/io/onedev/server/security/permission/ManageProject.java
+++ b/server-core/src/main/java/io/onedev/server/security/permission/ManageProject.java
@@ -4,7 +4,7 @@ import io.onedev.server.util.facade.UserFacade;
import org.apache.shiro.authz.Permission;
import org.jetbrains.annotations.Nullable;
-public class ManageProject implements BasePermission {
+public class ManageProject implements WritePermission {
@Override
public boolean implies(Permission p) {
diff --git a/server-core/src/main/java/io/onedev/server/security/permission/ManagePullRequests.java b/server-core/src/main/java/io/onedev/server/security/permission/ManagePullRequests.java
index 077c73672c..05fef81698 100644
--- a/server-core/src/main/java/io/onedev/server/security/permission/ManagePullRequests.java
+++ b/server-core/src/main/java/io/onedev/server/security/permission/ManagePullRequests.java
@@ -4,7 +4,7 @@ import io.onedev.server.util.facade.UserFacade;
import org.apache.shiro.authz.Permission;
import org.jetbrains.annotations.Nullable;
-public class ManagePullRequests implements BasePermission {
+public class ManagePullRequests implements WritePermission {
@Override
public boolean implies(Permission p) {
diff --git a/server-core/src/main/java/io/onedev/server/security/permission/ManageWorkspaces.java b/server-core/src/main/java/io/onedev/server/security/permission/ManageWorkspaces.java
index 318e195232..e97a76d5bf 100644
--- a/server-core/src/main/java/io/onedev/server/security/permission/ManageWorkspaces.java
+++ b/server-core/src/main/java/io/onedev/server/security/permission/ManageWorkspaces.java
@@ -4,7 +4,7 @@ import io.onedev.server.util.facade.UserFacade;
import org.apache.shiro.authz.Permission;
import org.jetbrains.annotations.Nullable;
-public class ManageWorkspaces implements BasePermission {
+public class ManageWorkspaces implements WritePermission {
@Override
public boolean implies(Permission p) {
diff --git a/server-core/src/main/java/io/onedev/server/security/permission/ProjectPermission.java b/server-core/src/main/java/io/onedev/server/security/permission/ProjectPermission.java
index f864947615..f20071a2cb 100644
--- a/server-core/src/main/java/io/onedev/server/security/permission/ProjectPermission.java
+++ b/server-core/src/main/java/io/onedev/server/security/permission/ProjectPermission.java
@@ -24,6 +24,11 @@ public class ProjectPermission implements BasePermission {
return privilege;
}
+ @Override
+ public boolean isWrite() {
+ return privilege.isWrite();
+ }
+
@Override
public boolean implies(Permission p) {
if (p instanceof ProjectPermission) {
diff --git a/server-core/src/main/java/io/onedev/server/security/permission/RunJob.java b/server-core/src/main/java/io/onedev/server/security/permission/RunJob.java
index d9ccf36882..a9a8775823 100644
--- a/server-core/src/main/java/io/onedev/server/security/permission/RunJob.java
+++ b/server-core/src/main/java/io/onedev/server/security/permission/RunJob.java
@@ -4,7 +4,7 @@ import io.onedev.server.util.facade.UserFacade;
import org.apache.shiro.authz.Permission;
import org.jetbrains.annotations.Nullable;
-public class RunJob implements BasePermission {
+public class RunJob implements WritePermission {
@Override
public boolean implies(Permission p) {
diff --git a/server-core/src/main/java/io/onedev/server/security/permission/ScheduleIssues.java b/server-core/src/main/java/io/onedev/server/security/permission/ScheduleIssues.java
index ea54d7267f..9ebd90b32b 100644
--- a/server-core/src/main/java/io/onedev/server/security/permission/ScheduleIssues.java
+++ b/server-core/src/main/java/io/onedev/server/security/permission/ScheduleIssues.java
@@ -4,7 +4,7 @@ import io.onedev.server.util.facade.UserFacade;
import org.apache.shiro.authz.Permission;
import org.jetbrains.annotations.Nullable;
-public class ScheduleIssues implements BasePermission {
+public class ScheduleIssues implements WritePermission {
@Override
public boolean implies(Permission p) {
diff --git a/server-core/src/main/java/io/onedev/server/security/permission/UploadCache.java b/server-core/src/main/java/io/onedev/server/security/permission/UploadCache.java
index 0596cde247..495b6b985a 100644
--- a/server-core/src/main/java/io/onedev/server/security/permission/UploadCache.java
+++ b/server-core/src/main/java/io/onedev/server/security/permission/UploadCache.java
@@ -4,7 +4,7 @@ import io.onedev.server.util.facade.UserFacade;
import org.apache.shiro.authz.Permission;
import org.jetbrains.annotations.Nullable;
-public class UploadCache implements BasePermission {
+public class UploadCache implements WritePermission {
@Override
public boolean implies(Permission p) {
diff --git a/server-core/src/main/java/io/onedev/server/security/permission/WriteCode.java b/server-core/src/main/java/io/onedev/server/security/permission/WriteCode.java
index 0569b68b02..09d1d2c525 100644
--- a/server-core/src/main/java/io/onedev/server/security/permission/WriteCode.java
+++ b/server-core/src/main/java/io/onedev/server/security/permission/WriteCode.java
@@ -4,7 +4,7 @@ import io.onedev.server.util.facade.UserFacade;
import org.apache.shiro.authz.Permission;
import org.jetbrains.annotations.Nullable;
-public class WriteCode implements BasePermission {
+public class WriteCode implements WritePermission {
@Override
public boolean implies(Permission p) {
diff --git a/server-core/src/main/java/io/onedev/server/security/permission/WritePack.java b/server-core/src/main/java/io/onedev/server/security/permission/WritePack.java
index 2880ebe2ae..20e3258fb5 100644
--- a/server-core/src/main/java/io/onedev/server/security/permission/WritePack.java
+++ b/server-core/src/main/java/io/onedev/server/security/permission/WritePack.java
@@ -4,7 +4,7 @@ import io.onedev.server.util.facade.UserFacade;
import org.apache.shiro.authz.Permission;
import org.jetbrains.annotations.Nullable;
-public class WritePack implements BasePermission {
+public class WritePack implements WritePermission {
@Override
public boolean implies(Permission p) {
diff --git a/server-core/src/main/java/io/onedev/server/security/permission/WritePermission.java b/server-core/src/main/java/io/onedev/server/security/permission/WritePermission.java
new file mode 100644
index 0000000000..21cb42d83f
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/security/permission/WritePermission.java
@@ -0,0 +1,10 @@
+package io.onedev.server.security.permission;
+
+/** A permission to change project data, subject to the project's maintenance mode. */
+public interface WritePermission extends BasePermission {
+
+ @Override
+ default boolean isWrite() {
+ return true;
+ }
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codeproblem/code-problem.js b/server-core/src/main/java/io/onedev/server/web/asset/codeproblem/code-problem.js
index b3dad5f366..4ef5a2bdca 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/codeproblem/code-problem.js
+++ b/server-core/src/main/java/io/onedev/server/web/asset/codeproblem/code-problem.js
@@ -31,7 +31,7 @@ onedev.server.codeProblem = {
return "badge-secondary";
}
},
- renderProblems: function(problems, translations) {
+ renderProblems: function(problems, translations, canComment) {
var $container = $("<div></div>");
for (var i in problems) {
var problem = problems[i];
@@ -41,8 +41,9 @@ onedev.server.codeProblem = {
$content.html(problem.message);
$content.prepend(`<span class='badge badge-sm mr-2 ${severityInfo}'>${translations[problem.severity]}</span>`);
- $content.append(`<a data-tippy-content='${translations["add-problem-comment"]}' class='add-comment ml-2'><svg class='icon icon-sm mr-2'><use xlink:href='${onedev.server.icons}#comment'/></svg></a>`);
+ if (canComment)
+ $content.append(`<a data-tippy-content='${translations["add-problem-comment"]}' class='add-comment ml-2'><svg class='icon icon-sm mr-2'><use xlink:href='${onedev.server.icons}#comment'/></svg></a>`);
}
return $container.html();
}
-}
\ No newline at end of file
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/MaintenanceBadge.java b/server-core/src/main/java/io/onedev/server/web/component/MaintenanceBadge.java
new file mode 100644
index 0000000000..a972b23a2e
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/MaintenanceBadge.java
@@ -0,0 +1,30 @@
+package io.onedev.server.web.component;
+
+import static io.onedev.server.web.translation.Translation._T;
+
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.model.IModel;
+
+public class MaintenanceBadge extends Label {
+
+ private final IModel<Boolean> maintenanceModel;
+
+ public MaintenanceBadge(String id, IModel<Boolean> maintenanceModel) {
+ super(id, _T("Maintenance"));
+ this.maintenanceModel = maintenanceModel;
+ add(AttributeAppender.append("class", "badge badge-sm badge-warning"));
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(maintenanceModel.getObject());
+ }
+
+ @Override
+ protected void onDetach() {
+ maintenanceModel.detach();
+ super.onDetach();
+ }
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
index 1120fc7034..2c5699fa25 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
@@ -265,7 +265,8 @@ public abstract class BuildListPanel extends Panel {
protected void onConfigure() {
super.onConfigure();
setEnabled(querySubmitted && queryModel.getObject() != null);
- setVisible(SecurityUtils.getAuthUser() != null && getQuerySaveSupport() != null);
+ setVisible(SecurityUtils.getAuthUser() != null && getQuerySaveSupport() != null
+ && (getProject() == null || SecurityUtils.canWorkOnProject(getProject())));
}
@Override
@@ -733,7 +734,8 @@ public abstract class BuildListPanel extends Panel {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(getProject() != null && SecurityUtils.canManageBuilds(getProject()));
+ setVisible(getProject() != null && SecurityUtils.canWorkOnProject(getProject())
+ && SecurityUtils.canManageBuilds(getProject()));
}
});
@@ -1015,7 +1017,8 @@ public abstract class BuildListPanel extends Panel {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(SecurityUtils.getAuthUser() != null && getPage() instanceof ProjectBuildsPage);
+ setVisible(SecurityUtils.getAuthUser() != null && getPage() instanceof ProjectBuildsPage
+ && SecurityUtils.canWorkOnProject(getProject()));
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
index f10eaec60e..6be750f72c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
@@ -187,7 +187,8 @@ public abstract class CodeCommentListPanel extends Panel {
protected void onConfigure() {
super.onConfigure();
setEnabled(querySubmitted && queryModel.getObject() != null);
- setVisible(SecurityUtils.getAuthUser() != null && getQuerySaveSupport() != null);
+ setVisible(SecurityUtils.getAuthUser() != null && getQuerySaveSupport() != null
+ && SecurityUtils.canWorkOnProject(getProject()));
}
@Override
@@ -615,7 +616,7 @@ public abstract class CodeCommentListPanel extends Panel {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(selectionColumn != null);
+ setVisible(selectionColumn != null && SecurityUtils.canWorkOnProject(getProject()));
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java
index 0e28faad81..d624045b15 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java
@@ -291,7 +291,7 @@ public abstract class CodeCommentPanel extends Panel implements ChatToolAware {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(SecurityUtils.getAuthUser() != null);
+ setVisible(SecurityUtils.getAuthUser() != null && SecurityUtils.canWorkOnProject(getComment().getProject()));
}
});
@@ -307,7 +307,7 @@ public abstract class CodeCommentPanel extends Panel implements ChatToolAware {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(SecurityUtils.getAuthUser() != null);
+ setVisible(SecurityUtils.getAuthUser() != null && SecurityUtils.canWorkOnProject(getComment().getProject()));
}
};
@@ -936,7 +936,7 @@ public abstract class CodeCommentPanel extends Panel implements ChatToolAware {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(SecurityUtils.getAuthUser() != null);
+ setVisible(SecurityUtils.getAuthUser() != null && SecurityUtils.canWorkOnProject(getComment().getProject()));
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/component/comment/CommentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/comment/CommentPanel.java
index 0362916dbf..320ec71784 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/comment/CommentPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/comment/CommentPanel.java
@@ -210,7 +210,8 @@ public abstract class CommentPanel extends Panel {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(isQuoteEnabled() && SecurityUtils.getAuthUser() != null && getComment() != null);
+ setVisible(isQuoteEnabled() && SecurityUtils.getAuthUser() != null && getComment() != null
+ && SecurityUtils.canWorkOnProject(getProject()));
}
});
@@ -255,8 +256,13 @@ public abstract class CommentPanel extends Panel {
if (getReactionSupport() != null) {
viewer.add(new ReactionListPanel("reactions") {
-
- @Override
+
+ @Override
+ protected Project getProject() {
+ return CommentPanel.this.getProject();
+ }
+
+ @Override
protected Collection<? extends EntityReaction> getReactions() {
return getReactionSupport().getReactions();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
index 6b04338733..9c11027743 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
@@ -339,7 +339,8 @@ public abstract class CommitListPanel extends Panel {
protected void onConfigure() {
super.onConfigure();
setEnabled(querySubmitted && queryModel.getObject() != null);
- setVisible(SecurityUtils.getAuthUser() != null && getQuerySaveSupport() != null);
+ setVisible(SecurityUtils.getAuthUser() != null && getQuerySaveSupport() != null
+ && SecurityUtils.canWorkOnProject(getProject()));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java
index 073ee9521e..a0efbbddb1 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java
@@ -361,11 +361,12 @@ public class BlobTextDiffPanel extends Panel implements ChatToolAware {
script = String.format("onedev.server.blobTextDiff.openSelectionPopover('%s', %s, %s, %s, '%s', %s);",
getMarkupId(), jsonOfPosition, convertToJson(commentRange), markUrl,
escapeJavaScript(getMarkedText(commentRange)),
- SecurityUtils.getAuthUser()!=null);
+ SecurityUtils.getAuthUser()!=null && SecurityUtils.canWorkOnProject(change.getProject()));
target.appendJavaScript(script);
break;
case "addComment":
Preconditions.checkNotNull(SecurityUtils.getAuthUser());
+ SecurityUtils.checkWorkOnProject(change.getProject());
commentRange = getRange(params, "param1", "param2", "param3", "param4", "param5");
getAnnotationSupport().onAddComment(target, commentRange);
@@ -564,7 +565,7 @@ public class BlobTextDiffPanel extends Panel implements ChatToolAware {
translations.put("add-problem-comment", _T("Add comment"));
var jsonOfMarkRange = convertToJson(markRange);
- String script = String.format("onedev.server.blobTextDiff.onDomReady('%s', '%s', '%s', '%s', '%s', '%s', %s, %s, %s, %s, %s, %s, %s, %s, %s);",
+ String script = String.format("onedev.server.blobTextDiff.onDomReady('%s', '%s', '%s', '%s', '%s', '%s', %s, %s, %s, %s, %s, %s, %s, %s, %s, %s);",
getMarkupId(), symbolTooltip.getMarkupId(),
change.getOldBlobIdent().revision,
change.getNewBlobIdent().revision,
@@ -574,7 +575,8 @@ public class BlobTextDiffPanel extends Panel implements ChatToolAware {
jsonOfMarkRange, convertToJson(openCommentInfo),
convertToJson(annotationInfoModel.getObject()),
commentContainerId, convertToJson(translations),
- getSymbolContextJson(), convertToJson(oemService.getDocsite()));
+ getSymbolContextJson(), convertToJson(oemService.getDocsite()),
+ getAnnotationSupport() != null && SecurityUtils.getAuthUser() != null && SecurityUtils.canWorkOnProject(change.getProject()));
response.render(OnDomReadyHeaderItem.forScript(script));
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/blob-text-diff.js b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/blob-text-diff.js
index 204b222a26..137a309532 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/blob-text-diff.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/blob-text-diff.js
@@ -2,11 +2,12 @@ onedev.server.blobTextDiff = {
symbolClasses: ".cm-property, .cm-variable, .cm-variable-2, .cm-variable-3, .cm-def, .cm-meta, .cm-string, .cm-tag, .cm-attribute, cm-builtin, cm-qualifier",
onDomReady: function(containerId, symbolTooltipId, oldRev, newRev, oldPath, newPath,
callback, blameMessageCallback, markRange, openComment,
- annotationInfo, commentContainerId, translations, symbolContext, docsite) {
+ annotationInfo, commentContainerId, translations, symbolContext, docsite, canComment) {
onedev.server.blobTextDiff.translations = translations;
var $container = $("#" + containerId);
$container.data("commentContainerId", commentContainerId);
$container.data("callback", callback);
+ $container.data("canComment", canComment);
$container.data("oldPath", oldPath);
$container.data("newPath", newPath);
$container.data("blameMessageCallback", blameMessageCallback);
@@ -917,7 +918,8 @@ onedev.server.blobTextDiff = {
sanitize: false,
placement: "top",
container: $container,
- content: onedev.server.codeProblem.renderProblems(problems, onedev.server.blobTextDiff.translations),
+ content: onedev.server.codeProblem.renderProblems(problems, onedev.server.blobTextDiff.translations,
+ $container.data("canComment")),
template: `<div data-line='${line}' class='${oldOrNew} popover problem-popover'><div class='arrow'></div><div class='popover-body'></div></div>`
}).on("shown.bs.popover", function() {
var $currentPopover = $(`.problem-popover.${oldOrNew}[data-line='${line}']`);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
index a896ee2d96..99f4dbe742 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
@@ -967,6 +967,7 @@ public abstract class RevisionDiffPanel extends Panel {
super.onSubmit(target);
String content = contentInput.getModelObject();
+ SecurityUtils.checkWorkOnProject(getProject());
if (content.length() > CodeComment.MAX_CONTENT_LEN) {
error(_T("Comment too long"));
target.add(feedback);
@@ -2194,6 +2195,7 @@ public abstract class RevisionDiffPanel extends Panel {
super.onSubmit(target);
String content = contentInput.getModelObject();
+ SecurityUtils.checkWorkOnProject(getProject());
if (content.length() > CodeComment.MAX_CONTENT_LEN) {
error(_T("Comment too long"));
target.add(feedback);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/entity/labels/EntityLabelsPanel.html b/server-core/src/main/java/io/onedev/server/web/component/entity/labels/EntityLabelsPanel.html
index 301ccd56a3..ef7adc4740 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/entity/labels/EntityLabelsPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/entity/labels/EntityLabelsPanel.html
@@ -1,3 +1,4 @@
<wicket:panel>
+ <span wicket:id="maintenance" class="mr-2"></span>
<wicket:container wicket:id="labels"><span wicket:id="label" class="mr-2"></span></wicket:container>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/entity/labels/EntityLabelsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/entity/labels/EntityLabelsPanel.java
index b17f9ab217..e69d227347 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/entity/labels/EntityLabelsPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/entity/labels/EntityLabelsPanel.java
@@ -11,10 +11,14 @@ import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
+import io.onedev.server.OneDev;
+import io.onedev.server.SubscriptionService;
import io.onedev.server.model.LabelSpec;
+import io.onedev.server.model.Project;
import io.onedev.server.model.support.EntityLabel;
import io.onedev.server.model.support.LabelSupport;
import io.onedev.server.web.component.LabelBadge;
+import io.onedev.server.web.component.MaintenanceBadge;
public class EntityLabelsPanel<T extends EntityLabel> extends Panel {
@@ -29,6 +33,8 @@ public class EntityLabelsPanel<T extends EntityLabel> extends Panel {
protected void onInitialize() {
super.onInitialize();
+ add(new MaintenanceBadge("maintenance", this::isMaintenance));
+
add(new ListView<LabelSpec>("labels", new LoadableDetachableModel<List<LabelSpec>>() {
@Override
@@ -53,7 +59,12 @@ public class EntityLabelsPanel<T extends EntityLabel> extends Panel {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(!model.getObject().getLabels().isEmpty());
+ setVisible(isMaintenance() || !model.getObject().getLabels().isEmpty());
+ }
+
+ private boolean isMaintenance() {
+ return model.getObject() instanceof Project project && project.isMaintenance()
+ && OneDev.getInstance(SubscriptionService.class).isSubscriptionActive();
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/entity/watches/EntityWatchesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/entity/watches/EntityWatchesPanel.java
index 86ac210081..868b8dc70e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/entity/watches/EntityWatchesPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/entity/watches/EntityWatchesPanel.java
@@ -17,6 +17,7 @@ import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.LoadableDetachableModel;
import io.onedev.server.model.AbstractEntity;
+import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.model.support.EntityWatch;
import io.onedev.server.security.SecurityUtils;
@@ -110,7 +111,8 @@ public abstract class EntityWatchesPanel extends Panel {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(SecurityUtils.getAuthUser() != null && SecurityUtils.getAuthUser().getType() != SERVICE);
+ setVisible(SecurityUtils.getAuthUser() != null && SecurityUtils.getAuthUser().getType() != SERVICE
+ && SecurityUtils.canWorkOnProject(getProject()));
}
@Override
@@ -156,6 +158,8 @@ public abstract class EntityWatchesPanel extends Panel {
}
protected abstract AbstractEntity getEntity();
+
+ protected abstract Project getProject();
protected abstract void onSaveWatch(EntityWatch watch);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java
index 11575c3c89..1c80cfc9af 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java
@@ -232,7 +232,7 @@ public abstract class IssueActivitiesPanel extends Panel {
});
- if (SecurityUtils.getAuthUser() != null) {
+ if (SecurityUtils.getAuthUser() != null && SecurityUtils.canWorkOnProject(getIssue().getProject())) {
Fragment fragment = new Fragment("addComment", "addCommentFrag", this);
fragment.setOutputMarkupId(true);
CommentInput input = new CommentInput("comment", Model.of(""), false) {
@@ -313,6 +313,7 @@ public abstract class IssueActivitiesPanel extends Panel {
add(fragment);
} else {
Fragment fragment = new Fragment("addComment", "loginToCommentFrag", this);
+ fragment.setVisible(SecurityUtils.canWorkOnProject(getIssue().getProject()));
fragment.add(new AjaxLink<Void>("login") {
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.java
index 503b70376d..0fe2323c14 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.java
@@ -23,6 +23,7 @@ import io.onedev.server.OneDev;
import io.onedev.server.service.IssueWorkService;
import io.onedev.server.service.SettingService;
import io.onedev.server.model.IssueWork;
+import io.onedev.server.model.Project;
import io.onedev.server.model.support.EntityReaction;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.service.IssueWorkReactionService;
@@ -108,6 +109,11 @@ class IssueWorkPanel extends Panel {
fragment.add(new ReactionListPanel("reactions") {
+ @Override
+ protected Project getProject() {
+ return getWork().getIssue().getProject();
+ }
+
@Override
protected Collection<? extends EntityReaction> getReactions() {
return getWork().getReactions();
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java
index 673d97af1e..86e7acbbd2 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java
@@ -314,8 +314,13 @@ abstract class BatchEditPanel extends Panel implements InputContext {
Map<String, Object> fieldValues = FieldUtils.getFieldValues(getProject(), customFieldsBean, selectedFields);
try {
var user = SecurityUtils.getUser();
+ var issues = new ArrayList<Issue>();
+ getIssueIterator().forEachRemaining(issue -> {
+ SecurityUtils.checkWorkOnProject(issue.getProject());
+ issues.add(issue);
+ });
OneDev.getInstance(IssueChangeService.class).batchUpdate(
- user, getIssueIterator(), state, confidential, iterations,
+ user, issues.iterator(), state, confidential, iterations,
fieldValues, comment, sendNotifications);
} catch (ValidationException e) {
form.error(e.getMessage());
@@ -397,4 +402,4 @@ abstract class BatchEditPanel extends Panel implements InputContext {
protected abstract void onCancel(AjaxRequestTarget target);
-}
\ No newline at end of file
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
index c050a016fc..a1791d925d 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
@@ -299,7 +299,8 @@ public abstract class IssueListPanel extends Panel {
protected void onConfigure() {
super.onConfigure();
setEnabled(querySubmitted && queryModel.getObject() != null);
- setVisible(SecurityUtils.getAuthUser() != null && getQuerySaveSupport() != null);
+ setVisible(SecurityUtils.getAuthUser() != null && getQuerySaveSupport() != null
+ && (getProject() == null || SecurityUtils.canWorkOnProject(getProject())));
}
@Override
@@ -514,7 +515,7 @@ public abstract class IssueListPanel extends Panel {
@Override
public boolean evaluate(Project object) {
- return cache.get(object.getId()).isIssueManagement();
+ return cache.get(object.getId()).isIssueManagement() && SecurityUtils.canWorkOnProject(object);
}
});
@@ -541,7 +542,8 @@ public abstract class IssueListPanel extends Panel {
});
} else {
PageParameters params = NewIssuePage.paramsOf(getProject(), getBaseQuery().toString());
- add(new BookmarkablePageLink<Void>("newIssue", NewIssuePage.class, params));
+ add(new BookmarkablePageLink<Void>("newIssue", NewIssuePage.class, params)
+ .setVisible(SecurityUtils.canWorkOnProject(getProject())));
}
add(new ModalLink("fieldsAndLinks") {
@@ -1018,6 +1020,7 @@ public abstract class IssueListPanel extends Panel {
for (IModel<Issue> each : selectionColumn.getSelections())
issues.add(each.getObject());
var user = SecurityUtils.getUser();
+ issues.forEach(it -> SecurityUtils.checkWorkOnProject(it.getProject()));
getIssueService().move(user, issues, getProject(), getTargetProject());
setResponsePage(ProjectIssueListPage.class,
ProjectIssueListPage.paramsOf(getTargetProject(), getQueryAfterCopyOrMove(), 0));
@@ -1173,6 +1176,7 @@ public abstract class IssueListPanel extends Panel {
return;
}
getTransactionService().run(()-> {
+ issues.forEach(it -> SecurityUtils.checkWorkOnProject(it.getProject()));
getIssueService().delete(issues, getProject());
for (var issue: issues) {
var oldAuditContent = VersionedXmlDoc.fromBean(issue).toXML();
@@ -1387,6 +1391,7 @@ public abstract class IssueListPanel extends Panel {
issues.add(it.next());
}
var user = SecurityUtils.getUser();
+ issues.forEach(it -> SecurityUtils.checkWorkOnProject(it.getProject()));
OneDev.getInstance(IssueService.class).move(user, issues, getProject(), getTargetProject());
setResponsePage(ProjectIssueListPage.class,
ProjectIssueListPage.paramsOf(getTargetProject(), getQueryAfterCopyOrMove(), 0));
@@ -1546,6 +1551,7 @@ public abstract class IssueListPanel extends Panel {
return;
}
getTransactionService().run(()-> {
+ issues.forEach(it -> SecurityUtils.checkWorkOnProject(it.getProject()));
getIssueService().delete(issues, getProject());
for (var issue: issues) {
var oldAuditContent = VersionedXmlDoc.fromBean(issue).toXML();
@@ -1622,6 +1628,7 @@ public abstract class IssueListPanel extends Panel {
Collection<Issue> issues = new ArrayList<>();
for (@SuppressWarnings("unchecked") var it = (Iterator<Issue>) dataProvider.iterator(0, issuesTable.getItemCount()); it.hasNext(); )
issues.add(it.next());
+ issues.forEach(it -> SecurityUtils.checkWorkOnProject(it.getProject()));
getWatchService().setWatchStatus(SecurityUtils.getAuthUser(), issues, watchStatus);
Session.get().success(_T("Watch status changed"));
}
@@ -1783,7 +1790,7 @@ public abstract class IssueListPanel extends Panel {
@Override
public boolean evaluate(Project object) {
- return cache.get(object.getId()).isIssueManagement();
+ return cache.get(object.getId()).isIssueManagement() && SecurityUtils.canWorkOnProject(object);
}
});
@@ -1800,7 +1807,8 @@ public abstract class IssueListPanel extends Panel {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(SecurityUtils.getAuthUser() != null);
+ setVisible(SecurityUtils.getAuthUser() != null
+ && (getProject() == null || SecurityUtils.canWorkOnProject(getProject())));
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java
index 38cf123bbf..243106a874 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java
@@ -11,6 +11,7 @@ import org.apache.wicket.model.LoadableDetachableModel;
import com.google.common.collect.Lists;
import io.onedev.server.model.Issue;
+import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.behavior.ChangeObserver;
import io.onedev.server.web.component.issue.IssueStateBadge;
import io.onedev.server.web.component.issue.progress.IssueProgressPanel;
@@ -42,7 +43,8 @@ public abstract class IssueOperationsPanel extends Panel {
}, true));
addOrReplace(new BookmarkablePageLink<Void>("newIssue", NewIssuePage.class,
- NewIssuePage.paramsOf(getIssue().getProject())));
+ NewIssuePage.paramsOf(getIssue().getProject()))
+ .setVisible(SecurityUtils.canWorkOnProject(getIssue().getProject())));
super.onBeforeRender();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryPanel.java
index c0f5ff59e0..8e6bc5fdbd 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryPanel.java
@@ -379,11 +379,13 @@ public abstract class IssuePrimaryPanel extends Panel {
RepeatingView linkedIssuesView = new RepeatingView("linkedIssues");
for (IssueLink issueLink: group.getIssueLinks()) {
LinkDeleteListener deleteListener;
- if (canEditIssueLink) {
+ if (canEditIssueLink && SecurityUtils.canWorkOnProject(issueLink.getLinked(getIssue()).getProject())) {
deleteListener = new LinkDeleteListener() {
@Override
void onDelete(AjaxRequestTarget target, Issue linkedIssue) {
+ SecurityUtils.checkWorkOnProject(getProject());
+ SecurityUtils.checkWorkOnProject(linkedIssue.getProject());
issueChangeService.removeLink(SecurityUtils.getUser(), linkSpecService.load(specId), getIssue(),
linkedIssue, opposite);
notifyIssueChange(target, getIssue());
@@ -398,7 +400,8 @@ public abstract class IssuePrimaryPanel extends Panel {
}
item.add(linkedIssuesView);
- if (canEditIssueLink) {
+ if (canEditIssueLink && group.getIssueLinks().stream()
+ .allMatch(it -> SecurityUtils.canWorkOnProject(it.getLinked(getIssue()).getProject()))) {
item.add(new SortBehavior() {
@Override
@@ -411,6 +414,8 @@ public abstract class IssuePrimaryPanel extends Panel {
var issueLinkId = (Long) it.next().getDefaultModelObject();
issueLinks.add(issueLinkService.load(issueLinkId));
}
+ SecurityUtils.checkWorkOnProject(getProject());
+ issueLinks.forEach(it -> SecurityUtils.checkWorkOnProject(it.getLinked(getIssue()).getProject()));
if (fromIndex != toIndex && fromIndex < issueLinks.size() && toIndex < issueLinks.size()) {
var movedIssueLink = issueLinks.remove(fromIndex);
@@ -616,7 +621,11 @@ public abstract class IssuePrimaryPanel extends Panel {
private boolean checkLink(AjaxRequestTarget target, Issue linkIssue) {
LinkSpec spec = linkSpecService.load(specId);
- if (getIssue().getId().equals(linkIssue.getId())) {
+ if (!SecurityUtils.canWorkOnProject(linkIssue.getProject())) {
+ form.error(_T("Project is in maintenance mode"));
+ target.add(form);
+ return false;
+ } else if (getIssue().getId().equals(linkIssue.getId())) {
form.error(_T("Cannot link to self: " + linkIssue.getReference().toString(getProject())));
target.add(form);
return false;
@@ -630,6 +639,8 @@ public abstract class IssuePrimaryPanel extends Panel {
}
private void addLink(AjaxRequestTarget target, Issue linkIssue) {
+ SecurityUtils.checkWorkOnProject(getProject());
+ SecurityUtils.checkWorkOnProject(linkIssue.getProject());
LinkSpec spec = linkSpecService.load(specId);
issueChangeService.addLink(SecurityUtils.getUser(), spec, getIssue(), linkIssue, opposite);
notifyIssueChange(target, getIssue());
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/progress/TimingDetailPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/progress/TimingDetailPanel.java
index 0877789efb..01a4459325 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/progress/TimingDetailPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/progress/TimingDetailPanel.java
@@ -109,7 +109,7 @@ abstract class TimingDetailPanel extends Panel {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(SecurityUtils.getAuthUser() != null);
+ setVisible(SecurityUtils.getAuthUser() != null && SecurityUtils.canWorkOnProject(getIssue().getProject()));
}
};
}
@@ -147,7 +147,7 @@ abstract class TimingDetailPanel extends Panel {
protected void onConfigure() {
super.onConfigure();
var user = SecurityUtils.getAuthUser();
- setVisible(user != null && getStopWatchManager().find(user, getIssue()) == null);
+ setVisible(user != null && SecurityUtils.canWorkOnProject(getIssue().getProject()) && getStopWatchManager().find(user, getIssue()) == null);
}
};
}
@@ -165,7 +165,7 @@ abstract class TimingDetailPanel extends Panel {
protected void onConfigure() {
super.onConfigure();
var user = SecurityUtils.getAuthUser();
- setVisible(user != null && getStopWatchManager().find(user, getIssue()) == null);
+ setVisible(user != null && SecurityUtils.canWorkOnProject(getIssue().getProject()) && getStopWatchManager().find(user, getIssue()) == null);
}
};
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
index 868b4ab2cd..678cddbf6e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
@@ -138,6 +138,11 @@ public abstract class IssueSidePanel extends Panel {
addOrReplace(watchesContainer = new EntityWatchesPanel("watches") {
+ @Override
+ protected Project getProject() {
+ return IssueSidePanel.this.getProject();
+ }
+
@Override
protected void onSaveWatch(EntityWatch watch) {
OneDev.getInstance(IssueWatchService.class).createOrUpdate((IssueWatch) watch);
@@ -557,6 +562,12 @@ public abstract class IssueSidePanel extends Panel {
AjaxLink<Void> voteLink = new AjaxLink<Void>("vote") {
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(SecurityUtils.canWorkOnProject(getProject()));
+ }
+
private IssueVote getVote(User user) {
for (IssueVote vote: getIssue().getVotes()) {
if (user.equals(vote.getUser()))
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.java
index 7102262db6..531a1112a4 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.java
@@ -228,7 +228,8 @@ public abstract class PackListPanel extends Panel {
protected void onConfigure() {
super.onConfigure();
setEnabled(querySubmitted && queryModel.getObject() != null);
- setVisible(SecurityUtils.getAuthUser() != null && getQuerySaveSupport() != null);
+ setVisible(SecurityUtils.getAuthUser() != null && getQuerySaveSupport() != null
+ && (getProject() == null || SecurityUtils.canWorkOnProject(getProject())));
}
@Override
@@ -401,7 +402,8 @@ public abstract class PackListPanel extends Panel {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(getProject() != null && SecurityUtils.canWritePack(getProject()));
+ setVisible(getProject() != null && SecurityUtils.canWorkOnProject(getProject())
+ && SecurityUtils.canWritePack(getProject()));
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
index 437347d797..2d665b540e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
@@ -262,7 +262,8 @@ public abstract class PullRequestListPanel extends Panel {
protected void onConfigure() {
super.onConfigure();
setEnabled(querySubmitted && queryModel.getObject() != null);
- setVisible(SecurityUtils.getAuthUser() != null && getQuerySaveSupport() != null);
+ setVisible(SecurityUtils.getAuthUser() != null && getQuerySaveSupport() != null
+ && (getProject() == null || SecurityUtils.canWorkOnProject(getProject())));
}
@Override
@@ -318,6 +319,7 @@ public abstract class PullRequestListPanel extends Panel {
var requests = selectionColumn.getSelections().stream()
.map(it->it.getObject()).collect(toList());
+ requests.forEach(it -> SecurityUtils.checkWorkOnProject(it.getProject()));
pullRequestWatchService.setWatchStatus(SecurityUtils.getAuthUser(), requests, watchStatus);
selectionColumn.getSelections().clear();
Session.get().success(_T("Watch status changed"));
@@ -518,6 +520,7 @@ public abstract class PullRequestListPanel extends Panel {
Collection<PullRequest> requests = new ArrayList<>();
for (@SuppressWarnings("unchecked") var it = (Iterator<PullRequest>) dataProvider.iterator(0, requestsTable.getItemCount()); it.hasNext(); )
requests.add(it.next());
+ requests.forEach(it -> SecurityUtils.checkWorkOnProject(it.getProject()));
pullRequestWatchService.setWatchStatus(SecurityUtils.getAuthUser(), requests, watchStatus);
Session.get().success(_T("Watch status changed"));
}
@@ -738,7 +741,8 @@ public abstract class PullRequestListPanel extends Panel {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(SecurityUtils.getAuthUser() != null);
+ setVisible(SecurityUtils.getAuthUser() != null
+ && (getProject() == null || SecurityUtils.canWorkOnProject(getProject())));
}
});
@@ -869,6 +873,7 @@ public abstract class PullRequestListPanel extends Panel {
@Override
protected List<Project> load() {
List<Project> projects = new ArrayList<>(SecurityUtils.getAuthorizedProjects(new ReadCode()));
+ projects.removeIf(it -> !SecurityUtils.canWorkOnProject(it));
projects.sort(projectService.cloneCache().comparingPath());
return projects;
}
@@ -890,7 +895,7 @@ public abstract class PullRequestListPanel extends Panel {
});
} else {
add(new BookmarkablePageLink<Void>("newPullRequest", NewPullRequestPage.class,
- NewPullRequestPage.paramsOf(getProject())));
+ NewPullRequestPage.paramsOf(getProject())).setVisible(SecurityUtils.canWorkOnProject(getProject())));
}
body = new WebMarkupContainer("body");
add(body.setOutputMarkupId(true));
diff --git a/server-core/src/main/java/io/onedev/server/web/component/reaction/ReactionListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/reaction/ReactionListPanel.java
index 2c33854284..2d95c7d09c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/reaction/ReactionListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/reaction/ReactionListPanel.java
@@ -20,6 +20,7 @@ import org.apache.wicket.markup.html.panel.Panel;
import io.onedev.server.web.component.RepeatingView;
import org.apache.wicket.model.LoadableDetachableModel;
+import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.model.support.EntityReaction;
import io.onedev.server.security.SecurityUtils;
@@ -54,7 +55,7 @@ public abstract class ReactionListPanel extends Panel {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(SecurityUtils.getUser() != null);
+ setVisible(SecurityUtils.getUser() != null && SecurityUtils.canWorkOnProject(getProject()));
}
@Override
@@ -105,7 +106,7 @@ public abstract class ReactionListPanel extends Panel {
@Override
protected void onConfigure() {
super.onConfigure();
- setEnabled(SecurityUtils.getUser() != null);
+ setEnabled(SecurityUtils.getUser() != null && SecurityUtils.canWorkOnProject(getProject()));
}
};
@@ -139,6 +140,8 @@ public abstract class ReactionListPanel extends Panel {
setOutputMarkupId(true);
}
+ protected abstract Project getProject();
+
protected abstract Collection<? extends EntityReaction> getReactions();
protected abstract void onToggleEmoji(AjaxRequestTarget target, String emoji);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.java
index 8be9a8933d..ae4ffd05bd 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.java
@@ -165,7 +165,8 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(SecurityUtils.getAuthUser() != null && (getQueryPersonalization() != null || canEditCommonQueries()));
+ setVisible(SecurityUtils.getAuthUser() != null && (getQueryPersonalization() != null || canEditCommonQueries())
+ && (Project.get() == null || SecurityUtils.canWorkOnProject(Project.get())));
}
private Component newPersonalQueriesEditor(String componentId, ModalPanel modal) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/workspace/list/WorkspaceListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/workspace/list/WorkspaceListPanel.java
index 60f651ab03..4ab30f780f 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/workspace/list/WorkspaceListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/workspace/list/WorkspaceListPanel.java
@@ -212,7 +212,8 @@ public abstract class WorkspaceListPanel extends Panel {
protected void onConfigure() {
super.onConfigure();
setEnabled(querySubmitted && queryModel.getObject() != null);
- setVisible(SecurityUtils.getAuthUser() != null && getQuerySaveSupport() != null);
+ setVisible(SecurityUtils.getAuthUser() != null && getQuerySaveSupport() != null
+ && (getProject() == null || SecurityUtils.canWorkOnProject(getProject())));
}
@Override
@@ -370,7 +371,8 @@ public abstract class WorkspaceListPanel extends Panel {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(getProject() != null && SecurityUtils.canManageWorkspaces(getProject()));
+ setVisible(getProject() != null && SecurityUtils.canWorkOnProject(getProject())
+ && SecurityUtils.canManageWorkspaces(getProject()));
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html
index 09841918e4..8ad0cc8968 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html
@@ -69,6 +69,7 @@
<wicket:fragment wicket:id="menuHeaderFrag">
<img wicket:id="icon" class="menu-header-icon avatar"></img>
<span wicket:id="label" class="menu-header-text"></span>
+ <span wicket:id="badge" class="menu-header-badge flex-shrink-0"></span>
<a wicket:id="moreInfo" class="mehu-header-ellipsis" data-tippy-content="More info"><wicket:svg href="ellipsis" class="icon"/></a>
</wicket:fragment>
<wicket:fragment wicket:id="menuBodyFrag">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
index 6e6276f0bc..1ecadbf063 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
@@ -470,6 +470,7 @@ public abstract class LayoutPage extends BasePage {
Fragment fragment = new Fragment("header", "menuHeaderFrag", LayoutPage.this);
fragment.add(new ExternalImage("icon", Model.of(header.getImageUrl())));
fragment.add(new Label("label", header.getLabel()));
+ fragment.add(header.newBadge("badge"));
if (header.hasMoreInfo()) {
fragment.add(new DropdownLink("moreInfo") {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/SidebarMenu.java b/server-core/src/main/java/io/onedev/server/web/page/layout/SidebarMenu.java
index 0321ba6beb..545d7f665e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/SidebarMenu.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/SidebarMenu.java
@@ -7,6 +7,7 @@ import java.util.List;
import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import io.onedev.server.web.component.floating.FloatingPanel;
@@ -93,6 +94,10 @@ public class SidebarMenu implements Serializable {
return label;
}
+ protected Component newBadge(String componentId) {
+ return new WebMarkupContainer(componentId).setVisible(false);
+ }
+
protected boolean hasMoreInfo() {
return false;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/layout.css b/server-core/src/main/java/io/onedev/server/web/page/layout/layout.css
index d62cd03e25..72a4582057 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/layout.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/layout.css
@@ -354,7 +354,7 @@
flex-wrap: wrap;
}
- .sidebar-minimized .sidebar-brand, .sidebar-minimized .menu-header-text,
+ .sidebar-minimized .sidebar-brand, .sidebar-minimized .menu-header-text, .sidebar-minimized .menu-header-badge,
.sidebar-minimized .menu-body .menu-body, .sidebar-minimized .menu-bullet,
.sidebar-minimized .sidebar-menu>.menu-body>.menu-item>.menu-link>.menu-text,
.sidebar-minimized .sidebar-menu>.menu-body>.menu-item>.menu-link>.menu-arrow,
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
index 7c488c1d1f..d42823708c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
@@ -59,6 +59,7 @@ import io.onedev.server.web.opengraph.OpenGraphHeaderMeta;
import io.onedev.server.web.opengraph.OpenGraphHeaderMetaType;
import io.onedev.server.web.page.layout.LayoutPage;
import io.onedev.server.web.page.layout.SidebarMenu;
+import io.onedev.server.web.component.MaintenanceBadge;
import io.onedev.server.web.page.layout.SidebarMenuItem;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.branches.ProjectBranchesPage;
@@ -258,7 +259,12 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware, Ch
}
String avatarUrl = OneDev.getInstance(AvatarService.class).getProjectAvatarUrl(getProject().getId());
- var menu = new SidebarMenu(new SidebarMenu.Header(avatarUrl, getProject().getName()), menuItems);
+ var menu = new SidebarMenu(new SidebarMenu.Header(avatarUrl, getProject().getName()) {
+ @Override
+ protected Component newBadge(String componentId) {
+ return new MaintenanceBadge(componentId, () -> getProject().isMaintenance() && isSubscriptionActive());
+ }
+ }, menuItems);
var contributions = new ArrayList<>(OneDev.getExtensions(ProjectMenuContribution.class));
contributions.sort(Comparator.comparing(ProjectMenuContribution::getOrder));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java
index 14f154a509..f90493a746 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java
@@ -511,7 +511,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
String position = BlobRenderer.getSourcePosition(range);
String script = String.format("onedev.server.sourceView.openSelectionPopover(%s, '%s', %s);",
- convertToJson(range), context.getPositionUrl(position), SecurityUtils.getAuthUser()!=null);
+ convertToJson(range), context.getPositionUrl(position), SecurityUtils.getAuthUser()!=null && SecurityUtils.canWorkOnProject(context.getProject()));
target.appendJavaScript(script);
break;
case "explainSelection":
@@ -525,6 +525,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
break;
case "addComment":
Preconditions.checkNotNull(SecurityUtils.getAuthUser());
+ SecurityUtils.checkWorkOnProject(context.getProject());
range = getRange(params, "param1", "param2", "param3", "param4");
var lines = context.getProject().getBlob(context.getBlobIdent(), true).getText().getLines();
var containTooLongLines = false;
@@ -623,6 +624,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
super.onSubmit(target);
String content = contentInput.getModelObject();
+ SecurityUtils.checkWorkOnProject(context.getProject());
if (content.length() > CodeComment.MAX_CONTENT_LEN) {
error("Comment too long");
target.add(feedback);
@@ -1079,7 +1081,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
translations.put("add-problem-comment", _T("Add comment"));
String script = String.format("onedev.server.sourceView.onDomReady("
- + "'%s', '%s', %s, %s, '%s', '%s', %s, %s, %s, %s, '%s', %s, %s);",
+ + "'%s', '%s', %s, %s, '%s', '%s', %s, %s, %s, %s, '%s', %s, %s, %s);",
JavaScriptEscape.escapeJavaScript(context.getBlobIdent().path),
JavaScriptEscape.escapeJavaScript(blob.getText().getContent()),
convertToJson(openCommentInfo),
@@ -1092,7 +1094,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
sourceFormat.getTabSize(),
sourceFormat.getLineWrapMode(),
convertToJson(annotationInfoModel.getObject()),
- convertToJson(translations));
+ convertToJson(translations), SecurityUtils.getAuthUser() != null && SecurityUtils.canWorkOnProject(context.getProject()));
response.render(OnDomReadyHeaderItem.forScript(script));
if (markRange != null) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.js
index 84e4d494de..4cba8fbaa0 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.js
@@ -1,7 +1,7 @@
onedev.server.sourceView = {
onDomReady: function(filePath, fileContent, openComment, markRange, symbolTooltipId,
revision, blameInfos, callback, blameMessageCallback, tabSize, lineWrapMode,
- annotationInfo, translations) {
+ annotationInfo, translations, canComment) {
onedev.server.sourceView.translations = translations;
var $sourceView = $(".source-view");
var $code = $sourceView.children(".code");
@@ -27,6 +27,7 @@ onedev.server.sourceView = {
onedev.server.codemirror.setModeByFileName(cm, filePath);
$sourceView.data("callback", callback);
+ $sourceView.data("canComment", canComment);
$sourceView.data("blameMessageCallback", blameMessageCallback);
if (markRange)
@@ -281,7 +282,8 @@ onedev.server.sourceView = {
sanitize: false,
placement: "top",
container: ".source-view>.code",
- content: onedev.server.codeProblem.renderProblems(problems, onedev.server.sourceView.translations),
+ content: onedev.server.codeProblem.renderProblems(problems, onedev.server.sourceView.translations,
+ $(".source-view").data("canComment")),
template: `<div data-line='${line}' class='popover problem-popover'><div class='arrow'></div><div class='popover-body'></div></div>`
}).on("shown.bs.popover", function() {
var $currentPopover = $(".problem-popover[data-line='" + line + "']");
@@ -688,4 +690,4 @@ $(function() {
if ($(e.target).closest(".problem-trigger, .problem-popover").length == 0)
$(".problem-popover").popover("hide");
});
-});
\ No newline at end of file
+});
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java
index 8a89624a31..9315fddf76 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java
@@ -15,6 +15,7 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.jspecify.annotations.Nullable;
+import io.onedev.server.security.SecurityUtils;
import io.onedev.server.OneDev;
import io.onedev.server.buildspecmodel.inputspec.InputContext;
import io.onedev.server.buildspecmodel.inputspec.InputSpec;
@@ -75,6 +76,11 @@ public class NewIssuePage extends ProjectPage implements InputContext {
super.onDetach();
}
+ @Override
+ protected boolean isPermitted() {
+ return super.isPermitted() && SecurityUtils.canWorkOnProject(getProject());
+ }
+
@Override
protected void onInitialize() {
super.onInitialize();
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
index 5165b24a6e..0add69909e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
@@ -1215,7 +1215,8 @@ public class NewPullRequestPage extends ProjectPage implements RevisionAnnotatio
@Override
protected boolean isPermitted() {
- return SecurityUtils.canReadCode(target.getProject())
+ return SecurityUtils.canWorkOnProject(target.getProject())
+ && SecurityUtils.canReadCode(target.getProject())
&& SecurityUtils.canReadCode(source.getProject());
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
index fd48af587d..d97146d4d3 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
@@ -1291,6 +1291,11 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
fragment.add(new EntityWatchesPanel("watches") {
+ @Override
+ protected Project getProject() {
+ return PullRequestDetailPage.this.getProject();
+ }
+
@Override
protected void onSaveWatch(EntityWatch watch) {
pullRequestWatchService.createOrUpdate((PullRequestWatch) watch);
@@ -2019,7 +2024,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
});
operationsContainer.setOutputMarkupPlaceholderTag(true);
- operationsContainer.setVisible(SecurityUtils.getAuthUser() != null);
+ operationsContainer.setVisible(SecurityUtils.getAuthUser() != null && SecurityUtils.canWorkOnProject(getProject()));
operationsContainer.add(new MenuLink("updateSourceBranch") {
@@ -2142,6 +2147,8 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
private boolean canOperate() {
return SecurityUtils.canWriteCode(getPullRequest().getProject())
+ && getPullRequest().getSourceProject() != null
+ && SecurityUtils.canWorkOnProject(getPullRequest().getSourceProject())
&& getPullRequest().isOpen()
&& getPullRequest().getSourceHead() != null
&& getPullRequest().isSourceOutdated();
@@ -2456,6 +2463,8 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
*/
private Object checkUpdateSourceBranch(boolean updateByMerge) {
var request = getPullRequest();
+ SecurityUtils.checkWorkOnProject(request.getTargetProject());
+ SecurityUtils.checkWorkOnProject(request.getSourceProject());
var user = SecurityUtils.getAuthUser();
var project = request.getProject();
var protection = request.getSourceProject().getBranchProtection(request.getSourceBranch(), user);
@@ -2501,6 +2510,8 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
private void updateSourceBranch(ObjectId commitId) {
var request = getPullRequest();
+ SecurityUtils.checkWorkOnProject(request.getTargetProject());
+ SecurityUtils.checkWorkOnProject(request.getSourceProject());
if (!request.getSourceProject().equals(request.getTargetProject()))
gitService.fetch(request.getSourceProject(), request.getTargetProject(), commitId.name());
var oldCommitId = request.getSourceHead();
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java
index 8cb3ec0d36..e0b92725d5 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java
@@ -230,7 +230,7 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {
});
container.setOutputMarkupId(true);
- if (getLoginUser() != null) {
+ if (getLoginUser() != null && SecurityUtils.canWorkOnProject(getProject())) {
Fragment fragment = new Fragment("addComment", "addCommentFrag", this);
fragment.setOutputMarkupId(true);
@@ -315,6 +315,7 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {
container.add(fragment);
} else {
Fragment fragment = new Fragment("addComment", "loginToCommentFrag", this);
+ fragment.setVisible(SecurityUtils.canWorkOnProject(getProject()));
fragment.add(new Link<Void>("login") {
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.java
index 85059a5518..8f75606da0 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.java
@@ -3,6 +3,7 @@ package io.onedev.server.web.page.project.setting.general;
import static io.onedev.server.model.Project.PROP_CODE_MANAGEMENT;
import static io.onedev.server.model.Project.PROP_WIKI_MANAGEMENT;
import static io.onedev.server.model.Project.PROP_DESCRIPTION;
+import static io.onedev.server.model.Project.PROP_MAINTENANCE;
import static io.onedev.server.model.Project.PROP_ISSUE_MANAGEMENT;
import static io.onedev.server.model.Project.PROP_KEY;
import static io.onedev.server.model.Project.PROP_NAME;
@@ -68,7 +69,7 @@ public class GeneralProjectSettingPage extends ProjectSettingPage {
}
Collection<String> properties = Sets.newHashSet(PROP_NAME, PROP_KEY,
- PROP_DESCRIPTION, PROP_CODE_MANAGEMENT, PROP_WIKI_MANAGEMENT, PROP_PACK_MANAGEMENT,
+ PROP_DESCRIPTION, PROP_MAINTENANCE, PROP_CODE_MANAGEMENT, PROP_WIKI_MANAGEMENT, PROP_PACK_MANAGEMENT,
PROP_ISSUE_MANAGEMENT, PROP_TIME_TRACKING);
LabelsBean labelsBean = LabelsBean.of(getProject());