Skip to content

The Unified and Autonomous Development Platform

Fix issue #336 - Allow for the project with build templates to be non-public

Robin Shen9f50fb0b375b
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java
index d052af331e..df30fdd242 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java
@@ -22,6 +22,7 @@ import javax.validation.Validator;
import org.apache.commons.lang3.SerializationUtils;
import org.apache.wicket.Component;
+import org.eclipse.jgit.revwalk.RevCommit;
import org.yaml.snakeyaml.DumperOptions.FlowStyle;
import org.yaml.snakeyaml.nodes.MappingNode;
import org.yaml.snakeyaml.nodes.Node;
@@ -54,6 +55,7 @@ import io.onedev.server.buildspec.step.UseTemplateStep;
import io.onedev.server.migration.VersionedYamlDoc;
import io.onedev.server.migration.XmlBuildSpecMigrator;
import io.onedev.server.util.ComponentContext;
+import io.onedev.server.util.JobSecretAuthorizationContext;
import io.onedev.server.util.validation.Validatable;
import io.onedev.server.util.validation.annotation.ClassValidating;
import io.onedev.server.web.editable.annotation.Editable;
@@ -177,8 +179,15 @@ public class BuildSpec implements Serializable, Validatable {
Collection<String> newProjectChain = new HashSet<>(projectChain);
newProjectChain.add(aImport.getProjectName());
try {
- importedBuildSpecs.addAll(aImport.getBuildSpec().getImportedBuildSpecs(newProjectChain));
- importedBuildSpecs.add(aImport.getBuildSpec());
+ BuildSpec importedBuildSpec = aImport.getBuildSpec();
+ RevCommit commit = aImport.getProject().getRevCommit(aImport.getTag(), true);
+ JobSecretAuthorizationContext.push(new JobSecretAuthorizationContext(aImport.getProject(), commit, null));
+ try {
+ importedBuildSpecs.addAll(importedBuildSpec.getImportedBuildSpecs(newProjectChain));
+ } finally {
+ JobSecretAuthorizationContext.pop();
+ }
+ importedBuildSpecs.add(importedBuildSpec);
} catch (Exception e) {
// Ignore here as we rely on this method to show viewer/editor
// Errors relating to this will be shown when validated
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/Import.java b/server-core/src/main/java/io/onedev/server/buildspec/Import.java
index 8a7d4db68a..3c8b116ae9 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/Import.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/Import.java
@@ -4,6 +4,7 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import java.util.Stack;
+import java.util.stream.Collectors;
import javax.annotation.Nullable;
import javax.validation.ConstraintValidatorContext;
@@ -11,25 +12,35 @@ import javax.validation.ConstraintViolation;
import javax.validation.ValidationException;
import javax.validation.Validator;
+import org.apache.shiro.subject.Subject;
import org.eclipse.jgit.revwalk.RevCommit;
import org.hibernate.validator.constraints.NotEmpty;
+import com.google.common.base.Preconditions;
+
import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.AccessProject;
+import io.onedev.server.security.permission.ProjectPermission;
import io.onedev.server.security.permission.ReadCode;
import io.onedev.server.util.EditContext;
+import io.onedev.server.util.JobSecretAuthorizationContext;
import io.onedev.server.util.validation.Validatable;
import io.onedev.server.util.validation.annotation.ClassValidating;
import io.onedev.server.web.editable.annotation.ChoiceProvider;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Interpolative;
+import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
import io.onedev.server.web.page.project.ProjectPage;
+import io.onedev.server.web.page.project.blob.ProjectBlobPage;
+import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;
import io.onedev.server.web.util.SuggestionUtils;
import io.onedev.server.web.util.WicketUtils;
@@ -43,6 +54,8 @@ public class Import implements Serializable, Validatable {
private String tag;
+ private String accessTokenSecret;
+
private transient BuildSpec buildSpec;
private static ThreadLocal<Stack<String>> importChain = new ThreadLocal<Stack<String>>() {
@@ -93,7 +106,7 @@ public class Import implements Serializable, Validatable {
}
@Editable(order=200, description="Specify tag in above project to import build spec from")
- @Interpolative(variableSuggester="suggestTags", literalSuggester="suggestTags")
+ @Interpolative(variableSuggester="suggestVariables", literalSuggester="suggestTags")
@NotEmpty
public String getTag() {
return tag;
@@ -103,6 +116,11 @@ public class Import implements Serializable, Validatable {
this.tag = tag;
}
+ @SuppressWarnings("unused")
+ private static List<InputSuggestion> suggestVariables(String matchWith) {
+ return BuildSpec.suggestVariables(matchWith, false, false);
+ }
+
@SuppressWarnings("unused")
private static List<InputSuggestion> suggestTags(String matchWith) {
Project project = getInputProject();
@@ -112,36 +130,74 @@ public class Import implements Serializable, Validatable {
return new ArrayList<>();
}
- private boolean canReadCode(Project project) {
- return project.getDefaultRole() != null && project.getDefaultRole().implies(new ReadCode());
+ @Editable(order=500, description="Specify a secret to be used as access token to import build spec "
+ + "from above project. If not specified, OneDev will try to import build spec anonymously")
+ @ChoiceProvider("getAccessTokenSecretChoices")
+ @Nullable
+ @NameOfEmptyValue("Access Anonymously")
+ public String getAccessTokenSecret() {
+ return accessTokenSecret;
+ }
+
+ public void setAccessTokenSecret(String accessTokenSecret) {
+ this.accessTokenSecret = accessTokenSecret;
+ }
+
+ @SuppressWarnings("unused")
+ private static List<String> getAccessTokenSecretChoices() {
+ return Project.get().getBuildSetting().getJobSecrets()
+ .stream().map(it->it.getName()).collect(Collectors.toList());
}
public BuildSpec getBuildSpec() {
if (buildSpec == null) {
Project project = getProject();
-
- if (canReadCode(project)) {
- RevCommit commit = project.getRevCommit(tag, false);
- if (commit == null) {
- String errorMessage = String.format("Unable to find tag to import build spec (project: %s, tag: %s)",
- projectName, tag);
- throw new ExplicitException(errorMessage);
- }
- try {
- buildSpec = project.getBuildSpec(commit);
- } catch (BuildSpecParseException e) {
- String errorMessage = String.format("Malformed build spec (project: %s, tag: %s)",
- projectName, tag);
- throw new ExplicitException(errorMessage);
+
+ Subject subject;
+ if (getAccessTokenSecret() != null) {
+ JobSecretAuthorizationContext context = Preconditions.checkNotNull(JobSecretAuthorizationContext.get());
+ String accessToken;
+
+ if (WicketUtils.getPage() instanceof ProjectBlobPage) {
+ ProjectBlobPage page = (ProjectBlobPage) WicketUtils.getPage();
+ if (context.getProject().equals(page.getProject())
+ && (page.getMode() == Mode.ADD || page.getMode() == Mode.EDIT)) {
+ accessToken = context.getSecretValue(page.getBlobIdent().revision, accessTokenSecret);
+ } else {
+ accessToken = context.getSecretValue(accessTokenSecret);
+ }
+ } else {
+ accessToken = context.getSecretValue(accessTokenSecret);
}
- if (buildSpec == null) {
- String errorMessage = String.format("Build spec not defined (project: %s, tag: %s)",
- projectName, tag);
- throw new ExplicitException(errorMessage);
+ User user = OneDev.getInstance(UserManager.class).findByAccessToken(accessToken);
+ if (user == null) {
+ throw new ExplicitException(String.format(
+ "Unable to import build spec as access token is invalid (import project: %s, access token: %s)",
+ projectName, accessToken));
}
+ subject = user.asSubject();
} else {
- String errorMessage = String.format("Unable to read build spec. Make sure default role of the project "
- + "has permission to read code (project: %s, tag: %s)", projectName, tag);
+ subject = SecurityUtils.asSubject(0L);
+ }
+ if (!subject.isPermitted(new ProjectPermission(project, new ReadCode()))
+ && !project.isPermittedByLoginUser(new ReadCode())) {
+ String errorMessage = String.format(
+ "Code read permission is required to import build spec (import project: %s)",
+ projectName);
+ throw new ExplicitException(errorMessage);
+ }
+
+ RevCommit commit = getCommit();
+ try {
+ buildSpec = project.getBuildSpec(commit);
+ } catch (BuildSpecParseException e) {
+ String errorMessage = String.format("Malformed build spec (import project: %s, tag: %s)",
+ projectName, tag);
+ throw new ExplicitException(errorMessage);
+ }
+ if (buildSpec == null) {
+ String errorMessage = String.format("Build spec not defined (import project: %s, tag: %s)",
+ projectName, tag);
throw new ExplicitException(errorMessage);
}
@@ -162,18 +218,24 @@ public class Import implements Serializable, Validatable {
importChain.get().push(projectName);
try {
Validator validator = OneDev.getInstance(Validator.class);
- for (int i=0; i<getBuildSpec().getImports().size(); i++) {
- Import aImport = getBuildSpec().getImports().get(i);
- for (ConstraintViolation<Import> violation: validator.validate(aImport)) {
- String location = "imports[" + i + "]";
- if (violation.getPropertyPath().toString().length() != 0)
- location += "." + violation.getPropertyPath();
- String message = String.format("Error validating imported build spec (project: %s, location: %s, message: %s)",
- projectName, location, violation.getMessage());
- throw new ValidationException(message);
+ BuildSpec buildSpec = getBuildSpec();
+ JobSecretAuthorizationContext.push(new JobSecretAuthorizationContext(getProject(), getCommit(), null));
+ try {
+ for (int i=0; i<buildSpec.getImports().size(); i++) {
+ Import aImport = buildSpec.getImports().get(i);
+ for (ConstraintViolation<Import> violation: validator.validate(aImport)) {
+ String location = "imports[" + i + "]";
+ if (violation.getPropertyPath().toString().length() != 0)
+ location += "." + violation.getPropertyPath();
+ String message = String.format("Error validating imported build spec (import project: %s, location: %s, message: %s)",
+ projectName, location, violation.getMessage());
+ throw new ValidationException(message);
+ }
}
+ return true;
+ } finally {
+ JobSecretAuthorizationContext.pop();
}
- return true;
} catch (Exception e) {
context.disableDefaultConstraintViolation();
context.buildConstraintViolationWithTemplate(e.getMessage()).addConstraintViolation();
@@ -187,9 +249,19 @@ public class Import implements Serializable, Validatable {
public Project getProject() {
Project project = OneDev.getInstance(ProjectManager.class).find(projectName);
if (project == null)
- throw new ExplicitException("Unable to find project to import build spec (" + projectName + ")");
+ throw new ExplicitException("Unable to find project to import build spec: " + projectName);
else
return project;
}
+ public RevCommit getCommit() {
+ RevCommit commit = getProject().getRevCommit(tag, false);
+ if (commit == null) {
+ String errorMessage = String.format("Unable to find tag to import build spec (import project: %s, tag: %s)",
+ projectName, tag);
+ throw new ExplicitException(errorMessage);
+ }
+ return commit;
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java
index c6e4f48e5f..d27ee1a790 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java
@@ -93,6 +93,7 @@ import io.onedev.server.event.build.BuildRunning;
import io.onedev.server.event.build.BuildSubmitted;
import io.onedev.server.event.entity.EntityPersisted;
import io.onedev.server.event.entity.EntityRemoved;
+import io.onedev.server.event.pullrequest.PullRequestEvent;
import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.event.system.SystemStopping;
import io.onedev.server.git.GitUtils;
@@ -117,6 +118,7 @@ import io.onedev.server.security.permission.AccessBuild;
import io.onedev.server.security.permission.JobPermission;
import io.onedev.server.security.permission.ProjectPermission;
import io.onedev.server.util.CommitAware;
+import io.onedev.server.util.JobSecretAuthorizationContext;
import io.onedev.server.util.MatrixRunner;
import io.onedev.server.util.SimpleLogger;
import io.onedev.server.util.interpolative.VariableInterpolator;
@@ -192,10 +194,10 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
this.taskScheduler = taskScheduler;
}
- private void validate(Project project, ObjectId commitId) {
+ private void validateBuildSpec(Project project, ObjectId commitId, BuildSpec buildSpec) {
Project.push(project);
try {
- for (ConstraintViolation<?> violation: validator.validate(project.getBuildSpec(commitId))) {
+ for (ConstraintViolation<?> violation: validator.validate(buildSpec)) {
String message = String.format("Error validating build spec (project: %s, commit: %s, location: %s, message: %s)",
project.getName(), commitId.name(), violation.getPropertyPath(), violation.getMessage());
throw new ExplicitException(message);
@@ -219,21 +221,36 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
});
- // Lock to guarantee uniqueness of build (by project, commit, job and parameters)
+ JobSecretAuthorizationContext.push(new JobSecretAuthorizationContext(project, commitId, reason.getPullRequest()));
try {
+ // Lock to guarantee uniqueness of build (by project, commit, job and parameters)
lock.lockInterruptibly();
- validate(project, commitId);
+ BuildSpec buildSpec = project.getBuildSpec(commitId);
+ if (buildSpec == null) {
+ throw new ExplicitException(String.format(
+ "Build spec not defined (project: %s, commit: %s)",
+ project.getName(), commitId.name()));
+ }
+
+ validateBuildSpec(project, commitId, buildSpec);
+
+ if (!buildSpec.getJobMap().containsKey(jobName)) {
+ throw new ExplicitException(String.format(
+ "Job not found (project: %s, commit: %s, job: %s)",
+ project.getName(), commitId.name(), jobName));
+ }
return doSubmit(project, commitId, jobName, paramMap, reason);
} catch (Throwable e) {
throw ExceptionUtils.unchecked(e);
+ } finally {
+ JobSecretAuthorizationContext.pop();
}
}
private Build doSubmit(Project project, ObjectId commitId, String jobName,
Map<String, List<String>> paramMap, SubmitReason reason) {
-
ScriptIdentity.push(new JobIdentity(project, commitId));
try {
Build build = new Build();
@@ -335,7 +352,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
Subject subject;
if (dependency.getAccessTokenSecret() != null) {
- String accessToken = build.getSecretValue(dependency.getAccessTokenSecret());
+ String accessToken = build.getJobSecretAuthorizationContext().getSecretValue(dependency.getAccessTokenSecret());
User user = userManager.findByAccessToken(accessToken);
if (user == null) {
throw new ExplicitException("Unable to access dependency project '"
@@ -354,7 +371,8 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
}
JobPermission jobPermission = new JobPermission(dependencyBuild.getJobName(), new AccessBuild());
- if (!subject.isPermitted(new ProjectPermission(dependencyProject, jobPermission))) {
+ if (!dependencyProject.isPermittedByLoginUser(jobPermission)
+ && !subject.isPermitted(new ProjectPermission(dependencyProject, jobPermission))) {
throw new ExplicitException("Unable to access dependency build '"
+ dependencyBuild.getFQN() + "': permission denied");
}
@@ -387,12 +405,13 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
}
private JobExecution execute(Build build) {
+ JobSecretAuthorizationContext.push(build.getJobSecretAuthorizationContext());
Build.push(build);
try {
String jobToken = UUID.randomUUID().toString();
Collection<String> jobSecretsToMask = Sets.newHashSet(jobToken);
- BuildSpec buildSpec = build.getProject().getBuildSpec(build.getCommitId());
+ BuildSpec buildSpec = build.getSpec();
Job job = build.getJob();
JobExecutor executor = getJobExecutor(build);
@@ -422,6 +441,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
@Override
public void run() {
Build build = buildManager.load(buildId);
+ JobSecretAuthorizationContext.push(build.getJobSecretAuthorizationContext());
Build.push(build);
try {
VariableInterpolator interpolator = new VariableInterpolator(build, build.getParamCombination());
@@ -442,6 +462,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
retryDelay.set(job.getRetryDelay());
} finally {
Build.pop();
+ JobSecretAuthorizationContext.pop();
}
}
@@ -455,6 +476,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
public JobContext call() throws Exception {
Build build = buildManager.load(buildId);
Build.push(build);
+ JobSecretAuthorizationContext.push(build.getJobSecretAuthorizationContext());
try {
return new JobContext(projectName, buildNumber, projectGitDir,
actions, job.getCpuRequirement(), job.getMemoryRequirement(),
@@ -570,6 +592,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
};
} finally {
Build.pop();
+ JobSecretAuthorizationContext.pop();
}
}
@@ -660,6 +683,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
}
} finally {
Build.pop();
+ JobSecretAuthorizationContext.pop();
}
}
@@ -704,10 +728,15 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
if (event instanceof CommitAware) {
ObjectId commitId = ((CommitAware) event).getCommit().getCommitId();
if (!commitId.equals(ObjectId.zeroId())) {
+ PullRequest request = null;
+ if (event instanceof PullRequestEvent)
+ request = ((PullRequestEvent) event).getRequest();
+ JobSecretAuthorizationContext.push(new JobSecretAuthorizationContext(event.getProject(), commitId, request));
ScriptIdentity.push(new JobIdentity(event.getProject(), commitId));
try {
BuildSpec buildSpec = event.getProject().getBuildSpec(commitId);
if (buildSpec != null) {
+ validateBuildSpec(event.getProject(), commitId, buildSpec);
for (Job job: buildSpec.getJobMap().values()) {
JobTriggerMatch match = job.getTriggerMatch(event);
if (match != null) {
@@ -756,6 +785,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
logger.error(message, e);
} finally {
ScriptIdentity.pop();
+ JobSecretAuthorizationContext.pop();
}
}
}
@@ -765,46 +795,65 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
@Override
public void resubmit(Build build, Map<String, List<String>> paramMap, String reason) {
if (build.isFinished()) {
- validate(build.getProject(), build.getCommitId());
-
- build.setStatus(Build.Status.WAITING);
- build.setFinishDate(null);
- build.setPendingDate(null);
- build.setRetryDate(null);
- build.setRunningDate(null);
- build.setSubmitDate(new Date());
- build.setSubmitter(SecurityUtils.getUser());
- build.setSubmitReason(reason);
- build.setCanceller(null);
- build.setCancellerName(null);
-
- buildParamManager.deleteParams(build);
- for (Map.Entry<String, List<String>> entry: paramMap.entrySet()) {
- ParamSpec paramSpec = build.getJob().getParamSpecMap().get(entry.getKey());
- Preconditions.checkNotNull(paramSpec);
- String type = paramSpec.getType();
- List<String> values = entry.getValue();
- if (!values.isEmpty()) {
- for (String value: values) {
+ JobSecretAuthorizationContext.push(build.getJobSecretAuthorizationContext());
+ try {
+ BuildSpec buildSpec = build.getSpec();
+
+ if (buildSpec == null) {
+ throw new ExplicitException(String.format(
+ "Build spec not defined (project: %s, commit: %s)",
+ build.getProject().getName(), build.getCommitHash()));
+ }
+
+ validateBuildSpec(build.getProject(), build.getCommitId(), buildSpec);
+
+ if (!buildSpec.getJobMap().containsKey(build.getJobName())) {
+ throw new ExplicitException(String.format(
+ "Job not found (project: %s, commit: %s, job: %s)",
+ build.getProject().getName(), build.getCommitId().name(), build.getJobName()));
+ }
+
+ build.setStatus(Build.Status.WAITING);
+ build.setFinishDate(null);
+ build.setPendingDate(null);
+ build.setRetryDate(null);
+ build.setRunningDate(null);
+ build.setSubmitDate(new Date());
+ build.setSubmitter(SecurityUtils.getUser());
+ build.setSubmitReason(reason);
+ build.setCanceller(null);
+ build.setCancellerName(null);
+
+ buildParamManager.deleteParams(build);
+ for (Map.Entry<String, List<String>> entry: paramMap.entrySet()) {
+ ParamSpec paramSpec = build.getJob().getParamSpecMap().get(entry.getKey());
+ Preconditions.checkNotNull(paramSpec);
+ String type = paramSpec.getType();
+ List<String> values = entry.getValue();
+ if (!values.isEmpty()) {
+ for (String value: values) {
+ BuildParam param = new BuildParam();
+ param.setBuild(build);
+ param.setName(entry.getKey());
+ param.setType(type);
+ param.setValue(value);
+ build.getParams().add(param);
+ buildParamManager.save(param);
+ }
+ } else {
BuildParam param = new BuildParam();
param.setBuild(build);
- param.setName(entry.getKey());
+ param.setName(paramSpec.getName());
param.setType(type);
- param.setValue(value);
build.getParams().add(param);
buildParamManager.save(param);
}
- } else {
- BuildParam param = new BuildParam();
- param.setBuild(build);
- param.setName(paramSpec.getName());
- param.setType(type);
- build.getParams().add(param);
- buildParamManager.save(param);
}
+ buildManager.save(build);
+ listenerRegistry.post(new BuildSubmitted(build));
+ } finally {
+ JobSecretAuthorizationContext.pop();
}
- buildManager.save(build);
- listenerRegistry.post(new BuildSubmitted(build));
} else {
throw new ExplicitException("Build #" + build.getNumber() + " not finished yet");
}
@@ -930,21 +979,27 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
if (defaultBranch != null) {
ObjectId commitId = project.getObjectId(defaultBranch, false);
if (commitId != null) {
- BuildSpec buildSpec = project.getBuildSpec(commitId);
- if (buildSpec != null) {
- ScheduledTimeReaches event = new ScheduledTimeReaches(project);
- for (Job job: buildSpec.getJobMap().values()) {
- for (JobTrigger trigger: job.getTriggers()) {
- if (trigger instanceof ScheduleTrigger) {
- ScheduleTrigger scheduledTrigger = (ScheduleTrigger) trigger;
- SubmitReason reason = trigger.matches(event, job);
- if (reason != null) {
- String taskId = taskScheduler.schedule(newSchedulableTask(project, commitId, job, scheduledTrigger, reason));
- tasksOfProject.add(taskId);
+ JobSecretAuthorizationContext.push(new JobSecretAuthorizationContext(project, commitId, null));
+ try {
+ BuildSpec buildSpec = project.getBuildSpec(commitId);
+ if (buildSpec != null) {
+ validateBuildSpec(project, commitId, buildSpec);
+ ScheduledTimeReaches event = new ScheduledTimeReaches(project);
+ for (Job job: buildSpec.getJobMap().values()) {
+ for (JobTrigger trigger: job.getTriggers()) {
+ if (trigger instanceof ScheduleTrigger) {
+ ScheduleTrigger scheduledTrigger = (ScheduleTrigger) trigger;
+ SubmitReason reason = trigger.matches(event, job);
+ if (reason != null) {
+ String taskId = taskScheduler.schedule(newSchedulableTask(project, commitId, job, scheduledTrigger, reason));
+ tasksOfProject.add(taskId);
+ }
}
}
}
}
+ } finally {
+ JobSecretAuthorizationContext.pop();
}
}
}
@@ -1122,6 +1177,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
@Override
public void run() {
Build build = OneDev.getInstance(BuildManager.class).load(buildId);
+ JobSecretAuthorizationContext.push(build.getJobSecretAuthorizationContext());
Build.push(build);
try {
VariableInterpolator interpolator = new VariableInterpolator(build, build.getParamCombination());
@@ -1138,6 +1194,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
logger.error(message, e);
} finally {
Build.pop();
+ JobSecretAuthorizationContext.pop();
}
}
});
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/HttpCredential.java b/server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/HttpCredential.java
index 276b10869d..71cfc13e20 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/HttpCredential.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/HttpCredential.java
@@ -46,7 +46,7 @@ public class HttpCredential implements GitCredential, Validatable {
@Override
public CloneInfo newCloneInfo(Build build, String jobToken) {
return new HttpCloneInfo(OneDev.getInstance(UrlManager.class).cloneUrlFor(build.getProject(), false),
- build.getSecretValue(accessTokenSecret));
+ build.getJobSecretAuthorizationContext().getSecretValue(accessTokenSecret));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/SshCredential.java b/server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/SshCredential.java
index 08fafba5c8..c2046721e6 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/SshCredential.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/SshCredential.java
@@ -57,7 +57,7 @@ public class SshCredential implements GitCredential, Validatable {
} catch (IOException e) {
throw new RuntimeException(e);
}
- return new SshCloneInfo(cloneUrl, build.getSecretValue(keySecret), knownHosts.toString());
+ return new SshCloneInfo(cloneUrl, build.getJobSecretAuthorizationContext().getSecretValue(keySecret), knownHosts.toString());
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/ProjectDependency.java b/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/ProjectDependency.java
index 9e60c857e3..2f47959232 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/ProjectDependency.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/ProjectDependency.java
@@ -105,7 +105,7 @@ public class ProjectDependency implements Serializable {
}
@Editable(order=500, description="Specify a secret to be used as access token to retrieve artifacts "
- + "from specified project. If not specified, project artifacts will be accessed anonymously")
+ + "from above project. If not specified, project artifacts will be accessed anonymously")
@ChoiceProvider("getAccessTokenSecretChoices")
@Nullable
@NameOfEmptyValue("Access Anonymously")
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/ParamUtils.java b/server-core/src/main/java/io/onedev/server/buildspec/param/ParamUtils.java
index c04555c6db..02ba7e805d 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/param/ParamUtils.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/ParamUtils.java
@@ -217,7 +217,7 @@ public class ParamUtils {
for (List<String> value: param.getValuesProvider().getValues(build, paramCombination)) {
List<String> resolvedValue = new ArrayList<>();
for (String each: value)
- resolvedValue.add(SecretInput.LITERAL_VALUE_PREFIX + build.getSecretValue(each));
+ resolvedValue.add(SecretInput.LITERAL_VALUE_PREFIX + build.getJobSecretAuthorizationContext().getSecretValue(each));
resolvedValues.add(resolvedValue);
}
paramMatrix.put(param.getName(), resolvedValues);
diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.java
index 2e742b4f94..fced8ef9d7 100644
--- a/server-core/src/main/java/io/onedev/server/model/Build.java
+++ b/server-core/src/main/java/io/onedev/server/model/Build.java
@@ -57,7 +57,6 @@ import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
-import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.LockUtils;
import io.onedev.commons.utils.StringUtils;
@@ -86,11 +85,11 @@ import io.onedev.server.util.ComponentContext;
import io.onedev.server.util.Day;
import io.onedev.server.util.Input;
import io.onedev.server.util.IssueUtils;
+import io.onedev.server.util.JobSecretAuthorizationContext;
import io.onedev.server.util.MatrixRunner;
import io.onedev.server.util.ProjectScopedNumber;
import io.onedev.server.util.Referenceable;
import io.onedev.server.util.facade.BuildFacade;
-import io.onedev.server.util.match.PathMatcher;
import io.onedev.server.util.match.WildcardUtils;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.util.script.identity.JobIdentity;
@@ -354,6 +353,8 @@ public class Build extends AbstractEntity implements Referenceable {
private transient Map<Integer, Collection<Long>> streamPreviousNumbersCache = new HashMap<>();
+ private transient JobSecretAuthorizationContext jobSecretAuthorizationContext;
+
public Project getNumberScope() {
return numberScope;
}
@@ -720,10 +721,16 @@ public class Build extends AbstractEntity implements Referenceable {
return new BuildFacade(getId(), getProject().getId(), getCommitHash());
}
+ public JobSecretAuthorizationContext getJobSecretAuthorizationContext() {
+ if (jobSecretAuthorizationContext == null)
+ jobSecretAuthorizationContext = new JobSecretAuthorizationContext(project, getCommitId(), request);
+ return jobSecretAuthorizationContext;
+ }
+
public Collection<String> getSecretValuesToMask() {
Collection<String> secretValuesToMask = new HashSet<>();
for (JobSecret secret: getProject().getBuildSetting().getJobSecrets()) {
- if (isOnBranches(secret.getAuthorizedBranches()))
+ if (getJobSecretAuthorizationContext().isOnBranches(secret.getAuthorizedBranches()))
secretValuesToMask.add(secret.getValue());
}
@@ -741,22 +748,6 @@ public class Build extends AbstractEntity implements Referenceable {
return secretValuesToMask;
}
- public String getSecretValue(String secretName) {
- if (secretName.startsWith(SecretInput.LITERAL_VALUE_PREFIX)) {
- return secretName.substring(SecretInput.LITERAL_VALUE_PREFIX.length());
- } else {
- for (JobSecret secret: getProject().getBuildSetting().getJobSecrets()) {
- if (secret.getName().equals(secretName)) {
- if (isOnBranches(secret.getAuthorizedBranches()))
- return secret.getValue();
- else
- throw new ExplicitException("Job secret not authorized: " + secretName);
- }
- }
- throw new ExplicitException("No job secret found: " + secretName);
- }
- }
-
@Nullable
public BuildSpec getSpec() {
if (spec == null)
@@ -766,7 +757,12 @@ public class Build extends AbstractEntity implements Referenceable {
@Nullable
public Job getJob() {
- return getSpec()!=null? getSpec().getJobMap().get(getJobName()): null;
+ JobSecretAuthorizationContext.push(getJobSecretAuthorizationContext());
+ try {
+ return getSpec()!=null? getSpec().getJobMap().get(getJobName()): null;
+ } finally {
+ JobSecretAuthorizationContext.pop();
+ }
}
public Serializable getParamBean() {
@@ -892,7 +888,7 @@ public class Build extends AbstractEntity implements Referenceable {
public boolean canCreateTag(String tagName) {
for (ActionAuthorization authorization: getProject().getBuildSetting().getActionAuthorizations()) {
- if (isOnBranches(authorization.getAuthorizedBranches())) {
+ if (getJobSecretAuthorizationContext().isOnBranches(authorization.getAuthorizedBranches())) {
if (authorization instanceof CreateTagAuthorization) {
CreateTagAuthorization createTagAuthorization = (CreateTagAuthorization) authorization;
String tagNames = createTagAuthorization.getTagNames();
@@ -906,7 +902,7 @@ public class Build extends AbstractEntity implements Referenceable {
public boolean canCloseMilestone(String milestoneName) {
for (ActionAuthorization authorization: getProject().getBuildSetting().getActionAuthorizations()) {
- if (isOnBranches(authorization.getAuthorizedBranches())) {
+ if (getJobSecretAuthorizationContext().isOnBranches(authorization.getAuthorizedBranches())) {
if (authorization instanceof CloseMilestoneAuthorization) {
CloseMilestoneAuthorization closeMilestoneAuthorization = (CloseMilestoneAuthorization) authorization;
String milestoneNames = closeMilestoneAuthorization.getMilestoneNames();
@@ -940,23 +936,6 @@ public class Build extends AbstractEntity implements Referenceable {
return null;
}
}
-
- public boolean isOnBranches(@Nullable String branches) {
- if (branches == null)
- branches = "**";
- if (project.isCommitOnBranches(getCommitId(), branches)) {
- return true;
- } else if (getRequest() != null) {
- PatternSet patternSet = PatternSet.parse(branches);
- PathMatcher matcher = new PathMatcher();
- return project.equals(getRequest().getSourceProject())
- && patternSet.matches(matcher, getRequest().getTargetBranch())
- && getRequest().getSourceBranch() != null
- && patternSet.matches(matcher, getRequest().getSourceBranch());
- } else {
- return false;
- }
- }
public boolean matchParams(List<ParamSupply> paramSupplies) {
AtomicBoolean matches = new AtomicBoolean(false);
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 6976008345..0a16743e59 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
@@ -39,6 +39,7 @@ import javax.persistence.Table;
import javax.validation.Validator;
import org.apache.commons.lang3.SerializationUtils;
+import org.apache.shiro.authz.Permission;
import org.eclipse.jgit.api.CreateBranchCommand;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.api.TagCommand;
@@ -1547,6 +1548,10 @@ public class Project extends AbstractEntity implements NameAware {
}
}
+ public boolean isPermittedByLoginUser(Permission permission) {
+ return getDefaultRole() != null && getDefaultRole().implies(permission);
+ }
+
public LinkedHashMap<String, ContributedProjectSetting> getContributedSettings() {
return contributedSettings;
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/support/JobRun.java b/server-core/src/main/java/io/onedev/server/rest/support/JobRun.java
index fef9b92964..f14113deba 100644
--- a/server-core/src/main/java/io/onedev/server/rest/support/JobRun.java
+++ b/server-core/src/main/java/io/onedev/server/rest/support/JobRun.java
@@ -15,13 +15,16 @@ public abstract class JobRun implements Serializable {
private static final long serialVersionUID = 1L;
- @Api(order=250) String jobName;
+ @Api(order=250)
+ private String jobName;
@Api(order=260, description="A map of param name to value list. Normally the value list "
+ "contains only one param value. However in case the job param is defined as "
- + "multi-valued in build spec, you can add multiple param values") Map<String, List<String>> params = new HashMap<>();
+ + "multi-valued in build spec, you can add multiple param values")
+ private Map<String, List<String>> params = new HashMap<>();
- @Api(order=1000) String reason;
+ @Api(order=1000)
+ private String reason;
@NotEmpty
public String getJobName() {
diff --git a/server-core/src/main/java/io/onedev/server/util/JobSecretAuthorizationContext.java b/server-core/src/main/java/io/onedev/server/util/JobSecretAuthorizationContext.java
new file mode 100644
index 0000000000..8086e4e19e
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/JobSecretAuthorizationContext.java
@@ -0,0 +1,150 @@
+package io.onedev.server.util;
+
+import java.util.Stack;
+
+import javax.annotation.Nullable;
+
+import org.eclipse.jgit.lib.ObjectId;
+
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.support.build.JobSecret;
+import io.onedev.server.model.support.inputspec.SecretInput;
+import io.onedev.server.util.match.PathMatcher;
+import io.onedev.server.util.patternset.PatternSet;
+import io.onedev.server.web.util.WicketUtils;
+
+public class JobSecretAuthorizationContext {
+
+ private final Project project;
+
+ private final ObjectId commitId;
+
+ private final PullRequest pullRequest;
+
+ public JobSecretAuthorizationContext(Project project, ObjectId commitId, @Nullable PullRequest pullRequest) {
+ this.project = project;
+ this.commitId = commitId;
+ this.pullRequest = pullRequest;
+ }
+
+ public Project getProject() {
+ return project;
+ }
+
+ public ObjectId getCommitId() {
+ return commitId;
+ }
+
+ @Nullable
+ public PullRequest getPullRequest() {
+ return pullRequest;
+ }
+
+ public boolean isOnBranches(@Nullable String branches) {
+ if (branches == null)
+ branches = "**";
+ if (project.isCommitOnBranches(getCommitId(), branches)) {
+ return true;
+ } else if (pullRequest != null) {
+ PatternSet patternSet = PatternSet.parse(branches);
+ PathMatcher matcher = new PathMatcher();
+ return project.equals(pullRequest.getSourceProject())
+ && patternSet.matches(matcher, pullRequest.getTargetBranch())
+ && pullRequest.getSourceBranch() != null
+ && patternSet.matches(matcher, pullRequest.getSourceBranch());
+ } else {
+ return false;
+ }
+ }
+
+ public String getSecretValue(String secretName) {
+ if (secretName.startsWith(SecretInput.LITERAL_VALUE_PREFIX)) {
+ return secretName.substring(SecretInput.LITERAL_VALUE_PREFIX.length());
+ } else {
+ for (JobSecret secret: project.getBuildSetting().getJobSecrets()) {
+ if (secret.getName().equals(secretName)) {
+ if (isOnBranches(secret.getAuthorizedBranches())) {
+ return secret.getValue();
+ } else {
+ throw new ExplicitException(String.format(
+ "Job secret not authorized (project: %s, job secret: %s)",
+ project.getName(), secretName));
+ }
+ }
+ }
+ throw new ExplicitException(String.format(
+ "Job secret not found (project: %s, job secret: %s)",
+ project.getName(), secretName));
+ }
+ }
+
+ public String getSecretValue(String branchName, String secretName) {
+ if (secretName.startsWith(SecretInput.LITERAL_VALUE_PREFIX)) {
+ return secretName.substring(SecretInput.LITERAL_VALUE_PREFIX.length());
+ } else {
+ JobSecret secret = null;
+ for (JobSecret each: project.getBuildSetting().getJobSecrets()) {
+ if (each.getName().equals(secretName)) {
+ secret = each;
+ break;
+ }
+ }
+ if (secret == null) {
+ throw new ExplicitException(String.format(
+ "Job secret not found (project: %s, job secret: %s)",
+ project.getName(), secretName));
+ }
+
+ String authorizedBranches = secret.getAuthorizedBranches();
+ if (authorizedBranches == null)
+ authorizedBranches = "**";
+
+ PatternSet patternSet = PatternSet.parse(authorizedBranches);
+ PathMatcher matcher = new PathMatcher();
+ if (!patternSet.matches(matcher, branchName)) {
+ throw new ExplicitException(String.format(
+ "Job secret not authorized (project: %s, job secret: %s)",
+ project.getName(), secretName));
+ }
+ return secret.getValue();
+ }
+ }
+
+ private static ThreadLocal<Stack<JobSecretAuthorizationContext>> stack =
+ new ThreadLocal<Stack<JobSecretAuthorizationContext>>() {
+
+ @Override
+ protected Stack<JobSecretAuthorizationContext> initialValue() {
+ return new Stack<>();
+ }
+
+ };
+
+ public static void push(JobSecretAuthorizationContext commitId) {
+ stack.get().push(commitId);
+ }
+
+ public static void pop() {
+ stack.get().pop();
+ }
+
+ @Nullable
+ public static JobSecretAuthorizationContext get() {
+ if (!stack.get().isEmpty()) {
+ return stack.get().peek();
+ } else {
+ ComponentContext componentContext = ComponentContext.get();
+ if (componentContext != null) {
+ JobSecretAuthorizationContextAware jobSecretAuthorizationContextAware = WicketUtils.findInnermost(
+ componentContext.getComponent(),
+ JobSecretAuthorizationContextAware.class);
+ if (jobSecretAuthorizationContextAware != null)
+ return jobSecretAuthorizationContextAware.getJobSecretAuthorizationContext();
+ }
+ return null;
+ }
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/util/JobSecretAuthorizationContextAware.java b/server-core/src/main/java/io/onedev/server/util/JobSecretAuthorizationContextAware.java
new file mode 100644
index 0000000000..8100486587
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/JobSecretAuthorizationContextAware.java
@@ -0,0 +1,7 @@
+package io.onedev.server.util;
+
+public interface JobSecretAuthorizationContextAware {
+
+ JobSecretAuthorizationContext getJobSecretAuthorizationContext();
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/util/interpolative/VariableInterpolator.java b/server-core/src/main/java/io/onedev/server/util/interpolative/VariableInterpolator.java
index b47737be91..e71241f16a 100644
--- a/server-core/src/main/java/io/onedev/server/util/interpolative/VariableInterpolator.java
+++ b/server-core/src/main/java/io/onedev/server/util/interpolative/VariableInterpolator.java
@@ -68,7 +68,7 @@ public class VariableInterpolator {
List<String> paramValues = new ArrayList<>();
for (String value: entry.getValue().getValues()) {
if (paramType.equals(ParamSpec.SECRET))
- value = build.getSecretValue(value);
+ value = build.getJobSecretAuthorizationContext().getSecretValue(value);
paramValues.add(value);
}
return StringUtils.join(paramValues, ",");
@@ -96,7 +96,7 @@ public class VariableInterpolator {
secretName = t.substring(PREFIX_SECRET.length());
else
secretName = t.substring("secrets:".length());
- return build.getSecretValue(secretName);
+ return build.getJobSecretAuthorizationContext().getSecretValue(secretName);
} else if (t.startsWith(PREFIX_SCRIPT) || t.startsWith("scripts:")) {
String scriptName;
if (t.startsWith(PREFIX_SCRIPT))
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java
index ae32720653..5d26b81bf9 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java
@@ -127,6 +127,7 @@ public abstract class BuildSidePanel extends Panel {
CommitDetailPage.State commitState = new CommitDetailPage.State();
commitState.revision = getBuild().getCommitHash();
+ commitState.requestId = PullRequest.idOf(getBuild().getRequest());
params = CommitDetailPage.paramsOf(getProject(), commitState);
Link<Void> hashLink = new ViewStateAwarePageLink<Void>("commit", CommitDetailPage.class, params) {
@@ -150,6 +151,11 @@ public abstract class BuildSidePanel extends Panel {
return BuildSidePanel.this.getProject();
}
+ @Override
+ protected PullRequest getPullRequest() {
+ return getBuild().getRequest();
+ }
+
@Override
protected void onConfigure() {
super.onConfigure();
@@ -180,7 +186,9 @@ public abstract class BuildSidePanel extends Panel {
if (request != null
&& request.getSource() != null
&& request.getSource().getObjectName(false) != null
- && SecurityUtils.canModify(request.getSourceProject(), request.getSourceBranch(), BuildSpec.BLOB_PATH)) {
+ && SecurityUtils.canModify(request.getSourceProject(), request.getSourceBranch(), BuildSpec.BLOB_PATH)
+ && getBuild().getSpec() != null
+ && getBuild().getSpec().getJobs().stream().anyMatch(it->it.getName().equals(getBuild().getJobName()))) {
BlobIdent blobIdent = new BlobIdent(request.getSourceBranch(), BuildSpec.BLOB_PATH,
FileMode.REGULAR_FILE.getBits());
state = new ProjectBlobPage.State(blobIdent);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java
index 68c9fb3b8d..d3260674f0 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java
@@ -26,6 +26,7 @@ import io.onedev.server.model.Build;
import io.onedev.server.model.Build.Status;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.util.JobSecretAuthorizationContext;
import io.onedev.server.web.component.build.status.BuildStatusIcon;
import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.job.joblist.JobListPanel;
@@ -45,6 +46,8 @@ public abstract class CommitStatusPanel extends Panel {
@Override
protected List<Job> load() {
List<Job> jobs = new ArrayList<>();
+ JobSecretAuthorizationContext.push(
+ new JobSecretAuthorizationContext(getProject(), commitId, getPullRequest()));
try {
BuildSpec buildSpec = getProject().getBuildSpec(commitId);
if (buildSpec != null)
@@ -52,6 +55,8 @@ public abstract class CommitStatusPanel extends Panel {
} catch (Exception e) {
logger.error("Error retrieving build spec (project: {}, commit: {})",
getProject().getName(), commitId.name(), e);
+ } finally {
+ JobSecretAuthorizationContext.pop();
}
return jobs;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/JobDefLink.java b/server-core/src/main/java/io/onedev/server/web/component/job/JobDefLink.java
index cf98e537f4..fd74c58e1b 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/job/JobDefLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/job/JobDefLink.java
@@ -1,5 +1,7 @@
package io.onedev.server.web.component.job;
+import javax.annotation.Nullable;
+
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -10,6 +12,7 @@ import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.buildspec.job.Job;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequest;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.blob.render.renderers.buildspec.BuildSpecRendererProvider;
@@ -42,6 +45,11 @@ public abstract class JobDefLink extends BookmarkablePageLink<Void> {
protected abstract Project getProject();
+ @Nullable
+ protected PullRequest getPullRequest() {
+ return null;
+ }
+
@Override
public PageParameters getPageParameters() {
ProjectBlobPage.State state = new ProjectBlobPage.State();
@@ -49,6 +57,7 @@ public abstract class JobDefLink extends BookmarkablePageLink<Void> {
if (getProject().getBlob(state.blobIdent, false) == null)
state.blobIdent = new BlobIdent(commitId.name(), ".onedev-buildspec", FileMode.REGULAR_FILE.getBits());
state.position = BuildSpecRendererProvider.getPosition(Job.SELECTION_PREFIX + jobName);
+ state.requestId = PullRequest.idOf(getPullRequest());
return ProjectBlobPage.paramsOf(getProject(), state);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/link/BuildSpecLink.java b/server-core/src/main/java/io/onedev/server/web/component/link/BuildSpecLink.java
index e555f8fc75..9cb315998a 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/link/BuildSpecLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/link/BuildSpecLink.java
@@ -1,5 +1,7 @@
package io.onedev.server.web.component.link;
+import javax.annotation.Nullable;
+
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -9,6 +11,7 @@ import org.eclipse.jgit.lib.ObjectId;
import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequest;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
@@ -37,10 +40,16 @@ public abstract class BuildSpecLink extends BookmarkablePageLink<Void> {
protected abstract Project getProject();
+ @Nullable
+ protected PullRequest getPullRequest() {
+ return null;
+ }
+
@Override
public PageParameters getPageParameters() {
ProjectBlobPage.State state = new ProjectBlobPage.State();
state.blobIdent = new BlobIdent(commitId.name(), BuildSpec.BLOB_PATH, FileMode.REGULAR_FILE.getBits());
+ state.requestId = PullRequest.idOf(getPullRequest());
if (getProject().getBlob(state.blobIdent, false) == null)
state.blobIdent = new BlobIdent(commitId.name(), ".onedev-buildspec", FileMode.REGULAR_FILE.getBits());
return ProjectBlobPage.paramsOf(getProject(), state);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java
index 316244e784..81c6f7663a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java
@@ -227,7 +227,8 @@ public abstract class BasePage extends WebPage {
@Override
public void component(Component object, IVisit<Void> visit) {
- observers.addAll(object.getBehaviors(WebSocketObserver.class));
+ if (object.isVisibleInHierarchy())
+ observers.addAll(object.getBehaviors(WebSocketObserver.class));
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java
index 1266d55ebd..d270ed2771 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java
@@ -13,6 +13,7 @@ import com.google.common.collect.Sets;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Project;
+import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.Path;
import io.onedev.server.util.PathNode;
import io.onedev.server.web.editable.BeanContext;
@@ -66,6 +67,11 @@ public class NewProjectPage extends LayoutPage {
add(form);
}
+ @Override
+ protected boolean isPermitted() {
+ return SecurityUtils.getUser() != null;
+ }
+
@Override
protected Component newTopbarTitle(String componentId) {
return new Label(componentId, "Create Project");
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
index 186df85486..c07070ca33 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
@@ -86,6 +86,8 @@ import io.onedev.server.search.code.query.BlobQuery;
import io.onedev.server.search.code.query.TextQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.FilenameUtils;
+import io.onedev.server.util.JobSecretAuthorizationContext;
+import io.onedev.server.util.JobSecretAuthorizationContextAware;
import io.onedev.server.util.script.identity.JobIdentity;
import io.onedev.server.util.script.identity.ScriptIdentity;
import io.onedev.server.util.script.identity.ScriptIdentityAware;
@@ -118,7 +120,8 @@ import io.onedev.server.web.util.EditParamsAware;
import io.onedev.server.web.websocket.WebSocketManager;
@SuppressWarnings("serial")
-public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, ScriptIdentityAware, EditParamsAware {
+public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,
+ ScriptIdentityAware, EditParamsAware, JobSecretAuthorizationContextAware {
private static final String PARAM_REVISION = "revision";
@@ -1541,4 +1544,9 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S
return new Label(componentId, "Files");
}
+ @Override
+ public JobSecretAuthorizationContext getJobSecretAuthorizationContext() {
+ return new JobSecretAuthorizationContext(getProject(), getCommit(), getPullRequest());
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html
index 3c77a5f7de..b6db82e984 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html
@@ -19,8 +19,8 @@
</div>
<div class="card-body d-flex flex-grow-1 position-relative">
<div class="main flex-grow-1 d-flex flex-column">
- <div wicket:id="jobNotFound" class="alert alert-danger">Job '<span wicket:id="jobName"></span>' associated with the build not found.
- Most probably there are import errors in the <a wicket:id="buildSpec" class="alert-link">build spec</a></div>
+ <div wicket:id="jobNotFound" class="alert alert-notice alert-light-danger">Job '<span wicket:id="jobName"></span>' associated with the build not found.
+ Most probably there are import errors in the <a wicket:id="buildSpec">build spec</a></div>
<pre wicket:id="errorMessage" class="error-message alert alert-notice alert-light-danger overflow-auto mb-4 flex-shrink-0 p-3 text-break"></pre>
<ul wicket:id="buildTabs" class="tabs nav nav-tabs nav-tabs-line nav-bold mb-5 flex-shrink-0"></ul>
<wicket:child></wicket:child>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
index a04854328e..a842de3c5c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
@@ -51,6 +51,8 @@ import io.onedev.server.model.support.inputspec.InputContext;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.build.BuildQuery;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.JobSecretAuthorizationContext;
+import io.onedev.server.util.JobSecretAuthorizationContextAware;
import io.onedev.server.util.ProjectScopedNumber;
import io.onedev.server.util.script.identity.JobIdentity;
import io.onedev.server.util.script.identity.ScriptIdentity;
@@ -89,7 +91,7 @@ import io.onedev.server.web.util.CursorSupport;
@SuppressWarnings("serial")
public abstract class BuildDetailPage extends ProjectPage
- implements InputContext, ScriptIdentityAware, BuildAware {
+ implements InputContext, ScriptIdentityAware, BuildAware, JobSecretAuthorizationContextAware {
public static final String PARAM_BUILD = "build";
@@ -363,6 +365,11 @@ public abstract class BuildDetailPage extends ProjectPage
protected Project getProject() {
return getBuild().getProject();
}
+
+ @Override
+ protected PullRequest getPullRequest() {
+ return getBuild().getRequest();
+ }
});
@@ -602,5 +609,10 @@ public abstract class BuildDetailPage extends ProjectPage
else
return "Build #" + getBuild().getNumber() + " - " + getProject().getName();
}
+
+ @Override
+ public JobSecretAuthorizationContext getJobSecretAuthorizationContext() {
+ return new JobSecretAuthorizationContext(getProject(), getBuild().getCommitId(), getBuild().getRequest());
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
index 64e2ee5b77..53a4a7bf77 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
@@ -57,6 +57,7 @@ import io.onedev.server.code.LineCoverageContribution;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.CodeCommentManager;
import io.onedev.server.entitymanager.CodeCommentReplyManager;
+import io.onedev.server.entitymanager.PullRequestManager;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.RefInfo;
@@ -70,6 +71,8 @@ import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.CompareContext;
import io.onedev.server.model.support.Mark;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.JobSecretAuthorizationContext;
+import io.onedev.server.util.JobSecretAuthorizationContextAware;
import io.onedev.server.util.diff.WhitespaceOption;
import io.onedev.server.web.behavior.WebSocketObserver;
import io.onedev.server.web.component.branch.create.CreateBranchLink;
@@ -92,7 +95,7 @@ import io.onedev.server.web.util.ReferenceTransformer;
import io.onedev.server.web.util.RevisionDiff;
@SuppressWarnings("serial")
-public class CommitDetailPage extends ProjectPage implements RevisionDiff.AnnotationSupport {
+public class CommitDetailPage extends ProjectPage implements RevisionDiff.AnnotationSupport, JobSecretAuthorizationContextAware {
private static final Logger logger = LoggerFactory.getLogger(CommitDetailPage.class);
@@ -104,6 +107,8 @@ public class CommitDetailPage extends ProjectPage implements RevisionDiff.Annota
private static final String PARAM_BLAME_FILE = "blame-file";
+ private static final String PARAM_PULL_REQUEST = "request";
+
private static final String PARAM_WHITESPACE_OPTION = "whitespace-option";
private static final String PARAM_PATH_FILTER = "path-filter";
@@ -159,6 +164,7 @@ public class CommitDetailPage extends ProjectPage implements RevisionDiff.Annota
state.blameFile = params.get(PARAM_BLAME_FILE).toString();
state.commentId = params.get(PARAM_COMMENT).toOptionalLong();
state.mark = Mark.fromString(params.get(PARAM_MARK).toString());
+ state.requestId = params.get(PARAM_PULL_REQUEST).toOptionalLong();
resolvedRevision = getProject().getRevCommit(state.revision, true).copy();
if (state.compareWith != null)
@@ -190,6 +196,7 @@ public class CommitDetailPage extends ProjectPage implements RevisionDiff.Annota
BlobIdent blobIdent = new BlobIdent(getCommit().name(), null, FileMode.TYPE_TREE);
ProjectBlobPage.State browseState = new ProjectBlobPage.State(blobIdent);
+ browseState.requestId = state.requestId;
PageParameters params = ProjectBlobPage.paramsOf(projectModel.getObject(), browseState);
add(new ViewStateAwarePageLink<Void>("browseCode", ProjectBlobPage.class, params));
@@ -580,6 +587,14 @@ public class CommitDetailPage extends ProjectPage implements RevisionDiff.Annota
return projectModel.getObject();
}
+ @Override
+ protected PullRequest getPullRequest() {
+ if (state.requestId != null)
+ return OneDev.getInstance(PullRequestManager.class).load(state.requestId);
+ else
+ return null;
+ }
+
};
revisionDiff.setOutputMarkupId(true);
if (target != null) {
@@ -633,6 +648,8 @@ public class CommitDetailPage extends ProjectPage implements RevisionDiff.Annota
params.set(PARAM_COMMENT, state.commentId);
if (state.mark != null)
params.set(PARAM_MARK, state.mark.toString());
+ if (state.requestId != null)
+ params.set(PARAM_PULL_REQUEST, state.requestId);
return params;
}
@@ -678,6 +695,8 @@ public class CommitDetailPage extends ProjectPage implements RevisionDiff.Annota
@Nullable
public Mark mark;
+ @Nullable
+ public Long requestId;
}
@Override
@@ -853,4 +872,17 @@ public class CommitDetailPage extends ProjectPage implements RevisionDiff.Annota
+ " - " + getProject().getName();
}
+ @Nullable
+ private PullRequest getPullRequest() {
+ if (state.requestId != null)
+ return OneDev.getInstance(PullRequestManager.class).load(state.requestId);
+ else
+ return null;
+ }
+
+ @Override
+ public JobSecretAuthorizationContext getJobSecretAuthorizationContext() {
+ return new JobSecretAuthorizationContext(getProject(), getCommit(), getPullRequest());
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/imports/ProjectImportPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/imports/ProjectImportPage.java
index 25459d33df..2bac5f24a6 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/imports/ProjectImportPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/imports/ProjectImportPage.java
@@ -24,6 +24,7 @@ import io.onedev.server.persistence.TransactionManager;
import io.onedev.server.search.entity.EntitySort;
import io.onedev.server.search.entity.EntitySort.Direction;
import io.onedev.server.search.entity.project.ProjectQuery;
+import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.SimpleLogger;
import io.onedev.server.web.ajaxlistener.ShowGlobalAjaxIndicatorListener;
import io.onedev.server.web.component.taskbutton.TaskButton;
@@ -184,6 +185,11 @@ public class ProjectImportPage<T extends Serializable, S extends Serializable> e
add(form);
}
+ @Override
+ protected boolean isPermitted() {
+ return SecurityUtils.getUser() != null;
+ }
+
@Override
protected Component newTopbarTitle(String componentId) {
return new Label(componentId, "Importing Projects from " + importer.getName());
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/imports/IssueImportPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/imports/IssueImportPage.java
index ad9a62c41b..eac8486f0f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/imports/IssueImportPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/imports/IssueImportPage.java
@@ -26,6 +26,7 @@ import io.onedev.server.persistence.TransactionManager;
import io.onedev.server.search.entity.EntitySort;
import io.onedev.server.search.entity.EntitySort.Direction;
import io.onedev.server.search.entity.issue.IssueQuery;
+import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.SimpleLogger;
import io.onedev.server.web.ajaxlistener.ShowGlobalAjaxIndicatorListener;
import io.onedev.server.web.component.taskbutton.TaskButton;
@@ -205,6 +206,11 @@ public class IssueImportPage<T extends Serializable, S extends Serializable> ext
return importOption;
}
+ @Override
+ protected boolean isPermitted() {
+ return SecurityUtils.getUser() != null;
+ }
+
@Override
protected Component newProjectTitle(String componentId) {
return new Label(componentId, "Import Issues frmo " + importer.getName());
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPanel.html
index 3f3656d571..3a74cdbaa9 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPanel.html
@@ -5,6 +5,7 @@
<span class="drag-indicator"><wicket:svg href="grip" class="icon mr-4"/></span>
<a wicket:id="edit" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-2" title="Edit this rule"><wicket:svg href="edit" class="icon"></wicket:svg></a>
<a wicket:id="delete" class="btn btn-xs btn-icon btn-light btn-hover-danger mr-4" title="Delete this rule"><wicket:svg href="trash" class="icon"></wicket:svg></a>
+ <span wicket:id="disabled" class="badge badge-warning">Disabled</span>
</div>
<div class="card-toolbar">
<span class="switch switch-sm switch-primary">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPanel.java
index 66ed03c991..fe6fed162e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPanel.java
@@ -5,9 +5,8 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
-import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import io.onedev.server.model.support.BranchProtection;
@@ -72,6 +71,16 @@ abstract class BranchProtectionPanel extends Panel {
});
+ add(new WebMarkupContainer("disabled") {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(!protection.isEnabled());
+ }
+
+ });
+
add(new AjaxCheckBox("enable", Model.of(protection.isEnabled())) {
@Override
@@ -85,15 +94,6 @@ abstract class BranchProtectionPanel extends Panel {
add(BeanContext.view("protection", protection).setOutputMarkupId(true));
- add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {
-
- @Override
- protected String load() {
- return !protection.isEnabled()? "disabled": "";
- }
-
- }));
-
setOutputMarkupId(true);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css b/server-core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css
index 6865b78e5f..4df5299f04 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css
@@ -14,6 +14,10 @@
.project-setting .branch-protections .bean-list td.property-jobNames {
width: 30%;
}
+.project-setting .branch-protection>.card-header .badge,
+.project-setting .tag-protection>.card-header .badge {
+ font-size: 0.9rem;
+}
.project-setting .project-authorizations .bean-list td.property-userName {
width: 50%;
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPanel.html
index b57ba5740b..99194f00ba 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPanel.html
@@ -5,6 +5,7 @@
<span class="drag-indicator"><wicket:svg href="grip" class="icon mr-4"/></span>
<a wicket:id="edit" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-2" title="Edit this rule"><wicket:svg href="edit" class="icon"></wicket:svg></a>
<a wicket:id="delete" class="btn btn-xs btn-icon btn-light btn-hover-danger mr-4" title="Delete this rule"><wicket:svg href="trash" class="icon"></wicket:svg></a>
+ <span wicket:id="disabled" class="badge badge-warning">Disabled</span>
</div>
<div class="card-toolbar">
<span class="switch switch-sm switch-primary">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPanel.java
index 88e4462570..0ac2f7e3b8 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPanel.java
@@ -5,9 +5,8 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
-import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import io.onedev.server.model.support.TagProtection;
@@ -72,6 +71,16 @@ abstract class TagProtectionPanel extends Panel {
});
+ add(new WebMarkupContainer("disabled") {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(!protection.isEnabled());
+ }
+
+ });
+
add(new AjaxCheckBox("enable", Model.of(protection.isEnabled())) {
@Override
@@ -83,15 +92,6 @@ abstract class TagProtectionPanel extends Panel {
});
- add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {
-
- @Override
- protected String load() {
- return !protection.isEnabled()? "disabled": "";
- }
-
- }));
-
add(BeanContext.view("protection", protection).setOutputMarkupId(true));
setOutputMarkupId(true);