The Unified and Autonomous Development Platform
Able to inherit secrets and build reservation rules from project owner
Robin Shen163f7a6a68bc
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/Authentication.java b/server-core/src/main/java/io/onedev/server/buildspec/job/Authentication.javaindex f82b7f64bf..5240d5d5a4 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/Authentication.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/Authentication.java@@ -42,7 +42,7 @@ public class Authentication implements Serializable {@SuppressWarnings("unused")private static List<String> getPasswordSecretChoices() {- return Project.get().getSecrets().stream().map(it->it.getName()).collect(Collectors.toList());+ return Project.get().getBuildSetting().getSecrets().stream().map(it->it.getName()).collect(Collectors.toList());}}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.javaindex 59a325f691..9eb23bec4e 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@@ -264,7 +264,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizthrow new OneException("Unable to access dependency project '"+ dependency.getProjectName() + "': user not found");}- String password = project.getSecretValue(dependency.getAuthentication().getPasswordSecret(), commitId);+ String password = project.getBuildSetting().getSecretValue(project, dependency.getAuthentication().getPasswordSecret(), commitId);if (!passwordService.passwordsMatch(password, user.getPassword())) {throw new OneException("Unable to access dependency project '"+ dependency.getProjectName() + "': password incorrect");diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.javaindex 22da4d60bd..d729ec7af5 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java@@ -1,827 +1,827 @@-package io.onedev.server.entitymanager.impl;--import java.io.IOException;-import java.util.ArrayList;-import java.util.Collection;-import java.util.HashMap;-import java.util.HashSet;-import java.util.Iterator;-import java.util.List;-import java.util.Map;-import java.util.concurrent.Callable;-import java.util.concurrent.atomic.AtomicInteger;-import java.util.concurrent.locks.ReadWriteLock;-import java.util.concurrent.locks.ReentrantReadWriteLock;-import java.util.stream.Collectors;--import javax.annotation.Nullable;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.Join;-import javax.persistence.criteria.JoinType;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;-import javax.persistence.criteria.Selection;--import org.eclipse.jgit.errors.MissingObjectException;-import org.eclipse.jgit.lib.ObjectId;-import org.eclipse.jgit.revwalk.RevCommit;-import org.eclipse.jgit.revwalk.RevWalk;-import org.hibernate.Session;-import org.hibernate.criterion.Criterion;-import org.hibernate.criterion.MatchMode;-import org.hibernate.criterion.Order;-import org.hibernate.criterion.Restrictions;-import org.hibernate.query.Query;-import org.quartz.CronScheduleBuilder;-import org.quartz.ScheduleBuilder;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;--import com.google.common.base.Preconditions;--import io.onedev.commons.launcher.loader.Listen;-import io.onedev.commons.utils.FileUtils;-import io.onedev.server.entitymanager.BuildDependenceManager;-import io.onedev.server.entitymanager.BuildManager;-import io.onedev.server.entitymanager.BuildParamManager;-import io.onedev.server.entitymanager.GroupManager;-import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.event.entity.EntityRemoved;-import io.onedev.server.event.system.SystemStarted;-import io.onedev.server.event.system.SystemStopping;-import io.onedev.server.model.Build;-import io.onedev.server.model.Build.Status;-import io.onedev.server.model.BuildDependence;-import io.onedev.server.model.BuildParam;-import io.onedev.server.model.Group;-import io.onedev.server.model.GroupAuthorization;-import io.onedev.server.model.Project;-import io.onedev.server.model.Role;-import io.onedev.server.model.User;-import io.onedev.server.model.UserAuthorization;-import io.onedev.server.model.support.BuildPreservation;-import io.onedev.server.model.support.role.JobPrivilege;-import io.onedev.server.persistence.TransactionManager;-import io.onedev.server.persistence.annotation.Sessional;-import io.onedev.server.persistence.annotation.Transactional;-import io.onedev.server.persistence.dao.AbstractEntityManager;-import io.onedev.server.persistence.dao.Dao;-import io.onedev.server.persistence.dao.EntityCriteria;-import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.search.entity.EntitySort;-import io.onedev.server.search.entity.EntitySort.Direction;-import io.onedev.server.search.entity.build.BuildQuery;-import io.onedev.server.storage.StorageManager;-import io.onedev.server.util.ProjectScopedNumber;-import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.facade.BuildFacade;-import io.onedev.server.util.match.StringMatcher;-import io.onedev.server.util.patternset.PatternSet;-import io.onedev.server.util.query.BuildQueryConstants;-import io.onedev.server.util.schedule.SchedulableTask;-import io.onedev.server.util.schedule.TaskScheduler;--@Singleton-public class DefaultBuildManager extends AbstractEntityManager<Build> implements BuildManager, SchedulableTask {-- private static final int STATUS_QUERY_BATCH = 500;-- private static final int CLEANUP_BATCH = 5000;-- private static final Logger logger = LoggerFactory.getLogger(DefaultBuildManager.class);-- private final BuildParamManager buildParamManager;-- private final BuildDependenceManager buildDependenceManager;-- private final StorageManager storageManager;-- private final GroupManager groupManager;-- private final ProjectManager projectManager;-- private final TaskScheduler taskScheduler;-- private final TransactionManager transactionManager;-- private final Map<Long, BuildFacade> builds = new HashMap<>();-- private final ReadWriteLock buildsLock = new ReentrantReadWriteLock();-- private final Map<Long, Collection<String>> jobNames = new HashMap<>();-- private final ReadWriteLock jobNamesLock = new ReentrantReadWriteLock();-- private String taskId;-- @Inject- public DefaultBuildManager(Dao dao, BuildParamManager buildParamManager,- TaskScheduler taskScheduler, BuildDependenceManager buildDependenceManager,- GroupManager groupManager, StorageManager storageManager,- ProjectManager projectManager, TransactionManager transactionManager) {- super(dao);- this.buildParamManager = buildParamManager;- this.buildDependenceManager = buildDependenceManager;- this.storageManager = storageManager;- this.groupManager = groupManager;- this.projectManager = projectManager;- this.taskScheduler = taskScheduler;- this.transactionManager = transactionManager;- }-- @Transactional- @Override- public void delete(Build build) {- super.delete(build);-- FileUtils.deleteDir(storageManager.getBuildDir(build.getProject().getId(), build.getNumber()));- Long buildId = build.getId();- transactionManager.runAfterCommit(new Runnable() {-- @Override- public void run() {- buildsLock.writeLock().lock();- try {- builds.remove(buildId);- } finally {- buildsLock.writeLock().unlock();- }- }- });- }-- @Sessional- @Override- public Build find(Project project, long number) {- EntityCriteria<Build> criteria = newCriteria();- criteria.add(Restrictions.eq("project", project));- criteria.add(Restrictions.eq("number", number));- criteria.setCacheable(true);- return find(criteria);- }-- @Sessional- @Override- public Build find(String buildFQN) {- ProjectScopedNumber number = ProjectScopedNumber.from(buildFQN);- return find(number.getProject(), number.getNumber());- }-- @Transactional- @Override- public void save(Build build) {- super.save(build);-- BuildFacade facade = build.getFacade();- String jobName = build.getJobName();- transactionManager.runAfterCommit(new Runnable() {-- @Override- public void run() {- buildsLock.writeLock().lock();- try {- builds.put(facade.getId(), facade);- } finally {- buildsLock.writeLock().unlock();- }- jobNamesLock.writeLock().lock();- try {- populateJobNames(facade.getProjectId(), jobName);- } finally {- jobNamesLock.writeLock().unlock();- }- }-- });- }-- @Transactional- @Listen- public void on(EntityRemoved event) {- if (event.getEntity() instanceof Project) {- Long projectId = event.getEntity().getId();- transactionManager.runAfterCommit(new Runnable() {-- @Override- public void run() {- buildsLock.writeLock().lock();- try {- for (Iterator<Map.Entry<Long, BuildFacade>> it = builds.entrySet().iterator(); it.hasNext();) {- BuildFacade build = it.next().getValue();- if (build.getProjectId().equals(projectId))- it.remove();- }- } finally {- buildsLock.writeLock().unlock();- }- jobNamesLock.writeLock().lock();- try {- for (Iterator<Map.Entry<Long, Collection<String>>> it = jobNames.entrySet().iterator(); it.hasNext();) {- if (it.next().getKey().equals(projectId))- it.remove();- }- } finally {- jobNamesLock.writeLock().unlock();- }- }- });- }- }-- @Sessional- @Override- public Collection<Build> query(Project project, ObjectId commitId) {- return query(project, commitId, null);- }-- @Sessional- @Override- public Collection<Build> query(Project project, ObjectId commitId, String jobName) {- return query(project, commitId, jobName, new HashMap<>());- }-- @Sessional- @Override- public Collection<Build> query(Project project, ObjectId commitId, String jobName, Map<String, List<String>> params) {- CriteriaBuilder builder = getSession().getCriteriaBuilder();- CriteriaQuery<Build> query = builder.createQuery(Build.class);- Root<Build> root = query.from(Build.class);-- List<Predicate> predicates = new ArrayList<>();- predicates.add(builder.equal(root.get("project"), project));- predicates.add(builder.equal(root.get("commitHash"), commitId.name()));- if (jobName != null)- predicates.add(builder.equal(root.get("jobName"), jobName));-- for (Map.Entry<String, List<String>> entry: params.entrySet()) {- if (!entry.getValue().isEmpty()) {- for (String value: entry.getValue()) {- Join<?, ?> join = root.join(BuildQueryConstants.ATTR_PARAMS, JoinType.INNER);- predicates.add(builder.equal(join.get(BuildParam.ATTR_NAME), entry.getKey()));- predicates.add(builder.equal(join.get(BuildParam.ATTR_VALUE), value));- }- } else {- Join<?, ?> join = root.join(BuildQueryConstants.ATTR_PARAMS, JoinType.INNER);- predicates.add(builder.equal(join.get(BuildParam.ATTR_NAME), entry.getKey()));- predicates.add(builder.isNull(join.get(BuildParam.ATTR_VALUE)));- }- }-- query.where(predicates.toArray(new Predicate[0]));- return getSession().createQuery(query).list();- }-- @Sessional- @Override- public Collection<Build> queryUnfinished() {- EntityCriteria<Build> criteria = newCriteria();- criteria.add(Restrictions.or(- Restrictions.eq("status", Status.PENDING),- Restrictions.eq("status", Status.RUNNING),- Restrictions.eq("status", Status.WAITING)));- criteria.setCacheable(true);- return query(criteria);- }-- @Sessional- @Override- public List<Build> query(Project project, String term, int count) {- List<Build> builds = new ArrayList<>();-- EntityCriteria<Build> criteria = newCriteria();- criteria.add(Restrictions.eq(BuildQueryConstants.ATTR_PROJECT, project));-- if (!SecurityUtils.canManage(project)) {- List<Criterion> jobCriterions = new ArrayList<>();- for (String jobName: getAccessibleJobNames(project).get(project))- jobCriterions.add(Restrictions.eq(BuildQueryConstants.ATTR_JOB, jobName));- if (!jobCriterions.isEmpty())- criteria.add(Restrictions.or(jobCriterions.toArray(new Criterion[jobCriterions.size()])));- else- return builds;- }-- if (term.startsWith("#"))- term = term.substring(1);- if (term.length() != 0) {- try {- long buildNumber = Long.parseLong(term);- criteria.add(Restrictions.eq("number", buildNumber));- } catch (NumberFormatException e) {- criteria.add(Restrictions.or(- Restrictions.ilike("version", term, MatchMode.ANYWHERE),- Restrictions.ilike("jobName", term, MatchMode.ANYWHERE)));- }- }-- criteria.addOrder(Order.desc("number"));- builds.addAll(query(criteria, 0, count));-- return builds;- }-- @Sessional- @Override- public List<String> queryVersions(Project project, String matchWith, int count) {- CriteriaBuilder builder = getSession().getCriteriaBuilder();- CriteriaQuery<String> criteriaQuery = builder.createQuery(String.class);- Root<Build> root = criteriaQuery.from(Build.class);- criteriaQuery.select(root.get(BuildQueryConstants.ATTR_VERSION)).distinct(true);-- Collection<Predicate> predicates = getPredicates(project, root, builder);- predicates.add(builder.like(- builder.lower(root.get(BuildQueryConstants.ATTR_VERSION)),- "%" + matchWith.toLowerCase() + "%"));- criteriaQuery.where(predicates.toArray(new Predicate[predicates.size()]));- criteriaQuery.orderBy(builder.asc(root.get(BuildQueryConstants.ATTR_VERSION)));-- Query<String> query = getSession().createQuery(criteriaQuery);- query.setFirstResult(0);- query.setMaxResults(count);-- return query.getResultList();- }-- @Transactional- @Override- public void create(Build build) {- Preconditions.checkArgument(build.isNew());- Query<?> query = getSession().createQuery("select max(number) from Build where project=:project");- query.setParameter("project", build.getProject());- build.setNumber(getNextNumber(build.getProject(), query));- save(build);- for (BuildParam param: build.getParams())- buildParamManager.save(param);- for (BuildDependence dependence: build.getDependencies())- buildDependenceManager.save(dependence);- }-- private Collection<Predicate> getPredicates(@Nullable Project project, Root<Build> root,- CriteriaBuilder builder) {- Collection<Predicate> predicates = new ArrayList<>();-- if (project != null) {- predicates.add(builder.equal(root.get(BuildQueryConstants.ATTR_PROJECT), project));- if (!SecurityUtils.canManage(project)) {- List<Predicate> jobPredicates = new ArrayList<>();- for (String jobName: getAccessibleJobNames(project).get(project))- jobPredicates.add(builder.equal(root.get(BuildQueryConstants.ATTR_JOB), jobName));- predicates.add(builder.or(jobPredicates.toArray(new Predicate[jobPredicates.size()])));- }- } else if (!SecurityUtils.isAdministrator()) {- List<Predicate> projectPredicates = new ArrayList<>();- for (Map.Entry<Project, Collection<String>> entry: getAccessibleJobNames(null).entrySet()) {- if (SecurityUtils.canManage(project)) {- projectPredicates.add(builder.equal(root.get(BuildQueryConstants.ATTR_PROJECT), entry.getKey()));- } else {- List<Predicate> jobPredicates = new ArrayList<>();- for (String jobName: entry.getValue())- jobPredicates.add(builder.equal(root.get(BuildQueryConstants.ATTR_JOB), jobName));- projectPredicates.add(builder.and(- builder.equal(root.get(BuildQueryConstants.ATTR_PROJECT), entry.getKey()),- builder.or(jobPredicates.toArray(new Predicate[jobPredicates.size()]))));- }- }- predicates.add(builder.or(projectPredicates.toArray(new Predicate[projectPredicates.size()])));- }-- return predicates;- }-- private Predicate[] getPredicates(@Nullable Project project,- @Nullable io.onedev.server.search.entity.EntityCriteria<Build> criteria,- Root<Build> root, CriteriaBuilder builder) {- Collection<Predicate> predicates = getPredicates(project, root, builder);- if (criteria != null)- predicates.add(criteria.getPredicate(root, builder));- return predicates.toArray(new Predicate[0]);- }-- private CriteriaQuery<Build> buildCriteriaQuery(@Nullable Project project,- Session session, EntityQuery<Build> buildQuery) {- CriteriaBuilder builder = session.getCriteriaBuilder();- CriteriaQuery<Build> query = builder.createQuery(Build.class);- Root<Build> root = query.from(Build.class);- query.select(root);-- query.where(getPredicates(project, buildQuery.getCriteria(), root, builder));-- applyOrders(root, query, builder, buildQuery);-- return query;- }-- @Sessional- @Override- public List<Build> query(@Nullable Project project, EntityQuery<Build> buildQuery,- int firstResult, int maxResults) {- CriteriaQuery<Build> criteriaQuery = buildCriteriaQuery(project, getSession(), buildQuery);- Query<Build> query = getSession().createQuery(criteriaQuery);- query.setFirstResult(firstResult);- query.setMaxResults(maxResults);- return query.getResultList();- }-- private void applyOrders(Root<Build> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder builder,- EntityQuery<Build> buildQuery) {- List<javax.persistence.criteria.Order> orders = new ArrayList<>();- for (EntitySort sort: buildQuery.getSorts()) {- if (sort.getDirection() == Direction.ASCENDING)- orders.add(builder.asc(BuildQuery.getPath(root, BuildQueryConstants.ORDER_FIELDS.get(sort.getField()))));- else- orders.add(builder.desc(BuildQuery.getPath(root, BuildQueryConstants.ORDER_FIELDS.get(sort.getField()))));- }-- if (orders.isEmpty())- orders.add(builder.desc(root.get(BuildQueryConstants.ATTR_ID)));- criteriaQuery.orderBy(orders);- }-- @Sessional- @Override- public Collection<Long> queryIds(Project project, EntityQuery<Build> buildQuery,- int firstResult, int maxResults) {- CriteriaBuilder builder = getSession().getCriteriaBuilder();- CriteriaQuery<Long> criteriaQuery = builder.createQuery(Long.class);- Root<Build> root = criteriaQuery.from(Build.class);- criteriaQuery.select(root.get(BuildQueryConstants.ATTR_ID));-- criteriaQuery.where(getPredicates(project, buildQuery.getCriteria(), root, builder));-- applyOrders(root, criteriaQuery, builder, buildQuery);-- Query<Long> query = getSession().createQuery(criteriaQuery);- query.setFirstResult(firstResult);- query.setMaxResults(maxResults);-- return query.list();- }-- @Sessional- @Override- public int count(@Nullable Project project, io.onedev.server.search.entity.EntityCriteria<Build> buildCriteria) {- CriteriaBuilder builder = getSession().getCriteriaBuilder();- CriteriaQuery<Long> criteriaQuery = builder.createQuery(Long.class);- Root<Build> root = criteriaQuery.from(Build.class);-- criteriaQuery.where(getPredicates(project, buildCriteria, root, builder));-- criteriaQuery.select(builder.count(root));- return getSession().createQuery(criteriaQuery).uniqueResult().intValue();- }-- @Sessional- @Override- public Map<ObjectId, Map<String, Status>> queryStatus(Project project, Collection<ObjectId> commitIds) {- Map<ObjectId, Map<String, Collection<Status>>> commitStatuses = new HashMap<>();-- Collection<ObjectId> batch = new HashSet<>();- for (ObjectId commitId: commitIds) {- batch.add(commitId);- if (batch.size() == STATUS_QUERY_BATCH) {- fillStatus(project, batch, commitStatuses);- batch.clear();- }- }- if (!batch.isEmpty())- fillStatus(project, batch, commitStatuses);- Map<ObjectId, Map<String, Status>> overallCommitStatuses = new HashMap<>();- for (Map.Entry<ObjectId, Map<String, Collection<Status>>> entry: commitStatuses.entrySet()) {- Map<String, Status> jobOverallStatuses = new HashMap<>();- for (Map.Entry<String, Collection<Status>> entry2: entry.getValue().entrySet())- jobOverallStatuses.put(entry2.getKey(), Status.getOverallStatus(entry2.getValue()));- overallCommitStatuses.put(entry.getKey(), jobOverallStatuses);- }- for (ObjectId commitId: commitIds) {- if (!overallCommitStatuses.containsKey(commitId))- overallCommitStatuses.put(commitId, new HashMap<>());- }- return overallCommitStatuses;- }-- @SuppressWarnings("unchecked")- private void fillStatus(Project project, Collection<ObjectId> commitIds,- Map<ObjectId, Map<String, Collection<Status>>> commitStatuses) {- Query<?> query = getSession().createQuery("select commitHash, jobName, status from Build "- + "where project=:project and commitHash in :commitHashes");- query.setParameter("project", project);- query.setParameter("commitHashes", commitIds.stream().map(it->it.name()).collect(Collectors.toList()));- for (Object[] row: (List<Object[]>)query.list()) {- ObjectId commitId = ObjectId.fromString((String) row[0]);- String jobName = (String) row[1];- Status status = (Status) row[2];- Map<String, Collection<Status>> commitStatus = commitStatuses.get(commitId);- if (commitStatus == null) {- commitStatus = new HashMap<>();- commitStatuses.put(commitId, commitStatus);- }- Collection<Status> jobStatus = commitStatus.get(jobName);- if (jobStatus == null) {- jobStatus = new HashSet<>();- commitStatus.put(jobName, jobStatus);- }- jobStatus.add(status);- }- }-- @Sessional- protected long getMaxId() {- CriteriaBuilder builder = getSession().getCriteriaBuilder();- CriteriaQuery<Long> query = builder.createQuery(Long.class);- Root<Build> root = query.from(Build.class);- query.select(builder.max(root.get(BuildQueryConstants.ATTR_ID)));- Long maxId = getSession().createQuery(query).getSingleResult();- return maxId!=null?maxId:0;- }-- @Override- public void execute() {- long maxId = getMaxId();- Collection<Long> idsToPreserve = new HashSet<>();- for (Project project: projectManager.query()) {- logger.debug("Populating preserved build ids of project '" + project.getName() + "'...");- List<BuildPreservation> preservations = project.getBuildSetting().getPreservations();- if (preservations.isEmpty()) {- idsToPreserve.addAll(queryIds(project, new BuildQuery(), 0, Integer.MAX_VALUE));- } else {- for (BuildPreservation preservation: project.getBuildSetting().getPreservations()) {- try {- BuildQuery query = BuildQuery.parse(project, preservation.getCondition(), false, false);- int count;- if (preservation.getCount() != null)- count = preservation.getCount();- else- count = Integer.MAX_VALUE;- idsToPreserve.addAll(queryIds(project, query, 0, count));- } catch (Exception e) {- String message = String.format("Error parsing build preserve condition(project: %s, condition: %s)",- project.getName(), preservation.getCondition());- logger.error(message, e);- idsToPreserve.addAll(queryIds(project, new BuildQuery(), 0, Integer.MAX_VALUE));- }- }- }- }-- EntityCriteria<Build> criteria = newCriteria();- AtomicInteger firstResult = new AtomicInteger(0);-- while (transactionManager.call(new Callable<Boolean>() {-- @Override- public Boolean call() {- List<Build> builds = query(criteria, firstResult.get(), CLEANUP_BATCH);- if (!builds.isEmpty()) {- logger.debug("Checking build preservation: {}->{}",- firstResult.get()+1, firstResult.get()+builds.size());- }- for (Build build: builds) {- if (build.isFinished() && build.getId() <= maxId && !idsToPreserve.contains(build.getId())) {- logger.debug("Deleting build " + build.getFQN() + "...");- delete(build);- }- }- firstResult.set(firstResult.get() + CLEANUP_BATCH);- return builds.size() == CLEANUP_BATCH;- }-- })) {}- }-- @Override- public ScheduleBuilder<?> getScheduleBuilder() {- return CronScheduleBuilder.dailyAtHourAndMinute(0, 0);- }-- @SuppressWarnings("unchecked")- @Listen- public void on(SystemStarted event) {- logger.info("Caching build info...");-- Query<?> query = dao.getSession().createQuery("select id, project.id, commitHash, jobName from Build");- for (Object[] fields: (List<Object[]>)query.list()) {- Long buildId = (Long) fields[0];- Long projectId = (Long)fields[1];- builds.put(buildId, new BuildFacade(buildId, projectId, (String)fields[2]));- populateJobNames(projectId, (String)fields[3]);- }- taskId = taskScheduler.schedule(this);- }-- @Listen- public void on(SystemStopping event) {- taskScheduler.unschedule(taskId);- }-- private CriteriaQuery<Object[]> buildQueryOfStreamPrevios(Build build, Status status, String...fields) {- CriteriaBuilder builder = getSession().getCriteriaBuilder();- CriteriaQuery<Object[]> query = builder.createQuery(Object[].class);- Root<Build> root = query.from(Build.class);-- List<Predicate> predicates = new ArrayList<>();- predicates.add(builder.equal(root.get("project"), build.getProject()));- predicates.add(builder.equal(root.get("jobName"), build.getJobName()));- if (status != null)- predicates.add(builder.equal(root.get("status"), status));- predicates.add(builder.lessThan(root.get("number"), build.getNumber()));- query.where(predicates.toArray(new Predicate[0]));- List<Selection<?>> selections = new ArrayList<>();- for (String field: fields)- selections.add(root.get(field));- query.multiselect(selections);-- return query;- }-- @Sessional- @Override- public Collection<Long> queryNumbersOfStreamPrevious(Build build, Status status, int limit) {- Map<ObjectId, Long> buildNumbers = new HashMap<>();- for (Object[] fields: getSession().createQuery(buildQueryOfStreamPrevios(build, status, "commitHash", "number")).list()) {- buildNumbers.put(ObjectId.fromString((String) fields[0]), (Long)fields[1]);- }-- Collection<Long> prevBuildNumbers = new HashSet<>();- try (RevWalk revWalk = new RevWalk(build.getProject().getRepository())) {- RevCommit current = revWalk.lookupCommit(build.getCommitId());- revWalk.parseHeaders(current);- while (current.getParentCount() != 0) {- RevCommit firstParent = current.getParent(0);- Long buildNumber = buildNumbers.get(firstParent);- if (buildNumber != null) {- prevBuildNumbers.add(buildNumber);- if (prevBuildNumbers.size() >= limit)- break;- }- current = firstParent;- revWalk.parseHeaders(current);- }- } catch (MissingObjectException e) {- } catch (IOException e) {- throw new RuntimeException(e);- }- return prevBuildNumbers;- }-- @Sessional- @Override- public Build findStreamPrevious(Build build, Status status) {- Map<ObjectId, Long> buildIds = new HashMap<>();- for (Object[] fields: getSession().createQuery(buildQueryOfStreamPrevios(- build, status, "commitHash", "id")).list()) {- buildIds.put(ObjectId.fromString((String) fields[0]), (Long)fields[1]);- }-- try (RevWalk revWalk = new RevWalk(build.getProject().getRepository())) {- RevCommit current = revWalk.lookupCommit(build.getCommitId());- revWalk.parseHeaders(current);- while (current.getParentCount() != 0) {- RevCommit firstParent = current.getParent(0);- Long buildId = buildIds.get(firstParent);- if (buildId != null)- return load(buildId);- current = firstParent;- revWalk.parseHeaders(current);- }- } catch (MissingObjectException e) {- } catch (IOException e) {- throw new RuntimeException(e);- }- return null;- }-- @Override- public Collection<Long> getIdsByProject(Long projectId) {- buildsLock.readLock().lock();- try {- Collection<Long> buildIds = new HashSet<>();- for (BuildFacade build: builds.values()) {- if (build.getProjectId().equals(projectId))- buildIds.add(build.getId());- }- return buildIds;- } finally {- buildsLock.readLock().unlock();- }- }-- @Override- public Collection<Long> filterIds(Long projectId, Collection<String> commitHashes) {- buildsLock.readLock().lock();- try {- Collection<Long> buildIds = new HashSet<>();- for (BuildFacade build: builds.values()) {- if (build.getProjectId().equals(projectId)- && commitHashes.contains(build.getCommitHash())) {- buildIds.add(build.getId());- }- }- return buildIds;- } finally {- buildsLock.readLock().unlock();- }- }-- private void populateJobNames(Long projectId, String jobName) {- Collection<String> jobNamesOfProject = jobNames.get(projectId);- if (jobNamesOfProject == null) {- jobNamesOfProject = new HashSet<>();- jobNames.put(projectId, jobNamesOfProject);- }- jobNamesOfProject.add(jobName);- }-- private Collection<String> getAccessibleJobNames(Role role, Collection<String> jobNames) {- Collection<String> accessibleJobNames = new HashSet<>();- if (role.isManageProject()) {- accessibleJobNames.addAll(jobNames);- } else {- StringMatcher matcher = new StringMatcher();- for (JobPrivilege jobPrivilege: role.getJobPrivileges()) {- PatternSet patternSet = PatternSet.fromString(jobPrivilege.getJobNames());- for (String jobName: jobNames) {- if (patternSet.matches(matcher, jobName))- accessibleJobNames.add(jobName);- }- }- }- return accessibleJobNames;- }-- @Override- public Collection<String> getJobNames(@Nullable Project project) {- jobNamesLock.readLock().lock();- try {- Collection<String> jobNames = new HashSet<>();- for (Map.Entry<Long, Collection<String>> entry: this.jobNames.entrySet()) {- if (project == null || project.getId().equals(entry.getKey()))- jobNames.addAll(entry.getValue());- }- return jobNames;- } finally {- jobNamesLock.readLock().unlock();- }- }-- private void populateAccessibleJobNames(Map<Project, Collection<String>> accessibleJobNames,- Map<Long, Collection<String>> jobNames, Project project, Role role) {- Collection<String> jobNamesOfProject = jobNames.get(project.getId());- if (jobNamesOfProject != null) {- Collection<String> accessibleJobNamesOfProject = getAccessibleJobNames(role, jobNamesOfProject);- Collection<String> currentAccessibleJobNamesOfProject = accessibleJobNames.get(project);- if (currentAccessibleJobNamesOfProject == null) {- currentAccessibleJobNamesOfProject = new HashSet<>();- accessibleJobNames.put(project, currentAccessibleJobNamesOfProject);- }- currentAccessibleJobNamesOfProject.addAll(accessibleJobNamesOfProject);- }- }-- @Override- public Map<Project, Collection<String>> getAccessibleJobNames(@Nullable Project project) {- jobNamesLock.readLock().lock();- try {- Map<Project, Collection<String>> accessibleJobNames = new HashMap<>();- User user = SecurityUtils.getUser();- if (SecurityUtils.isAdministrator()) {- for (Map.Entry<Long, Collection<String>> entry: jobNames.entrySet())- accessibleJobNames.put(projectManager.load(entry.getKey()), new HashSet<>(entry.getValue()));- } else {- if (user != null) {- for (UserAuthorization authorization: user.getProjectAuthorizations()) {- if (project == null || project.equals(authorization.getProject())) {- populateAccessibleJobNames(accessibleJobNames, jobNames,- authorization.getProject(), authorization.getRole());- }- }- for (Group group: user.getGroups()) {- for (GroupAuthorization authorization: group.getProjectAuthorizations()) {- if (project == null || project.equals(authorization.getProject())) {- populateAccessibleJobNames(accessibleJobNames, jobNames,- authorization.getProject(), authorization.getRole());- }- }- }- }- Group group = groupManager.findAnonymous();- if (group != null) {- for (GroupAuthorization authorization: group.getProjectAuthorizations()) {- if (project == null || project.equals(authorization.getProject())) {- populateAccessibleJobNames(accessibleJobNames, jobNames,- authorization.getProject(), authorization.getRole());- }- }- }- }- if (project != null && !accessibleJobNames.containsKey(project))- accessibleJobNames.put(project, new HashSet<>());- return accessibleJobNames;- } finally {- jobNamesLock.readLock().unlock();- }- }--}+package io.onedev.server.entitymanager.impl;++import java.io.IOException;+import java.util.ArrayList;+import java.util.Collection;+import java.util.HashMap;+import java.util.HashSet;+import java.util.Iterator;+import java.util.List;+import java.util.Map;+import java.util.concurrent.Callable;+import java.util.concurrent.atomic.AtomicInteger;+import java.util.concurrent.locks.ReadWriteLock;+import java.util.concurrent.locks.ReentrantReadWriteLock;+import java.util.stream.Collectors;++import javax.annotation.Nullable;+import javax.inject.Inject;+import javax.inject.Singleton;+import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;+import javax.persistence.criteria.Join;+import javax.persistence.criteria.JoinType;+import javax.persistence.criteria.Predicate;+import javax.persistence.criteria.Root;+import javax.persistence.criteria.Selection;++import org.eclipse.jgit.errors.MissingObjectException;+import org.eclipse.jgit.lib.ObjectId;+import org.eclipse.jgit.revwalk.RevCommit;+import org.eclipse.jgit.revwalk.RevWalk;+import org.hibernate.Session;+import org.hibernate.criterion.Criterion;+import org.hibernate.criterion.MatchMode;+import org.hibernate.criterion.Order;+import org.hibernate.criterion.Restrictions;+import org.hibernate.query.Query;+import org.quartz.CronScheduleBuilder;+import org.quartz.ScheduleBuilder;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import com.google.common.base.Preconditions;++import io.onedev.commons.launcher.loader.Listen;+import io.onedev.commons.utils.FileUtils;+import io.onedev.server.entitymanager.BuildDependenceManager;+import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.entitymanager.BuildParamManager;+import io.onedev.server.entitymanager.GroupManager;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.event.entity.EntityRemoved;+import io.onedev.server.event.system.SystemStarted;+import io.onedev.server.event.system.SystemStopping;+import io.onedev.server.model.Build;+import io.onedev.server.model.Build.Status;+import io.onedev.server.model.BuildDependence;+import io.onedev.server.model.BuildParam;+import io.onedev.server.model.Group;+import io.onedev.server.model.GroupAuthorization;+import io.onedev.server.model.Project;+import io.onedev.server.model.Role;+import io.onedev.server.model.User;+import io.onedev.server.model.UserAuthorization;+import io.onedev.server.model.support.BuildPreservation;+import io.onedev.server.model.support.role.JobPrivilege;+import io.onedev.server.persistence.TransactionManager;+import io.onedev.server.persistence.annotation.Sessional;+import io.onedev.server.persistence.annotation.Transactional;+import io.onedev.server.persistence.dao.AbstractEntityManager;+import io.onedev.server.persistence.dao.Dao;+import io.onedev.server.persistence.dao.EntityCriteria;+import io.onedev.server.search.entity.EntityQuery;+import io.onedev.server.search.entity.EntitySort;+import io.onedev.server.search.entity.EntitySort.Direction;+import io.onedev.server.search.entity.build.BuildQuery;+import io.onedev.server.storage.StorageManager;+import io.onedev.server.util.ProjectScopedNumber;+import io.onedev.server.util.SecurityUtils;+import io.onedev.server.util.facade.BuildFacade;+import io.onedev.server.util.match.StringMatcher;+import io.onedev.server.util.patternset.PatternSet;+import io.onedev.server.util.query.BuildQueryConstants;+import io.onedev.server.util.schedule.SchedulableTask;+import io.onedev.server.util.schedule.TaskScheduler;++@Singleton+public class DefaultBuildManager extends AbstractEntityManager<Build> implements BuildManager, SchedulableTask {++ private static final int STATUS_QUERY_BATCH = 500;++ private static final int CLEANUP_BATCH = 5000;++ private static final Logger logger = LoggerFactory.getLogger(DefaultBuildManager.class);++ private final BuildParamManager buildParamManager;++ private final BuildDependenceManager buildDependenceManager;++ private final StorageManager storageManager;++ private final GroupManager groupManager;++ private final ProjectManager projectManager;++ private final TaskScheduler taskScheduler;++ private final TransactionManager transactionManager;++ private final Map<Long, BuildFacade> builds = new HashMap<>();++ private final ReadWriteLock buildsLock = new ReentrantReadWriteLock();++ private final Map<Long, Collection<String>> jobNames = new HashMap<>();++ private final ReadWriteLock jobNamesLock = new ReentrantReadWriteLock();++ private String taskId;++ @Inject+ public DefaultBuildManager(Dao dao, BuildParamManager buildParamManager,+ TaskScheduler taskScheduler, BuildDependenceManager buildDependenceManager,+ GroupManager groupManager, StorageManager storageManager,+ ProjectManager projectManager, TransactionManager transactionManager) {+ super(dao);+ this.buildParamManager = buildParamManager;+ this.buildDependenceManager = buildDependenceManager;+ this.storageManager = storageManager;+ this.groupManager = groupManager;+ this.projectManager = projectManager;+ this.taskScheduler = taskScheduler;+ this.transactionManager = transactionManager;+ }++ @Transactional+ @Override+ public void delete(Build build) {+ super.delete(build);++ FileUtils.deleteDir(storageManager.getBuildDir(build.getProject().getId(), build.getNumber()));+ Long buildId = build.getId();+ transactionManager.runAfterCommit(new Runnable() {++ @Override+ public void run() {+ buildsLock.writeLock().lock();+ try {+ builds.remove(buildId);+ } finally {+ buildsLock.writeLock().unlock();+ }+ }+ });+ }++ @Sessional+ @Override+ public Build find(Project project, long number) {+ EntityCriteria<Build> criteria = newCriteria();+ criteria.add(Restrictions.eq("project", project));+ criteria.add(Restrictions.eq("number", number));+ criteria.setCacheable(true);+ return find(criteria);+ }++ @Sessional+ @Override+ public Build find(String buildFQN) {+ ProjectScopedNumber number = ProjectScopedNumber.from(buildFQN);+ return find(number.getProject(), number.getNumber());+ }++ @Transactional+ @Override+ public void save(Build build) {+ super.save(build);++ BuildFacade facade = build.getFacade();+ String jobName = build.getJobName();+ transactionManager.runAfterCommit(new Runnable() {++ @Override+ public void run() {+ buildsLock.writeLock().lock();+ try {+ builds.put(facade.getId(), facade);+ } finally {+ buildsLock.writeLock().unlock();+ }+ jobNamesLock.writeLock().lock();+ try {+ populateJobNames(facade.getProjectId(), jobName);+ } finally {+ jobNamesLock.writeLock().unlock();+ }+ }++ });+ }++ @Transactional+ @Listen+ public void on(EntityRemoved event) {+ if (event.getEntity() instanceof Project) {+ Long projectId = event.getEntity().getId();+ transactionManager.runAfterCommit(new Runnable() {++ @Override+ public void run() {+ buildsLock.writeLock().lock();+ try {+ for (Iterator<Map.Entry<Long, BuildFacade>> it = builds.entrySet().iterator(); it.hasNext();) {+ BuildFacade build = it.next().getValue();+ if (build.getProjectId().equals(projectId))+ it.remove();+ }+ } finally {+ buildsLock.writeLock().unlock();+ }+ jobNamesLock.writeLock().lock();+ try {+ for (Iterator<Map.Entry<Long, Collection<String>>> it = jobNames.entrySet().iterator(); it.hasNext();) {+ if (it.next().getKey().equals(projectId))+ it.remove();+ }+ } finally {+ jobNamesLock.writeLock().unlock();+ }+ }+ });+ }+ }++ @Sessional+ @Override+ public Collection<Build> query(Project project, ObjectId commitId) {+ return query(project, commitId, null);+ }++ @Sessional+ @Override+ public Collection<Build> query(Project project, ObjectId commitId, String jobName) {+ return query(project, commitId, jobName, new HashMap<>());+ }++ @Sessional+ @Override+ public Collection<Build> query(Project project, ObjectId commitId, String jobName, Map<String, List<String>> params) {+ CriteriaBuilder builder = getSession().getCriteriaBuilder();+ CriteriaQuery<Build> query = builder.createQuery(Build.class);+ Root<Build> root = query.from(Build.class);++ List<Predicate> predicates = new ArrayList<>();+ predicates.add(builder.equal(root.get("project"), project));+ predicates.add(builder.equal(root.get("commitHash"), commitId.name()));+ if (jobName != null)+ predicates.add(builder.equal(root.get("jobName"), jobName));++ for (Map.Entry<String, List<String>> entry: params.entrySet()) {+ if (!entry.getValue().isEmpty()) {+ for (String value: entry.getValue()) {+ Join<?, ?> join = root.join(BuildQueryConstants.ATTR_PARAMS, JoinType.INNER);+ predicates.add(builder.equal(join.get(BuildParam.ATTR_NAME), entry.getKey()));+ predicates.add(builder.equal(join.get(BuildParam.ATTR_VALUE), value));+ }+ } else {+ Join<?, ?> join = root.join(BuildQueryConstants.ATTR_PARAMS, JoinType.INNER);+ predicates.add(builder.equal(join.get(BuildParam.ATTR_NAME), entry.getKey()));+ predicates.add(builder.isNull(join.get(BuildParam.ATTR_VALUE)));+ }+ }++ query.where(predicates.toArray(new Predicate[0]));+ return getSession().createQuery(query).list();+ }++ @Sessional+ @Override+ public Collection<Build> queryUnfinished() {+ EntityCriteria<Build> criteria = newCriteria();+ criteria.add(Restrictions.or(+ Restrictions.eq("status", Status.PENDING),+ Restrictions.eq("status", Status.RUNNING),+ Restrictions.eq("status", Status.WAITING)));+ criteria.setCacheable(true);+ return query(criteria);+ }++ @Sessional+ @Override+ public List<Build> query(Project project, String term, int count) {+ List<Build> builds = new ArrayList<>();++ EntityCriteria<Build> criteria = newCriteria();+ criteria.add(Restrictions.eq(BuildQueryConstants.ATTR_PROJECT, project));++ if (!SecurityUtils.canManage(project)) {+ List<Criterion> jobCriterions = new ArrayList<>();+ for (String jobName: getAccessibleJobNames(project).get(project))+ jobCriterions.add(Restrictions.eq(BuildQueryConstants.ATTR_JOB, jobName));+ if (!jobCriterions.isEmpty())+ criteria.add(Restrictions.or(jobCriterions.toArray(new Criterion[jobCriterions.size()])));+ else+ return builds;+ }++ if (term.startsWith("#"))+ term = term.substring(1);+ if (term.length() != 0) {+ try {+ long buildNumber = Long.parseLong(term);+ criteria.add(Restrictions.eq("number", buildNumber));+ } catch (NumberFormatException e) {+ criteria.add(Restrictions.or(+ Restrictions.ilike("version", term, MatchMode.ANYWHERE),+ Restrictions.ilike("jobName", term, MatchMode.ANYWHERE)));+ }+ }++ criteria.addOrder(Order.desc("number"));+ builds.addAll(query(criteria, 0, count));++ return builds;+ }++ @Sessional+ @Override+ public List<String> queryVersions(Project project, String matchWith, int count) {+ CriteriaBuilder builder = getSession().getCriteriaBuilder();+ CriteriaQuery<String> criteriaQuery = builder.createQuery(String.class);+ Root<Build> root = criteriaQuery.from(Build.class);+ criteriaQuery.select(root.get(BuildQueryConstants.ATTR_VERSION)).distinct(true);++ Collection<Predicate> predicates = getPredicates(project, root, builder);+ predicates.add(builder.like(+ builder.lower(root.get(BuildQueryConstants.ATTR_VERSION)),+ "%" + matchWith.toLowerCase() + "%"));+ criteriaQuery.where(predicates.toArray(new Predicate[predicates.size()]));+ criteriaQuery.orderBy(builder.asc(root.get(BuildQueryConstants.ATTR_VERSION)));++ Query<String> query = getSession().createQuery(criteriaQuery);+ query.setFirstResult(0);+ query.setMaxResults(count);++ return query.getResultList();+ }++ @Transactional+ @Override+ public void create(Build build) {+ Preconditions.checkArgument(build.isNew());+ Query<?> query = getSession().createQuery("select max(number) from Build where project=:project");+ query.setParameter("project", build.getProject());+ build.setNumber(getNextNumber(build.getProject(), query));+ save(build);+ for (BuildParam param: build.getParams())+ buildParamManager.save(param);+ for (BuildDependence dependence: build.getDependencies())+ buildDependenceManager.save(dependence);+ }++ private Collection<Predicate> getPredicates(@Nullable Project project, Root<Build> root,+ CriteriaBuilder builder) {+ Collection<Predicate> predicates = new ArrayList<>();++ if (project != null) {+ predicates.add(builder.equal(root.get(BuildQueryConstants.ATTR_PROJECT), project));+ if (!SecurityUtils.canManage(project)) {+ List<Predicate> jobPredicates = new ArrayList<>();+ for (String jobName: getAccessibleJobNames(project).get(project))+ jobPredicates.add(builder.equal(root.get(BuildQueryConstants.ATTR_JOB), jobName));+ predicates.add(builder.or(jobPredicates.toArray(new Predicate[jobPredicates.size()])));+ }+ } else if (!SecurityUtils.isAdministrator()) {+ List<Predicate> projectPredicates = new ArrayList<>();+ for (Map.Entry<Project, Collection<String>> entry: getAccessibleJobNames(null).entrySet()) {+ if (SecurityUtils.canManage(project)) {+ projectPredicates.add(builder.equal(root.get(BuildQueryConstants.ATTR_PROJECT), entry.getKey()));+ } else {+ List<Predicate> jobPredicates = new ArrayList<>();+ for (String jobName: entry.getValue())+ jobPredicates.add(builder.equal(root.get(BuildQueryConstants.ATTR_JOB), jobName));+ projectPredicates.add(builder.and(+ builder.equal(root.get(BuildQueryConstants.ATTR_PROJECT), entry.getKey()),+ builder.or(jobPredicates.toArray(new Predicate[jobPredicates.size()]))));+ }+ }+ predicates.add(builder.or(projectPredicates.toArray(new Predicate[projectPredicates.size()])));+ }++ return predicates;+ }++ private Predicate[] getPredicates(@Nullable Project project,+ @Nullable io.onedev.server.search.entity.EntityCriteria<Build> criteria,+ Root<Build> root, CriteriaBuilder builder) {+ Collection<Predicate> predicates = getPredicates(project, root, builder);+ if (criteria != null)+ predicates.add(criteria.getPredicate(root, builder));+ return predicates.toArray(new Predicate[0]);+ }++ private CriteriaQuery<Build> buildCriteriaQuery(@Nullable Project project,+ Session session, EntityQuery<Build> buildQuery) {+ CriteriaBuilder builder = session.getCriteriaBuilder();+ CriteriaQuery<Build> query = builder.createQuery(Build.class);+ Root<Build> root = query.from(Build.class);+ query.select(root);++ query.where(getPredicates(project, buildQuery.getCriteria(), root, builder));++ applyOrders(root, query, builder, buildQuery);++ return query;+ }++ @Sessional+ @Override+ public List<Build> query(@Nullable Project project, EntityQuery<Build> buildQuery,+ int firstResult, int maxResults) {+ CriteriaQuery<Build> criteriaQuery = buildCriteriaQuery(project, getSession(), buildQuery);+ Query<Build> query = getSession().createQuery(criteriaQuery);+ query.setFirstResult(firstResult);+ query.setMaxResults(maxResults);+ return query.getResultList();+ }++ private void applyOrders(Root<Build> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder builder,+ EntityQuery<Build> buildQuery) {+ List<javax.persistence.criteria.Order> orders = new ArrayList<>();+ for (EntitySort sort: buildQuery.getSorts()) {+ if (sort.getDirection() == Direction.ASCENDING)+ orders.add(builder.asc(BuildQuery.getPath(root, BuildQueryConstants.ORDER_FIELDS.get(sort.getField()))));+ else+ orders.add(builder.desc(BuildQuery.getPath(root, BuildQueryConstants.ORDER_FIELDS.get(sort.getField()))));+ }++ if (orders.isEmpty())+ orders.add(builder.desc(root.get(BuildQueryConstants.ATTR_ID)));+ criteriaQuery.orderBy(orders);+ }++ @Sessional+ @Override+ public Collection<Long> queryIds(Project project, EntityQuery<Build> buildQuery,+ int firstResult, int maxResults) {+ CriteriaBuilder builder = getSession().getCriteriaBuilder();+ CriteriaQuery<Long> criteriaQuery = builder.createQuery(Long.class);+ Root<Build> root = criteriaQuery.from(Build.class);+ criteriaQuery.select(root.get(BuildQueryConstants.ATTR_ID));++ criteriaQuery.where(getPredicates(project, buildQuery.getCriteria(), root, builder));++ applyOrders(root, criteriaQuery, builder, buildQuery);++ Query<Long> query = getSession().createQuery(criteriaQuery);+ query.setFirstResult(firstResult);+ query.setMaxResults(maxResults);++ return query.list();+ }++ @Sessional+ @Override+ public int count(@Nullable Project project, io.onedev.server.search.entity.EntityCriteria<Build> buildCriteria) {+ CriteriaBuilder builder = getSession().getCriteriaBuilder();+ CriteriaQuery<Long> criteriaQuery = builder.createQuery(Long.class);+ Root<Build> root = criteriaQuery.from(Build.class);++ criteriaQuery.where(getPredicates(project, buildCriteria, root, builder));++ criteriaQuery.select(builder.count(root));+ return getSession().createQuery(criteriaQuery).uniqueResult().intValue();+ }++ @Sessional+ @Override+ public Map<ObjectId, Map<String, Status>> queryStatus(Project project, Collection<ObjectId> commitIds) {+ Map<ObjectId, Map<String, Collection<Status>>> commitStatuses = new HashMap<>();++ Collection<ObjectId> batch = new HashSet<>();+ for (ObjectId commitId: commitIds) {+ batch.add(commitId);+ if (batch.size() == STATUS_QUERY_BATCH) {+ fillStatus(project, batch, commitStatuses);+ batch.clear();+ }+ }+ if (!batch.isEmpty())+ fillStatus(project, batch, commitStatuses);+ Map<ObjectId, Map<String, Status>> overallCommitStatuses = new HashMap<>();+ for (Map.Entry<ObjectId, Map<String, Collection<Status>>> entry: commitStatuses.entrySet()) {+ Map<String, Status> jobOverallStatuses = new HashMap<>();+ for (Map.Entry<String, Collection<Status>> entry2: entry.getValue().entrySet())+ jobOverallStatuses.put(entry2.getKey(), Status.getOverallStatus(entry2.getValue()));+ overallCommitStatuses.put(entry.getKey(), jobOverallStatuses);+ }+ for (ObjectId commitId: commitIds) {+ if (!overallCommitStatuses.containsKey(commitId))+ overallCommitStatuses.put(commitId, new HashMap<>());+ }+ return overallCommitStatuses;+ }++ @SuppressWarnings("unchecked")+ private void fillStatus(Project project, Collection<ObjectId> commitIds,+ Map<ObjectId, Map<String, Collection<Status>>> commitStatuses) {+ Query<?> query = getSession().createQuery("select commitHash, jobName, status from Build "+ + "where project=:project and commitHash in :commitHashes");+ query.setParameter("project", project);+ query.setParameter("commitHashes", commitIds.stream().map(it->it.name()).collect(Collectors.toList()));+ for (Object[] row: (List<Object[]>)query.list()) {+ ObjectId commitId = ObjectId.fromString((String) row[0]);+ String jobName = (String) row[1];+ Status status = (Status) row[2];+ Map<String, Collection<Status>> commitStatus = commitStatuses.get(commitId);+ if (commitStatus == null) {+ commitStatus = new HashMap<>();+ commitStatuses.put(commitId, commitStatus);+ }+ Collection<Status> jobStatus = commitStatus.get(jobName);+ if (jobStatus == null) {+ jobStatus = new HashSet<>();+ commitStatus.put(jobName, jobStatus);+ }+ jobStatus.add(status);+ }+ }++ @Sessional+ protected long getMaxId() {+ CriteriaBuilder builder = getSession().getCriteriaBuilder();+ CriteriaQuery<Long> query = builder.createQuery(Long.class);+ Root<Build> root = query.from(Build.class);+ query.select(builder.max(root.get(BuildQueryConstants.ATTR_ID)));+ Long maxId = getSession().createQuery(query).getSingleResult();+ return maxId!=null?maxId:0;+ }++ @Override+ public void execute() {+ long maxId = getMaxId();+ Collection<Long> idsToPreserve = new HashSet<>();+ for (Project project: projectManager.query()) {+ logger.debug("Populating preserved build ids of project '" + project.getName() + "'...");+ List<BuildPreservation> preservations = project.getBuildSetting().getHierarchyBuildPreservations(project);+ if (preservations.isEmpty()) {+ idsToPreserve.addAll(queryIds(project, new BuildQuery(), 0, Integer.MAX_VALUE));+ } else {+ for (BuildPreservation preservation: project.getBuildSetting().getBuildPreservations()) {+ try {+ BuildQuery query = BuildQuery.parse(project, preservation.getCondition(), false, false);+ int count;+ if (preservation.getCount() != null)+ count = preservation.getCount();+ else+ count = Integer.MAX_VALUE;+ idsToPreserve.addAll(queryIds(project, query, 0, count));+ } catch (Exception e) {+ String message = String.format("Error parsing build preserve condition(project: %s, condition: %s)",+ project.getName(), preservation.getCondition());+ logger.error(message, e);+ idsToPreserve.addAll(queryIds(project, new BuildQuery(), 0, Integer.MAX_VALUE));+ }+ }+ }+ }++ EntityCriteria<Build> criteria = newCriteria();+ AtomicInteger firstResult = new AtomicInteger(0);++ while (transactionManager.call(new Callable<Boolean>() {++ @Override+ public Boolean call() {+ List<Build> builds = query(criteria, firstResult.get(), CLEANUP_BATCH);+ if (!builds.isEmpty()) {+ logger.debug("Checking build preservation: {}->{}",+ firstResult.get()+1, firstResult.get()+builds.size());+ }+ for (Build build: builds) {+ if (build.isFinished() && build.getId() <= maxId && !idsToPreserve.contains(build.getId())) {+ logger.debug("Deleting build " + build.getFQN() + "...");+ delete(build);+ }+ }+ firstResult.set(firstResult.get() + CLEANUP_BATCH);+ return builds.size() == CLEANUP_BATCH;+ }++ })) {}+ }++ @Override+ public ScheduleBuilder<?> getScheduleBuilder() {+ return CronScheduleBuilder.dailyAtHourAndMinute(0, 0);+ }++ @SuppressWarnings("unchecked")+ @Listen+ public void on(SystemStarted event) {+ logger.info("Caching build info...");++ Query<?> query = dao.getSession().createQuery("select id, project.id, commitHash, jobName from Build");+ for (Object[] fields: (List<Object[]>)query.list()) {+ Long buildId = (Long) fields[0];+ Long projectId = (Long)fields[1];+ builds.put(buildId, new BuildFacade(buildId, projectId, (String)fields[2]));+ populateJobNames(projectId, (String)fields[3]);+ }+ taskId = taskScheduler.schedule(this);+ }++ @Listen+ public void on(SystemStopping event) {+ taskScheduler.unschedule(taskId);+ }++ private CriteriaQuery<Object[]> buildQueryOfStreamPrevios(Build build, Status status, String...fields) {+ CriteriaBuilder builder = getSession().getCriteriaBuilder();+ CriteriaQuery<Object[]> query = builder.createQuery(Object[].class);+ Root<Build> root = query.from(Build.class);++ List<Predicate> predicates = new ArrayList<>();+ predicates.add(builder.equal(root.get("project"), build.getProject()));+ predicates.add(builder.equal(root.get("jobName"), build.getJobName()));+ if (status != null)+ predicates.add(builder.equal(root.get("status"), status));+ predicates.add(builder.lessThan(root.get("number"), build.getNumber()));+ query.where(predicates.toArray(new Predicate[0]));+ List<Selection<?>> selections = new ArrayList<>();+ for (String field: fields)+ selections.add(root.get(field));+ query.multiselect(selections);++ return query;+ }++ @Sessional+ @Override+ public Collection<Long> queryNumbersOfStreamPrevious(Build build, Status status, int limit) {+ Map<ObjectId, Long> buildNumbers = new HashMap<>();+ for (Object[] fields: getSession().createQuery(buildQueryOfStreamPrevios(build, status, "commitHash", "number")).list()) {+ buildNumbers.put(ObjectId.fromString((String) fields[0]), (Long)fields[1]);+ }++ Collection<Long> prevBuildNumbers = new HashSet<>();+ try (RevWalk revWalk = new RevWalk(build.getProject().getRepository())) {+ RevCommit current = revWalk.lookupCommit(build.getCommitId());+ revWalk.parseHeaders(current);+ while (current.getParentCount() != 0) {+ RevCommit firstParent = current.getParent(0);+ Long buildNumber = buildNumbers.get(firstParent);+ if (buildNumber != null) {+ prevBuildNumbers.add(buildNumber);+ if (prevBuildNumbers.size() >= limit)+ break;+ }+ current = firstParent;+ revWalk.parseHeaders(current);+ }+ } catch (MissingObjectException e) {+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ return prevBuildNumbers;+ }++ @Sessional+ @Override+ public Build findStreamPrevious(Build build, Status status) {+ Map<ObjectId, Long> buildIds = new HashMap<>();+ for (Object[] fields: getSession().createQuery(buildQueryOfStreamPrevios(+ build, status, "commitHash", "id")).list()) {+ buildIds.put(ObjectId.fromString((String) fields[0]), (Long)fields[1]);+ }++ try (RevWalk revWalk = new RevWalk(build.getProject().getRepository())) {+ RevCommit current = revWalk.lookupCommit(build.getCommitId());+ revWalk.parseHeaders(current);+ while (current.getParentCount() != 0) {+ RevCommit firstParent = current.getParent(0);+ Long buildId = buildIds.get(firstParent);+ if (buildId != null)+ return load(buildId);+ current = firstParent;+ revWalk.parseHeaders(current);+ }+ } catch (MissingObjectException e) {+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ return null;+ }++ @Override+ public Collection<Long> getIdsByProject(Long projectId) {+ buildsLock.readLock().lock();+ try {+ Collection<Long> buildIds = new HashSet<>();+ for (BuildFacade build: builds.values()) {+ if (build.getProjectId().equals(projectId))+ buildIds.add(build.getId());+ }+ return buildIds;+ } finally {+ buildsLock.readLock().unlock();+ }+ }++ @Override+ public Collection<Long> filterIds(Long projectId, Collection<String> commitHashes) {+ buildsLock.readLock().lock();+ try {+ Collection<Long> buildIds = new HashSet<>();+ for (BuildFacade build: builds.values()) {+ if (build.getProjectId().equals(projectId)+ && commitHashes.contains(build.getCommitHash())) {+ buildIds.add(build.getId());+ }+ }+ return buildIds;+ } finally {+ buildsLock.readLock().unlock();+ }+ }++ private void populateJobNames(Long projectId, String jobName) {+ Collection<String> jobNamesOfProject = jobNames.get(projectId);+ if (jobNamesOfProject == null) {+ jobNamesOfProject = new HashSet<>();+ jobNames.put(projectId, jobNamesOfProject);+ }+ jobNamesOfProject.add(jobName);+ }++ private Collection<String> getAccessibleJobNames(Role role, Collection<String> jobNames) {+ Collection<String> accessibleJobNames = new HashSet<>();+ if (role.isManageProject()) {+ accessibleJobNames.addAll(jobNames);+ } else {+ StringMatcher matcher = new StringMatcher();+ for (JobPrivilege jobPrivilege: role.getJobPrivileges()) {+ PatternSet patternSet = PatternSet.fromString(jobPrivilege.getJobNames());+ for (String jobName: jobNames) {+ if (patternSet.matches(matcher, jobName))+ accessibleJobNames.add(jobName);+ }+ }+ }+ return accessibleJobNames;+ }++ @Override+ public Collection<String> getJobNames(@Nullable Project project) {+ jobNamesLock.readLock().lock();+ try {+ Collection<String> jobNames = new HashSet<>();+ for (Map.Entry<Long, Collection<String>> entry: this.jobNames.entrySet()) {+ if (project == null || project.getId().equals(entry.getKey()))+ jobNames.addAll(entry.getValue());+ }+ return jobNames;+ } finally {+ jobNamesLock.readLock().unlock();+ }+ }++ private void populateAccessibleJobNames(Map<Project, Collection<String>> accessibleJobNames,+ Map<Long, Collection<String>> jobNames, Project project, Role role) {+ Collection<String> jobNamesOfProject = jobNames.get(project.getId());+ if (jobNamesOfProject != null) {+ Collection<String> accessibleJobNamesOfProject = getAccessibleJobNames(role, jobNamesOfProject);+ Collection<String> currentAccessibleJobNamesOfProject = accessibleJobNames.get(project);+ if (currentAccessibleJobNamesOfProject == null) {+ currentAccessibleJobNamesOfProject = new HashSet<>();+ accessibleJobNames.put(project, currentAccessibleJobNamesOfProject);+ }+ currentAccessibleJobNamesOfProject.addAll(accessibleJobNamesOfProject);+ }+ }++ @Override+ public Map<Project, Collection<String>> getAccessibleJobNames(@Nullable Project project) {+ jobNamesLock.readLock().lock();+ try {+ Map<Project, Collection<String>> accessibleJobNames = new HashMap<>();+ User user = SecurityUtils.getUser();+ if (SecurityUtils.isAdministrator()) {+ for (Map.Entry<Long, Collection<String>> entry: jobNames.entrySet())+ accessibleJobNames.put(projectManager.load(entry.getKey()), new HashSet<>(entry.getValue()));+ } else {+ if (user != null) {+ for (UserAuthorization authorization: user.getProjectAuthorizations()) {+ if (project == null || project.equals(authorization.getProject())) {+ populateAccessibleJobNames(accessibleJobNames, jobNames,+ authorization.getProject(), authorization.getRole());+ }+ }+ for (Group group: user.getGroups()) {+ for (GroupAuthorization authorization: group.getProjectAuthorizations()) {+ if (project == null || project.equals(authorization.getProject())) {+ populateAccessibleJobNames(accessibleJobNames, jobNames,+ authorization.getProject(), authorization.getRole());+ }+ }+ }+ }+ Group group = groupManager.findAnonymous();+ if (group != null) {+ for (GroupAuthorization authorization: group.getProjectAuthorizations()) {+ if (project == null || project.equals(authorization.getProject())) {+ populateAccessibleJobNames(accessibleJobNames, jobNames,+ authorization.getProject(), authorization.getRole());+ }+ }+ }+ }+ if (project != null && !accessibleJobNames.containsKey(project))+ accessibleJobNames.put(project, new HashSet<>());+ return accessibleJobNames;+ } finally {+ jobNamesLock.readLock().unlock();+ }+ }++}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.javaindex afab988138..b251f14c90 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@@ -536,7 +536,7 @@ public class Build extends AbstractEntity implements Referenceable {if (secretName.startsWith(SecretInput.LITERAL_VALUE_PREFIX))return secretName.substring(SecretInput.LITERAL_VALUE_PREFIX.length());else- return project.getSecretValue(secretName, ObjectId.fromString(getCommitHash()));+ return project.getBuildSetting().getSecretValue(project, secretName, ObjectId.fromString(getCommitHash()));}public BuildSpec getBuildSpec() {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.javaindex 1b7c63f8d9..fbb9cf5107 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@@ -69,7 +69,6 @@ import io.onedev.commons.utils.LinearRange;import io.onedev.commons.utils.LockUtils;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;-import io.onedev.server.OneException;import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.BuildQuerySettingManager;@@ -99,7 +98,6 @@ import io.onedev.server.model.support.BranchProtection;import io.onedev.server.model.support.NamedCodeCommentQuery;import io.onedev.server.model.support.NamedCommitQuery;import io.onedev.server.model.support.ProjectBuildSetting;-import io.onedev.server.model.support.Secret;import io.onedev.server.model.support.TagProtection;import io.onedev.server.model.support.WebHook;import io.onedev.server.model.support.issue.ProjectIssueSetting;@@ -183,11 +181,6 @@ public class Project extends AbstractEntity {@JsonView(DefaultView.class)private ArrayList<TagProtection> tagProtections = new ArrayList<>();- @Lob- @Column(nullable=false, length=65535)- @JsonView(DefaultView.class)- private ArrayList<Secret> secrets = new ArrayList<>();-@Column(nullable=false)private Date createDate = new Date();@@ -1151,15 +1144,6 @@ public class Project extends AbstractEntity {this.webHooks = webHooks;}- @Editable- public ArrayList<Secret> getSecrets() {- return secrets;- }-- public void setSecrets(ArrayList<Secret> secrets) {- this.secrets = secrets;- }-@Nullablepublic TagProtection getTagProtection(String tagName, User user) {for (TagProtection protection: tagProtections) {@@ -1363,14 +1347,6 @@ public class Project extends AbstractEntity {return protection != null && protection.isBuildRequiredForPush(this, branch, oldObjectId, newObjectId, gitEnvs);}- public String getSecretValue(String secretName, ObjectId commitId) {- for (Secret secret: getSecrets()) {- if (secret.getName().equals(secretName) && secret.isAuthorized(this, commitId))- return secret.getValue();- }- throw new OneException("No authorized secret found: " + secretName);- }-@Nullablepublic static Project get() {if (!stack.get().isEmpty()) {diff --git a/server-core/src/main/java/io/onedev/server/model/User.java b/server-core/src/main/java/io/onedev/server/model/User.javaindex 0949e775c1..e00cc7bd5e 100644--- a/server-core/src/main/java/io/onedev/server/model/User.java+++ b/server-core/src/main/java/io/onedev/server/model/User.java@@ -1,498 +1,511 @@-package io.onedev.server.model;--import java.util.ArrayList;-import java.util.Collection;-import java.util.LinkedHashMap;-import java.util.LinkedHashSet;-import java.util.Stack;-import java.util.stream.Collectors;--import javax.annotation.Nullable;-import javax.persistence.CascadeType;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.Index;-import javax.persistence.Lob;-import javax.persistence.OneToMany;-import javax.persistence.Table;--import org.apache.shiro.authc.AuthenticationInfo;-import org.apache.shiro.subject.PrincipalCollection;-import org.apache.shiro.subject.SimplePrincipalCollection;-import org.apache.shiro.subject.Subject;-import org.eclipse.jgit.lib.PersonIdent;-import org.hibernate.annotations.Cache;-import org.hibernate.annotations.CacheConcurrencyStrategy;-import org.hibernate.validator.constraints.Email;-import org.hibernate.validator.constraints.NotEmpty;--import com.fasterxml.jackson.annotation.JsonView;-import com.google.common.base.MoreObjects;--import io.onedev.server.model.support.NamedBuildQuery;-import io.onedev.server.model.support.NamedProjectQuery;-import io.onedev.server.model.support.QuerySetting;-import io.onedev.server.model.support.issue.NamedIssueQuery;-import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;-import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.jackson.DefaultView;-import io.onedev.server.util.match.MatchScoreUtils;-import io.onedev.server.util.validation.annotation.UserName;-import io.onedev.server.util.watch.QuerySubscriptionSupport;-import io.onedev.server.util.watch.QueryWatchSupport;-import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.Password;--@Entity-@Table(indexes={@Index(columnList="email"), @Index(columnList="fullName")})-@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)-@Editable-public class User extends AbstractEntity implements AuthenticationInfo {-- private static final long serialVersionUID = 1L;-- public static final Long SYSTEM_ID = -1L;-- public static final Long ROOT_ID = 1L;-- private static ThreadLocal<Stack<User>> stack = new ThreadLocal<Stack<User>>() {-- @Override- protected Stack<User> initialValue() {- return new Stack<User>();- }-- };-- @Column(unique=true, nullable=false)- private String name;-- @Column(length=1024, nullable=false)- @JsonView(DefaultView.class)- private String password;-- private String fullName;-- @Column(unique=true, nullable=false)- private String email;-- @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)- @Cache(usage=CacheConcurrencyStrategy.READ_WRITE)- private Collection<UserAuthorization> projectAuthorizations = new ArrayList<>();-- @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)- @Cache(usage=CacheConcurrencyStrategy.READ_WRITE)- private Collection<Membership> memberships = new ArrayList<>();-- @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)- private Collection<PullRequestReview> reviews = new ArrayList<>();-- @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)- private Collection<PullRequestWatch> requestWatches = new ArrayList<>();-- @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)- private Collection<IssueWatch> issueWatches = new ArrayList<>();-- @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)- private Collection<IssueQuerySetting> projectIssueQuerySettings = new ArrayList<>();-- @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)- private Collection<BuildQuerySetting> projectBuildQuerySettings = new ArrayList<>();-- @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)- private Collection<PullRequestQuerySetting> projectPullRequestQuerySettings = new ArrayList<>();-- @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)- private Collection<CommitQuerySetting> projectCommitQuerySettings = new ArrayList<>();-- @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)- private Collection<CodeCommentQuerySetting> projectCodeCommentQuerySettings = new ArrayList<>();-- @OneToMany(mappedBy="owner")- @Cache(usage=CacheConcurrencyStrategy.READ_WRITE)- private Collection<Project> projects = new ArrayList<>();-- @Lob- @Column(nullable=false, length=65535)- private ArrayList<NamedProjectQuery> userProjectQueries = new ArrayList<>();-- @Lob- @Column(nullable=false, length=65535)- private ArrayList<NamedIssueQuery> userIssueQueries = new ArrayList<>();-- @Lob- @Column(nullable=false, length=65535)- private LinkedHashMap<String, Boolean> userIssueQueryWatches = new LinkedHashMap<>();-- @Lob- @Column(nullable=false, length=65535)- private LinkedHashMap<String, Boolean> issueQueryWatches = new LinkedHashMap<>();-- @Lob- @Column(nullable=false, length=65535)- private ArrayList<NamedPullRequestQuery> userPullRequestQueries = new ArrayList<>();-- @Lob- @Column(nullable=false, length=65535)- private LinkedHashMap<String, Boolean> userPullRequestQueryWatches = new LinkedHashMap<>();-- @Lob- @Column(nullable=false, length=65535)- private LinkedHashMap<String, Boolean> pullRequestQueryWatches = new LinkedHashMap<>();-- @Lob- @Column(nullable=false, length=65535)- private ArrayList<NamedBuildQuery> userBuildQueries = new ArrayList<>();-- @Lob- @Column(nullable=false, length=65535)- private LinkedHashSet<String> userBuildQuerySubscriptions = new LinkedHashSet<>();-- @Lob- @Column(nullable=false, length=65535)- private LinkedHashSet<String> buildQuerySubscriptions = new LinkedHashSet<>();-- private transient Collection<Group> groups;-- public QuerySetting<NamedProjectQuery> getProjectQuerySetting() {- return new QuerySetting<NamedProjectQuery>() {-- @Override- public Project getProject() {- return null;- }-- @Override- public User getUser() {- return User.this;- }-- @Override- public ArrayList<NamedProjectQuery> getUserQueries() {- return userProjectQueries;- }-- @Override- public void setUserQueries(ArrayList<NamedProjectQuery> userQueries) {- userProjectQueries = userQueries;- }-- @Override- public QueryWatchSupport<NamedProjectQuery> getQueryWatchSupport() {- return null;- }-- @Override- public QuerySubscriptionSupport<NamedProjectQuery> getQuerySubscriptionSupport() {- return null;- }-- };- }-- public QuerySetting<NamedIssueQuery> getIssueQuerySetting() {- return new QuerySetting<NamedIssueQuery>() {-- @Override- public Project getProject() {- return null;- }-- @Override- public User getUser() {- return User.this;- }-- @Override- public ArrayList<NamedIssueQuery> getUserQueries() {- return userIssueQueries;- }-- @Override- public void setUserQueries(ArrayList<NamedIssueQuery> userQueries) {- userIssueQueries = userQueries;- }-- @Override- public QueryWatchSupport<NamedIssueQuery> getQueryWatchSupport() {- return new QueryWatchSupport<NamedIssueQuery>() {-- @Override- public LinkedHashMap<String, Boolean> getUserQueryWatches() {- return userIssueQueryWatches;- }-- @Override- public LinkedHashMap<String, Boolean> getQueryWatches() {- return issueQueryWatches;- }-- };- }-- @Override- public QuerySubscriptionSupport<NamedIssueQuery> getQuerySubscriptionSupport() {- return null;- }-- };- }-- public QuerySetting<NamedPullRequestQuery> getPullRequestQuerySetting() {- return new QuerySetting<NamedPullRequestQuery>() {-- @Override- public Project getProject() {- return null;- }-- @Override- public User getUser() {- return User.this;- }-- @Override- public ArrayList<NamedPullRequestQuery> getUserQueries() {- return userPullRequestQueries;- }-- @Override- public void setUserQueries(ArrayList<NamedPullRequestQuery> userQueries) {- userPullRequestQueries = userQueries;- }-- @Override- public QueryWatchSupport<NamedPullRequestQuery> getQueryWatchSupport() {- return new QueryWatchSupport<NamedPullRequestQuery>() {-- @Override- public LinkedHashMap<String, Boolean> getUserQueryWatches() {- return userPullRequestQueryWatches;- }-- @Override- public LinkedHashMap<String, Boolean> getQueryWatches() {- return pullRequestQueryWatches;- }-- };- }-- @Override- public QuerySubscriptionSupport<NamedPullRequestQuery> getQuerySubscriptionSupport() {- return null;- }-- };- }-- public QuerySetting<NamedBuildQuery> getBuildQuerySetting() {- return new QuerySetting<NamedBuildQuery>() {-- @Override- public Project getProject() {- return null;- }-- @Override- public User getUser() {- return User.this;- }-- @Override- public ArrayList<NamedBuildQuery> getUserQueries() {- return userBuildQueries;- }-- @Override- public void setUserQueries(ArrayList<NamedBuildQuery> userQueries) {- userBuildQueries = userQueries;- }-- @Override- public QueryWatchSupport<NamedBuildQuery> getQueryWatchSupport() {- return null;- }-- @Override- public QuerySubscriptionSupport<NamedBuildQuery> getQuerySubscriptionSupport() {- return new QuerySubscriptionSupport<NamedBuildQuery>() {-- @Override- public LinkedHashSet<String> getUserQuerySubscriptions() {- return userBuildQuerySubscriptions;- }-- @Override- public LinkedHashSet<String> getQuerySubscriptions() {- return buildQuerySubscriptions;- }-- };- }-- };- }-- @Override- public PrincipalCollection getPrincipals() {- return new SimplePrincipalCollection(getId(), "");- }-- @Override- public Object getCredentials() {- return password;- }-- public Subject asSubject() {- return SecurityUtils.asSubject(getId());- }-- public Collection<Project> getProjects() {- return projects;- }-- public void setProjects(Collection<Project> projects) {- this.projects = projects;- }-- @Editable(name="Login Name", order=100)- @UserName- @NotEmpty- public String getName() {- return name;- }-- public void setName(String name) {- this.name = name;- }-- @Editable(order=150)- @Password(confirmative=true, autoComplete="new-password")- @NotEmpty- public String getPassword() {- return password;- }-- /**- * Set password of this user.- *- * @param password- * password to set- */- public void setPassword(String password) {- this.password = password;- }-- @Editable(order=200)- public String getFullName() {- return fullName;- }-- public void setFullName(String fullName) {- this.fullName = fullName;- }-- @Editable(order=300)- @NotEmpty- public String getEmail() {- return email;- }-- public void setEmail(String email) {- this.email = email;- }-- public Collection<Membership> getMemberships() {- return memberships;- }-- public void setGroups(Collection<Membership> memberships) {- this.memberships = memberships;- }-- @Override- public String toString() {- return MoreObjects.toStringHelper(this)- .add("name", getName())- .toString();- }-- public PersonIdent asPerson() {- return new PersonIdent(getName(), getEmail());- }-- public String getDisplayName() {- if (getFullName() != null)- return getFullName();- else- return getName();- }-- public boolean isRoot() {- return ROOT_ID.equals(getId());- }-- public boolean isSystem() {- return SYSTEM_ID.equals(getId());- }-- public Collection<UserAuthorization> getProjectAuthorizations() {- return projectAuthorizations;- }-- public void setProjectAuthorizations(Collection<UserAuthorization> projectAuthorizations) {- this.projectAuthorizations = projectAuthorizations;- }-- @Override- public int compareTo(AbstractEntity entity) {- User user = (User) entity;- if (getDisplayName().equals(user.getDisplayName())) {- return getId().compareTo(entity.getId());- } else {- return getDisplayName().compareTo(user.getDisplayName());- }- }-- public double getMatchScore(@Nullable String queryTerm) {- double scoreOfName = MatchScoreUtils.getMatchScore(name, queryTerm);- double scoreOfFullName = MatchScoreUtils.getMatchScore(fullName, queryTerm);- return Math.max(scoreOfName, scoreOfFullName);- }-- public Collection<Group> getGroups() {- if (groups == null)- groups = getMemberships().stream().map(it->it.getGroup()).collect(Collectors.toList());- return groups;- }-- public static User from(@Nullable User user, @Nullable String displayName) {- if (user == null) {- user = new User();- if (displayName != null)- user.setName(displayName);- else- user.setName("Unknown");- }- return user;- }-- public static void push(User user) {- stack.get().push(user);- }-- public static void pop() {- stack.get().pop();- }-- @Nullable- public static User get() {- if (!stack.get().isEmpty())- return stack.get().peek();- else- return SecurityUtils.getUser();- }--}+package io.onedev.server.model;++import java.util.ArrayList;+import java.util.Collection;+import java.util.LinkedHashMap;+import java.util.LinkedHashSet;+import java.util.Stack;+import java.util.stream.Collectors;++import javax.annotation.Nullable;+import javax.persistence.CascadeType;+import javax.persistence.Column;+import javax.persistence.Entity;+import javax.persistence.Index;+import javax.persistence.Lob;+import javax.persistence.OneToMany;+import javax.persistence.Table;++import org.apache.shiro.authc.AuthenticationInfo;+import org.apache.shiro.subject.PrincipalCollection;+import org.apache.shiro.subject.SimplePrincipalCollection;+import org.apache.shiro.subject.Subject;+import org.eclipse.jgit.lib.PersonIdent;+import org.hibernate.annotations.Cache;+import org.hibernate.annotations.CacheConcurrencyStrategy;+import org.hibernate.validator.constraints.Email;+import org.hibernate.validator.constraints.NotEmpty;++import com.fasterxml.jackson.annotation.JsonView;+import com.google.common.base.MoreObjects;++import io.onedev.server.model.support.NamedBuildQuery;+import io.onedev.server.model.support.NamedProjectQuery;+import io.onedev.server.model.support.UserBuildSetting;+import io.onedev.server.model.support.QuerySetting;+import io.onedev.server.model.support.issue.NamedIssueQuery;+import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;+import io.onedev.server.util.SecurityUtils;+import io.onedev.server.util.jackson.DefaultView;+import io.onedev.server.util.match.MatchScoreUtils;+import io.onedev.server.util.validation.annotation.UserName;+import io.onedev.server.util.watch.QuerySubscriptionSupport;+import io.onedev.server.util.watch.QueryWatchSupport;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.Password;++@Entity+@Table(indexes={@Index(columnList="email"), @Index(columnList="fullName")})+@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)+@Editable+public class User extends AbstractEntity implements AuthenticationInfo {++ private static final long serialVersionUID = 1L;++ public static final Long SYSTEM_ID = -1L;++ public static final Long ROOT_ID = 1L;++ private static ThreadLocal<Stack<User>> stack = new ThreadLocal<Stack<User>>() {++ @Override+ protected Stack<User> initialValue() {+ return new Stack<User>();+ }++ };++ @Column(unique=true, nullable=false)+ private String name;++ @Column(length=1024, nullable=false)+ @JsonView(DefaultView.class)+ private String password;++ private String fullName;++ @Column(unique=true, nullable=false)+ private String email;++ @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)+ @Cache(usage=CacheConcurrencyStrategy.READ_WRITE)+ private Collection<UserAuthorization> projectAuthorizations = new ArrayList<>();++ @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)+ @Cache(usage=CacheConcurrencyStrategy.READ_WRITE)+ private Collection<Membership> memberships = new ArrayList<>();++ @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)+ private Collection<PullRequestReview> reviews = new ArrayList<>();++ @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)+ private Collection<PullRequestWatch> requestWatches = new ArrayList<>();++ @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)+ private Collection<IssueWatch> issueWatches = new ArrayList<>();++ @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)+ private Collection<IssueQuerySetting> projectIssueQuerySettings = new ArrayList<>();++ @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)+ private Collection<BuildQuerySetting> projectBuildQuerySettings = new ArrayList<>();++ @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)+ private Collection<PullRequestQuerySetting> projectPullRequestQuerySettings = new ArrayList<>();++ @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)+ private Collection<CommitQuerySetting> projectCommitQuerySettings = new ArrayList<>();++ @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)+ private Collection<CodeCommentQuerySetting> projectCodeCommentQuerySettings = new ArrayList<>();++ @OneToMany(mappedBy="owner")+ @Cache(usage=CacheConcurrencyStrategy.READ_WRITE)+ private Collection<Project> projects = new ArrayList<>();++ @Lob+ @Column(nullable=false, length=65535)+ private ArrayList<NamedProjectQuery> userProjectQueries = new ArrayList<>();++ @Lob+ @Column(nullable=false, length=65535)+ private ArrayList<NamedIssueQuery> userIssueQueries = new ArrayList<>();++ @Lob+ @Column(nullable=false, length=65535)+ private LinkedHashMap<String, Boolean> userIssueQueryWatches = new LinkedHashMap<>();++ @Lob+ @Column(nullable=false, length=65535)+ private LinkedHashMap<String, Boolean> issueQueryWatches = new LinkedHashMap<>();++ @Lob+ @Column(nullable=false, length=65535)+ private ArrayList<NamedPullRequestQuery> userPullRequestQueries = new ArrayList<>();++ @Lob+ @Column(nullable=false, length=65535)+ private LinkedHashMap<String, Boolean> userPullRequestQueryWatches = new LinkedHashMap<>();++ @Lob+ @Column(nullable=false, length=65535)+ private LinkedHashMap<String, Boolean> pullRequestQueryWatches = new LinkedHashMap<>();++ @Lob+ @Column(nullable=false, length=65535)+ private ArrayList<NamedBuildQuery> userBuildQueries = new ArrayList<>();++ @Lob+ @Column(nullable=false, length=65535)+ private LinkedHashSet<String> userBuildQuerySubscriptions = new LinkedHashSet<>();++ @Lob+ @Column(nullable=false, length=65535)+ private LinkedHashSet<String> buildQuerySubscriptions = new LinkedHashSet<>();++ @Lob+ @Column(length=65535, nullable=false)+ private UserBuildSetting buildSetting = new UserBuildSetting();++ private transient Collection<Group> groups;++ public QuerySetting<NamedProjectQuery> getProjectQuerySetting() {+ return new QuerySetting<NamedProjectQuery>() {++ @Override+ public Project getProject() {+ return null;+ }++ @Override+ public User getUser() {+ return User.this;+ }++ @Override+ public ArrayList<NamedProjectQuery> getUserQueries() {+ return userProjectQueries;+ }++ @Override+ public void setUserQueries(ArrayList<NamedProjectQuery> userQueries) {+ userProjectQueries = userQueries;+ }++ @Override+ public QueryWatchSupport<NamedProjectQuery> getQueryWatchSupport() {+ return null;+ }++ @Override+ public QuerySubscriptionSupport<NamedProjectQuery> getQuerySubscriptionSupport() {+ return null;+ }++ };+ }++ public QuerySetting<NamedIssueQuery> getIssueQuerySetting() {+ return new QuerySetting<NamedIssueQuery>() {++ @Override+ public Project getProject() {+ return null;+ }++ @Override+ public User getUser() {+ return User.this;+ }++ @Override+ public ArrayList<NamedIssueQuery> getUserQueries() {+ return userIssueQueries;+ }++ @Override+ public void setUserQueries(ArrayList<NamedIssueQuery> userQueries) {+ userIssueQueries = userQueries;+ }++ @Override+ public QueryWatchSupport<NamedIssueQuery> getQueryWatchSupport() {+ return new QueryWatchSupport<NamedIssueQuery>() {++ @Override+ public LinkedHashMap<String, Boolean> getUserQueryWatches() {+ return userIssueQueryWatches;+ }++ @Override+ public LinkedHashMap<String, Boolean> getQueryWatches() {+ return issueQueryWatches;+ }++ };+ }++ @Override+ public QuerySubscriptionSupport<NamedIssueQuery> getQuerySubscriptionSupport() {+ return null;+ }++ };+ }++ public QuerySetting<NamedPullRequestQuery> getPullRequestQuerySetting() {+ return new QuerySetting<NamedPullRequestQuery>() {++ @Override+ public Project getProject() {+ return null;+ }++ @Override+ public User getUser() {+ return User.this;+ }++ @Override+ public ArrayList<NamedPullRequestQuery> getUserQueries() {+ return userPullRequestQueries;+ }++ @Override+ public void setUserQueries(ArrayList<NamedPullRequestQuery> userQueries) {+ userPullRequestQueries = userQueries;+ }++ @Override+ public QueryWatchSupport<NamedPullRequestQuery> getQueryWatchSupport() {+ return new QueryWatchSupport<NamedPullRequestQuery>() {++ @Override+ public LinkedHashMap<String, Boolean> getUserQueryWatches() {+ return userPullRequestQueryWatches;+ }++ @Override+ public LinkedHashMap<String, Boolean> getQueryWatches() {+ return pullRequestQueryWatches;+ }++ };+ }++ @Override+ public QuerySubscriptionSupport<NamedPullRequestQuery> getQuerySubscriptionSupport() {+ return null;+ }++ };+ }++ public QuerySetting<NamedBuildQuery> getBuildQuerySetting() {+ return new QuerySetting<NamedBuildQuery>() {++ @Override+ public Project getProject() {+ return null;+ }++ @Override+ public User getUser() {+ return User.this;+ }++ @Override+ public ArrayList<NamedBuildQuery> getUserQueries() {+ return userBuildQueries;+ }++ @Override+ public void setUserQueries(ArrayList<NamedBuildQuery> userQueries) {+ userBuildQueries = userQueries;+ }++ @Override+ public QueryWatchSupport<NamedBuildQuery> getQueryWatchSupport() {+ return null;+ }++ @Override+ public QuerySubscriptionSupport<NamedBuildQuery> getQuerySubscriptionSupport() {+ return new QuerySubscriptionSupport<NamedBuildQuery>() {++ @Override+ public LinkedHashSet<String> getUserQuerySubscriptions() {+ return userBuildQuerySubscriptions;+ }++ @Override+ public LinkedHashSet<String> getQuerySubscriptions() {+ return buildQuerySubscriptions;+ }++ };+ }++ };+ }++ @Override+ public PrincipalCollection getPrincipals() {+ return new SimplePrincipalCollection(getId(), "");+ }++ @Override+ public Object getCredentials() {+ return password;+ }++ public Subject asSubject() {+ return SecurityUtils.asSubject(getId());+ }++ public Collection<Project> getProjects() {+ return projects;+ }++ public void setProjects(Collection<Project> projects) {+ this.projects = projects;+ }++ @Editable(name="Login Name", order=100)+ @UserName+ @NotEmpty+ public String getName() {+ return name;+ }++ public void setName(String name) {+ this.name = name;+ }++ @Editable(order=150)+ @Password(confirmative=true, autoComplete="new-password")+ @NotEmpty+ public String getPassword() {+ return password;+ }++ /**+ * Set password of this user.+ *+ * @param password+ * password to set+ */+ public void setPassword(String password) {+ this.password = password;+ }++ @Editable(order=200)+ public String getFullName() {+ return fullName;+ }++ public void setFullName(String fullName) {+ this.fullName = fullName;+ }++ @Editable(order=300)+ @NotEmpty+ public String getEmail() {+ return email;+ }++ public void setEmail(String email) {+ this.email = email;+ }++ public Collection<Membership> getMemberships() {+ return memberships;+ }++ public void setGroups(Collection<Membership> memberships) {+ this.memberships = memberships;+ }++ @Override+ public String toString() {+ return MoreObjects.toStringHelper(this)+ .add("name", getName())+ .toString();+ }++ public PersonIdent asPerson() {+ return new PersonIdent(getName(), getEmail());+ }++ public String getDisplayName() {+ if (getFullName() != null)+ return getFullName();+ else+ return getName();+ }++ public boolean isRoot() {+ return ROOT_ID.equals(getId());+ }++ public boolean isSystem() {+ return SYSTEM_ID.equals(getId());+ }++ public Collection<UserAuthorization> getProjectAuthorizations() {+ return projectAuthorizations;+ }++ public void setProjectAuthorizations(Collection<UserAuthorization> projectAuthorizations) {+ this.projectAuthorizations = projectAuthorizations;+ }++ public UserBuildSetting getBuildSetting() {+ return buildSetting;+ }++ public void setBuildSetting(UserBuildSetting buildSetting) {+ this.buildSetting = buildSetting;+ }++ @Override+ public int compareTo(AbstractEntity entity) {+ User user = (User) entity;+ if (getDisplayName().equals(user.getDisplayName())) {+ return getId().compareTo(entity.getId());+ } else {+ return getDisplayName().compareTo(user.getDisplayName());+ }+ }++ public double getMatchScore(@Nullable String queryTerm) {+ double scoreOfName = MatchScoreUtils.getMatchScore(name, queryTerm);+ double scoreOfFullName = MatchScoreUtils.getMatchScore(fullName, queryTerm);+ return Math.max(scoreOfName, scoreOfFullName);+ }++ public Collection<Group> getGroups() {+ if (groups == null)+ groups = getMemberships().stream().map(it->it.getGroup()).collect(Collectors.toList());+ return groups;+ }++ public static User from(@Nullable User user, @Nullable String displayName) {+ if (user == null) {+ user = new User();+ if (displayName != null)+ user.setName(displayName);+ else+ user.setName("Unknown");+ }+ return user;+ }++ public static void push(User user) {+ stack.get().push(user);+ }++ public static void pop() {+ stack.get().pop();+ }++ @Nullable+ public static User get() {+ if (!stack.get().isEmpty())+ return stack.get().peek();+ else+ return SecurityUtils.getUser();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/Secret.java b/server-core/src/main/java/io/onedev/server/model/support/JobSecret.javasimilarity index 68%rename from server-core/src/main/java/io/onedev/server/model/support/Secret.javarename to server-core/src/main/java/io/onedev/server/model/support/JobSecret.javaindex 7b1516b994..a482ce6bfc 100644--- a/server-core/src/main/java/io/onedev/server/model/support/Secret.java+++ b/server-core/src/main/java/io/onedev/server/model/support/JobSecret.java@@ -1,12 +1,16 @@package io.onedev.server.model.support;import java.io.Serializable;+import java.util.ArrayList;import java.util.List;import org.eclipse.jgit.lib.ObjectId;import org.hibernate.validator.constraints.NotEmpty;+import io.onedev.commons.codeassist.InputCompletion;+import io.onedev.commons.codeassist.InputStatus;import io.onedev.commons.codeassist.InputSuggestion;+import io.onedev.commons.utils.LinearRange;import io.onedev.server.model.Project;import io.onedev.server.util.match.PathMatcher;import io.onedev.server.util.patternset.PatternSet;@@ -15,22 +19,22 @@ import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.Password;import io.onedev.server.web.editable.annotation.Patterns;+import io.onedev.server.web.editable.annotation.SuggestionProvider;import io.onedev.server.web.util.SuggestionUtils;@Editable-public class Secret implements Serializable {+public class JobSecret implements Serializable {private static final long serialVersionUID = 1L;private String name;- private String description;-private String value;private String authorizedBranches;@Editable(order=100)+ @SuggestionProvider("suggestNames")@NotEmpty@DnsNamepublic String getName() {@@ -40,14 +44,23 @@ public class Secret implements Serializable {public void setName(String name) {this.name = name;}-- @Editable(order=150)- public String getDescription() {- return description;- }-- public void setDescription(String description) {- this.description = description;++ @SuppressWarnings("unused")+ private static List<InputCompletion> suggestNames(InputStatus inputStatus) {+ Project project = Project.get();+ List<InputCompletion> suggestions = new ArrayList<>();+ if (project != null) {+ for (JobSecret secret: project.getBuildSetting().getInheritedSecrets(project)) {+ LinearRange match = LinearRange.match(secret.getName(), inputStatus.getContentBeforeCaret());+ if (match != null) {+ InputCompletion suggestion = new InputCompletion(secret.getName(),+ secret.getName() + inputStatus.getContentAfterCaret(),+ secret.getName().length(), "override inherited", match);+ suggestions.add(suggestion);+ }+ }+ }+ return suggestions;}@Editable(order=200)@@ -88,4 +101,5 @@ public class Secret implements Serializable {return authorizedBranches == null|| PatternSet.fromString(authorizedBranches).matches(new PathMatcher(), branch);}+}diff --git a/server-core/src/main/java/io/onedev/server/model/support/ProjectBuildSetting.java b/server-core/src/main/java/io/onedev/server/model/support/ProjectBuildSetting.javaindex f7d2702594..f6bb791d15 100644--- a/server-core/src/main/java/io/onedev/server/model/support/ProjectBuildSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/ProjectBuildSetting.java@@ -2,12 +2,19 @@ package io.onedev.server.model.support;import java.io.Serializable;import java.util.ArrayList;+import java.util.LinkedHashMap;import java.util.List;+import java.util.Map;+import java.util.stream.Collectors;import javax.annotation.Nullable;+import org.eclipse.jgit.lib.ObjectId;+import io.onedev.server.OneDev;+import io.onedev.server.OneException;import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.GlobalBuildSetting;import io.onedev.server.web.editable.annotation.Editable;@@ -20,16 +27,26 @@ public class ProjectBuildSetting implements Serializable {private List<NamedBuildQuery> namedQueries;+ private List<JobSecret> secrets = new ArrayList<>();++ private List<BuildPreservation> buildPreservations = new ArrayList<>();+private transient GlobalBuildSetting setting;- private List<BuildPreservation> preservations = new ArrayList<>();+ public List<JobSecret> getSecrets() {+ return secrets;+ }++ public void setSecrets(List<JobSecret> secrets) {+ this.secrets = secrets;+ }- public List<BuildPreservation> getPreservations() {- return preservations;+ public List<BuildPreservation> getBuildPreservations() {+ return buildPreservations;}- public void setPreservations(List<BuildPreservation> preservations) {- this.preservations = preservations;+ public void setBuildPreservations(List<BuildPreservation> buildPreservations) {+ this.buildPreservations = buildPreservations;}private GlobalBuildSetting getGlobalSetting() {@@ -71,4 +88,36 @@ public class ProjectBuildSetting implements Serializable {return null;}+ public List<JobSecret> getInheritedSecrets(Project project) {+ Map<String, JobSecret> inheritedSecrets = new LinkedHashMap<>();+ for (JobSecret secret: project.getOwner().getBuildSetting().getSecrets())+ inheritedSecrets.put(secret.getName(), secret);+ inheritedSecrets.keySet().removeAll(secrets.stream().map(it->it.getName()).collect(Collectors.toSet()));+ return new ArrayList<>(inheritedSecrets.values());+ }++ public List<JobSecret> getHierarchySecrets(Project project) {+ List<JobSecret> hierarchySecrets = new ArrayList<>(getSecrets());+ hierarchySecrets.addAll(getInheritedSecrets(project));+ return hierarchySecrets;+ }++ public String getSecretValue(Project project, String secretName, ObjectId commitId) {+ for (JobSecret secret: getHierarchySecrets(project)) {+ if (secret.getName().equals(secretName)) {+ if (secret.isAuthorized(project, commitId))+ return secret.getValue();+ else+ throw new OneException("Job secret not authorized: " + secretName);+ }+ }+ throw new OneException("No job secret found: " + secretName);+ }++ public List<BuildPreservation> getHierarchyBuildPreservations(Project project) {+ List<BuildPreservation> hierarchyBuildPreservations = new ArrayList<>(getBuildPreservations());+ hierarchyBuildPreservations.addAll(project.getOwner().getBuildSetting().getBuildPreservations());+ return hierarchyBuildPreservations;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/model/support/UserBuildSetting.java b/server-core/src/main/java/io/onedev/server/model/support/UserBuildSetting.javanew file mode 100644index 0000000000..0c3c7aed57--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/UserBuildSetting.java@@ -0,0 +1,34 @@+package io.onedev.server.model.support;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;++import io.onedev.server.web.editable.annotation.Editable;++@Editable+public class UserBuildSetting implements Serializable {++ private static final long serialVersionUID = 1L;++ private List<JobSecret> secrets = new ArrayList<>();++ private List<BuildPreservation> buildPreservations = new ArrayList<>();++ public List<JobSecret> getSecrets() {+ return secrets;+ }++ public void setSecrets(List<JobSecret> secrets) {+ this.secrets = secrets;+ }++ public List<BuildPreservation> getBuildPreservations() {+ return buildPreservations;+ }++ public void setBuildPreservations(List<BuildPreservation> buildPreservations) {+ this.buildPreservations = buildPreservations;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.javaindex a47db778c3..9392a359ef 100644--- a/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java+++ b/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java@@ -1,240 +1,246 @@-package io.onedev.server.web;--import org.apache.wicket.core.request.mapper.ResourceMapper;-import org.apache.wicket.markup.html.pages.BrowserInfoPage;-import org.apache.wicket.protocol.http.WebApplication;-import org.apache.wicket.request.mapper.CompoundRequestMapper;--import io.onedev.server.web.download.ArchiveDownloadResourceReference;-import io.onedev.server.web.download.ArtifactDownloadResourceReference;-import io.onedev.server.web.download.AttachmentDownloadResourceReference;-import io.onedev.server.web.download.BuildLogDownloadResourceReference;-import io.onedev.server.web.download.RawBlobDownloadResourceReference;-import io.onedev.server.web.download.ServerLogDownloadResourceReference;-import io.onedev.server.web.mapper.OnePageMapper;-import io.onedev.server.web.mapper.OneResourceMapper;-import io.onedev.server.web.page.admin.authenticator.AuthenticatorPage;-import io.onedev.server.web.page.admin.databasebackup.DatabaseBackupPage;-import io.onedev.server.web.page.admin.groovyscript.GroovyScriptListPage;-import io.onedev.server.web.page.admin.group.GroupAuthorizationsPage;-import io.onedev.server.web.page.admin.group.GroupListPage;-import io.onedev.server.web.page.admin.group.GroupMembershipsPage;-import io.onedev.server.web.page.admin.group.GroupProfilePage;-import io.onedev.server.web.page.admin.group.NewGroupPage;-import io.onedev.server.web.page.admin.issuesetting.DefaultBoardListPage;-import io.onedev.server.web.page.admin.issuesetting.DefaultStateTransitionsPage;-import io.onedev.server.web.page.admin.issuesetting.IssueFieldListPage;-import io.onedev.server.web.page.admin.issuesetting.IssueStateListPage;-import io.onedev.server.web.page.admin.jobexecutor.JobExecutorPage;-import io.onedev.server.web.page.admin.mailsetting.MailSettingPage;-import io.onedev.server.web.page.admin.role.NewRolePage;-import io.onedev.server.web.page.admin.role.RoleDetailPage;-import io.onedev.server.web.page.admin.role.RoleListPage;-import io.onedev.server.web.page.admin.securitysetting.SecuritySettingPage;-import io.onedev.server.web.page.admin.serverinformation.ServerInformationPage;-import io.onedev.server.web.page.admin.serverlog.ServerLogPage;-import io.onedev.server.web.page.admin.systemsetting.SystemSettingPage;-import io.onedev.server.web.page.admin.user.NewUserPage;-import io.onedev.server.web.page.admin.user.UserAuthorizationsPage;-import io.onedev.server.web.page.admin.user.UserAvatarPage;-import io.onedev.server.web.page.admin.user.UserListPage;-import io.onedev.server.web.page.admin.user.UserMembershipsPage;-import io.onedev.server.web.page.admin.user.UserPasswordPage;-import io.onedev.server.web.page.admin.user.UserProfilePage;-import io.onedev.server.web.page.admin.user.UserTokenPage;-import io.onedev.server.web.page.build.BuildListPage;-import io.onedev.server.web.page.init.ServerInitPage;-import io.onedev.server.web.page.issue.IssueListPage;-import io.onedev.server.web.page.my.MyAvatarPage;-import io.onedev.server.web.page.my.MyPasswordPage;-import io.onedev.server.web.page.my.MyProfilePage;-import io.onedev.server.web.page.my.MyTokenPage;-import io.onedev.server.web.page.project.NewProjectPage;-import io.onedev.server.web.page.project.ProjectListPage;-import io.onedev.server.web.page.project.blob.ProjectBlobPage;-import io.onedev.server.web.page.project.branches.ProjectBranchesPage;-import io.onedev.server.web.page.project.builds.ProjectBuildsPage;-import io.onedev.server.web.page.project.builds.detail.InvalidBuildPage;-import io.onedev.server.web.page.project.builds.detail.artifacts.BuildArtifactsPage;-import io.onedev.server.web.page.project.builds.detail.changes.BuildChangesPage;-import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPage;-import io.onedev.server.web.page.project.builds.detail.issues.FixedIssuesPage;-import io.onedev.server.web.page.project.builds.detail.log.BuildLogPage;-import io.onedev.server.web.page.project.codecomments.ProjectCodeCommentsPage;-import io.onedev.server.web.page.project.commits.CommitDetailPage;-import io.onedev.server.web.page.project.commits.ProjectCommitsPage;-import io.onedev.server.web.page.project.compare.RevisionComparePage;-import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;-import io.onedev.server.web.page.project.issues.boards.IssueBoardsPage;-import io.onedev.server.web.page.project.issues.create.NewIssuePage;-import io.onedev.server.web.page.project.issues.detail.FixingBuildsPage;-import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;-import io.onedev.server.web.page.project.issues.list.ProjectIssueListPage;-import io.onedev.server.web.page.project.issues.milestones.MilestoneDetailPage;-import io.onedev.server.web.page.project.issues.milestones.MilestoneEditPage;-import io.onedev.server.web.page.project.issues.milestones.MilestoneListPage;-import io.onedev.server.web.page.project.issues.milestones.NewMilestonePage;-import io.onedev.server.web.page.project.pullrequests.InvalidPullRequestPage;-import io.onedev.server.web.page.project.pullrequests.ProjectPullRequestsPage;-import io.onedev.server.web.page.project.pullrequests.create.NewPullRequestPage;-import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;-import io.onedev.server.web.page.project.pullrequests.detail.changes.PullRequestChangesPage;-import io.onedev.server.web.page.project.pullrequests.detail.codecomments.PullRequestCodeCommentsPage;-import io.onedev.server.web.page.project.pullrequests.detail.mergepreview.MergePreviewPage;-import io.onedev.server.web.page.project.setting.authorization.ProjectAuthorizationsPage;-import io.onedev.server.web.page.project.setting.avatar.AvatarEditPage;-import io.onedev.server.web.page.project.setting.branchprotection.BranchProtectionPage;-import io.onedev.server.web.page.project.setting.build.BuildPreserveSettingPage;-import io.onedev.server.web.page.project.setting.general.GeneralSettingPage;-import io.onedev.server.web.page.project.setting.issue.PromptFieldsUponIssueOpenSettingPage;-import io.onedev.server.web.page.project.setting.issue.StateTransitionsPage;-import io.onedev.server.web.page.project.setting.secret.SecretListPage;-import io.onedev.server.web.page.project.setting.tagprotection.TagProtectionPage;-import io.onedev.server.web.page.project.setting.webhook.WebHooksPage;-import io.onedev.server.web.page.project.stats.ProjectContribsPage;-import io.onedev.server.web.page.project.stats.SourceLinesPage;-import io.onedev.server.web.page.project.tags.ProjectTagsPage;-import io.onedev.server.web.page.pullrequest.PullRequestListPage;-import io.onedev.server.web.page.security.ForgetPage;-import io.onedev.server.web.page.security.LoginPage;-import io.onedev.server.web.page.security.LogoutPage;-import io.onedev.server.web.page.security.RegisterPage;--public class OneUrlMapper extends CompoundRequestMapper {-- public OneUrlMapper(WebApplication app) {- add(new OnePageMapper("init", ServerInitPage.class));- add(new OnePageMapper("loading", BrowserInfoPage.class));- add(new OnePageMapper("issues", IssueListPage.class));- add(new OnePageMapper("pull-requests", PullRequestListPage.class));- add(new OnePageMapper("builds", BuildListPage.class));- addProjectPages();- addMyPages();- addAdministrationPages();- addSecurityPages();-- addResources();- }-- private void addMyPages() {- add(new OnePageMapper("my/profile", MyProfilePage.class));- add(new OnePageMapper("my/avatar", MyAvatarPage.class));- add(new OnePageMapper("my/password", MyPasswordPage.class));- add(new OnePageMapper("my/token", MyTokenPage.class));- }-- private void addResources() {- add(new ResourceMapper("downloads/server-log", new ServerLogDownloadResourceReference()));- add(new ResourceMapper("downloads/projects/${project}/builds/${build}/log", new BuildLogDownloadResourceReference()));- add(new ResourceMapper("projects/${project}/archive/${revision}", new ArchiveDownloadResourceReference()));- add(new OneResourceMapper("projects/${project}/raw/${revision}/${path}", new RawBlobDownloadResourceReference()));- add(new ResourceMapper("projects/${project}/attachment/${uuid}/${attachment}", new AttachmentDownloadResourceReference()));- add(new OneResourceMapper("downloads/projects/${project}/builds/${build}/artifacts/${path}",- new ArtifactDownloadResourceReference()));- }-- private void addSecurityPages() {- add(new OnePageMapper("login", LoginPage.class));- add(new OnePageMapper("logout", LogoutPage.class));- add(new OnePageMapper("register", RegisterPage.class));- add(new OnePageMapper("forget", ForgetPage.class));- }-- private void addAdministrationPages() {- add(new OnePageMapper("administration/users", UserListPage.class));- add(new OnePageMapper("administration/users/new", NewUserPage.class));- add(new OnePageMapper("administration/users/${user}/profile", UserProfilePage.class));- add(new OnePageMapper("administration/users/${user}/groups", UserMembershipsPage.class));- add(new OnePageMapper("administration/users/${user}/authorizations", UserAuthorizationsPage.class));- add(new OnePageMapper("administration/users/${user}/avatar", UserAvatarPage.class));- add(new OnePageMapper("administration/users/${user}/password", UserPasswordPage.class));- add(new OnePageMapper("administration/users/${user}/token", UserTokenPage.class));-- add(new OnePageMapper("administration/roles", RoleListPage.class));- add(new OnePageMapper("administration/roles/new", NewRolePage.class));- add(new OnePageMapper("administration/roles/${role}", RoleDetailPage.class));-- add(new OnePageMapper("administration/groups", GroupListPage.class));- add(new OnePageMapper("administration/groups/new", NewGroupPage.class));- add(new OnePageMapper("administration/groups/${group}", GroupProfilePage.class));- add(new OnePageMapper("administration/groups/${group}/profile", GroupProfilePage.class));- add(new OnePageMapper("administration/groups/${group}/members", GroupMembershipsPage.class));- add(new OnePageMapper("administration/groups/${group}/authorizations", GroupAuthorizationsPage.class));-- add(new OnePageMapper("administration/settings/system", SystemSettingPage.class));- add(new OnePageMapper("administration/settings/mail", MailSettingPage.class));- add(new OnePageMapper("administration/settings/backup", DatabaseBackupPage.class));- add(new OnePageMapper("administration/settings/security", SecuritySettingPage.class));- add(new OnePageMapper("administration/settings/authenticator", AuthenticatorPage.class));-- add(new OnePageMapper("administration/settings/job-executors", JobExecutorPage.class));- add(new OnePageMapper("administration/settings/groovy-scripts", GroovyScriptListPage.class));-- add(new OnePageMapper("administration/settings/issue-fields", IssueFieldListPage.class));- add(new OnePageMapper("administration/settings/issue-states", IssueStateListPage.class));- add(new OnePageMapper("administration/settings/state-transitions", DefaultStateTransitionsPage.class));- add(new OnePageMapper("administration/settings/issue-boards", DefaultBoardListPage.class));-- add(new OnePageMapper("administration/server-log", ServerLogPage.class));- add(new OnePageMapper("administration/server-information", ServerInformationPage.class));- }-- private void addProjectPages() {- add(new OnePageMapper("projects", ProjectListPage.class));- add(new OnePageMapper("projects/new", NewProjectPage.class));- add(new OnePageMapper("projects/${project}", ProjectDashboardPage.class));-- add(new OnePageMapper("projects/${project}/blob/#{revision}/#{path}", ProjectBlobPage.class));- add(new OnePageMapper("projects/${project}/commits/${revision}", CommitDetailPage.class));- add(new OnePageMapper("projects/${project}/commits", ProjectCommitsPage.class));- add(new OnePageMapper("projects/${project}/compare", RevisionComparePage.class));- add(new OnePageMapper("projects/${project}/stats/contribs", ProjectContribsPage.class));- add(new OnePageMapper("projects/${project}/stats/lines", SourceLinesPage.class));-- add(new OnePageMapper("projects/${project}/branches", ProjectBranchesPage.class));- add(new OnePageMapper("projects/${project}/tags", ProjectTagsPage.class));- add(new OnePageMapper("projects/${project}/codecomments", ProjectCodeCommentsPage.class));-- add(new OnePageMapper("projects/${project}/pulls", ProjectPullRequestsPage.class));- add(new OnePageMapper("projects/${project}/pulls/new", NewPullRequestPage.class));- add(new OnePageMapper("projects/${project}/pulls/${request}", PullRequestActivitiesPage.class));- add(new OnePageMapper("projects/${project}/pulls/${request}/activities", PullRequestActivitiesPage.class));- add(new OnePageMapper("projects/${project}/pulls/${request}/code-comments", PullRequestCodeCommentsPage.class));- add(new OnePageMapper("projects/${project}/pulls/${request}/changes", PullRequestChangesPage.class));- add(new OnePageMapper("projects/${project}/pulls/${request}/merge-preview", MergePreviewPage.class));- add(new OnePageMapper("projects/${project}/pulls/${request}/invalid", InvalidPullRequestPage.class));-- add(new OnePageMapper("projects/${project}/issue-boards", IssueBoardsPage.class));- add(new OnePageMapper("projects/${project}/issue-boards/${board}", IssueBoardsPage.class));- add(new OnePageMapper("projects/${project}/issue-list", ProjectIssueListPage.class));- add(new OnePageMapper("projects/${project}/issues/${issue}", IssueActivitiesPage.class));- add(new OnePageMapper("projects/${project}/issues/${issue}/activities", IssueActivitiesPage.class));- add(new OnePageMapper("projects/${project}/issues/${issue}/builds", FixingBuildsPage.class));- add(new OnePageMapper("projects/${project}/issues/new", NewIssuePage.class));- add(new OnePageMapper("projects/${project}/builds", ProjectBuildsPage.class));- add(new OnePageMapper("projects/${project}/builds/${build}", BuildDashboardPage.class));- add(new OnePageMapper("projects/${project}/builds/${build}/log", BuildLogPage.class));- add(new OnePageMapper("projects/${project}/builds/${build}/changes", BuildChangesPage.class));- add(new OnePageMapper("projects/${project}/builds/${build}/fixed-issues", FixedIssuesPage.class));- add(new OnePageMapper("projects/${project}/builds/${build}/artifacts", BuildArtifactsPage.class));- add(new OnePageMapper("projects/${project}/builds/${build}/invalid", InvalidBuildPage.class));-- add(new OnePageMapper("projects/${project}/milestones", MilestoneListPage.class));- add(new OnePageMapper("projects/${project}/milestones/${milestone}", MilestoneDetailPage.class));- add(new OnePageMapper("projects/${project}/milestones/${milestone}/edit", MilestoneEditPage.class));- add(new OnePageMapper("projects/${project}/milestones/new", NewMilestonePage.class));-- add(new OnePageMapper("projects/${project}/settings/general", GeneralSettingPage.class));- add(new OnePageMapper("projects/${project}/settings/authorizations", ProjectAuthorizationsPage.class));- add(new OnePageMapper("projects/${project}/settings/avatar-edit", AvatarEditPage.class));- add(new OnePageMapper("projects/${project}/settings/branch-protection", BranchProtectionPage.class));- add(new OnePageMapper("projects/${project}/settings/tag-protection", TagProtectionPage.class));- add(new OnePageMapper("projects/${project}/settings/secrets", SecretListPage.class));- add(new OnePageMapper("projects/${project}/settings/issue/state-transitions", StateTransitionsPage.class));- add(new OnePageMapper("projects/${project}/settings/issue/prompt-fields-upon-issue-open",- PromptFieldsUponIssueOpenSettingPage.class));- add(new OnePageMapper("projects/${project}/settings/build-preservations", BuildPreserveSettingPage.class));- add(new OnePageMapper("projects/${project}/settings/web-hooks", WebHooksPage.class));- }--}+package io.onedev.server.web;++import org.apache.wicket.core.request.mapper.ResourceMapper;+import org.apache.wicket.markup.html.pages.BrowserInfoPage;+import org.apache.wicket.protocol.http.WebApplication;+import org.apache.wicket.request.mapper.CompoundRequestMapper;++import io.onedev.server.web.download.ArchiveDownloadResourceReference;+import io.onedev.server.web.download.ArtifactDownloadResourceReference;+import io.onedev.server.web.download.AttachmentDownloadResourceReference;+import io.onedev.server.web.download.BuildLogDownloadResourceReference;+import io.onedev.server.web.download.RawBlobDownloadResourceReference;+import io.onedev.server.web.download.ServerLogDownloadResourceReference;+import io.onedev.server.web.mapper.OnePageMapper;+import io.onedev.server.web.mapper.OneResourceMapper;+import io.onedev.server.web.page.admin.authenticator.AuthenticatorPage;+import io.onedev.server.web.page.admin.databasebackup.DatabaseBackupPage;+import io.onedev.server.web.page.admin.groovyscript.GroovyScriptListPage;+import io.onedev.server.web.page.admin.group.GroupAuthorizationsPage;+import io.onedev.server.web.page.admin.group.GroupListPage;+import io.onedev.server.web.page.admin.group.GroupMembershipsPage;+import io.onedev.server.web.page.admin.group.GroupProfilePage;+import io.onedev.server.web.page.admin.group.NewGroupPage;+import io.onedev.server.web.page.admin.issuesetting.DefaultBoardListPage;+import io.onedev.server.web.page.admin.issuesetting.DefaultStateTransitionsPage;+import io.onedev.server.web.page.admin.issuesetting.IssueFieldListPage;+import io.onedev.server.web.page.admin.issuesetting.IssueStateListPage;+import io.onedev.server.web.page.admin.jobexecutor.JobExecutorPage;+import io.onedev.server.web.page.admin.mailsetting.MailSettingPage;+import io.onedev.server.web.page.admin.role.NewRolePage;+import io.onedev.server.web.page.admin.role.RoleDetailPage;+import io.onedev.server.web.page.admin.role.RoleListPage;+import io.onedev.server.web.page.admin.securitysetting.SecuritySettingPage;+import io.onedev.server.web.page.admin.serverinformation.ServerInformationPage;+import io.onedev.server.web.page.admin.serverlog.ServerLogPage;+import io.onedev.server.web.page.admin.systemsetting.SystemSettingPage;+import io.onedev.server.web.page.admin.user.NewUserPage;+import io.onedev.server.web.page.admin.user.UserAuthorizationsPage;+import io.onedev.server.web.page.admin.user.UserAvatarPage;+import io.onedev.server.web.page.admin.user.UserListPage;+import io.onedev.server.web.page.admin.user.UserMembershipsPage;+import io.onedev.server.web.page.admin.user.UserPasswordPage;+import io.onedev.server.web.page.admin.user.UserProfilePage;+import io.onedev.server.web.page.admin.user.UserTokenPage;+import io.onedev.server.web.page.admin.user.buildsetting.UserBuildPreserveRulesPage;+import io.onedev.server.web.page.admin.user.buildsetting.UserSecretListPage;+import io.onedev.server.web.page.build.BuildListPage;+import io.onedev.server.web.page.init.ServerInitPage;+import io.onedev.server.web.page.issue.IssueListPage;+import io.onedev.server.web.page.my.MyAvatarPage;+import io.onedev.server.web.page.my.MyPasswordPage;+import io.onedev.server.web.page.my.MyProfilePage;+import io.onedev.server.web.page.my.buildsetting.MyBuildPreserveRulesPage;+import io.onedev.server.web.page.my.buildsetting.MySecretListPage;+import io.onedev.server.web.page.project.NewProjectPage;+import io.onedev.server.web.page.project.ProjectListPage;+import io.onedev.server.web.page.project.blob.ProjectBlobPage;+import io.onedev.server.web.page.project.branches.ProjectBranchesPage;+import io.onedev.server.web.page.project.builds.ProjectBuildsPage;+import io.onedev.server.web.page.project.builds.detail.InvalidBuildPage;+import io.onedev.server.web.page.project.builds.detail.artifacts.BuildArtifactsPage;+import io.onedev.server.web.page.project.builds.detail.changes.BuildChangesPage;+import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPage;+import io.onedev.server.web.page.project.builds.detail.issues.FixedIssuesPage;+import io.onedev.server.web.page.project.builds.detail.log.BuildLogPage;+import io.onedev.server.web.page.project.codecomments.ProjectCodeCommentsPage;+import io.onedev.server.web.page.project.commits.CommitDetailPage;+import io.onedev.server.web.page.project.commits.ProjectCommitsPage;+import io.onedev.server.web.page.project.compare.RevisionComparePage;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;+import io.onedev.server.web.page.project.issues.boards.IssueBoardsPage;+import io.onedev.server.web.page.project.issues.create.NewIssuePage;+import io.onedev.server.web.page.project.issues.detail.FixingBuildsPage;+import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;+import io.onedev.server.web.page.project.issues.list.ProjectIssueListPage;+import io.onedev.server.web.page.project.issues.milestones.MilestoneDetailPage;+import io.onedev.server.web.page.project.issues.milestones.MilestoneEditPage;+import io.onedev.server.web.page.project.issues.milestones.MilestoneListPage;+import io.onedev.server.web.page.project.issues.milestones.NewMilestonePage;+import io.onedev.server.web.page.project.pullrequests.InvalidPullRequestPage;+import io.onedev.server.web.page.project.pullrequests.ProjectPullRequestsPage;+import io.onedev.server.web.page.project.pullrequests.create.NewPullRequestPage;+import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;+import io.onedev.server.web.page.project.pullrequests.detail.changes.PullRequestChangesPage;+import io.onedev.server.web.page.project.pullrequests.detail.codecomments.PullRequestCodeCommentsPage;+import io.onedev.server.web.page.project.pullrequests.detail.mergepreview.MergePreviewPage;+import io.onedev.server.web.page.project.setting.authorization.ProjectAuthorizationsPage;+import io.onedev.server.web.page.project.setting.avatar.AvatarEditPage;+import io.onedev.server.web.page.project.setting.branchprotection.BranchProtectionPage;+import io.onedev.server.web.page.project.setting.build.ProjectBuildPreserveRulesPage;+import io.onedev.server.web.page.project.setting.build.ProjectSecretListPage;+import io.onedev.server.web.page.project.setting.general.GeneralSettingPage;+import io.onedev.server.web.page.project.setting.issue.PromptFieldsUponIssueOpenSettingPage;+import io.onedev.server.web.page.project.setting.issue.StateTransitionsPage;+import io.onedev.server.web.page.project.setting.tagprotection.TagProtectionPage;+import io.onedev.server.web.page.project.setting.webhook.WebHooksPage;+import io.onedev.server.web.page.project.stats.ProjectContribsPage;+import io.onedev.server.web.page.project.stats.SourceLinesPage;+import io.onedev.server.web.page.project.tags.ProjectTagsPage;+import io.onedev.server.web.page.pullrequest.PullRequestListPage;+import io.onedev.server.web.page.security.ForgetPage;+import io.onedev.server.web.page.security.LoginPage;+import io.onedev.server.web.page.security.LogoutPage;+import io.onedev.server.web.page.security.RegisterPage;++public class OneUrlMapper extends CompoundRequestMapper {++ public OneUrlMapper(WebApplication app) {+ add(new OnePageMapper("init", ServerInitPage.class));+ add(new OnePageMapper("loading", BrowserInfoPage.class));+ add(new OnePageMapper("issues", IssueListPage.class));+ add(new OnePageMapper("pull-requests", PullRequestListPage.class));+ add(new OnePageMapper("builds", BuildListPage.class));+ addProjectPages();+ addMyPages();+ addAdministrationPages();+ addSecurityPages();++ addResources();+ }++ private void addMyPages() {+ add(new OnePageMapper("my/profile", MyProfilePage.class));+ add(new OnePageMapper("my/avatar", MyAvatarPage.class));+ add(new OnePageMapper("my/password", MyPasswordPage.class));+ add(new OnePageMapper("my/build-setting/secrets", MySecretListPage.class));+ add(new OnePageMapper("my/build-setting/preserve-rules", MyBuildPreserveRulesPage.class));+ }++ private void addResources() {+ add(new ResourceMapper("downloads/server-log", new ServerLogDownloadResourceReference()));+ add(new ResourceMapper("downloads/projects/${project}/builds/${build}/log", new BuildLogDownloadResourceReference()));+ add(new ResourceMapper("projects/${project}/archive/${revision}", new ArchiveDownloadResourceReference()));+ add(new OneResourceMapper("projects/${project}/raw/${revision}/${path}", new RawBlobDownloadResourceReference()));+ add(new ResourceMapper("projects/${project}/attachment/${uuid}/${attachment}", new AttachmentDownloadResourceReference()));+ add(new OneResourceMapper("downloads/projects/${project}/builds/${build}/artifacts/${path}",+ new ArtifactDownloadResourceReference()));+ }++ private void addSecurityPages() {+ add(new OnePageMapper("login", LoginPage.class));+ add(new OnePageMapper("logout", LogoutPage.class));+ add(new OnePageMapper("register", RegisterPage.class));+ add(new OnePageMapper("forget", ForgetPage.class));+ }++ private void addAdministrationPages() {+ add(new OnePageMapper("administration/users", UserListPage.class));+ add(new OnePageMapper("administration/users/new", NewUserPage.class));+ add(new OnePageMapper("administration/users/${user}/profile", UserProfilePage.class));+ add(new OnePageMapper("administration/users/${user}/groups", UserMembershipsPage.class));+ add(new OnePageMapper("administration/users/${user}/authorizations", UserAuthorizationsPage.class));+ add(new OnePageMapper("administration/users/${user}/avatar", UserAvatarPage.class));+ add(new OnePageMapper("administration/users/${user}/password", UserPasswordPage.class));+ add(new OnePageMapper("administration/users/${user}/token", UserTokenPage.class));+ add(new OnePageMapper("administration/users/${user}/build-setting/secrets", UserSecretListPage.class));+ add(new OnePageMapper("administration/users/${user}/build-setting/preserve-rules", UserBuildPreserveRulesPage.class));++ add(new OnePageMapper("administration/roles", RoleListPage.class));+ add(new OnePageMapper("administration/roles/new", NewRolePage.class));+ add(new OnePageMapper("administration/roles/${role}", RoleDetailPage.class));++ add(new OnePageMapper("administration/groups", GroupListPage.class));+ add(new OnePageMapper("administration/groups/new", NewGroupPage.class));+ add(new OnePageMapper("administration/groups/${group}", GroupProfilePage.class));+ add(new OnePageMapper("administration/groups/${group}/profile", GroupProfilePage.class));+ add(new OnePageMapper("administration/groups/${group}/members", GroupMembershipsPage.class));+ add(new OnePageMapper("administration/groups/${group}/authorizations", GroupAuthorizationsPage.class));++ add(new OnePageMapper("administration/settings/system", SystemSettingPage.class));+ add(new OnePageMapper("administration/settings/mail", MailSettingPage.class));+ add(new OnePageMapper("administration/settings/backup", DatabaseBackupPage.class));+ add(new OnePageMapper("administration/settings/security", SecuritySettingPage.class));+ add(new OnePageMapper("administration/settings/authenticator", AuthenticatorPage.class));++ add(new OnePageMapper("administration/settings/job-executors", JobExecutorPage.class));+ add(new OnePageMapper("administration/settings/groovy-scripts", GroovyScriptListPage.class));++ add(new OnePageMapper("administration/settings/issue-fields", IssueFieldListPage.class));+ add(new OnePageMapper("administration/settings/issue-states", IssueStateListPage.class));+ add(new OnePageMapper("administration/settings/state-transitions", DefaultStateTransitionsPage.class));+ add(new OnePageMapper("administration/settings/issue-boards", DefaultBoardListPage.class));++ add(new OnePageMapper("administration/server-log", ServerLogPage.class));+ add(new OnePageMapper("administration/server-information", ServerInformationPage.class));+ }++ private void addProjectPages() {+ add(new OnePageMapper("projects", ProjectListPage.class));+ add(new OnePageMapper("projects/new", NewProjectPage.class));+ add(new OnePageMapper("projects/${project}", ProjectDashboardPage.class));++ add(new OnePageMapper("projects/${project}/blob/#{revision}/#{path}", ProjectBlobPage.class));+ add(new OnePageMapper("projects/${project}/commits/${revision}", CommitDetailPage.class));+ add(new OnePageMapper("projects/${project}/commits", ProjectCommitsPage.class));+ add(new OnePageMapper("projects/${project}/compare", RevisionComparePage.class));+ add(new OnePageMapper("projects/${project}/stats/contribs", ProjectContribsPage.class));+ add(new OnePageMapper("projects/${project}/stats/lines", SourceLinesPage.class));++ add(new OnePageMapper("projects/${project}/branches", ProjectBranchesPage.class));+ add(new OnePageMapper("projects/${project}/tags", ProjectTagsPage.class));+ add(new OnePageMapper("projects/${project}/codecomments", ProjectCodeCommentsPage.class));++ add(new OnePageMapper("projects/${project}/pulls", ProjectPullRequestsPage.class));+ add(new OnePageMapper("projects/${project}/pulls/new", NewPullRequestPage.class));+ add(new OnePageMapper("projects/${project}/pulls/${request}", PullRequestActivitiesPage.class));+ add(new OnePageMapper("projects/${project}/pulls/${request}/activities", PullRequestActivitiesPage.class));+ add(new OnePageMapper("projects/${project}/pulls/${request}/code-comments", PullRequestCodeCommentsPage.class));+ add(new OnePageMapper("projects/${project}/pulls/${request}/changes", PullRequestChangesPage.class));+ add(new OnePageMapper("projects/${project}/pulls/${request}/merge-preview", MergePreviewPage.class));+ add(new OnePageMapper("projects/${project}/pulls/${request}/invalid", InvalidPullRequestPage.class));++ add(new OnePageMapper("projects/${project}/issue-boards", IssueBoardsPage.class));+ add(new OnePageMapper("projects/${project}/issue-boards/${board}", IssueBoardsPage.class));+ add(new OnePageMapper("projects/${project}/issue-list", ProjectIssueListPage.class));+ add(new OnePageMapper("projects/${project}/issues/${issue}", IssueActivitiesPage.class));+ add(new OnePageMapper("projects/${project}/issues/${issue}/activities", IssueActivitiesPage.class));+ add(new OnePageMapper("projects/${project}/issues/${issue}/builds", FixingBuildsPage.class));+ add(new OnePageMapper("projects/${project}/issues/new", NewIssuePage.class));+ add(new OnePageMapper("projects/${project}/builds", ProjectBuildsPage.class));+ add(new OnePageMapper("projects/${project}/builds/${build}", BuildDashboardPage.class));+ add(new OnePageMapper("projects/${project}/builds/${build}/log", BuildLogPage.class));+ add(new OnePageMapper("projects/${project}/builds/${build}/changes", BuildChangesPage.class));+ add(new OnePageMapper("projects/${project}/builds/${build}/fixed-issues", FixedIssuesPage.class));+ add(new OnePageMapper("projects/${project}/builds/${build}/artifacts", BuildArtifactsPage.class));+ add(new OnePageMapper("projects/${project}/builds/${build}/invalid", InvalidBuildPage.class));++ add(new OnePageMapper("projects/${project}/milestones", MilestoneListPage.class));+ add(new OnePageMapper("projects/${project}/milestones/${milestone}", MilestoneDetailPage.class));+ add(new OnePageMapper("projects/${project}/milestones/${milestone}/edit", MilestoneEditPage.class));+ add(new OnePageMapper("projects/${project}/milestones/new", NewMilestonePage.class));++ add(new OnePageMapper("projects/${project}/settings/general", GeneralSettingPage.class));+ add(new OnePageMapper("projects/${project}/settings/authorizations", ProjectAuthorizationsPage.class));+ add(new OnePageMapper("projects/${project}/settings/avatar-edit", AvatarEditPage.class));+ add(new OnePageMapper("projects/${project}/settings/branch-protection", BranchProtectionPage.class));+ add(new OnePageMapper("projects/${project}/settings/tag-protection", TagProtectionPage.class));+ add(new OnePageMapper("projects/${project}/settings/build/secrets", ProjectSecretListPage.class));+ add(new OnePageMapper("projects/${project}/settings/build/preserve-rules", ProjectBuildPreserveRulesPage.class));+ add(new OnePageMapper("projects/${project}/settings/issue/state-transitions", StateTransitionsPage.class));+ add(new OnePageMapper("projects/${project}/settings/issue/prompt-fields-upon-issue-open",+ PromptFieldsUponIssueOpenSettingPage.class));+ add(new OnePageMapper("projects/${project}/settings/web-hooks", WebHooksPage.class));+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/ReferenceInputBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/ReferenceInputBehavior.javaindex 725ede678c..b4b1fa957f 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/ReferenceInputBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/ReferenceInputBehavior.java@@ -30,7 +30,6 @@ public abstract class ReferenceInputBehavior extends InputAssistBehavior {private final boolean appendTitle;public ReferenceInputBehavior(boolean appendTitle) {- super(false);this.appendTitle = appendTitle;}@@ -90,7 +89,7 @@ public abstract class ReferenceInputBehavior extends InputAssistBehavior {content + inputStatus.getContentAfterCaret(), content.length(),suggestion.getDescription(), suggestion.getMatch());} else {- String content = contentBeforeCaret.substring(0, hashIndex) + suggestion.getContent() + " ";+ String content = contentBeforeCaret.substring(0, hashIndex) + suggestion.getContent();completion = new InputCompletion(suggestion.getContent(),content + inputStatus.getContentAfterCaret(), content.length(),suggestion.getDescription(), suggestion.getMatch());diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.java b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.javaindex cd6fd4f8ee..8f76356b56 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.java@@ -13,7 +13,6 @@ import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.markup.repeater.RepeatingView;import io.onedev.commons.codeassist.InputCompletion;-import io.onedev.commons.codeassist.InputStatus;import io.onedev.commons.utils.LinearRange;import io.onedev.server.web.behavior.infinitescroll.InfiniteScrollBehavior;@@ -24,16 +23,13 @@ abstract class AssistPanel extends Panel {private final Component input;- private final InputStatus inputStatus;-private final List<String> hints;private final List<InputCompletion> suggestions;- public AssistPanel(String id, Component input, InputStatus inputStatus, List<InputCompletion> suggestions, List<String> hints) {+ public AssistPanel(String id, Component input, List<InputCompletion> suggestions, List<String> hints) {super(id);this.input = input;- this.inputStatus = inputStatus;this.suggestions = suggestions;this.hints = hints;}@@ -120,10 +116,6 @@ abstract class AssistPanel extends Panel {String content = suggestion.getContent();item.add(AttributeAppender.append("data-content", content));item.add(AttributeAppender.append("data-caret", suggestion.getCaret()));- if (!suggestion.getContent().equals(inputStatus.getContent())- || suggestion.getCaret() != inputStatus.getCaret()) {- item.add(AttributeAppender.append("class", "different"));- }item.setOutputMarkupId(true);return item;}diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistBehavior.javaindex 9a2ed248c2..58a1053281 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistBehavior.java@@ -3,7 +3,6 @@ package io.onedev.server.web.behavior.inputassist;import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;import java.util.ArrayList;-import java.util.Iterator;import java.util.List;import org.apache.wicket.Component;@@ -41,26 +40,14 @@ public abstract class InputAssistBehavior extends AbstractPostAjaxBehavior {public static final int MAX_SUGGESTIONS = 1000;- private final boolean noAutoFocus;-private FloatingPanel dropdown;- public InputAssistBehavior(boolean noAutoFocus) {- this.noAutoFocus = noAutoFocus;- }-- public InputAssistBehavior() {- this(true);- }-@Overrideprotected void onBind() {super.onBind();Component input = getComponent();input.add(AttributeAppender.append("class", "input-assist"));- if (noAutoFocus)- input.add(AttributeAppender.append("class", "no-autofocus"));input.setOutputMarkupId(true);}@@ -147,19 +134,20 @@ public abstract class InputAssistBehavior extends AbstractPostAjaxBehavior {if (inputCaret != null) {InputStatus inputStatus = new InputStatus(inputContent, inputCaret);- List<InputCompletion> suggestions;+ List<InputCompletion> suggestions = new ArrayList<>();ComponentContext.push(new ComponentContext(getComponent()));try {- suggestions = getSuggestions(new InputStatus(inputContent, inputCaret));+ for (InputCompletion suggestion: getSuggestions(new InputStatus(inputContent, inputCaret))) {+ if (!suggestion.getContent().equals(inputStatus.getContent())+ || suggestion.getCaret() != inputStatus.getCaret()) {+ suggestions.add(suggestion);+ if (suggestions.size() >= MAX_SUGGESTIONS)+ break;+ }+ }} finally {ComponentContext.pop();}- int count = 0;- for (Iterator<InputCompletion> it = suggestions.iterator(); it.hasNext();) {- it.next();- if (++count > MAX_SUGGESTIONS)- it.remove();- }if (!suggestions.isEmpty()) {int anchor = getAnchor(inputContent.substring(0, inputCaret));if (dropdown == null) {@@ -167,7 +155,7 @@ public abstract class InputAssistBehavior extends AbstractPostAjaxBehavior {@Overrideprotected Component newContent(String id) {- return new AssistPanel(id, getComponent(), inputStatus, suggestions, getHints(inputStatus)) {+ return new AssistPanel(id, getComponent(), suggestions, getHints(inputStatus)) {@Overrideprotected void onClose(AjaxRequestTarget target) {@@ -189,7 +177,7 @@ public abstract class InputAssistBehavior extends AbstractPostAjaxBehavior {target.appendJavaScript(script);} else {Component content = dropdown.getContent();- Component newContent = new AssistPanel(content.getId(), getComponent(), inputStatus, suggestions, getHints(inputStatus)) {+ Component newContent = new AssistPanel(content.getId(), getComponent(), suggestions, getHints(inputStatus)) {@Overrideprotected void onClose(AjaxRequestTarget target) {diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.js b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.jsindex afe9477983..81b03f8fb6 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.js+++ b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.js@@ -112,8 +112,8 @@ onedev.server.inputassist = {var $active = $dropdown.find("tr.active");if ($active.length != 0)$input.data("update")($active);- else if ($dropdown.find("tr.different").length != 0)- $input.data("update")($dropdown.find("tr.different").first());+ else if ($dropdown.find("tr").length != 0)+ $input.data("update")($dropdown.find("tr").first());}return false;} else {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.javaindex 8a0741b291..f362c8f504 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@@ -19,6 +19,7 @@ import org.apache.wicket.ajax.markup.html.form.AjaxButton;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.event.Broadcast;import org.apache.wicket.event.IEvent;+import org.apache.wicket.feedback.FencedFeedbackPanel;import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;@@ -49,7 +50,7 @@ import org.slf4j.LoggerFactory;import com.google.common.collect.Lists;-import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;+import io.onedev.commons.utils.HtmlUtils;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;import io.onedev.server.OneException;@@ -105,7 +106,7 @@ public abstract class CommitListPanel extends Panel {return CommitQuery.merge(getBaseQuery(), additionalQuery);} catch (Exception e) {logger.error("Error parsing commit query: " + query, e);- error(e.getMessage());+ error(HtmlUtils.formatAsHtml(e.getMessage()));}return null;}@@ -152,7 +153,7 @@ public abstract class CommitListPanel extends Panel {commitHashes = command.call();} catch (Exception e) {if (e.getMessage() != null)- error(e.getMessage());+ error(HtmlUtils.formatAsHtml(e.getMessage()));elseerror("Error calculating commits: check log for details");commitHashes = new ArrayList<>();@@ -358,8 +359,9 @@ public abstract class CommitListPanel extends Panel {body.setOutputMarkupId(true);add(body);- NotificationPanel feedback;- body.add(feedback = new NotificationPanel("feedback", this));+ FencedFeedbackPanel feedback;+ body.add(feedback = new FencedFeedbackPanel("feedback", this));+ feedback.setEscapeModelStrings(false);body.add(new WebMarkupContainer("noCommits") {diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.css b/server-core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.cssindex e795f092af..7bc7115c90 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.css+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.css@@ -26,7 +26,7 @@.commit-list>.body .no-commits {font-size: 16px;}-.commit-list>.body li {+.commit-list>.body>ul>li {padding: 4px 0;position: relative;}diff --git a/server-core/src/main/java/io/onedev/server/web/component/floating/floating.js b/server-core/src/main/java/io/onedev/server/web/component/floating/floating.jsindex 7e42b8b45a..1bdf757fc3 100644--- a/server-core/src/main/java/io/onedev/server/web/component/floating/floating.js+++ b/server-core/src/main/java/io/onedev/server/web/component/floating/floating.js@@ -11,8 +11,8 @@ onedev.server.floating = {* floating panel, as normally the triggering element already has the logic* closing the floating when it is clicked (to achieve the toggle effect)*/- var x = e.pageX + $(window).scrollLeft();- var y = e.pageY + $(window).scrollTop();+ var x = e.pageX;+ var y = e.pageY;// add this extra check as otherwise clicking on scroll bar of floating will hide the// floating in IEdiff --git a/server-core/src/main/java/io/onedev/server/web/editable/SecretEditBean.java b/server-core/src/main/java/io/onedev/server/web/editable/JobSecretEditBean.javasimilarity index 78%rename from server-core/src/main/java/io/onedev/server/web/editable/SecretEditBean.javarename to server-core/src/main/java/io/onedev/server/web/editable/JobSecretEditBean.javaindex 331a6b8156..938ac6710c 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/SecretEditBean.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/JobSecretEditBean.java@@ -6,14 +6,14 @@ import java.util.List;import org.hibernate.validator.constraints.NotEmpty;-import io.onedev.server.model.support.Secret;+import io.onedev.server.model.support.JobSecret;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.util.WicketUtils;@Editable-public class SecretEditBean implements Serializable {+public class JobSecretEditBean implements Serializable {private static final long serialVersionUID = 1L;@@ -34,8 +34,8 @@ public class SecretEditBean implements Serializable {private static List<String> getSecretChoices() {List<String> secretNames = new ArrayList<>();ProjectBlobPage page = (ProjectBlobPage) WicketUtils.getPage();- for (Secret secret: page.getProject().getSecrets()) {- if (!secretNames.contains(secret.getName()) && secret.isAuthorized(page.getProject(), page.getCommit()))+ for (JobSecret secret: page.getProject().getBuildSetting().getSecrets()) {+ if (secret.isAuthorized(page.getProject(), page.getCommit()))secretNames.add(secret.getName());}return secretNames;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/SuggestionEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/SuggestionEditSupport.javanew file mode 100644index 0000000000..b18f70e2ac--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/SuggestionEditSupport.java@@ -0,0 +1,82 @@+package io.onedev.server.web.editable;++import java.lang.reflect.Method;+import java.util.ArrayList;+import java.util.List;++import org.apache.wicket.model.IModel;++import io.onedev.commons.codeassist.InputCompletion;+import io.onedev.commons.codeassist.InputStatus;+import io.onedev.commons.utils.LinearRange;+import io.onedev.server.util.ReflectionUtils;+import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;+import io.onedev.server.web.editable.annotation.SuggestionProvider;+import io.onedev.server.web.editable.string.StringPropertyEditor;+import io.onedev.server.web.editable.string.StringPropertyViewer;++@SuppressWarnings("serial")+public class SuggestionEditSupport implements EditSupport {++ @Override+ public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {+ Method propertyGetter = descriptor.getPropertyGetter();+ SuggestionProvider suggestionProvider = propertyGetter.getAnnotation(SuggestionProvider.class);+ if (suggestionProvider != null) {+ if (propertyGetter.getReturnType() == String.class) {+ return new PropertyContext<String>(descriptor) {++ @Override+ public PropertyViewer renderForView(String componentId, IModel<String> model) {+ return new StringPropertyViewer(componentId, descriptor, model.getObject());+ }++ @Override+ public PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {+ return new StringPropertyEditor(componentId, descriptor, model) {++ @Override+ protected InputAssistBehavior getInputAssistBehavior() {+ return new InputAssistBehavior() {++ @SuppressWarnings("unchecked")+ @Override+ protected List<InputCompletion> getSuggestions(InputStatus inputStatus) {+ String suggestionMethod = suggestionProvider.value();+ return (List<InputCompletion>) ReflectionUtils.invokeStaticMethod(+ descriptor.getBeanClass(),+ suggestionMethod, new Object[] {inputStatus});+ }++ @Override+ protected List<LinearRange> getErrors(String inputContent) {+ return new ArrayList<>();+ }++ @Override+ protected int getAnchor(String inputContent) {+ return 0;+ }++ };+ }++ };+ }++ };+ } else {+ throw new RuntimeException("Annotation 'SuggestionProvider' should be applied to property "+ + "of type 'String'");+ }+ } else {+ return null;+ }+ }++ @Override+ public int getPriority() {+ return DEFAULT_PRIORITY;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/annotation/BuildQuery.java b/server-core/src/main/java/io/onedev/server/web/editable/annotation/BuildQuery.javaindex 316d67f13a..4aa1c85020 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/annotation/BuildQuery.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/annotation/BuildQuery.java@@ -18,6 +18,8 @@ public @interface BuildQuery {boolean withUnfinishedCriteria();+ boolean noAutoFocus() default true;+String message() default "";Class<?>[] groups() default {};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/annotation/SuggestionProvider.java b/server-core/src/main/java/io/onedev/server/web/editable/annotation/SuggestionProvider.javanew file mode 100644index 0000000000..946ee7b4ad--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/annotation/SuggestionProvider.java@@ -0,0 +1,12 @@+package io.onedev.server.web.editable.annotation;++import java.lang.annotation.ElementType;+import java.lang.annotation.Retention;+import java.lang.annotation.RetentionPolicy;+import java.lang.annotation.Target;++@Target({ElementType.METHOD, ElementType.FIELD})+@Retention(RetentionPolicy.RUNTIME)+public @interface SuggestionProvider {+ String value();+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/build/query/BuildQueryEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/build/query/BuildQueryEditor.javaindex 3817fd26ff..80c5b0fd63 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/build/query/BuildQueryEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/build/query/BuildQueryEditor.java@@ -37,7 +37,10 @@ public class BuildQueryEditor extends PropertyEditor<String> {@Overridepublic Project getObject() {- return ((ProjectPage) getPage()).getProject();+ if (getPage() instanceof ProjectPage)+ return ((ProjectPage) getPage()).getProject();+ else+ return null;}}, buildQuery.withCurrentUserCriteria(), buildQuery.withUnfinishedCriteria()));diff --git a/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldsupply/FieldListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldsupply/FieldListEditPanel.javaindex 508695a43e..c33e7857dc 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldsupply/FieldListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldsupply/FieldListEditPanel.java@@ -42,7 +42,7 @@ import io.onedev.server.web.editable.BeanDescriptor;import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;-import io.onedev.server.web.editable.SecretEditBean;+import io.onedev.server.web.editable.JobSecretEditBean;import io.onedev.server.web.editable.annotation.FieldNamesProvider;import io.onedev.server.web.editable.annotation.Password;@@ -241,7 +241,7 @@ class FieldListEditPanel extends PropertyEditor<List<Serializable>> {if (property.getPropertyGetter().getAnnotation(Password.class) == null) {return PropertyContext.edit("value", fieldBean, property.getPropertyName());} else {- SecretEditBean bean = new SecretEditBean();+ JobSecretEditBean bean = new JobSecretEditBean();bean.setSecret((String) property.getPropertyValue(fieldBean));return PropertyContext.edit("value", bean, "secret");}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListEditPanel.javaindex 647bd85f86..9b0795411a 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListEditPanel.java@@ -45,7 +45,7 @@ import io.onedev.server.web.editable.BeanDescriptor;import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;-import io.onedev.server.web.editable.SecretEditBean;+import io.onedev.server.web.editable.JobSecretEditBean;import io.onedev.server.web.editable.annotation.ParamSpecProvider;import io.onedev.server.web.editable.annotation.Password;@@ -268,7 +268,7 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {if (property.getPropertyGetter().getAnnotation(Password.class) == null) {item.add(PropertyContext.edit("value", paramBean, property.getPropertyName()));} else {- SecretEditBean bean = new SecretEditBean();+ JobSecretEditBean bean = new JobSecretEditBean();bean.setSecret((String) property.getPropertyValue(paramBean));item.add(PropertyContext.edit("value", bean, "secret"));}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.javaindex 75734b20df..6a6aac3d77 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java@@ -26,6 +26,8 @@ import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.component.tabbable.Tabbable;import io.onedev.server.web.component.user.avatar.UserAvatar;import io.onedev.server.web.page.admin.AdministrationPage;+import io.onedev.server.web.page.admin.user.buildsetting.UserBuildSettingPage;+import io.onedev.server.web.page.admin.user.buildsetting.UserSecretListPage;@SuppressWarnings("serial")public abstract class UserPage extends AdministrationPage {@@ -85,6 +87,7 @@ public abstract class UserPage extends AdministrationPage {tabs.add(new UserTab("Access Token", "fa fa-fw fa-ticket", UserTokenPage.class));tabs.add(new UserTab("Belonging Groups", "fa fa-fw fa-group", UserMembershipsPage.class));tabs.add(new UserTab("Authorized Projects", "fa fa-fw fa-ext fa-repo", UserAuthorizationsPage.class));+ tabs.add(new UserTab("Build Setting", "fa fa-fw fa-cubes", UserSecretListPage.class, UserBuildSettingPage.class));return tabs;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildPreserveSettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserBuildPreserveRulesPage.htmlsimilarity index 52%rename from server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildPreserveSettingPage.htmlrename to server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserBuildPreserveRulesPage.htmlindex c292152634..c58fc6d6bf 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildPreserveSettingPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserBuildPreserveRulesPage.html@@ -1,7 +1,7 @@<wicket:extend>- <div class="page-title">Build Preserve Setting</div>- <div class="help-block">Define rules to preserve builds. A build will be preserved as long as one rule preserves it.- All builds will be preserved if no rules are defined</div>+ <div class="help-block">Define common rules to preserve builds for all projects owned+ by current user. A build will be preserved as long as one rule preserves it. All builds+ will be preserved if no rules are defined</div><form wicket:id="form" class="leave-confirm build-preservations"><div wicket:id="feedback"></div><div wicket:id="editor"></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserBuildPreserveRulesPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserBuildPreserveRulesPage.javanew file mode 100644index 0000000000..6865591ce4--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserBuildPreserveRulesPage.java@@ -0,0 +1,52 @@+package io.onedev.server.web.page.admin.user.buildsetting;++import java.io.Serializable;++import org.apache.wicket.feedback.FencedFeedbackPanel;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.web.editable.PropertyContext;++@SuppressWarnings("serial")+public class UserBuildPreserveRulesPage extends UserBuildSettingPage {++ public UserBuildPreserveRulesPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onSubmit() {+ super.onSubmit();++ OneDev.getInstance(UserManager.class).save(getUser());+ getSession().success("Build preserve rules have been saved");+ setResponsePage(UserBuildPreserveRulesPage.class, UserBuildPreserveRulesPage.paramsOf(getUser()));+ }++ };++ form.add(new FencedFeedbackPanel("feedback", form));++ form.add(PropertyContext.editModel("editor", new AbstractReadOnlyModel<Serializable>() {++ @Override+ public Serializable getObject() {+ return getUser().getBuildSetting();+ }++ }, "buildPreservations"));++ add(form);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserBuildSettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserBuildSettingPage.htmlnew file mode 100644index 0000000000..7d7d288e62--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserBuildSettingPage.html@@ -0,0 +1,7 @@+<wicket:extend>+ <div class="page-title">Build Setting</div>+ <div class="build-setting">+ <ul wicket:id="buildSettingTabs" class="nav nav-tabs"></ul>+ <wicket:child></wicket:child>+ </div>+</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserBuildSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserBuildSettingPage.javanew file mode 100644index 0000000000..c2f6f2624e--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserBuildSettingPage.java@@ -0,0 +1,63 @@+package io.onedev.server.web.page.admin.user.buildsetting;++import java.util.ArrayList;+import java.util.List;++import org.apache.wicket.Component;+import org.apache.wicket.Page;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.web.component.tabbable.PageTab;+import io.onedev.server.web.component.tabbable.PageTabLink;+import io.onedev.server.web.component.tabbable.Tab;+import io.onedev.server.web.component.tabbable.Tabbable;+import io.onedev.server.web.page.admin.user.UserPage;++@SuppressWarnings("serial")+public abstract class UserBuildSettingPage extends UserPage {++ public UserBuildSettingPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ List<Tab> tabs = new ArrayList<>();+ tabs.add(new PageTab(Model.of("Secrets"), UserSecretListPage.class) {++ @Override+ public Component render(String componentId) {+ return new TabLink(componentId, this);+ }++ });++ tabs.add(new PageTab(Model.of("Build Preserve Rules"), UserBuildPreserveRulesPage.class) {++ @Override+ public Component render(String componentId) {+ return new TabLink(componentId, this);+ }++ });+ add(new Tabbable("buildSettingTabs", tabs));+ }++ private class TabLink extends PageTabLink {++ public TabLink(String id, PageTab tab) {+ super(id, tab);+ }++ @Override+ protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {+ return new BookmarkablePageLink<Void>(linkId, pageClass, UserPage.paramsOf(getUser()));+ }++ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/secret/SecretListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserSecretListPage.htmlsimilarity index 85%rename from server-core/src/main/java/io/onedev/server/web/page/project/setting/secret/SecretListPage.htmlrename to server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserSecretListPage.htmlindex 2736fc4cbb..4a44d4f392 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/secret/SecretListPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserSecretListPage.html@@ -1,5 +1,4 @@<wicket:extend>- <div class="page-title">Secrets</div><div wicket:id="note" class="help-block"></div><form wicket:id="form" class="leave-confirm secrets"><div wicket:id="feedback"></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserSecretListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserSecretListPage.javanew file mode 100644index 0000000000..0347d9deb2--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserSecretListPage.java@@ -0,0 +1,72 @@+package io.onedev.server.web.page.admin.user.buildsetting;++import java.io.Serializable;+import java.util.HashSet;+import java.util.Set;++import org.apache.wicket.feedback.FencedFeedbackPanel;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.model.support.JobSecret;+import io.onedev.server.util.inputspec.SecretInput;+import io.onedev.server.web.editable.PropertyContext;++@SuppressWarnings("serial")+public class UserSecretListPage extends UserBuildSettingPage {++ public UserSecretListPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onSubmit() {+ super.onSubmit();++ Set<String> names = new HashSet<>();+ for (JobSecret secret: getUser().getBuildSetting().getSecrets()) {+ if (names.contains(secret.getName())) {+ error("Duplicate name found: " + secret.getName());+ return;+ } else {+ names.add(secret.getName());+ }+ }++ OneDev.getInstance(UserManager.class).save(getUser());+ getSession().success("Job secrets have been saved");+ setResponsePage(UserSecretListPage.class, UserSecretListPage.paramsOf(getUser()));+ }++ };++ form.add(new FencedFeedbackPanel("feedback", form));++ form.add(PropertyContext.editModel("editor", new AbstractReadOnlyModel<Serializable>() {++ @Override+ public Serializable getObject() {+ return getUser().getBuildSetting();+ }++ }, "secrets"));++ add(form);++ String note = String.format("Define commons secrets to be used in build jobs of all projects "+ + "owned by current user. Secret value less than %d characters will not be masked "+ + "in build log", SecretInput.MASK.length());+ add(new Label("note", note).setEscapeModelStrings(false));+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.css b/server-core/src/main/java/io/onedev/server/web/page/base/base.cssindex f29dabdd7e..9de338470e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.css+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.css@@ -1,666 +1,666 @@-body {- font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";- background: white;-}--a {- color: #1f3b7b;-}-a.embedded-reference {- color: #0d87e9;-}-.pointer {- cursor: pointer;-}-.drag-indicator {- color: #999;-}--.has-error.form-control {- border-color: #a94442;- -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);- box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);-}-.red {- color: red;-}--/* FEEDBACK */-#session-feedback {- position: fixed;- max-width: 75%;- padding: 6px 12px;- z-index: 10000;- border-radius: 0 0 4px 4px;- border: 1px solid;- border-top: none;- top: 0;- display: none;-}-#session-feedback.success {- background: #DFF0D8;- color: #204021;-}-#session-feedback.error {- background: #F2DEDE;- color: #A94442;- border-color: #622726;-}-#session-feedback.warning {- background: #FCF8E3;- color: #8A6D3B;- border-color: #815A0D;-}-#session-feedback.info {- background: #D9EDF7;- color: #31708F;- border-color: #145562;-}-#session-feedback ul {- padding: 0;- margin: 0;-}-#session-feedback li {- list-style: none;- border: none;- padding: 0;- margin: 0;- background: none;-}--ul.feedbackPanel {- margin: 0 0 20px 0;- padding: 0;- list-style: none;-}-ul.feedbackPanel>li {- margin: 0;- padding: 8px 0 8px 12px;- border-left: 6px solid;-}-li.feedbackPanelERROR, li.feedbackPanelFATAL {- color: #DD4B4B;- background: #FEDADA;- border-left-color: #BF1111;-}-li.feedbackPanelSUCCESS {- color: #399529;- background: #E5FBE5;- border-left-color: #19A519;-}-li.feedbackPanelINFO {- color: #31708f;- background: #d9edf7;- border-left-color: #46A7D8;-}-li.feedbackPanelWARNING {- background: #FDF3C9;- color: #836A05;- border-left-color: #AD8C07;-}--ul.feedbackPanel>li:first-child {- border-radius: 4px 4px 0 0;-}-ul.feedbackPanel>li:last-child {- border-radius: 0 0 4px 4px;-}-ul.feedbackPanel>li:first-child:last-child {- border-radius: 4px;-}-form .required {- font-size: 16px;- color: #B94A48;-}--.noselect {- -webkit-touch-callout: none;- -webkit-user-select: none;- -khtml-user-select: none;- -moz-user-select: none;- -ms-user-select: none;- user-select: none;-}--/* TABLE COMPONENTS */-table .row-selector {- width: 24px;-}-table>thead>tr>th {- white-space: nowrap;-}--.navigator {- text-align: center;-}-.navigatorLabel {- display: none;-}--a.wicket_orderUp:after, a.wicket_orderDown:after, a.wicket_orderNone:after {- font-family: FontAwesome;- font-weight: normal;- font-style: normal;- text-decoration: none;- display: inline-block;- color: #666;- margin-left: 8px;-}-a.wicket_orderUp:AFTER {- content: "\f062";-}-a.wicket_orderDown:AFTER {- content: "\f063";-}-.pagination {- margin-bottom: 0;-}-.pagination a.first, .pagination a.prev, .pagination a.next, .pagination a.last {- font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;-}-.table>thead+tfoot>tr>td.norecords-td>div {- border-top: 2px solid #DDD;- margin-top: -10px;- padding-top: 10px;-}-.norecords-td {- font-style: italic;-}--/* TREE */-.tree-theme-windows .tree-node span.tree-content a {- color: #444444;-}-.tree-content {- white-space: nowrap;-}-a.tree-junction {- text-decoration: none;-}--/* Tabs */-.tabbable>.tab-content {- padding-top: 16px;-}--.help-block {- font-size: 13px;-}--.input-group .select2-container.form-control .select2-choice,-.input-group .select2-container.form-control .select2-choices {- border-radius: 0 4px 4px 0;-}-.select2-container .avatar {- margin-right: 4px;- margin-top: -2px;-}--/* Ajax Loading Indicator */-#ajax-loading-indicator {- position: fixed;- top: 0;- left: 50%;- display:none;- z-index: 10000;-}-#ajax-loading-indicator>div {- position:relative;- left:-50%;- top:0;- text-align:center;- font-weight: bold;- width: 130px;- background: #FAF3D0;- color: #8A6D3B;- border: 2px solid #F6DBA4;- border-top:none;- padding:6px 12px;- border-radius:0 0 4px 4px;-}--.working-indicator {- color: #25A305;- margin-left: 4px;-}--/* Ajax Loading Overlay */-#ajax-loading-overlay {- z-index:1;- display: none;-}-#ajax-loading-overlay>div {- bottom: 0;- left: 0;- position: fixed;- right: 0;- top: 0;- z-index: 1000000;- filter:alpha(opacity=0); /* Only applies to IE */- background: white; /* This will be overwritten by browsers that support rgba */- background: rgba(255,255,255,0.0); /* IE ignores this since it's not supported */-}--/* WEB SOCKET ERROR */-.websocket-error {- z-index: 1050;- display: none;- position: fixed;- left: 50%;- top: 0;- background: #f2dede;- border: 1px solid #ebccd1;- color: #a94442;- padding: 4px 8px;- margin-left: -120px;-}-.websocket-error span {- color: #F54D4D;-}-.websocket-error.websocket-client-error {- margin-left: -240px;-}--/* FILE INPUT */-.btn-file {- position: relative;- overflow: hidden;-}-.btn-file input[type=file] {- position: absolute;- top: 0;- right: 0;- min-width: 100%;- min-height: 100%;- font-size: 100px;- text-align: right;- filter: alpha(opacity=0);- opacity: 0;- outline: none;- background: white;- cursor: inherit;- display: block;-}--.center-box {- padding: 50px;- max-width: 600px;- min-width: 300px;- background: #FAFAFA;- border: 8px solid #E0E0E0;- margin-left: auto;- margin-right: auto;- margin-top: 50px;- margin-bottom: 50px;- color: #333;-}-.center-box .logo {- width: 36px;- height: 36px;- margin-bottom: 8px;-}-@media(max-width: 738px) {- .center-box {- border: none;- background: none;- }-}-.wide.center-box {- max-width: 900px;- min-width: 900px;-}--.center-box h1 {- font-size: 32px;- margin: 0 0 30px;- font-weight: 300;-}-.center-box h1 .fa {- font-size: 32px;-}---a {- cursor: pointer;-}-a.fa {- text-decoration: none;- color: #666;-}-table {- width: 100%;-}-table>tbody>tr>td {- vertical-align: top;-}-table.table>thead>tr>th>a {- color: black;- text-decoration: underline;-}--textarea {- resize: none;-}-form>.actions {- margin-top: 20px;-}-form>.actions>.btn {- margin-right: 12px;-}-form>.actions>.btn:last-child {- margin-right: 0;-}-.actions>a {- margin-right: 8px;-}-.actions>a:last-child {- margin-right: 0;-}-.nav-tabs>li>a {- color: #777;-}-div.center {- text-align: center;-}--div.no-records {- font-style: italic;- font-size: 16px;-}--.middot:before {- content: ".";- font-size: 16px;- line-height: 12px;- vertical-align: top;- color: #999;-}--.input-group>.form-control+.btn.input-group-addon {- border-radius: 0 4px 4px 0;- border-left: none;-}--li.selectable a, a.selectable {- border: 1px solid white;- text-decoration: none !important;- display: block;- padding: 2px 4px;- color: #333;-}-li.selectable:hover a, a.selectable:hover {- background-color: #E0F0FC;- border-color: #BBDFF9;-}-li.selectable.active a, a.selectable.active {- background-color: #CBE8FB;- border-color: #8BC8F9;-}--.ellipsis-expander {- display: inline-block;- background: #DDD;- padding: 0px 6px;- border-radius: 2px;- color: #777;- vertical-align: middle;- line-height: 16px;-}-.ellipsis-expander .fa {- color: #666;-}-.ellipsis-expander:hover {- background: #888;-}-.ellipsis-expander:hover .fa {- color: white;-}--input.search {- width: 200px;-}--.list>.head {- margin-bottom: 8px;-}-.list>.head>.pull-left {- margin-right: 20px;- margin-bottom: 8px;-}--table>thead>tr>th.minimum, table>tbody>tr>td.minimum {- width: 1px;-}-table>tbody>tr>td.actions a {- color: #666;- margin-right: 8px;-}-table>tbody>tr>td.actions a:last-child {- margin-right: 0;-}--.floating>.content>.selection {- padding: 16px;-}-.floating>.content>.selection>a {- padding: 4px;- display: block;- color: #666;- text-decoration: none;- max-width: 360px;-}-.floating>.content>.selection>a.active:BEFORE {- font-family: "FontAwesome";- content: "\f00c";- position: absolute;- left: 4px;-}-.floating>.content>.selection>a>.title {- font-weight: bold;- margin-bottom: 2px;-}-.floating>.content>.selection>a:hover {- background: #F0F0F0;-}--.nav-tabs {- margin-bottom: 20px;-}-.nav-tabs>li>a>.badge {- margin-left: 8px;-}--.hash {- font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;-}--.dropdown-menu li a i {- margin-right: 4px;-}--.modal-header .close {- font-family: sans-serif;-}--.clearable-wrapper {- position: relative;-}-.clearable-wrapper input.clearable::-ms-clear {- display: none;-}-.clearable-wrapper input.clearable {- padding-right: 20px;-}-a.input-clear {- font-family: sans-serif;- display: block;- width: 12px;- height: 24px;- line-height: 24px;- font-size: 16px;- position: absolute;- right: 6px;- top: 0;- bottom: 0;- margin: auto;- text-decoration: none;- color: #999;- z-index: 10;- background: white;- text-align: center;-}-a.input-clear.input-group-clear {- right: 45px;-}-.message-box>.content, .confirm-box>.content {- font-size: 18px;- padding: 10px 20px;-}-.message-box>.actions, .confirm-box>.actions {- border-top: 1px solid #E0E0E0;- padding: 12px;- text-align: center;-}-.confirm-box>.actions {- text-align: right;-}-.confirm-box>.actions>* {- margin-right: 8px;-}--.project-avatar+.name, .avatar+.name {- margin-left: 2px !important;-}--.alert {- font-size: 16px;- border: none;- border-left: 6px solid;-}-.alert a {- font-weight: bold;-}-.alert-info {- border-color: #46A7D8;-}-.alert-success {- border-color: #19A519;- background: #E5FBE5;- color: #399529;-}-.alert-danger {- color: #DD4B4B;- background: #FEDADA;- border-color: #BF1111;-}-.alert-warning {- background: #FDF3C9;- color: #836A05;- border-color: #AD8C07;-}--a.disabled, a[disabled="disabled"] {- cursor: default;- color: #AAA !important;- text-decoration: none;-}--.floating {- background-clip: padding-box;- background-color: #FFF;- border: 1px solid rgba(0, 0, 0, 0.2);- box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);- position: absolute;- border-radius: 3px;- z-index: 2000;-}--/* wicket default ajax lazyload style */-.floating>.content>div>img[alt="Loading..."] {- margin: 8px;-}--.nav.nav-tabs>li.options {- float: right;-}--.def-list table>tbody>tr>td {- padding: 0;-}-.def-list table td.norecords-td {- padding: 5px;-}-.def-list table>tfoot>tr>td.norecords-td>div {- margin-top: -7px;- padding-top: 7px;-}--.def-list table a {- display: block;- color: #666;- text-decoration: none;- padding: 8px;-}--.floating.side.def-detail {- width: 480px;-}-@media(max-width: 767px) {- .floating.side.def-detail {- width: 360px;- }-}--.floating.side.def-detail .actions {- margin-bottom: 12px;-}--td.no-elements {- font-style: italic;-}--td.ellipsis {- font-size: 16px;-}--.panel-list .panel {- border-width: 2px;-}-.panel-list .drag-indicator {- margin-right: 8px;-}-.panel-list .panel-heading a {- color: #444;- margin-right: 8px;-}-.panel-list .panel-heading input {- vertical-align: text-top;-}-.panel-list input[type="checkbox"]+label {- font-weight: normal;-}-.panel-list .add-new {- display: block;- padding: 16px;- background: #F2F2F2;- border: 2px solid #DDD;- border-radius: 4px;- font-size: 16px;- color: #444;- margin-bottom: 16px;-}-.panel-list a.add-new:hover {- text-decoration: none;- background-color: #EBEBEB;- border-color: #ADADAD;-}--.panel-list .disabled .panel, .panel-list .disabled .panel span, .panel-list .disabled .panel a {- color: #999;-}--.panel-heading .checkbox {- display: inline-block;- margin: 0;-}-+body {+ font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";+ background: white;+}++a {+ color: #1f3b7b;+}+a.embedded-reference {+ color: #0d87e9;+}+.pointer {+ cursor: pointer;+}+.drag-indicator {+ color: #999;+}++.has-error.form-control {+ border-color: #a94442;+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);+}+.red {+ color: red;+}++/* FEEDBACK */+#session-feedback {+ position: fixed;+ max-width: 75%;+ padding: 6px 12px;+ z-index: 10000;+ border-radius: 0 0 4px 4px;+ border: 1px solid;+ border-top: none;+ top: 0;+ display: none;+}+#session-feedback.success {+ background: #DFF0D8;+ color: #204021;+}+#session-feedback.error {+ background: #F2DEDE;+ color: #A94442;+ border-color: #622726;+}+#session-feedback.warning {+ background: #FCF8E3;+ color: #8A6D3B;+ border-color: #815A0D;+}+#session-feedback.info {+ background: #D9EDF7;+ color: #31708F;+ border-color: #145562;+}+#session-feedback ul {+ padding: 0;+ margin: 0;+}+#session-feedback li {+ list-style: none;+ border: none;+ padding: 0;+ margin: 0;+ background: none;+}++ul.feedbackPanel {+ margin: 0 0 20px 0;+ padding: 0;+ list-style: none;+}+ul.feedbackPanel>li {+ margin: 0;+ padding: 8px 0 8px 12px;+ border-left: 6px solid;+}+li.feedbackPanelERROR, li.feedbackPanelFATAL {+ color: #DD4B4B;+ background: #FEDADA;+ border-left-color: #BF1111;+}+li.feedbackPanelSUCCESS {+ color: #399529;+ background: #E5FBE5;+ border-left-color: #19A519;+}+li.feedbackPanelINFO {+ color: #31708f;+ background: #d9edf7;+ border-left-color: #46A7D8;+}+li.feedbackPanelWARNING {+ background: #FDF3C9;+ color: #836A05;+ border-left-color: #AD8C07;+}++ul.feedbackPanel>li:first-child {+ border-radius: 4px 4px 0 0;+}+ul.feedbackPanel>li:last-child {+ border-radius: 0 0 4px 4px;+}+ul.feedbackPanel>li:first-child:last-child {+ border-radius: 4px;+}+form .required {+ font-size: 16px;+ color: #B94A48;+}++.noselect {+ -webkit-touch-callout: none;+ -webkit-user-select: none;+ -khtml-user-select: none;+ -moz-user-select: none;+ -ms-user-select: none;+ user-select: none;+}++/* TABLE COMPONENTS */+table .row-selector {+ width: 24px;+}+table>thead>tr>th {+ white-space: nowrap;+}++.navigator {+ text-align: center;+}+.navigatorLabel {+ display: none;+}++a.wicket_orderUp:after, a.wicket_orderDown:after, a.wicket_orderNone:after {+ font-family: FontAwesome;+ font-weight: normal;+ font-style: normal;+ text-decoration: none;+ display: inline-block;+ color: #666;+ margin-left: 8px;+}+a.wicket_orderUp:AFTER {+ content: "\f062";+}+a.wicket_orderDown:AFTER {+ content: "\f063";+}+.pagination {+ margin-bottom: 0;+}+.pagination a.first, .pagination a.prev, .pagination a.next, .pagination a.last {+ font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;+}+.table>thead+tfoot>tr>td.norecords-td>div {+ border-top: 2px solid #DDD;+ margin-top: -10px;+ padding-top: 10px;+}+.norecords-td {+ font-style: italic;+}++/* TREE */+.tree-theme-windows .tree-node span.tree-content a {+ color: #444444;+}+.tree-content {+ white-space: nowrap;+}+a.tree-junction {+ text-decoration: none;+}++/* Tabs */+.tabbable>.tab-content {+ padding-top: 16px;+}++.help-block {+ font-size: 13px;+}++.input-group .select2-container.form-control .select2-choice,+.input-group .select2-container.form-control .select2-choices {+ border-radius: 0 4px 4px 0;+}+.select2-container .avatar {+ margin-right: 4px;+ margin-top: -2px;+}++/* Ajax Loading Indicator */+#ajax-loading-indicator {+ position: fixed;+ top: 0;+ left: 50%;+ display:none;+ z-index: 10000;+}+#ajax-loading-indicator>div {+ position:relative;+ left:-50%;+ top:0;+ text-align:center;+ font-weight: bold;+ width: 130px;+ background: #FAF3D0;+ color: #8A6D3B;+ border: 2px solid #F6DBA4;+ border-top:none;+ padding:6px 12px;+ border-radius:0 0 4px 4px;+}++.working-indicator {+ color: #25A305;+ margin-left: 4px;+}++/* Ajax Loading Overlay */+#ajax-loading-overlay {+ z-index:1;+ display: none;+}+#ajax-loading-overlay>div {+ bottom: 0;+ left: 0;+ position: fixed;+ right: 0;+ top: 0;+ z-index: 1000000;+ filter:alpha(opacity=0); /* Only applies to IE */+ background: white; /* This will be overwritten by browsers that support rgba */+ background: rgba(255,255,255,0.0); /* IE ignores this since it's not supported */+}++/* WEB SOCKET ERROR */+.websocket-error {+ z-index: 1050;+ display: none;+ position: fixed;+ left: 50%;+ top: 0;+ background: #f2dede;+ border: 1px solid #ebccd1;+ color: #a94442;+ padding: 4px 8px;+ margin-left: -120px;+}+.websocket-error span {+ color: #F54D4D;+}+.websocket-error.websocket-client-error {+ margin-left: -240px;+}++/* FILE INPUT */+.btn-file {+ position: relative;+ overflow: hidden;+}+.btn-file input[type=file] {+ position: absolute;+ top: 0;+ right: 0;+ min-width: 100%;+ min-height: 100%;+ font-size: 100px;+ text-align: right;+ filter: alpha(opacity=0);+ opacity: 0;+ outline: none;+ background: white;+ cursor: inherit;+ display: block;+}++.center-box {+ padding: 50px;+ max-width: 600px;+ min-width: 300px;+ background: #FAFAFA;+ border: 8px solid #E0E0E0;+ margin-left: auto;+ margin-right: auto;+ margin-top: 50px;+ margin-bottom: 50px;+ color: #333;+}+.center-box .logo {+ width: 36px;+ height: 36px;+ margin-bottom: 8px;+}+@media(max-width: 738px) {+ .center-box {+ border: none;+ background: none;+ }+}+.wide.center-box {+ max-width: 900px;+ min-width: 900px;+}++.center-box h1 {+ font-size: 32px;+ margin: 0 0 30px;+ font-weight: 300;+}+.center-box h1 .fa {+ font-size: 32px;+}+++a {+ cursor: pointer;+}+a.fa {+ text-decoration: none;+ color: #666;+}+table {+ width: 100%;+}+table>tbody>tr>td {+ vertical-align: top;+}+table.table>thead>tr>th>a {+ color: black;+ text-decoration: underline;+}++textarea {+ resize: none;+}+form>.actions {+ margin-top: 20px;+}+form>.actions>.btn {+ margin-right: 12px;+}+form>.actions>.btn:last-child {+ margin-right: 0;+}+.actions>a {+ margin-right: 8px;+}+.actions>a:last-child {+ margin-right: 0;+}+.nav-tabs>li>a {+ color: #777;+}+div.center {+ text-align: center;+}++div.no-records {+ font-style: italic;+ font-size: 16px;+}++.middot:before {+ content: ".";+ font-size: 16px;+ line-height: 12px;+ vertical-align: top;+ color: #999;+}++.input-group>.form-control+.btn.input-group-addon {+ border-radius: 0 4px 4px 0;+ border-left: none;+}++li.selectable a, a.selectable {+ border: 1px solid white;+ text-decoration: none !important;+ display: block;+ padding: 2px 4px;+ color: #333;+}+li.selectable:hover a, a.selectable:hover {+ background-color: #E0F0FC;+ border-color: #BBDFF9;+}+li.selectable.active a, a.selectable.active {+ background-color: #CBE8FB;+ border-color: #8BC8F9;+}++.ellipsis-expander {+ display: inline-block;+ background: #DDD;+ padding: 0px 6px;+ border-radius: 2px;+ color: #777;+ vertical-align: middle;+ line-height: 16px;+}+.ellipsis-expander .fa {+ color: #666;+}+.ellipsis-expander:hover {+ background: #888;+}+.ellipsis-expander:hover .fa {+ color: white;+}++input.search {+ width: 200px;+}++.list>.head {+ margin-bottom: 8px;+}+.list>.head>.pull-left {+ margin-right: 20px;+ margin-bottom: 8px;+}++table>thead>tr>th.minimum, table>tbody>tr>td.minimum {+ width: 1px;+}+table>tbody>tr>td.actions a {+ color: #666;+ margin-right: 8px;+}+table>tbody>tr>td.actions a:last-child {+ margin-right: 0;+}++.floating>.content>.selection {+ padding: 16px;+}+.floating>.content>.selection>a {+ padding: 4px;+ display: block;+ color: #666;+ text-decoration: none;+ max-width: 360px;+}+.floating>.content>.selection>a.active:BEFORE {+ font-family: "FontAwesome";+ content: "\f00c";+ position: absolute;+ left: 4px;+}+.floating>.content>.selection>a>.title {+ font-weight: bold;+ margin-bottom: 2px;+}+.floating>.content>.selection>a:hover {+ background: #F0F0F0;+}++.nav-tabs {+ margin-bottom: 20px;+}+.nav-tabs>li>a>.badge {+ margin-left: 8px;+}++.hash {+ font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;+}++.dropdown-menu li a i {+ margin-right: 4px;+}++.modal-header .close {+ font-family: sans-serif;+}++.clearable-wrapper {+ position: relative;+}+.clearable-wrapper input.clearable::-ms-clear {+ display: none;+}+.clearable-wrapper input.clearable {+ padding-right: 20px;+}+a.input-clear {+ font-family: sans-serif;+ display: block;+ width: 12px;+ height: 24px;+ line-height: 24px;+ font-size: 16px;+ position: absolute;+ right: 6px;+ top: 0;+ bottom: 0;+ margin: auto;+ text-decoration: none;+ color: #999;+ z-index: 10;+ background: white;+ text-align: center;+}+a.input-clear.input-group-clear {+ right: 45px;+}+.message-box>.content, .confirm-box>.content {+ font-size: 18px;+ padding: 10px 20px;+}+.message-box>.actions, .confirm-box>.actions {+ border-top: 1px solid #E0E0E0;+ padding: 12px;+ text-align: center;+}+.confirm-box>.actions {+ text-align: right;+}+.confirm-box>.actions>* {+ margin-right: 8px;+}++.project-avatar+.name, .avatar+.name {+ margin-left: 2px !important;+}++.alert {+ font-size: 16px;+ border: none;+ border-left: 6px solid;+}+.alert a {+ font-weight: bold;+}+.alert-info {+ border-color: #46A7D8;+}+.alert-success {+ border-color: #19A519;+ background: #E5FBE5;+ color: #399529;+}+.alert-danger {+ color: #DD4B4B;+ background: #FEDADA;+ border-color: #BF1111;+}+.alert-warning {+ background: #FDF3C9;+ color: #836A05;+ border-color: #AD8C07;+}++a.disabled, a[disabled="disabled"] {+ cursor: default;+ color: #AAA !important;+ text-decoration: none;+}++.floating {+ background-clip: padding-box;+ background-color: #FFF;+ border: 1px solid rgba(0, 0, 0, 0.2);+ box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);+ position: absolute;+ border-radius: 3px;+ z-index: 2000;+}++/* wicket default ajax lazyload style */+.floating>.content>div>img[alt="Loading..."] {+ margin: 8px;+}++.nav.nav-tabs>li.options {+ float: right;+}++.def-list table>tbody>tr>td {+ padding: 0;+}+.def-list table td.norecords-td {+ padding: 5px;+}+.def-list table>tfoot>tr>td.norecords-td>div {+ margin-top: -7px;+ padding-top: 7px;+}++.def-list table a {+ display: block;+ color: #666;+ text-decoration: none;+ padding: 8px;+}++.floating.side.def-detail {+ width: 480px;+}+@media(max-width: 767px) {+ .floating.side.def-detail {+ width: 360px;+ }+}++.floating.side.def-detail .actions {+ margin-bottom: 12px;+}++td.no-elements {+ font-style: italic;+}++td.ellipsis {+ font-size: 16px;+}++.panel {+ border-width: 2px;+}+.panel-list .drag-indicator {+ margin-right: 8px;+}+.panel-list .panel-heading a {+ color: #444;+ margin-right: 8px;+}+.panel-list .panel-heading input {+ vertical-align: text-top;+}+.panel-list input[type="checkbox"]+label {+ font-weight: normal;+}+.panel-list .add-new {+ display: block;+ padding: 16px;+ background: #F2F2F2;+ border: 2px solid #DDD;+ border-radius: 4px;+ font-size: 16px;+ color: #444;+ margin-bottom: 16px;+}+.panel-list a.add-new:hover {+ text-decoration: none;+ background-color: #EBEBEB;+ border-color: #ADADAD;+}++.panel-list .disabled .panel, .panel-list .disabled .panel span, .panel-list .disabled .panel a {+ color: #999;+}++.panel-heading .checkbox {+ display: inline-block;+ margin: 0;+}+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.htmlindex 08401932a7..0d4ea1eb57 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@@ -64,7 +64,7 @@<li wicket:id="myProfile"><a wicket:id="link"><i class="fa fa-fw fa-list-alt"></i> My Profile</a></li><li wicket:id="myAvatar"><a wicket:id="link"><i class="fa fa-fw fa-picture-o"></i> Edit Avatar</a></li><li wicket:id="myPassword"><a wicket:id="link"><i class="fa fa-fw fa-key"></i> Change Password</a></li>- <li wicket:id="myAccessToken"><a wicket:id="link"><i class="fa fa-fw fa-ticket"></i> Access Token</a></li>+ <li wicket:id="myBuildSetting"><a wicket:id="link"><i class="fa fa-fw fa-cubes"></i> Build Setting</a></li><li role="separator" class="divider"></li><li><a wicket:id="signOut"><i class="fa fa-fw fa-sign-out"></i> Sign Out</a></li></ul>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.javaindex 179e4d5547..0233a05286 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@@ -46,7 +46,8 @@ import io.onedev.server.web.page.my.MyAvatarPage;import io.onedev.server.web.page.my.MyPage;import io.onedev.server.web.page.my.MyPasswordPage;import io.onedev.server.web.page.my.MyProfilePage;-import io.onedev.server.web.page.my.MyTokenPage;+import io.onedev.server.web.page.my.buildsetting.MyBuildSettingPage;+import io.onedev.server.web.page.my.buildsetting.MySecretListPage;import io.onedev.server.web.page.security.LoginPage;import io.onedev.server.web.page.security.LogoutPage;import io.onedev.server.web.page.security.RegisterPage;@@ -197,10 +198,10 @@ public abstract class LayoutPage extends BasePage {item.add(new ViewStateAwarePageLink<Void>("link", MyPasswordPage.class));if (getPage() instanceof MyPasswordPage)item.add(AttributeAppender.append("class", "active"));-- signedInContainer.add(item = new WebMarkupContainer("myAccessToken"));- item.add(new ViewStateAwarePageLink<Void>("link", MyTokenPage.class));- if (getPage() instanceof MyTokenPage)++ signedInContainer.add(item = new WebMarkupContainer("myBuildSetting"));+ item.add(new ViewStateAwarePageLink<Void>("link", MySecretListPage.class));+ if (getPage() instanceof MyBuildSettingPage)item.add(AttributeAppender.append("class", "active"));signedInContainer.add(new ViewStateAwarePageLink<Void>("signOut", LogoutPage.class));diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/MyTabLink.html b/server-core/src/main/java/io/onedev/server/web/page/my/MyTabLink.htmldeleted file mode 100644index f9086e7c60..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/my/MyTabLink.html+++ /dev/null@@ -1,3 +0,0 @@-<wicket:panel>- <a wicket:id="link"><span wicket:id="icon"></span> <span wicket:id="label" class="text"></span></a>-</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/my/MyTokenPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/MyTokenPage.htmldeleted file mode 100644index 8fe73e67ec..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/my/MyTokenPage.html+++ /dev/null@@ -1,4 +0,0 @@-<wicket:extend>- <div class="page-title">Access Token</div>- <div wicket:id="content"></div>-</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/my/MyTokenPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/MyTokenPage.javadeleted file mode 100644index d195f03146..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/my/MyTokenPage.java+++ /dev/null@@ -1,30 +0,0 @@-package io.onedev.server.web.page.my;--import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import io.onedev.server.model.User;-import io.onedev.server.web.component.user.tokengenerate.TokenGeneratePanel;--@SuppressWarnings("serial")-public class MyTokenPage extends MyPage {-- public MyTokenPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new TokenGeneratePanel("content", new AbstractReadOnlyModel<User>() {-- @Override- public User getObject() {- return getLoginUser();- }-- }));- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildPreserveRulesPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildPreserveRulesPage.htmlnew file mode 100644index 0000000000..5719bc4614--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildPreserveRulesPage.html@@ -0,0 +1,12 @@+<wicket:extend>+ <div class="help-block">Define common rules to preserve builds of all projects owned by me.+ A build will be preserved as long as one rule preserves it. All builds will be preserved+ if no rules are defined</div>+ <form wicket:id="form" class="leave-confirm build-preservations">+ <div wicket:id="feedback"></div>+ <div wicket:id="editor"></div>+ <div class="actions">+ <input type="submit" class="btn btn-primary dirty-aware" value="Save">+ </div>+ </form>+</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildPreserveSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildPreserveRulesPage.javasimilarity index 57%rename from server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildPreserveSettingPage.javarename to server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildPreserveRulesPage.javaindex 1b56c062ca..2838db6838 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildPreserveSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildPreserveRulesPage.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.setting.build;+package io.onedev.server.web.page.my.buildsetting;import java.io.Serializable;@@ -8,14 +8,13 @@ import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.web.editable.PropertyContext;-import io.onedev.server.web.page.project.setting.ProjectSettingPage;@SuppressWarnings("serial")-public class BuildPreserveSettingPage extends ProjectSettingPage {+public class MyBuildPreserveRulesPage extends MyBuildSettingPage {- public BuildPreserveSettingPage(PageParameters params) {+ public MyBuildPreserveRulesPage(PageParameters params) {super(params);}@@ -29,9 +28,9 @@ public class BuildPreserveSettingPage extends ProjectSettingPage {protected void onSubmit() {super.onSubmit();- OneDev.getInstance(ProjectManager.class).save(getProject());- getSession().success("Build preserve setting has been saved");- setResponsePage(BuildPreserveSettingPage.class, BuildPreserveSettingPage.paramsOf(getProject()));+ OneDev.getInstance(UserManager.class).save(getLoginUser());+ getSession().success("Build preserve rules have been saved");+ setResponsePage(MyBuildPreserveRulesPage.class);}};@@ -42,10 +41,10 @@ public class BuildPreserveSettingPage extends ProjectSettingPage {@Overridepublic Serializable getObject() {- return getProject().getBuildSetting();+ return getLoginUser().getBuildSetting();}- }, "preservations"));+ }, "buildPreservations"));add(form);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildSettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildSettingPage.htmlnew file mode 100644index 0000000000..7d7d288e62--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildSettingPage.html@@ -0,0 +1,7 @@+<wicket:extend>+ <div class="page-title">Build Setting</div>+ <div class="build-setting">+ <ul wicket:id="buildSettingTabs" class="nav nav-tabs"></ul>+ <wicket:child></wicket:child>+ </div>+</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildSettingPage.javanew file mode 100644index 0000000000..b980075941--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildSettingPage.java@@ -0,0 +1,31 @@+package io.onedev.server.web.page.my.buildsetting;++import java.util.ArrayList;+import java.util.List;++import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.web.component.tabbable.PageTab;+import io.onedev.server.web.component.tabbable.Tab;+import io.onedev.server.web.component.tabbable.Tabbable;+import io.onedev.server.web.page.my.MyPage;++@SuppressWarnings("serial")+public abstract class MyBuildSettingPage extends MyPage {++ public MyBuildSettingPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ List<Tab> tabs = new ArrayList<>();+ tabs.add(new PageTab(Model.of("Secrets"), MySecretListPage.class));+ tabs.add(new PageTab(Model.of("Build Preserve Rules"), MyBuildPreserveRulesPage.class));+ add(new Tabbable("buildSettingTabs", tabs));+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MySecretListPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MySecretListPage.htmlnew file mode 100644index 0000000000..4a44d4f392--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MySecretListPage.html@@ -0,0 +1,10 @@+<wicket:extend>+ <div wicket:id="note" class="help-block"></div>+ <form wicket:id="form" class="leave-confirm secrets">+ <div wicket:id="feedback"></div>+ <div wicket:id="editor"></div>+ <div class="actions">+ <input type="submit" class="btn btn-primary dirty-aware" value="Save">+ </div>+ </form>+</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MySecretListPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MySecretListPage.javanew file mode 100644index 0000000000..daae73f735--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MySecretListPage.java@@ -0,0 +1,72 @@+package io.onedev.server.web.page.my.buildsetting;++import java.io.Serializable;+import java.util.HashSet;+import java.util.Set;++import org.apache.wicket.feedback.FencedFeedbackPanel;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.model.support.JobSecret;+import io.onedev.server.util.inputspec.SecretInput;+import io.onedev.server.web.editable.PropertyContext;++@SuppressWarnings("serial")+public class MySecretListPage extends MyBuildSettingPage {++ public MySecretListPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onSubmit() {+ super.onSubmit();++ Set<String> names = new HashSet<>();+ for (JobSecret secret: getLoginUser().getBuildSetting().getSecrets()) {+ if (names.contains(secret.getName())) {+ error("Duplicate name found: " + secret.getName());+ return;+ } else {+ names.add(secret.getName());+ }+ }++ OneDev.getInstance(UserManager.class).save(getLoginUser());+ getSession().success("Job secrets have been saved");+ setResponsePage(MySecretListPage.class);+ }++ };++ form.add(new FencedFeedbackPanel("feedback", form));++ form.add(PropertyContext.editModel("editor", new AbstractReadOnlyModel<Serializable>() {++ @Override+ public Serializable getObject() {+ return getLoginUser().getBuildSetting();+ }++ }, "secrets"));++ add(form);++ String note = String.format("Define commons secrets to be used in build jobs of all projects "+ + "owned by me. Secret value less than %d characters will not be masked "+ + "in build log", SecretInput.MASK.length());+ add(new Label("note", note).setEscapeModelStrings(false));+ }++}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.javaindex d8f2112a8e..83a89f563e 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@@ -60,11 +60,11 @@ import io.onedev.server.web.page.project.setting.ProjectSettingTab;import io.onedev.server.web.page.project.setting.authorization.ProjectAuthorizationsPage;import io.onedev.server.web.page.project.setting.avatar.AvatarEditPage;import io.onedev.server.web.page.project.setting.branchprotection.BranchProtectionPage;-import io.onedev.server.web.page.project.setting.build.BuildPreserveSettingPage;+import io.onedev.server.web.page.project.setting.build.ProjectBuildSettingPage;+import io.onedev.server.web.page.project.setting.build.ProjectSecretListPage;import io.onedev.server.web.page.project.setting.general.GeneralSettingPage;-import io.onedev.server.web.page.project.setting.issue.PromptFieldsUponIssueOpenSettingPage;+import io.onedev.server.web.page.project.setting.issue.ProjectIssueSettingPage;import io.onedev.server.web.page.project.setting.issue.StateTransitionsPage;-import io.onedev.server.web.page.project.setting.secret.SecretListPage;import io.onedev.server.web.page.project.setting.tagprotection.TagProtectionPage;import io.onedev.server.web.page.project.setting.webhook.WebHooksPage;import io.onedev.server.web.page.project.stats.ProjectContribsPage;@@ -309,9 +309,10 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {tabs.add(new ProjectSettingTab("Authorizations", "fa fa-fw fa-user", ProjectAuthorizationsPage.class));tabs.add(new ProjectSettingTab("Branch Protection", "fa fa-fw fa-lock", BranchProtectionPage.class));tabs.add(new ProjectSettingTab("Tag Protection", "fa fa-fw fa-lock", TagProtectionPage.class));- tabs.add(new ProjectSettingTab("Secrets", "fa fa-fw fa-key", SecretListPage.class));- tabs.add(new ProjectSettingTab("Issue Setting", "fa fa-fw fa-bug", StateTransitionsPage.class, PromptFieldsUponIssueOpenSettingPage.class));- tabs.add(new ProjectSettingTab("Build Preserve Setting", "fa fa-fw fa-cubes", BuildPreserveSettingPage.class));+ tabs.add(new ProjectSettingTab("Issue Setting", "fa fa-fw fa-bug",+ StateTransitionsPage.class, ProjectIssueSettingPage.class));+ tabs.add(new ProjectSettingTab("Build Setting", "fa fa-fw fa-cubes",+ ProjectSecretListPage.class, ProjectBuildSettingPage.class));tabs.add(new ProjectSettingTab("Web Hooks", "fa fa-fw fa-volume-up", WebHooksPage.class));return tabs;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildPreserveRulesPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildPreserveRulesPage.htmlnew file mode 100644index 0000000000..93ff7a2b3a--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildPreserveRulesPage.html@@ -0,0 +1,23 @@+<wicket:extend>+ <div class="help-block">Define rules to preserve builds. A build will be preserved as long as one rule preserves it.+ All builds will be preserved if no rules are defined</div>+ <wicket:enclosure child="inheritedBuildPreservations">+ <div class="panel panel-default">+ <div class="panel-heading"><b>Inherited from Owner</b></div>+ <div class="panel-body">+ <div wicket:id="inheritedBuildPreservations"></div>+ </div>+ </div>+ </wicket:enclosure>+ <div class="panel panel-default">+ <div class="panel-heading"><b>Project Specific</b></div>+ <div class="panel-body">+ <form wicket:id="form" class="leave-confirm build-preservations">+ <div wicket:id="feedback"></div>+ <div wicket:id="editor"></div>+ <div class="actions">+ <input type="submit" class="btn btn-primary dirty-aware" value="Save">+ </div>+ </form>+ </div>+ </div></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildPreserveRulesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildPreserveRulesPage.javanew file mode 100644index 0000000000..869efae137--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildPreserveRulesPage.java@@ -0,0 +1,61 @@+package io.onedev.server.web.page.project.setting.build;++import java.io.Serializable;+import java.util.List;++import org.apache.wicket.feedback.FencedFeedbackPanel;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.model.support.BuildPreservation;+import io.onedev.server.web.editable.PropertyContext;++@SuppressWarnings("serial")+public class ProjectBuildPreserveRulesPage extends ProjectBuildSettingPage {++ public ProjectBuildPreserveRulesPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ List<BuildPreservation> inheritedBuildPreservations = getProject().getOwner().getBuildSetting().getBuildPreservations();+ if (!inheritedBuildPreservations.isEmpty())+ add(PropertyContext.view("inheritedBuildPreservations", getProject().getOwner().getBuildSetting(), "buildPreservations"));+ else+ add(new WebMarkupContainer("inheritedBuildPreservations").setVisible(false));++ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onSubmit() {+ super.onSubmit();++ OneDev.getInstance(ProjectManager.class).save(getProject());+ getSession().success("Build preserve rules have been saved");+ setResponsePage(ProjectBuildPreserveRulesPage.class, ProjectBuildPreserveRulesPage.paramsOf(getProject()));+ }++ };++ form.add(new FencedFeedbackPanel("feedback", form));++ form.add(PropertyContext.editModel("editor", new AbstractReadOnlyModel<Serializable>() {++ @Override+ public Serializable getObject() {+ return getProject().getBuildSetting();+ }++ }, "buildPreservations"));++ add(form);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildSettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildSettingPage.htmlnew file mode 100644index 0000000000..7d7d288e62--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildSettingPage.html@@ -0,0 +1,7 @@+<wicket:extend>+ <div class="page-title">Build Setting</div>+ <div class="build-setting">+ <ul wicket:id="buildSettingTabs" class="nav nav-tabs"></ul>+ <wicket:child></wicket:child>+ </div>+</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildSettingPage.javanew file mode 100644index 0000000000..4bffa49c7d--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildSettingPage.java@@ -0,0 +1,63 @@+package io.onedev.server.web.page.project.setting.build;++import java.util.ArrayList;+import java.util.List;++import org.apache.wicket.Component;+import org.apache.wicket.Page;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.web.component.tabbable.PageTab;+import io.onedev.server.web.component.tabbable.PageTabLink;+import io.onedev.server.web.component.tabbable.Tab;+import io.onedev.server.web.component.tabbable.Tabbable;+import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.page.project.setting.ProjectSettingPage;++@SuppressWarnings("serial")+public abstract class ProjectBuildSettingPage extends ProjectSettingPage {++ public ProjectBuildSettingPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ List<Tab> tabs = new ArrayList<>();+ tabs.add(new PageTab(Model.of("Secrets"), ProjectSecretListPage.class) {++ @Override+ public Component render(String componentId) {+ return new TabLink(componentId, this);+ }++ });+ tabs.add(new PageTab(Model.of("Build Preserve Rules"), ProjectBuildPreserveRulesPage.class) {++ @Override+ public Component render(String componentId) {+ return new TabLink(componentId, this);+ }++ });+ add(new Tabbable("buildSettingTabs", tabs));+ }++ private class TabLink extends PageTabLink {++ public TabLink(String id, PageTab tab) {+ super(id, tab);+ }++ @Override+ protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {+ return new BookmarkablePageLink<Void>(linkId, pageClass, ProjectPage.paramsOf(getProject()));+ }++ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectSecretListPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectSecretListPage.htmlnew file mode 100644index 0000000000..c1ab80d060--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectSecretListPage.html@@ -0,0 +1,23 @@+<wicket:extend>+ <div wicket:id="note" class="help-block"></div>+ <wicket:enclosure child="inheritedSecrets">+ <div class="panel panel-default">+ <div class="panel-heading"><b>Inherited from Owner</b></div>+ <div class="panel-body">+ <div wicket:id="inheritedSecrets"></div>+ </div>+ </div>+ </wicket:enclosure>+ <div class="panel panel-default">+ <div class="panel-heading"><b>Project Specific</b></div>+ <div class="panel-body">+ <form wicket:id="form" class="leave-confirm secrets">+ <div wicket:id="feedback"></div>+ <div wicket:id="editor"></div>+ <div class="actions">+ <input type="submit" class="btn btn-primary dirty-aware" value="Save">+ </div>+ </form>+ </div>+ </div>+</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectSecretListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectSecretListPage.javanew file mode 100644index 0000000000..16ed64c7e8--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectSecretListPage.java@@ -0,0 +1,98 @@+package io.onedev.server.web.page.project.setting.build;++import java.io.Serializable;+import java.util.HashSet;+import java.util.List;+import java.util.Set;++import org.apache.wicket.feedback.FencedFeedbackPanel;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.model.support.JobSecret;+import io.onedev.server.util.inputspec.SecretInput;+import io.onedev.server.web.editable.PropertyContext;+import io.onedev.server.web.editable.annotation.Editable;++@SuppressWarnings("serial")+public class ProjectSecretListPage extends ProjectBuildSettingPage {++ public ProjectSecretListPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ List<JobSecret> inheritedSecrets = getProject().getBuildSetting().getInheritedSecrets(getProject());+ if (!inheritedSecrets.isEmpty()) {+ InheritedSecretsBean bean = new InheritedSecretsBean();+ bean.setSecrets(inheritedSecrets);+ add(PropertyContext.view("inheritedSecrets", bean, "secrets"));+ } else {+ add(new WebMarkupContainer("inheritedSecrets").setVisible(false));+ }++ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onSubmit() {+ super.onSubmit();++ Set<String> names = new HashSet<>();+ for (JobSecret secret: getProject().getBuildSetting().getSecrets()) {+ if (names.contains(secret.getName())) {+ error("Duplicate name found: " + secret.getName());+ return;+ } else {+ names.add(secret.getName());+ }+ }++ OneDev.getInstance(ProjectManager.class).save(getProject());+ getSession().success("Job secrets have been saved");+ setResponsePage(ProjectSecretListPage.class, ProjectSecretListPage.paramsOf(getProject()));+ }++ };++ form.add(new FencedFeedbackPanel("feedback", form));++ form.add(PropertyContext.editModel("editor", new AbstractReadOnlyModel<Serializable>() {++ @Override+ public Serializable getObject() {+ return getProject().getBuildSetting();+ }++ }, "secrets"));++ add(form);++ String note = String.format("Define secrets to be used in build jobs. Secret value less "+ + "than %d characters will not be masked in build log", SecretInput.MASK.length());+ add(new Label("note", note).setEscapeModelStrings(false));+ }++ @Editable+ public static class InheritedSecretsBean implements Serializable {++ private List<JobSecret> secrets;++ @Editable+ public List<JobSecret> getSecrets() {+ return secrets;+ }++ public void setSecrets(List<JobSecret> secrets) {+ this.secrets = secrets;+ }++ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/secret/SecretListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/secret/SecretListPage.javadeleted file mode 100644index fe377b1b5e..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/secret/SecretListPage.java+++ /dev/null@@ -1,60 +0,0 @@-package io.onedev.server.web.page.project.setting.secret;--import java.io.Serializable;--import org.apache.wicket.feedback.FencedFeedbackPanel;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.util.inputspec.SecretInput;-import io.onedev.server.web.editable.PropertyContext;-import io.onedev.server.web.page.project.setting.ProjectSettingPage;--@SuppressWarnings("serial")-public class SecretListPage extends ProjectSettingPage {-- public SecretListPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- Form<?> form = new Form<Void>("form") {-- @Override- protected void onSubmit() {- super.onSubmit();-- OneDev.getInstance(ProjectManager.class).save(getProject());- getSession().success("Project secrets have been saved");- setResponsePage(SecretListPage.class, SecretListPage.paramsOf(getProject()));- }-- };-- form.add(new FencedFeedbackPanel("feedback", form));-- form.add(PropertyContext.editModel("editor", new AbstractReadOnlyModel<Serializable>() {-- @Override- public Serializable getObject() {- return getProject();- }-- }, "secrets"));-- add(form);-- String note = String.format("Define project secrets here to be used in build jobs. Secret value less "- + "than %d characters will not be masked in build log. For a given name, the first "- + "authorized secret will be used", SecretInput.MASK.length());- add(new Label("note", note).setEscapeModelStrings(false));- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.javaindex 05f820040d..310cf2b34b 100644--- a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java+++ b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java@@ -44,7 +44,7 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;-import io.onedev.server.model.support.Secret;+import io.onedev.server.model.support.JobSecret;import io.onedev.server.model.support.administration.GroovyScript;import io.onedev.server.security.permission.AccessProject;import io.onedev.server.util.SecurityUtils;@@ -145,10 +145,10 @@ public class SuggestionUtils {variables.put(var.name().toLowerCase(), null);for (ParamSpec paramSpec: job.getParamSpecs())variables.put(VariableInterpolator.PARAMS_PREFIX + paramSpec.getName(), paramSpec.getDescription());- for (Secret secret: project.getSecrets()) {+ for (JobSecret secret: project.getBuildSetting().getHierarchySecrets(project)) {String varName = VariableInterpolator.SECRETS_PREFIX + secret.getName();- if (!variables.containsKey(varName)- && (commitId != null && secret.isAuthorized(project, commitId) || commitId == null && secret.isAuthorized(project, "master"))) {+ if (commitId != null && secret.isAuthorized(project, commitId)+ || commitId == null && secret.isAuthorized(project, "master")) {variables.put(varName, null);}}@@ -175,12 +175,12 @@ public class SuggestionUtils {return suggestions;}- public static List<InputSuggestion> suggestSecrets(Project project, String matchWith) {+ public static List<InputSuggestion> suggestJobSecrets(Project project, String matchWith) {matchWith = matchWith.toLowerCase();int numSuggestions = 0;List<InputSuggestion> suggestions = new ArrayList<>();- for (Secret secret: project.getSecrets()) {+ for (JobSecret secret: project.getBuildSetting().getSecrets()) {int index = secret.getName().toLowerCase().indexOf(matchWith);if (index != -1 && numSuggestions++<InputAssistBehavior.MAX_SUGGESTIONS)suggestions.add(new InputSuggestion(secret.getName(), new LinearRange(index, index+matchWith.length())));