Skip to content

The Unified and Autonomous Development Platform

Fix issue #289 - Commit GPG signature

Robin Shenee3603363119
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.java
index 6009c638e9..7cffb780db 100644
--- a/server-core/src/main/java/io/onedev/server/CoreModule.java
+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java
@@ -102,6 +102,7 @@ import io.onedev.server.entitymanager.CodeCommentReplyManager;
import io.onedev.server.entitymanager.CommitQueryPersonalizationManager;
import io.onedev.server.entitymanager.EmailAddressManager;
import io.onedev.server.entitymanager.GitLfsLockManager;
+import io.onedev.server.entitymanager.GpgKeyManager;
import io.onedev.server.entitymanager.GroupAuthorizationManager;
import io.onedev.server.entitymanager.GroupManager;
import io.onedev.server.entitymanager.IssueChangeManager;
@@ -146,6 +147,7 @@ import io.onedev.server.entitymanager.impl.DefaultCodeCommentReplyManager;
import io.onedev.server.entitymanager.impl.DefaultCommitQueryPersonalizationManager;
import io.onedev.server.entitymanager.impl.DefaultEmailAddressManager;
import io.onedev.server.entitymanager.impl.DefaultGitLfsLockManager;
+import io.onedev.server.entitymanager.impl.DefaultGpgKeyManager;
import io.onedev.server.entitymanager.impl.DefaultGroupAuthorizationManager;
import io.onedev.server.entitymanager.impl.DefaultGroupManager;
import io.onedev.server.entitymanager.impl.DefaultIssueChangeManager;
@@ -186,6 +188,8 @@ import io.onedev.server.git.config.GitConfig;
import io.onedev.server.git.exception.GitException;
import io.onedev.server.git.hookcallback.GitPostReceiveCallback;
import io.onedev.server.git.hookcallback.GitPreReceiveCallback;
+import io.onedev.server.git.signature.DefaultSignatureVerificationKeyLoader;
+import io.onedev.server.git.signature.SignatureVerificationKeyLoader;
import io.onedev.server.infomanager.CommitInfoManager;
import io.onedev.server.infomanager.DefaultCommitInfoManager;
import io.onedev.server.infomanager.DefaultIssueInfoManager;
@@ -435,6 +439,7 @@ public class CoreModule extends AbstractPluginModule {
bind(IssueLinkManager.class).to(DefaultIssueLinkManager.class);
bind(LinkAuthorizationManager.class).to(DefaultLinkAuthorizationManager.class);
bind(EmailAddressManager.class).to(DefaultEmailAddressManager.class);
+ bind(GpgKeyManager.class).to(DefaultGpgKeyManager.class);
bind(WebHookManager.class);
@@ -597,6 +602,7 @@ public class CoreModule extends AbstractPluginModule {
bind(GitLfsFilter.class);
bind(GitPreReceiveCallback.class);
bind(GitPostReceiveCallback.class);
+ bind(SignatureVerificationKeyLoader.class).to(DefaultSignatureVerificationKeyLoader.class);
contribute(SshCommandCreator.class, GitSshCommandCreator.class);
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/notificationreceiver/NotificationReceiver.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/notificationreceiver/NotificationReceiver.java
index 89e8584571..f8b0af8592 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/notificationreceiver/NotificationReceiver.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/notificationreceiver/NotificationReceiver.java
@@ -81,7 +81,7 @@ public class NotificationReceiver {
if (build != null) {
for (RevCommit commit: build.getCommits(null)) {
PersonIdent committer = commit.getCommitterIdent();
- if (committer != null && committer.getEmailAddress() != null)
+ if (committer != null && StringUtils.isNotBlank(committer.getEmailAddress()))
emailAddresses.add(committer.getEmailAddress());
}
}
@@ -89,7 +89,7 @@ public class NotificationReceiver {
if (build != null) {
for (RevCommit commit: build.getCommits(null)) {
PersonIdent author = commit.getAuthorIdent();
- if (author != null && author.getEmailAddress() != null)
+ if (author != null && StringUtils.isNotBlank(author.getEmailAddress()))
emailAddresses.add(author.getEmailAddress());
}
}
@@ -97,7 +97,7 @@ public class NotificationReceiver {
if (build != null) {
for (RevCommit commit: build.getCommits(Build.Status.SUCCESSFUL)) {
PersonIdent committer = commit.getCommitterIdent();
- if (committer != null && committer.getEmailAddress() != null)
+ if (committer != null && StringUtils.isNotBlank(committer.getEmailAddress()))
emailAddresses.add(committer.getEmailAddress());
}
}
@@ -105,7 +105,7 @@ public class NotificationReceiver {
if (build != null) {
for (RevCommit commit: build.getCommits(Build.Status.SUCCESSFUL)) {
PersonIdent author = commit.getAuthorIdent();
- if (author != null && author.getEmailAddress() != null)
+ if (author != null && StringUtils.isNotBlank(author.getEmailAddress()))
emailAddresses.add(author.getEmailAddress());
}
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/CreateTagStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/CreateTagStep.java
index d9b1edd588..58bbe72fef 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/CreateTagStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/CreateTagStep.java
@@ -4,6 +4,7 @@ import java.io.File;
import java.util.List;
import java.util.Map;
+import org.bouncycastle.openpgp.PGPSecretKeyRing;
import org.eclipse.jgit.lib.PersonIdent;
import org.eclipse.jgit.lib.Ref;
import org.hibernate.validator.constraints.NotEmpty;
@@ -14,6 +15,7 @@ import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.OneDev;
import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
@@ -59,17 +61,19 @@ public class CreateTagStep extends ServerSideStep {
@Override
public Map<String, byte[]> run(Build build, File inputDir, TaskLogger logger) {
- PersonIdent tagIdent = OneDev.getInstance(UserManager.class).getSystem().asPerson();
+ PersonIdent taggerIdent = OneDev.getInstance(UserManager.class).getSystem().asPerson();
Project project = build.getProject();
String tagName = getTagName();
if (build.canCreateTag(tagName)) {
+ PGPSecretKeyRing signingKey = OneDev.getInstance(SettingManager.class)
+ .getGpgSetting().getSigningKey();
Ref tagRef = project.getTagRef(tagName);
if (tagRef != null) {
OneDev.getInstance(ProjectManager.class).deleteTag(project, tagName);
- project.createTag(tagName, build.getCommitHash(), tagIdent, getTagMessage());
+ project.createTag(tagName, build.getCommitHash(), taggerIdent, getTagMessage(), signingKey);
} else {
- project.createTag(tagName, build.getCommitHash(), tagIdent, getTagMessage());
+ project.createTag(tagName, build.getCommitHash(), taggerIdent, getTagMessage(), signingKey);
}
} else {
throw new ExplicitException("This build is not authorized to create tag '" + tagName + "'");
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/GpgKeyManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/GpgKeyManager.java
new file mode 100644
index 0000000000..8f8b3cc4ef
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/GpgKeyManager.java
@@ -0,0 +1,13 @@
+package io.onedev.server.entitymanager;
+
+import javax.annotation.Nullable;
+
+import io.onedev.server.model.GpgKey;
+import io.onedev.server.persistence.dao.EntityManager;
+
+public interface GpgKeyManager extends EntityManager<GpgKey> {
+
+ @Nullable
+ GpgKey findByKeyId(long keyId);
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/SettingManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/SettingManager.java
index 85d1653b10..3d0ec76106 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/SettingManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/SettingManager.java
@@ -13,6 +13,7 @@ import io.onedev.server.model.support.administration.GlobalBuildSetting;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
import io.onedev.server.model.support.administration.GlobalProjectSetting;
import io.onedev.server.model.support.administration.GlobalPullRequestSetting;
+import io.onedev.server.model.support.administration.GpgSetting;
import io.onedev.server.model.support.administration.GroovyScript;
import io.onedev.server.model.support.administration.MailSetting;
import io.onedev.server.model.support.administration.PerformanceSetting;
@@ -152,12 +153,16 @@ public interface SettingManager extends EntityManager<Setting> {
void saveAgentSetting(AgentSetting agentSetting);
SshSetting getSshSetting();
+
+ GpgSetting getGpgSetting();
void savePerformanceSetting(PerformanceSetting performanceSetting);
PerformanceSetting getPerformanceSetting();
void saveSshSetting(SshSetting sshSetting);
+
+ void saveGpgSetting(GpgSetting gpgSetting);
List<SsoConnector> getSsoConnectors();
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGpgKeyManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGpgKeyManager.java
new file mode 100644
index 0000000000..26fad14256
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGpgKeyManager.java
@@ -0,0 +1,116 @@
+package io.onedev.server.entitymanager.impl;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import io.onedev.commons.loader.Listen;
+import io.onedev.server.entitymanager.GpgKeyManager;
+import io.onedev.server.event.entity.EntityPersisted;
+import io.onedev.server.event.entity.EntityRemoved;
+import io.onedev.server.event.system.SystemStarted;
+import io.onedev.server.model.EmailAddress;
+import io.onedev.server.model.GpgKey;
+import io.onedev.server.model.User;
+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.BaseEntityManager;
+import io.onedev.server.persistence.dao.Dao;
+
+@Singleton
+public class DefaultGpgKeyManager extends BaseEntityManager<GpgKey> implements GpgKeyManager {
+
+ private final TransactionManager transactionManager;
+
+ private final Map<Long, Long> idCache = new ConcurrentHashMap<>();
+
+ @Inject
+ public DefaultGpgKeyManager(Dao dao, TransactionManager transactionManager) {
+ super(dao);
+ this.transactionManager = transactionManager;
+ }
+
+ @Sessional
+ @Override
+ public GpgKey findByKeyId(long keyId) {
+ Long id = idCache.get(keyId);
+ return id != null? load(id): null;
+ }
+
+ @Listen
+ @Sessional
+ public void on(SystemStarted event) {
+ for (GpgKey key: query())
+ idCache.put(key.getKeyId(), key.getId());
+ }
+
+ @Transactional
+ @Listen
+ public void on(EntityRemoved event) {
+ if (event.getEntity() instanceof GpgKey) {
+ long keyId = ((GpgKey)event.getEntity()).getKeyId();
+ transactionManager.runAfterCommit(new Runnable() {
+
+ @Override
+ public void run() {
+ idCache.remove(keyId);
+ }
+
+ });
+ } else if (event.getEntity() instanceof EmailAddress) {
+ EmailAddress emailAddress = (EmailAddress) event.getEntity();
+ Collection<Long> keyIds = emailAddress.getGpgKeys().stream()
+ .map(it->it.getKeyId())
+ .collect(Collectors.toList());
+ transactionManager.runAfterCommit(new Runnable() {
+
+ @Override
+ public void run() {
+ idCache.keySet().removeAll(keyIds);
+ }
+
+ });
+ } else if (event.getEntity() instanceof User) {
+ User user = (User) event.getEntity();
+ Collection<Long> keyIds = new ArrayList<>();
+ for (EmailAddress emailAddress: user.getEmailAddresses()) {
+ keyIds.addAll(emailAddress.getGpgKeys().stream()
+ .map(it->it.getKeyId())
+ .collect(Collectors.toList()));
+ }
+ transactionManager.runAfterCommit(new Runnable() {
+
+ @Override
+ public void run() {
+ idCache.keySet().removeAll(keyIds);
+ }
+
+ });
+ }
+ }
+
+ @Transactional
+ @Listen
+ public void on(EntityPersisted event) {
+ if (event.getEntity() instanceof GpgKey) {
+ GpgKey gpgKey = (GpgKey) event.getEntity();
+ long keyId = gpgKey.getKeyId();
+ Long id = gpgKey.getId();
+ transactionManager.runAfterCommit(new Runnable() {
+
+ @Override
+ public void run() {
+ idCache.put(keyId, id);
+ }
+
+ });
+ }
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
index f70d1221ad..f2991b1e73 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
@@ -34,6 +34,7 @@ import javax.persistence.criteria.Root;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.util.lang.Objects;
+import org.bouncycastle.openpgp.PGPSecretKeyRing;
import org.eclipse.jgit.lib.CommitBuilder;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.ObjectInserter;
@@ -67,6 +68,7 @@ import io.onedev.server.entitymanager.PullRequestChangeManager;
import io.onedev.server.entitymanager.PullRequestManager;
import io.onedev.server.entitymanager.PullRequestReviewManager;
import io.onedev.server.entitymanager.PullRequestUpdateManager;
+import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entityreference.EntityReferenceManager;
import io.onedev.server.entityreference.ReferencedFromAware;
import io.onedev.server.event.RefUpdated;
@@ -165,6 +167,8 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im
private final EntityReferenceManager referenceManager;
+ private final SettingManager settingManager;
+
@Inject
public DefaultPullRequestManager(Dao dao, PullRequestUpdateManager updateManager,
PullRequestReviewManager reviewManager, MarkdownManager markdownManager,
@@ -172,7 +176,8 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im
SessionManager sessionManager, PullRequestChangeManager changeManager,
ExecutorService executorService, BuildManager buildManager,
TransactionManager transactionManager, ProjectManager projectManager,
- CommitInfoManager commitInfoManager, EntityReferenceManager referenceManager) {
+ CommitInfoManager commitInfoManager, EntityReferenceManager referenceManager,
+ SettingManager settingManager) {
super(dao);
this.updateManager = updateManager;
@@ -187,6 +192,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im
this.projectManager = projectManager;
this.commitInfoManager = commitInfoManager;
this.referenceManager = referenceManager;
+ this.settingManager = settingManager;
}
@Transactional
@@ -295,15 +301,17 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im
MergePreview mergePreview = Preconditions.checkNotNull(request.getMergePreview());
ObjectId mergeCommitId = ObjectId.fromString(
Preconditions.checkNotNull(mergePreview.getMergeCommitHash()));
- PersonIdent user = SecurityUtils.getUser().asPerson();
+ User user = SecurityUtils.getUser();
+ PersonIdent person = user.asPerson();
Project project = request.getTargetProject();
MergeStrategy mergeStrategy = mergePreview.getMergeStrategy();
+ PGPSecretKeyRing signingKey = settingManager.getGpgSetting().getSigningKey();
+
if (mergeStrategy == CREATE_MERGE_COMMIT
|| mergeStrategy == SQUASH_SOURCE_BRANCH_COMMITS
- || mergeStrategy == CREATE_MERGE_COMMIT_IF_NECESSARY
- && !mergeCommitId.name().equals(mergePreview.getHeadCommitHash())) {
+ || mergeStrategy == CREATE_MERGE_COMMIT_IF_NECESSARY && !mergeCommitId.name().equals(mergePreview.getHeadCommitHash())) {
try ( RevWalk revWalk = new RevWalk(project.getRepository());
ObjectInserter inserter = project.getRepository().newObjectInserter()) {
RevCommit mergeCommit = revWalk.parseCommit(mergeCommitId);
@@ -311,11 +319,13 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im
if (mergeStrategy == SQUASH_SOURCE_BRANCH_COMMITS)
commitBuilder.setAuthor(mergeCommit.getAuthorIdent());
else
- commitBuilder.setAuthor(user);
- commitBuilder.setCommitter(user);
+ commitBuilder.setAuthor(person);
+ commitBuilder.setCommitter(person);
commitBuilder.setMessage(commitMessage);
commitBuilder.setTreeId(mergeCommit.getTree());
commitBuilder.setParentIds(mergeCommit.getParents());
+ if (signingKey != null)
+ GitUtils.sign(commitBuilder, signingKey);
mergeCommitId = inserter.insert(commitBuilder);
inserter.flush();
} catch (Exception e) {
@@ -332,14 +342,15 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im
mergeCommit = targetHeadCommit;
for (RevCommit commit: commits) {
PersonIdent committer = commit.getCommitterIdent();
- if (committer.getName().equals(User.SYSTEM_NAME) && committer.getEmailAddress().length() == 0
- || !commit.getParent(0).equals(mergeCommit)) {
+ if (committer.getName().equals(User.ONEDEV_NAME) || !commit.getParent(0).equals(mergeCommit)) {
CommitBuilder commitBuilder = new CommitBuilder();
commitBuilder.setAuthor(commit.getAuthorIdent());
- commitBuilder.setCommitter(user);
+ commitBuilder.setCommitter(person);
commitBuilder.setParentId(mergeCommit.copy());
commitBuilder.setMessage(commit.getFullMessage());
commitBuilder.setTreeId(commit.getTree().getId());
+ if (signingKey != null)
+ GitUtils.sign(commitBuilder, signingKey);
mergeCommit = revWalk.parseCommit(inserter.insert(commitBuilder));
} else {
mergeCommit = commit;
@@ -364,7 +375,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im
String targetRef = request.getTargetRef();
ObjectId targetHeadCommitId = ObjectId.fromString(mergePreview.getTargetHeadCommitHash());
RefUpdate refUpdate = GitUtils.getRefUpdate(project.getRepository(), targetRef);
- refUpdate.setRefLogIdent(user);
+ refUpdate.setRefLogIdent(person);
refUpdate.setRefLogMessage("Pull request #" + request.getNumber(), true);
refUpdate.setExpectedOldObjectId(targetHeadCommitId);
refUpdate.setNewObjectId(mergeCommitId);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java
index 3897057dc7..87dfa21cf5 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java
@@ -26,6 +26,7 @@ import io.onedev.server.model.support.administration.GlobalBuildSetting;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
import io.onedev.server.model.support.administration.GlobalProjectSetting;
import io.onedev.server.model.support.administration.GlobalPullRequestSetting;
+import io.onedev.server.model.support.administration.GpgSetting;
import io.onedev.server.model.support.administration.GroovyScript;
import io.onedev.server.model.support.administration.MailSetting;
import io.onedev.server.model.support.administration.PerformanceSetting;
@@ -83,6 +84,8 @@ public class DefaultSettingManager extends BaseEntityManager<Setting> implements
private volatile Long sshSettingId;
+ private volatile Long gpgSettingId;
+
private volatile Long ssoConnectorsId;
private volatile Long contributedSettingsId;
@@ -743,5 +746,31 @@ public class DefaultSettingManager extends BaseEntityManager<Setting> implements
usage.add(getIssueSetting().onDeleteLink(linkName));
return usage.prefix("administration");
}
-
+
+ @Sessional
+ @Override
+ public GpgSetting getGpgSetting() {
+ Setting setting;
+ if (gpgSettingId == null) {
+ setting = getSetting(Key.GPG);
+ Preconditions.checkNotNull(setting);
+ gpgSettingId = setting.getId();
+ } else {
+ setting = load(gpgSettingId);
+ }
+ return (GpgSetting)setting.getValue();
+ }
+
+ @Transactional
+ @Override
+ public void saveGpgSetting(GpgSetting gpgSetting) {
+ Setting setting = getSetting(Key.GPG);
+ if (setting == null) {
+ setting = new Setting();
+ setting.setKey(Key.GPG);
+ }
+ setting.setValue(gpgSetting);
+ dao.persist(setting);
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java
index 2f9e9a7826..1ab9b57a86 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java
@@ -119,7 +119,7 @@ public class DefaultUserManager extends BaseEntityManager<User> implements UserM
@Sessional
@Override
public User getSystem() {
- return load(User.SYSTEM_ID);
+ return load(User.ONEDEV_ID);
}
@Sessional
diff --git a/server-core/src/main/java/io/onedev/server/git/BlobEdits.java b/server-core/src/main/java/io/onedev/server/git/BlobEdits.java
index 1c243c27c5..8cc42bb6c2 100644
--- a/server-core/src/main/java/io/onedev/server/git/BlobEdits.java
+++ b/server-core/src/main/java/io/onedev/server/git/BlobEdits.java
@@ -13,7 +13,10 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import javax.annotation.Nullable;
+
import org.apache.commons.lang.StringUtils;
+import org.bouncycastle.openpgp.PGPSecretKeyRing;
import org.eclipse.jgit.errors.RevisionSyntaxException;
import org.eclipse.jgit.lib.CommitBuilder;
import org.eclipse.jgit.lib.Constants;
@@ -221,7 +224,7 @@ public class BlobEdits implements Serializable {
*
*/
public ObjectId commit(Repository repository, String refName, ObjectId expectedOldCommitId, ObjectId parentCommitId,
- PersonIdent authorAndCommitter, String commitMessage) {
+ PersonIdent authorAndCommitter, String commitMessage, @Nullable PGPSecretKeyRing signingKey) {
try ( RevWalk revWalk = new RevWalk(repository);
TreeWalk treeWalk = new TreeWalk(repository);
@@ -250,6 +253,9 @@ public class BlobEdits implements Serializable {
else
commit.setTreeId(inserter.insert(new TreeFormatter()));
+ if (signingKey != null)
+ GitUtils.sign(commit, signingKey);
+
ObjectId commitId = inserter.insert(commit);
inserter.flush();
RefUpdate ru = repository.updateRef(refName);
diff --git a/server-core/src/main/java/io/onedev/server/git/GitUtils.java b/server-core/src/main/java/io/onedev/server/git/GitUtils.java
index 8c6a649847..34456d2a9f 100644
--- a/server-core/src/main/java/io/onedev/server/git/GitUtils.java
+++ b/server-core/src/main/java/io/onedev/server/git/GitUtils.java
@@ -1,8 +1,12 @@
package io.onedev.server.git;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
+import java.io.InputStream;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Date;
@@ -12,6 +16,24 @@ import java.util.Map;
import javax.annotation.Nullable;
+import org.bouncycastle.bcpg.ArmoredOutputStream;
+import org.bouncycastle.bcpg.BCPGOutputStream;
+import org.bouncycastle.bcpg.HashAlgorithmTags;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.openpgp.PGPCompressedData;
+import org.bouncycastle.openpgp.PGPException;
+import org.bouncycastle.openpgp.PGPPrivateKey;
+import org.bouncycastle.openpgp.PGPPublicKey;
+import org.bouncycastle.openpgp.PGPSecretKeyRing;
+import org.bouncycastle.openpgp.PGPSignature;
+import org.bouncycastle.openpgp.PGPSignatureGenerator;
+import org.bouncycastle.openpgp.PGPSignatureList;
+import org.bouncycastle.openpgp.PGPSignatureSubpacketGenerator;
+import org.bouncycastle.openpgp.PGPUtil;
+import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory;
+import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder;
+import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider;
+import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder;
import org.eclipse.jgit.diff.DiffEntry;
import org.eclipse.jgit.diff.DiffEntry.ChangeType;
import org.eclipse.jgit.diff.DiffFormatter;
@@ -24,6 +46,8 @@ import org.eclipse.jgit.lib.AnyObjectId;
import org.eclipse.jgit.lib.CommitBuilder;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.FileMode;
+import org.eclipse.jgit.lib.GpgSignature;
+import org.eclipse.jgit.lib.ObjectBuilder;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.ObjectInserter;
import org.eclipse.jgit.lib.ObjectReader;
@@ -35,14 +59,18 @@ import org.eclipse.jgit.merge.Merger;
import org.eclipse.jgit.merge.ResolveMerger;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevObject;
+import org.eclipse.jgit.revwalk.RevTag;
import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.revwalk.RevWalkUtils;
import org.eclipse.jgit.revwalk.filter.RevFilter;
import org.eclipse.jgit.treewalk.CanonicalTreeParser;
import org.eclipse.jgit.treewalk.TreeWalk;
import org.eclipse.jgit.treewalk.filter.TreeFilter;
+import org.eclipse.jgit.util.RawParseUtils;
import org.eclipse.jgit.util.SystemReader;
import org.eclipse.jgit.util.io.NullOutputStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.base.Joiner;
import com.google.common.base.Objects;
@@ -56,11 +84,19 @@ import io.onedev.server.git.command.FetchCommand;
import io.onedev.server.git.command.IsAncestorCommand;
import io.onedev.server.git.exception.ObsoleteCommitException;
import io.onedev.server.git.exception.RefUpdateException;
+import io.onedev.server.git.signature.SignatureUnverified;
+import io.onedev.server.git.signature.SignatureVerification;
+import io.onedev.server.git.signature.SignatureVerificationKey;
+import io.onedev.server.git.signature.SignatureVerificationKeyLoader;
+import io.onedev.server.git.signature.SignatureVerified;
+import io.onedev.server.util.GpgUtils;
public class GitUtils {
public static final int SHORT_SHA_LENGTH = 8;
-
+
+ private static final Logger logger = LoggerFactory.getLogger(GitUtils.class);
+
public static boolean isEmptyPath(String path) {
return Strings.isNullOrEmpty(path) || Objects.equal(path, DiffEntry.DEV_NULL);
}
@@ -515,5 +551,230 @@ public class GitUtils {
throw new RuntimeException(e);
}
}
+
+ public static void sign(ObjectBuilder object, PGPSecretKeyRing signingKey) {
+ JcePBESecretKeyDecryptorBuilder decryptorBuilder = new JcePBESecretKeyDecryptorBuilder()
+ .setProvider(BouncyCastleProvider.PROVIDER_NAME);
+ PGPPrivateKey privateKey;
+ try {
+ privateKey = signingKey.getSecretKey().extractPrivateKey(
+ decryptorBuilder.build(new char[0]));
+ } catch (PGPException e) {
+ throw new RuntimeException(e);
+ }
+
+ PGPPublicKey publicKey = signingKey.getPublicKey();
+
+ PGPSignatureGenerator signatureGenerator = new PGPSignatureGenerator(
+ new JcaPGPContentSignerBuilder(publicKey.getAlgorithm(), HashAlgorithmTags.SHA256)
+ .setProvider(BouncyCastleProvider.PROVIDER_NAME));
+ try {
+ signatureGenerator.init(PGPSignature.BINARY_DOCUMENT, privateKey);
+ PGPSignatureSubpacketGenerator subpackets = new PGPSignatureSubpacketGenerator();
+ subpackets.setIssuerFingerprint(false, publicKey);
+
+ String emailAddress = GpgUtils.getEmailAddress(publicKey.getUserIDs().next());
+ subpackets.addSignerUserID(false, emailAddress);
+
+ signatureGenerator.setHashedSubpackets(subpackets.generate());
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ try (BCPGOutputStream out = new BCPGOutputStream(new ArmoredOutputStream(buffer))) {
+ signatureGenerator.update(object.build());
+ signatureGenerator.generate().encode(out);
+ }
+ object.setGpgSignature(new GpgSignature(buffer.toByteArray()));
+ } catch (IOException | PGPException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Nullable
+ public static SignatureVerification verifyTagSignature(byte[] raw,
+ SignatureVerificationKeyLoader keyLoader) {
+ byte[] signatureData = TagParser.getRawGpgSignature(raw);
+ if (signatureData == null) {
+ return null;
+ }
+
+ // The signature is just tacked onto the end of the message, which
+ // is last in the buffer.
+ byte[] data = Arrays.copyOfRange(raw, 0, raw.length - signatureData.length);
+
+ PersonIdent taggerIdent = TagParser.getTaggerIdent(raw);
+ if (taggerIdent == null)
+ return null;
+
+ return verify(data, signatureData, taggerIdent.getEmailAddress(), keyLoader);
+ }
+
+ /*
+ * Most logic here is copied from JGit
+ */
+ @Nullable
+ public static SignatureVerification verifyCommitSignature(byte[] raw,
+ SignatureVerificationKeyLoader keyLoader) {
+ byte[] header = {'g', 'p', 'g', 's', 'i', 'g'};
+ int start = RawParseUtils.headerStart(header, raw, 0);
+ if (start < 0)
+ return null;
+ int end = RawParseUtils.headerEnd(raw, start);
+ byte[] signatureData = Arrays.copyOfRange(raw, start, end);
+
+ // start is at the beginning of the header's content
+ start -= header.length + 1;
+ // end is on the terminating LF; we need to skip that, too
+ if (end < raw.length) {
+ end++;
+ }
+ byte[] data = new byte[raw.length - (end - start)];
+ System.arraycopy(raw, 0, data, 0, start);
+ System.arraycopy(raw, end, data, start, raw.length - end);
+
+ int nameB = RawParseUtils.committer(raw, 0);
+ if (nameB < 0)
+ return null;
+ PersonIdent committerIdent = RawParseUtils.parsePersonIdent(raw, nameB);
+ String emailAddress = committerIdent.getEmailAddress();
+ return verify(data, signatureData, emailAddress, keyLoader);
+ }
+
+ @Nullable
+ public static SignatureVerification verifySignature(RevObject object, SignatureVerificationKeyLoader keyLoader) {
+ if (object instanceof RevCommit) {
+ RevCommit commit = (RevCommit) object;
+ return verifyCommitSignature(commit.getRawBuffer(), keyLoader);
+ } else if (object instanceof RevTag) {
+ RevTag tag = (RevTag) object;
+ return verifyTagSignature(tag.getRawBuffer(), keyLoader);
+ } else {
+ return null;
+ }
+ }
+
+ private static PGPSignature parseSignature(InputStream in) throws IOException, PGPException {
+ try (InputStream sigIn = PGPUtil.getDecoderStream(in)) {
+ JcaPGPObjectFactory pgpFactory = new JcaPGPObjectFactory(sigIn);
+ Object obj = pgpFactory.nextObject();
+ if (obj instanceof PGPCompressedData) {
+ obj = new JcaPGPObjectFactory(((PGPCompressedData) obj).getDataStream()).nextObject();
+ }
+ if (obj instanceof PGPSignatureList) {
+ return ((PGPSignatureList) obj).get(0);
+ }
+ return null;
+ }
+ }
+
+ @Nullable
+ private static SignatureVerification verify(byte[] data, byte[] signatureData, String dataWriter,
+ SignatureVerificationKeyLoader keyLoader) {
+ try (InputStream sigIn = new ByteArrayInputStream(signatureData)) {
+ PGPSignature signature = parseSignature(sigIn);
+ if (signature != null) {
+ SignatureVerificationKey key = keyLoader.getSignatureVerificationKey(signature.getKeyID());
+ if (key != null) {
+ try {
+ signature.init(
+ new JcaPGPContentVerifierBuilderProvider().setProvider(BouncyCastleProvider.PROVIDER_NAME),
+ key.getPublicKey());
+ signature.update(data);
+ if (signature.verify()) {
+ String signer = GpgUtils.getEmailAddress(key.getPublicKey());
+ if (!key.shouldVerifyDataWriter() || signer.equals(dataWriter))
+ return new SignatureVerified(key);
+ else
+ return new SignatureUnverified(key, "Email address of signing key and committer is different");
+ } else {
+ return new SignatureUnverified(key, "Invalid commit signature");
+ }
+ } catch (PGPException e) {
+ logger.error("Commit signature verification failed", e);
+ return new SignatureUnverified(key, "Signature verification failed");
+ }
+ } else {
+ return new SignatureUnverified(null, "Signature is signed with an unkown key "
+ + "(key ID: " + GpgUtils.getKeyIDString(signature.getKeyID()) + ")");
+ }
+ } else {
+ return new SignatureUnverified(null, "Signature does not decode into a signature object");
+ }
+ } catch (PGPException e) {
+ logger.error("Error parsing commit signature", e);
+ return new SignatureUnverified(null, "Signature cannot be parsed");
+ } catch (IOException e2) {
+ throw new RuntimeException(e2);
+ }
+ }
+
+ /*
+ * Copied from JGit
+ */
+ private static class TagParser {
+
+ private static final byte[] hSignature = Constants.encodeASCII("-----BEGIN PGP SIGNATURE-----");
+
+ private static int nextStart(byte[] prefix, byte[] buffer, int from) {
+ int stop = buffer.length - prefix.length + 1;
+ int ptr = from;
+ if (ptr > 0) {
+ ptr = RawParseUtils.nextLF(buffer, ptr - 1);
+ }
+ while (ptr < stop) {
+ int lineStart = ptr;
+ boolean found = true;
+ for (byte element : prefix) {
+ if (element != buffer[ptr++]) {
+ found = false;
+ break;
+ }
+ }
+ if (found) {
+ return lineStart;
+ }
+ do {
+ ptr = RawParseUtils.nextLF(buffer, ptr);
+ } while (ptr < stop && buffer[ptr] == '\n');
+ }
+ return -1;
+ }
+
+ private static int getSignatureStart(byte[] raw) {
+ int msgB = RawParseUtils.tagMessage(raw, 0);
+ if (msgB < 0) {
+ return msgB;
+ }
+ // Find the last signature start and return the rest
+ int start = nextStart(hSignature, raw, msgB);
+ if (start < 0) {
+ return start;
+ }
+ int next = RawParseUtils.nextLF(raw, start);
+ while (next < raw.length) {
+ int newStart = nextStart(hSignature, raw, next);
+ if (newStart < 0) {
+ break;
+ }
+ start = newStart;
+ next = RawParseUtils.nextLF(raw, start);
+ }
+ return start;
+ }
+
+ private static byte[] getRawGpgSignature(byte[] raw) {
+ int start = getSignatureStart(raw);
+ if (start < 0) {
+ return null;
+ }
+ return Arrays.copyOfRange(raw, start, raw.length);
+ }
+ private static PersonIdent getTaggerIdent(byte[] raw) {
+ int nameB = RawParseUtils.tagger(raw, 0);
+ if (nameB < 0)
+ return null;
+ return RawParseUtils.parsePersonIdent(raw, nameB);
+ }
+
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/git/command/GetRawCommitCommand.java b/server-core/src/main/java/io/onedev/server/git/command/GetRawCommitCommand.java
new file mode 100644
index 0000000000..d6d06850cf
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/git/command/GetRawCommitCommand.java
@@ -0,0 +1,51 @@
+package io.onedev.server.git.command;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.base.Preconditions;
+
+import io.onedev.commons.utils.command.Commandline;
+import io.onedev.commons.utils.command.LineConsumer;
+
+public class GetRawCommitCommand extends GitCommand<byte[]> {
+
+ private static final Logger logger = LoggerFactory.getLogger(GetRawCommitCommand.class);
+
+ private String revision;
+
+ public GetRawCommitCommand(File gitDir, Map<String, String> gitEnvs) {
+ super(gitDir, gitEnvs);
+ }
+
+ public GetRawCommitCommand revision(String revision) {
+ this.revision = revision;
+ return this;
+ }
+
+ @Override
+ public byte[] call() {
+ Preconditions.checkNotNull(revision, "revision has to be specified.");
+
+ Commandline cmd = cmd();
+
+ cmd.addArgs("cat-file", "commit", revision);
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ cmd.execute(baos, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.error(line);
+ }
+
+ }).checkReturnCode();
+
+ return baos.toByteArray();
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/git/command/GetRawTagCommand.java b/server-core/src/main/java/io/onedev/server/git/command/GetRawTagCommand.java
new file mode 100644
index 0000000000..0829e97759
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/git/command/GetRawTagCommand.java
@@ -0,0 +1,62 @@
+package io.onedev.server.git.command;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.base.Preconditions;
+
+import io.onedev.commons.utils.command.Commandline;
+import io.onedev.commons.utils.command.ExecutionResult;
+import io.onedev.commons.utils.command.LineConsumer;
+
+public class GetRawTagCommand extends GitCommand<byte[]> {
+
+ private static final Logger logger = LoggerFactory.getLogger(GetRawTagCommand.class);
+
+ private String tag;
+
+ public GetRawTagCommand(File gitDir, Map<String, String> gitEnvs) {
+ super(gitDir, gitEnvs);
+ }
+
+ public GetRawTagCommand revision(String tag) {
+ this.tag = tag;
+ return this;
+ }
+
+ @Override
+ public byte[] call() {
+ Preconditions.checkNotNull(tag, "tag has to be specified.");
+
+ Commandline cmd = cmd();
+
+ cmd.addArgs("cat-file", "tag", tag);
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
+ AtomicBoolean badFile = new AtomicBoolean(false);
+ ExecutionResult result = cmd.execute(baos, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ if (line.endsWith(": bad file"))
+ badFile.set(true);
+ else
+ logger.error(line);
+ }
+
+ });
+
+ if (badFile.get())
+ return null;
+
+ result.checkReturnCode();
+ return baos.toByteArray();
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/git/hookcallback/GitPreReceiveCallback.java b/server-core/src/main/java/io/onedev/server/git/hookcallback/GitPreReceiveCallback.java
index 6bd09ac367..03dbc79d0f 100644
--- a/server-core/src/main/java/io/onedev/server/git/hookcallback/GitPreReceiveCallback.java
+++ b/server-core/src/main/java/io/onedev/server/git/hookcallback/GitPreReceiveCallback.java
@@ -141,14 +141,23 @@ public class GitPreReceiveCallback extends HttpServlet {
List<String> errorMessages = new ArrayList<>();
BranchProtection protection = project.getHierarchyBranchProtection(branchName, user);
if (oldObjectId.equals(ObjectId.zeroId())) {
- if (protection.isPreventCreation())
+ if (protection.isPreventCreation()) {
errorMessages.add("Can not create this branch according to branch protection setting");
+ } else if (protection.isSignatureRequired()
+ && !project.hasValidCommitSignature(newObjectId, gitEnvs)) {
+ errorMessages.add("Can not create this branch as branch protection setting "
+ + "requires valid signature on head commit");
+ }
} else if (newObjectId.equals(ObjectId.zeroId())) {
if (protection.isPreventDeletion())
errorMessages.add("Can not delete this branch according to branch protection setting");
} else if (protection.isPreventForcedPush()
&& !GitUtils.isMergedInto(project.getRepository(), gitEnvs, oldObjectId, newObjectId)) {
errorMessages.add("Can not force-push to this branch according to branch protection setting");
+ } else if (protection.isSignatureRequired()
+ && !project.hasValidCommitSignature(newObjectId, gitEnvs)) {
+ errorMessages.add("Can not push to this branch as branch protection rule requires "
+ + "valid signature for head commit");
} else if (protection.isReviewRequiredForPush(user, project, branchName, oldObjectId, newObjectId, gitEnvs)) {
errorMessages.add("Review required for your change. Please submit pull request instead");
}
@@ -172,13 +181,22 @@ public class GitPreReceiveCallback extends HttpServlet {
List<String> errorMessages = new ArrayList<>();
TagProtection protection = project.getHierarchyTagProtection(tagName, user);
if (oldObjectId.equals(ObjectId.zeroId())) {
- if (protection.isPreventCreation())
+ if (protection.isPreventCreation()) {
errorMessages.add("Can not create this tag according to tag protection setting");
+ } else if (protection.isSignatureRequired()
+ && !project.hasValidTagSignature(newObjectId, gitEnvs)) {
+ errorMessages.add("Can not create this tag as tag protection setting requires "
+ + "valid tag signature");
+ }
} else if (newObjectId.equals(ObjectId.zeroId())) {
if (protection.isPreventDeletion())
errorMessages.add("Can not delete this tag according to tag protection setting");
} else if (protection.isPreventUpdate()) {
errorMessages.add("Can not update this tag according to tag protection setting");
+ } else if (protection.isSignatureRequired()
+ && !project.hasValidTagSignature(newObjectId, gitEnvs)) {
+ errorMessages.add("Can not update this tag as tag protection setting requires "
+ + "valid tag signature");
}
if (errorMessages.isEmpty() && newObjectId.equals(ObjectId.zeroId())) {
try {
diff --git a/server-core/src/main/java/io/onedev/server/git/signature/DefaultSignatureVerificationKeyLoader.java b/server-core/src/main/java/io/onedev/server/git/signature/DefaultSignatureVerificationKeyLoader.java
new file mode 100644
index 0000000000..2d64fb7869
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/git/signature/DefaultSignatureVerificationKeyLoader.java
@@ -0,0 +1,26 @@
+package io.onedev.server.git.signature;
+
+import javax.inject.Singleton;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.GpgKeyManager;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.model.GpgKey;
+import io.onedev.server.model.support.administration.GpgSetting;
+
+@Singleton
+public class DefaultSignatureVerificationKeyLoader implements SignatureVerificationKeyLoader {
+
+ @Override
+ public SignatureVerificationKey getSignatureVerificationKey(long keyId) {
+ GpgSetting gpgSetting = OneDev.getInstance(SettingManager.class).getGpgSetting();
+ SignatureVerificationKey verificationKey = gpgSetting.findSignatureVerificationKey(keyId);
+ if (verificationKey == null) {
+ GpgKey gpgKey = OneDev.getInstance(GpgKeyManager.class).findByKeyId(keyId);
+ if (gpgKey != null)
+ verificationKey = gpgKey.getSignatureVerificationKey();
+ }
+ return verificationKey;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/git/signature/SignatureUnverified.java b/server-core/src/main/java/io/onedev/server/git/signature/SignatureUnverified.java
new file mode 100644
index 0000000000..ca6ed4d439
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/git/signature/SignatureUnverified.java
@@ -0,0 +1,18 @@
+package io.onedev.server.git.signature;
+
+import javax.annotation.Nullable;
+
+public class SignatureUnverified extends SignatureVerification {
+
+ private final String errorMessage;
+
+ public SignatureUnverified(@Nullable SignatureVerificationKey key, String errorMessage) {
+ super(key);
+ this.errorMessage = errorMessage;
+ }
+
+ public String getErrorMessage() {
+ return errorMessage;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/git/signature/SignatureVerification.java b/server-core/src/main/java/io/onedev/server/git/signature/SignatureVerification.java
new file mode 100644
index 0000000000..561da8b1ad
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/git/signature/SignatureVerification.java
@@ -0,0 +1,18 @@
+package io.onedev.server.git.signature;
+
+import javax.annotation.Nullable;
+
+public abstract class SignatureVerification {
+
+ private final SignatureVerificationKey key;
+
+ public SignatureVerification(@Nullable SignatureVerificationKey key) {
+ this.key = key;
+ }
+
+ @Nullable
+ public SignatureVerificationKey getVerificationKey() {
+ return key;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/git/signature/SignatureVerificationKey.java b/server-core/src/main/java/io/onedev/server/git/signature/SignatureVerificationKey.java
new file mode 100644
index 0000000000..f7302b52f4
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/git/signature/SignatureVerificationKey.java
@@ -0,0 +1,11 @@
+package io.onedev.server.git.signature;
+
+import org.bouncycastle.openpgp.PGPPublicKey;
+
+public interface SignatureVerificationKey {
+
+ boolean shouldVerifyDataWriter();
+
+ PGPPublicKey getPublicKey();
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/git/signature/SignatureVerificationKeyLoader.java b/server-core/src/main/java/io/onedev/server/git/signature/SignatureVerificationKeyLoader.java
new file mode 100644
index 0000000000..7806bf5b42
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/git/signature/SignatureVerificationKeyLoader.java
@@ -0,0 +1,10 @@
+package io.onedev.server.git.signature;
+
+import javax.annotation.Nullable;
+
+public interface SignatureVerificationKeyLoader {
+
+ @Nullable
+ SignatureVerificationKey getSignatureVerificationKey(long keyId);
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/git/signature/SignatureVerified.java b/server-core/src/main/java/io/onedev/server/git/signature/SignatureVerified.java
new file mode 100644
index 0000000000..8e774fac02
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/git/signature/SignatureVerified.java
@@ -0,0 +1,9 @@
+package io.onedev.server.git.signature;
+
+public class SignatureVerified extends SignatureVerification {
+
+ public SignatureVerified(SignatureVerificationKey key) {
+ super(key);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java
index c8e2bf28db..845cef44dd 100644
--- a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java
+++ b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java
@@ -47,6 +47,7 @@ import io.onedev.server.model.support.administration.GlobalBuildSetting;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
import io.onedev.server.model.support.administration.GlobalProjectSetting;
import io.onedev.server.model.support.administration.GlobalPullRequestSetting;
+import io.onedev.server.model.support.administration.GpgSetting;
import io.onedev.server.model.support.administration.MailSetting;
import io.onedev.server.model.support.administration.PerformanceSetting;
import io.onedev.server.model.support.administration.SecuritySetting;
@@ -114,12 +115,12 @@ public class DefaultDataManager implements DataManager, Serializable {
@Override
public List<ManualConfig> init() {
List<ManualConfig> manualConfigs = new ArrayList<ManualConfig>();
- User system = userManager.get(User.SYSTEM_ID);
+ User system = userManager.get(User.ONEDEV_ID);
if (system == null) {
system = new User();
- system.setId(User.SYSTEM_ID);
- system.setName(User.SYSTEM_NAME.toLowerCase());
- system.setFullName(User.SYSTEM_NAME);
+ system.setId(User.ONEDEV_ID);
+ system.setName(User.ONEDEV_NAME.toLowerCase());
+ system.setFullName(User.ONEDEV_NAME);
system.setPassword("no password");
userManager.replicate(system);
}
@@ -217,6 +218,12 @@ public class DefaultDataManager implements DataManager, Serializable {
settingManager.saveSshSetting(sshSetting);
}
+ setting = settingManager.getSetting(Key.GPG);
+ if (setting == null || setting.getValue() == null) {
+ GpgSetting gpgSetting = new GpgSetting();
+ settingManager.saveGpgSetting(gpgSetting);
+ }
+
setting = settingManager.getSetting(Key.SECURITY);
if (setting == null) {
settingManager.saveSecuritySetting(new SecuritySetting());
diff --git a/server-core/src/main/java/io/onedev/server/model/EmailAddress.java b/server-core/src/main/java/io/onedev/server/model/EmailAddress.java
index 57073d3a98..eea19c142c 100644
--- a/server-core/src/main/java/io/onedev/server/model/EmailAddress.java
+++ b/server-core/src/main/java/io/onedev/server/model/EmailAddress.java
@@ -1,11 +1,16 @@
package io.onedev.server.model;
+import java.util.ArrayList;
+import java.util.Collection;
+
+import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.Index;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
import javax.persistence.Table;
import org.apache.commons.lang3.RandomStringUtils;
@@ -44,6 +49,10 @@ public class EmailAddress extends AbstractEntity {
@JoinColumn(nullable=false)
private User owner;
+ @OneToMany(mappedBy="emailAddress", cascade=CascadeType.REMOVE)
+ @Cache(usage=CacheConcurrencyStrategy.READ_WRITE)
+ private Collection<GpgKey> gpgKeys = new ArrayList<>();
+
@Editable
@Email
@NotEmpty
@@ -90,7 +99,15 @@ public class EmailAddress extends AbstractEntity {
this.owner = owner;
}
- public boolean isVerified() {
+ public Collection<GpgKey> getGpgKeys() {
+ return gpgKeys;
+ }
+
+ public void setGpgKeys(Collection<GpgKey> gpgKeys) {
+ this.gpgKeys = gpgKeys;
+ }
+
+ public boolean isVerified() {
return getVerficationCode() == null;
}
diff --git a/server-core/src/main/java/io/onedev/server/model/GpgKey.java b/server-core/src/main/java/io/onedev/server/model/GpgKey.java
new file mode 100644
index 0000000000..eb24feb9ea
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/GpgKey.java
@@ -0,0 +1,84 @@
+package io.onedev.server.model;
+
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Index;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+import org.bouncycastle.openpgp.PGPPublicKey;
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import io.onedev.server.git.signature.SignatureVerificationKey;
+import io.onedev.server.model.support.BaseGpgKey;
+import io.onedev.server.web.editable.annotation.Editable;
+
+@Editable
+@Entity
+@Table(indexes={@Index(columnList="o_emailAddress_id"), @Index(columnList="keyId")})
+@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)
+public class GpgKey extends BaseGpgKey {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final String PROP_KEY_ID = "keyId";
+
+ @JsonIgnore
+ @Column(unique=true)
+ private long keyId;
+
+ @JsonIgnore
+ @Column(nullable=false)
+ private Date createdAt;
+
+ @ManyToOne(fetch=FetchType.LAZY)
+ @JoinColumn(nullable=false)
+ private EmailAddress emailAddress;
+
+ public long getKeyId() {
+ return keyId;
+ }
+
+ public void setKeyId(long keyId) {
+ this.keyId = keyId;
+ }
+
+ public EmailAddress getEmailAddress() {
+ return emailAddress;
+ }
+
+ public void setEmailAddress(EmailAddress emailAddress) {
+ this.emailAddress = emailAddress;
+ }
+
+ public Date getCreatedAt() {
+ return createdAt;
+ }
+
+ public void setCreatedAt(Date createdAt) {
+ this.createdAt = createdAt;
+ }
+
+ public SignatureVerificationKey getSignatureVerificationKey() {
+ return new SignatureVerificationKey() {
+
+ @Override
+ public boolean shouldVerifyDataWriter() {
+ return true;
+ }
+
+ @Override
+ public PGPPublicKey getPublicKey() {
+ return GpgKey.this.getPublicKey();
+ }
+
+ };
+ }
+}
diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.java
index ad59e1ea6a..8ffea09f4a 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
@@ -47,19 +47,21 @@ import javax.validation.Validator;
import org.apache.commons.lang3.SerializationUtils;
import org.apache.shiro.authz.Permission;
import org.apache.tika.mime.MediaType;
+import org.bouncycastle.openpgp.PGPSecretKeyRing;
import org.eclipse.jgit.api.CreateBranchCommand;
import org.eclipse.jgit.api.Git;
-import org.eclipse.jgit.api.TagCommand;
import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.lib.AnyObjectId;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.lib.ObjectInserter;
import org.eclipse.jgit.lib.ObjectLoader;
import org.eclipse.jgit.lib.PersonIdent;
import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.lib.RefUpdate;
import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.lib.TagBuilder;
import org.eclipse.jgit.revwalk.LastCommitsOfChildren;
import org.eclipse.jgit.revwalk.LastCommitsOfChildren.Value;
import org.eclipse.jgit.revwalk.RevCommit;
@@ -105,9 +107,13 @@ import io.onedev.server.git.GitUtils;
import io.onedev.server.git.RefInfo;
import io.onedev.server.git.Submodule;
import io.onedev.server.git.command.BlameCommand;
+import io.onedev.server.git.command.GetRawCommitCommand;
+import io.onedev.server.git.command.GetRawTagCommand;
import io.onedev.server.git.command.ListChangedFilesCommand;
import io.onedev.server.git.exception.NotFileException;
import io.onedev.server.git.exception.ObjectNotFoundException;
+import io.onedev.server.git.signature.SignatureVerificationKeyLoader;
+import io.onedev.server.git.signature.SignatureVerified;
import io.onedev.server.infomanager.CommitInfoManager;
import io.onedev.server.model.Build.Status;
import io.onedev.server.model.support.BranchProtection;
@@ -201,6 +207,8 @@ public class Project extends AbstractEntity {
public static final String PROP_SERVICE_DESK_NAME = "serviceDeskName";
+ public static final String PROP_GIT_SIGN_STRATEGY = "gitSignStrategy";
+
public static final String NULL_SERVICE_DESK_PREFIX = "<$NullServiceDesk$>";
public static final List<String> QUERY_FIELDS =
@@ -1099,20 +1107,36 @@ public class Project extends AbstractEntity {
}
}
- public void createTag(String tagName, String tagRevision, PersonIdent taggerIdent, @Nullable String tagMessage) {
- try {
- TagCommand tag = git().tag();
- tag.setName(tagName);
- if (tagMessage != null)
- tag.setMessage(tagMessage);
- tag.setTagger(taggerIdent);
- tag.setObjectId(getRevCommit(tagRevision, true));
- tag.call();
+ public void createTag(String tagName, String tagRevision, PersonIdent taggerIdent,
+ @Nullable String tagMessage, @Nullable PGPSecretKeyRing signingKey) {
+ try ( RevWalk revWalk = new RevWalk(getRepository());
+ ObjectInserter inserter = getRepository().newObjectInserter();) {
+ TagBuilder tagBuilder = new TagBuilder();
+ tagBuilder.setTag(tagName);
+ if (tagMessage != null) {
+ if (!tagMessage.endsWith("\n"))
+ tagMessage += "\n";
+ tagBuilder.setMessage(tagMessage);
+ }
+ tagBuilder.setTagger(taggerIdent);
+ RevCommit commit = getRevCommit(tagRevision, true);
+ tagBuilder.setObjectId(commit);
+
+ if (signingKey != null)
+ GitUtils.sign(tagBuilder, signingKey);
+
+ ObjectId tagId = inserter.insert(tagBuilder);
+ inserter.flush();
+
String refName = GitUtils.tag2ref(tagName);
- cacheObjectId(refName, tag.getObjectId());
+ RefUpdate refUpdate = getRepository().updateRef(refName);
+ refUpdate.setNewObjectId(tagId);
+ GitUtils.updateRef(refUpdate);
+
+ cacheObjectId(refName, commit);
- ObjectId commitId = tag.getObjectId().copy();
+ ObjectId commitId = commit.copy();
OneDev.getInstance(TransactionManager.class).runAfterCommit(new Runnable() {
@Override
@@ -1130,7 +1154,7 @@ public class Project extends AbstractEntity {
}
});
- } catch (GitAPIException e) {
+ } catch (IOException e) {
throw new RuntimeException(e);
}
}
@@ -1415,6 +1439,7 @@ public class Project extends AbstractEntity {
boolean noCreation = false;
boolean noDeletion = false;
boolean noUpdate = false;
+ boolean signatureRequired = false;
for (TagProtection protection: getHierarchyTagProtections()) {
if (protection.isEnabled()
&& UserMatch.parse(protection.getUserMatch()).matches(this, user)
@@ -1422,6 +1447,7 @@ public class Project extends AbstractEntity {
noCreation = noCreation || protection.isPreventCreation();
noDeletion = noDeletion || protection.isPreventDeletion();
noUpdate = noUpdate || protection.isPreventUpdate();
+ signatureRequired = signatureRequired || protection.isSignatureRequired();
}
}
@@ -1429,6 +1455,7 @@ public class Project extends AbstractEntity {
protection.setPreventCreation(noCreation);
protection.setPreventDeletion(noDeletion);
protection.setPreventUpdate(noUpdate);
+ protection.setSignatureRequired(signatureRequired);
return protection;
}
@@ -1437,6 +1464,8 @@ public class Project extends AbstractEntity {
boolean noCreation = false;
boolean noDeletion = false;
boolean noForcedPush = false;
+ boolean signatureRequired = false;
+
Set<String> jobNames = new HashSet<>();
List<FileProtection> fileProtections = new ArrayList<>();
ReviewRequirement reviewRequirement = ReviewRequirement.parse(null, true);
@@ -1447,6 +1476,7 @@ public class Project extends AbstractEntity {
noCreation = noCreation || protection.isPreventCreation();
noDeletion = noDeletion || protection.isPreventDeletion();
noForcedPush = noForcedPush || protection.isPreventForcedPush();
+ signatureRequired = signatureRequired || protection.isSignatureRequired();
jobNames.addAll(protection.getJobNames());
fileProtections.addAll(protection.getFileProtections());
reviewRequirement.mergeWith(protection.getParsedReviewRequirement());
@@ -1459,6 +1489,7 @@ public class Project extends AbstractEntity {
protection.setPreventCreation(noCreation);
protection.setPreventDeletion(noDeletion);
protection.setPreventForcedPush(noForcedPush);
+ protection.setSignatureRequired(signatureRequired);
protection.setParsedReviewRequirement(reviewRequirement);
return protection;
@@ -1627,6 +1658,24 @@ public class Project extends AbstractEntity {
return getHierarchyBranchProtection(branch, user).isReviewRequiredForModification(user, this, branch, file);
}
+ public boolean isCommitSignatureRequiredButNoSigningKey(User user, String branch) {
+ return getHierarchyBranchProtection(branch, user).isSignatureRequired()
+ && OneDev.getInstance(SettingManager.class).getGpgSetting().getSigningKey() == null;
+ }
+
+ public boolean isCommitSignatureRequired(User user, String branch) {
+ return getHierarchyBranchProtection(branch, user).isSignatureRequired();
+ }
+
+ public boolean isTagSignatureRequired(User user, String tag) {
+ return getHierarchyTagProtection(tag, user).isSignatureRequired();
+ }
+
+ public boolean isTagSignatureRequiredButNoSigningKey(User user, String tag) {
+ return getHierarchyTagProtection(tag, user).isSignatureRequired()
+ && OneDev.getInstance(SettingManager.class).getGpgSetting().getSigningKey() == null;
+ }
+
public boolean isReviewRequiredForPush(User user, String branch, ObjectId oldObjectId,
ObjectId newObjectId, Map<String, String> gitEnvs) {
return getHierarchyBranchProtection(branch, user).isReviewRequiredForPush(user, this, branch, oldObjectId, newObjectId, gitEnvs);
@@ -1857,6 +1906,31 @@ public class Project extends AbstractEntity {
return patterns;
}
+ public boolean hasValidCommitSignature(RevCommit commit) {
+ SignatureVerificationKeyLoader keyLoader = OneDev.getInstance(SignatureVerificationKeyLoader.class);
+ return GitUtils.verifySignature(commit, keyLoader) instanceof SignatureVerified;
+ }
+
+ public boolean hasValidCommitSignature(ObjectId commitId, Map<String, String> gitEnvs) {
+ GetRawCommitCommand cmd = new GetRawCommitCommand(getGitDir(), gitEnvs);
+ cmd.revision(commitId.name());
+ byte[] commitRawData = cmd.call();
+ SignatureVerificationKeyLoader keyLoader = OneDev.getInstance(SignatureVerificationKeyLoader.class);
+ return GitUtils.verifyCommitSignature(commitRawData, keyLoader) instanceof SignatureVerified;
+ }
+
+ public boolean hasValidTagSignature(ObjectId tagId, Map<String, String> gitEnvs) {
+ GetRawTagCommand cmd = new GetRawTagCommand(getGitDir(), gitEnvs);
+ cmd.revision(tagId.name());
+ byte[] tagRawData = cmd.call();
+ SignatureVerificationKeyLoader keyLoader = OneDev.getInstance(SignatureVerificationKeyLoader.class);
+ return tagRawData != null && GitUtils.verifyTagSignature(tagRawData, keyLoader) instanceof SignatureVerified;
+ }
+
+ public boolean isCommitSignatureRequirementSatisfied(User user, String branch, RevCommit commit) {
+ return !isCommitSignatureRequired(user, branch) || hasValidCommitSignature(commit);
+ }
+
public static boolean containsPath(@Nullable String patterns, String path) {
PatternSet patternSet = PatternSet.parse(patterns);
return patternSet.getIncludes().stream().anyMatch(it->PathUtils.isSelfOrAncestor(path, it))
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
index acee85ab72..c5db21273f 100644
--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java
+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
@@ -940,6 +940,11 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach
.containsAll(requiredJobs);
}
+ public boolean isSignatureRequirementSatisfied() {
+ return getProject().isCommitSignatureRequirementSatisfied(getSubmitter(),
+ getTargetBranch(), getLatestUpdate().getHeadCommit());
+ }
+
@Override
public Project getAttachmentProject() {
return targetProject;
@@ -1003,7 +1008,7 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach
comparisonBase = mergeBase1;
break;
} else {
- PersonIdent person = new PersonIdent("OneDev", "");
+ PersonIdent person = new PersonIdent(User.ONEDEV_NAME, User.ONEDEV_EMAIL_ADDRESS);
comparisonBase = GitUtils.merge(repo, oldCommitId, mergeBase1, false,
person, person, "helper commit", true);
break;
@@ -1099,6 +1104,8 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach
return "Waiting for approvals";
if (!isRequiredBuildsSuccessful())
return "Some required builds not passed";
+ if (!isSignatureRequirementSatisfied())
+ return "No valid signature for head commit";
return null;
}
diff --git a/server-core/src/main/java/io/onedev/server/model/Setting.java b/server-core/src/main/java/io/onedev/server/model/Setting.java
index 815f61b2c0..904e1bc13c 100644
--- a/server-core/src/main/java/io/onedev/server/model/Setting.java
+++ b/server-core/src/main/java/io/onedev/server/model/Setting.java
@@ -21,7 +21,7 @@ public class Setting extends AbstractEntity {
private static final long serialVersionUID = 1L;
public enum Key {SYSTEM, MAIL, BACKUP, SECURITY, AUTHENTICATOR, ISSUE, JOB_EXECUTORS,
- GROOVY_SCRIPTS, PULL_REQUEST, BUILD, PROJECT, SSH, SSO_CONNECTORS,
+ GROOVY_SCRIPTS, PULL_REQUEST, BUILD, PROJECT, SSH, GPG, SSO_CONNECTORS,
NOTIFICATION_TEMPLATE_SETTING, CONTRIBUTED_SETTINGS, SERVICE_DESK_SETTING,
AGENT, PERFORMANCE};
diff --git a/server-core/src/main/java/io/onedev/server/model/SshKey.java b/server-core/src/main/java/io/onedev/server/model/SshKey.java
index 4c533fae1f..3e53de31aa 100644
--- a/server-core/src/main/java/io/onedev/server/model/SshKey.java
+++ b/server-core/src/main/java/io/onedev/server/model/SshKey.java
@@ -16,6 +16,8 @@ import javax.persistence.Table;
import javax.validation.ConstraintValidatorContext;
import org.apache.sshd.common.config.keys.KeyUtils;
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
import org.hibernate.validator.constraints.NotEmpty;
import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -32,6 +34,7 @@ import io.onedev.server.web.editable.annotation.OmitName;
@Editable
@Entity
@Table(indexes={@Index(columnList="o_owner_id"), @Index(columnList="digest")})
+@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)
@ClassValidating
public class SshKey extends AbstractEntity implements Validatable {
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.java
index 402b66ea33..4e5478e095 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
@@ -71,11 +71,13 @@ public class User extends AbstractEntity implements AuthenticationInfo {
public static final Long UNKNOWN_ID = -2L;
- public static final Long SYSTEM_ID = -1L;
+ public static final Long ONEDEV_ID = -1L;
public static final Long ROOT_ID = 1L;
- public static final String SYSTEM_NAME = "OneDev";
+ public static final String ONEDEV_NAME = "OneDev";
+
+ public static final String ONEDEV_EMAIL_ADDRESS = "[email protected]";
public static final String UNKNOWN_NAME = "Unknown";
@@ -487,10 +489,9 @@ public class User extends AbstractEntity implements AuthenticationInfo {
.toString();
}
- @Nullable
public PersonIdent asPerson() {
if (isSystem()) {
- return new PersonIdent(getDisplayName(), "");
+ return new PersonIdent(User.ONEDEV_NAME, User.ONEDEV_EMAIL_ADDRESS);
} else {
EmailAddress emailAddress = getGitEmailAddress();
if (emailAddress != null && emailAddress.isVerified())
@@ -512,7 +513,7 @@ public class User extends AbstractEntity implements AuthenticationInfo {
}
public boolean isSystem() {
- return SYSTEM_ID.equals(getId());
+ return ONEDEV_ID.equals(getId());
}
public boolean isUnknown() {
@@ -799,4 +800,12 @@ public class User extends AbstractEntity implements AuthenticationInfo {
return getSortedEmailAddresses().stream().filter(it->it.isGit()).findFirst().orElse(null);
}
+ public List<GpgKey> getGpgKeys() {
+ List<GpgKey> gpgKeys = new ArrayList<>();
+ for (EmailAddress emailAddress: getEmailAddresses())
+ gpgKeys.addAll(emailAddress.getGpgKeys());
+ Collections.sort(gpgKeys);
+ return gpgKeys;
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/BaseGpgKey.java b/server-core/src/main/java/io/onedev/server/model/support/BaseGpgKey.java
new file mode 100644
index 0000000000..0caa65afc4
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/support/BaseGpgKey.java
@@ -0,0 +1,67 @@
+package io.onedev.server.model.support;
+
+import javax.persistence.Column;
+import javax.persistence.MappedSuperclass;
+import javax.validation.ConstraintValidatorContext;
+
+import org.bouncycastle.openpgp.PGPPublicKey;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import io.onedev.server.model.AbstractEntity;
+import io.onedev.server.util.GpgUtils;
+import io.onedev.server.util.validation.Validatable;
+import io.onedev.server.util.validation.annotation.ClassValidating;
+import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.Multiline;
+import io.onedev.server.web.editable.annotation.OmitName;
+
+@Editable
+@ClassValidating
+@MappedSuperclass
+public class BaseGpgKey extends AbstractEntity implements Validatable {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final String PROP_CONTENT = "content";
+
+ @Column(nullable=false, length=5000)
+ private String content;
+
+ private transient PGPPublicKey publicKey;
+
+ @Editable(name="GPG Public Key", description="Provide a GPG public key. Begins with '-----BEGIN PGP PUBLIC KEY BLOCK-----'")
+ @NotEmpty
+ @Multiline
+ @OmitName
+ public String getContent() {
+ return content;
+ }
+
+ public void setContent(String content) {
+ this.content = content;
+ }
+
+ public PGPPublicKey getPublicKey() {
+ if (publicKey == null)
+ publicKey = GpgUtils.parse(content);
+ return publicKey;
+ }
+
+ @Override
+ public boolean isValid(ConstraintValidatorContext context) {
+ if (content == null) {
+ return true;
+ } else {
+ try {
+ GpgUtils.parse(content);
+ return true;
+ } catch (Exception e) {
+ context.disableDefaultConstraintViolation();
+ context.buildConstraintViolationWithTemplate("Invalid GPG Public key")
+ .addPropertyNode(PROP_CONTENT).addConstraintViolation();
+ return false;
+ }
+ }
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/BranchProtection.java b/server-core/src/main/java/io/onedev/server/model/support/BranchProtection.java
index 6a2226e14b..c453814db7 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/BranchProtection.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/BranchProtection.java
@@ -53,6 +53,8 @@ public class BranchProtection implements Serializable {
private boolean preventCreation = true;
+ private boolean signatureRequired = false;
+
private String reviewRequirement;
private transient ReviewRequirement parsedReviewRequirement;
@@ -124,6 +126,15 @@ public class BranchProtection implements Serializable {
this.preventCreation = preventCreation;
}
+ @Editable(order=360, description="Check this to require valid signature of head commit")
+ public boolean isSignatureRequired() {
+ return signatureRequired;
+ }
+
+ public void setSignatureRequired(boolean signatureRequired) {
+ this.signatureRequired = signatureRequired;
+ }
+
@Editable(order=400, name="Required Reviewers", description="Optionally specify required reviewers for changes of "
+ "specified branch")
@io.onedev.server.web.editable.annotation.ReviewRequirement
diff --git a/server-core/src/main/java/io/onedev/server/model/support/TagProtection.java b/server-core/src/main/java/io/onedev/server/model/support/TagProtection.java
index c8824fe842..afb9531b81 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/TagProtection.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/TagProtection.java
@@ -35,6 +35,8 @@ public class TagProtection implements Serializable {
private boolean preventCreation = true;
+ private boolean signatureRequired;
+
public boolean isEnabled() {
return enabled;
}
@@ -107,6 +109,15 @@ public class TagProtection implements Serializable {
this.preventCreation = preventCreation;
}
+ @Editable(order=560, description="Check this to require valid signature of head commit")
+ public boolean isSignatureRequired() {
+ return signatureRequired;
+ }
+
+ public void setSignatureRequired(boolean signatureRequired) {
+ this.signatureRequired = signatureRequired;
+ }
+
public void onRenameGroup(String oldName, String newName) {
userMatch = UserMatch.onRenameGroup(userMatch, oldName, newName);
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GpgSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GpgSetting.java
new file mode 100644
index 0000000000..27bac6622a
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GpgSetting.java
@@ -0,0 +1,131 @@
+package io.onedev.server.model.support.administration;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import javax.annotation.Nullable;
+
+import org.bouncycastle.openpgp.PGPException;
+import org.bouncycastle.openpgp.PGPPublicKey;
+import org.bouncycastle.openpgp.PGPSecretKeyRing;
+import org.bouncycastle.openpgp.bc.BcPGPSecretKeyRing;
+
+import io.onedev.server.git.signature.SignatureVerificationKey;
+import io.onedev.server.util.GpgUtils;
+
+public class GpgSetting implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private byte[] encodedSigningKey;
+
+ private transient PGPSecretKeyRing signingKey;
+
+ private Map<Long, String> encodedTrustedKeys = new LinkedHashMap<>();
+
+ private transient Map<Long, PGPPublicKey> trustedKeys;
+
+ public GpgSetting() {
+ // Add GitHub public GPG key
+ encodedTrustedKeys.put(GpgUtils.getKeyID("4AEE18F83AFDEB23"), ""
+ + "-----BEGIN PGP PUBLIC KEY BLOCK-----\n"
+ + "\n"
+ + "xsBNBFmUaEEBCACzXTDt6ZnyaVtueZASBzgnAmK13q9Urgch+sKYeIhdymjuMQta\n"
+ + "x15OklctmrZtqre5kwPUosG3/B2/ikuPYElcHgGPL4uL5Em6S5C/oozfkYzhwRrT\n"
+ + "SQzvYjsE4I34To4UdE9KA97wrQjGoz2Bx72WDLyWwctD3DKQtYeHXswXXtXwKfjQ\n"
+ + "7Fy4+Bf5IPh76dA8NJ6UtjjLIDlKqdxLW4atHe6xWFaJ+XdLUtsAroZcXBeWDCPa\n"
+ + "buXCDscJcLJRKZVc62gOZXXtPfoHqvUPp3nuLA4YjH9bphbrMWMf810Wxz9JTd3v\n"
+ + "yWgGqNY0zbBqeZoGv+TuExlRHT8ASGFS9SVDABEBAAHNNUdpdEh1YiAod2ViLWZs\n"
+ + "b3cgY29tbWl0IHNpZ25pbmcpIDxub3JlcGx5QGdpdGh1Yi5jb20+wsBiBBMBCAAW\n"
+ + "BQJZlGhBCRBK7hj4Ov3rIwIbAwIZAQAAmQEIACATWFmi2oxlBh3wAsySNCNV4IPf\n"
+ + "DDMeh6j80WT7cgoX7V7xqJOxrfrqPEthQ3hgHIm7b5MPQlUr2q+UPL22t/I+ESF6\n"
+ + "9b0QWLFSMJbMSk+BXkvSjH9q8jAO0986/pShPV5DU2sMxnx4LfLfHNhTzjXKokws\n"
+ + "+8ptJ8uhMNIDXfXuzkZHIxoXk3rNcjDN5c5X+sK8UBRH092BIJWCOfaQt7v7wig5\n"
+ + "4Ra28pM9GbHKXVNxmdLpCFyzvyMuCmINYYADsC848QQFFwnd4EQnupo6QvhEVx1O\n"
+ + "j7wDwvuH5dCrLuLwtwXaQh0onG4583p0LGms2Mf5F+Ick6o/4peOlBoZz48=\n"
+ + "=HXDP\n"
+ + "-----END PGP PUBLIC KEY BLOCK-----\n");
+ }
+
+ @Nullable
+ public byte[] getEncodedSigningKey() {
+ return encodedSigningKey;
+ }
+
+ public void setEncodedSigningKey(@Nullable byte[] encodedSigningKey) {
+ this.encodedSigningKey = encodedSigningKey;
+ }
+
+ @Nullable
+ public PGPSecretKeyRing getSigningKey() {
+ if (signingKey == null && encodedSigningKey != null) {
+ try {
+ signingKey = new BcPGPSecretKeyRing(encodedSigningKey);
+ } catch (IOException | PGPException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ return signingKey;
+ }
+
+ public Map<Long, String> getEncodedTrustedKeys() {
+ return encodedTrustedKeys;
+ }
+
+ @Nullable
+ public PGPPublicKey getTrustedKey(long keyId) {
+ if (trustedKeys == null)
+ trustedKeys = new HashMap<>();
+ PGPPublicKey trustedKey = trustedKeys.get(keyId);
+ if (trustedKey == null) {
+ String encodedTrustedKey = encodedTrustedKeys.get(keyId);
+ if (encodedTrustedKey != null) {
+ trustedKey = GpgUtils.parse(encodedTrustedKey);
+ trustedKeys.put(keyId, trustedKey);
+ }
+ }
+ return trustedKey;
+ }
+
+ @Nullable
+ public SignatureVerificationKey findSignatureVerificationKey(long keyId) {
+ if (getSigningKey() != null && getSigningKey().getPublicKey().getKeyID() == keyId) {
+ return new SignatureVerificationKey() {
+
+ @Override
+ public boolean shouldVerifyDataWriter() {
+ return false;
+ }
+
+ @Override
+ public PGPPublicKey getPublicKey() {
+ return getSigningKey().getPublicKey();
+ }
+
+ };
+ } else {
+ PGPPublicKey trustedKey = getTrustedKey(keyId);
+ if (trustedKey != null) {
+ return new SignatureVerificationKey() {
+
+ @Override
+ public boolean shouldVerifyDataWriter() {
+ return false;
+ }
+
+ @Override
+ public PGPPublicKey getPublicKey() {
+ return trustedKey;
+ }
+
+ };
+ } else {
+ return null;
+ }
+ }
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergeStrategy.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergeStrategy.java
index 2289cb851c..7a5adcab17 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergeStrategy.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergeStrategy.java
@@ -12,11 +12,12 @@ import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
public enum MergeStrategy {
+
CREATE_MERGE_COMMIT("Add all commits from source branch to target branch with a merge commit.") {
@Override
public ObjectId merge(PullRequest request, String commitMessage) {
- PersonIdent user = new PersonIdent(User.SYSTEM_NAME, "");
+ PersonIdent user = new PersonIdent(User.ONEDEV_NAME, User.ONEDEV_EMAIL_ADDRESS);
Repository repository = request.getTargetProject().getRepository();
ObjectId requestHead = request.getLatestUpdate().getHeadCommit();
ObjectId targetHead = request.getTarget().getObjectId();
@@ -35,7 +36,7 @@ public enum MergeStrategy {
if (GitUtils.isMergedInto(repository, null, targetHead, requestHead)) {
return requestHead;
} else {
- PersonIdent user = new PersonIdent(User.SYSTEM_NAME, "");
+ PersonIdent user = new PersonIdent(User.ONEDEV_NAME, User.ONEDEV_EMAIL_ADDRESS);
return GitUtils.merge(repository, targetHead, requestHead, false, user, user,
commitMessage, false);
}
@@ -49,7 +50,7 @@ public enum MergeStrategy {
Repository repository = request.getTargetProject().getRepository();
ObjectId requestHead = request.getLatestUpdate().getHeadCommit();
ObjectId targetHead = request.getTarget().getObjectId();
- PersonIdent committer = new PersonIdent(User.SYSTEM_NAME, "");
+ PersonIdent committer = new PersonIdent(User.ONEDEV_NAME, User.ONEDEV_EMAIL_ADDRESS);
return GitUtils.merge(repository, targetHead, requestHead, true, committer,
request.getSubmitter().asPerson(), commitMessage, false);
}
@@ -62,7 +63,7 @@ public enum MergeStrategy {
Repository repository = request.getTargetProject().getRepository();
ObjectId requestHead = request.getLatestUpdate().getHeadCommit();
ObjectId targetHead = request.getTarget().getObjectId();
- PersonIdent user = new PersonIdent(User.SYSTEM_NAME, "");
+ PersonIdent user = new PersonIdent(User.ONEDEV_NAME, User.ONEDEV_EMAIL_ADDRESS);
return GitUtils.rebase(repository, requestHead, targetHead, user);
}
@@ -89,5 +90,5 @@ public enum MergeStrategy {
@Nullable
public abstract ObjectId merge(PullRequest request, String commitMessage);
-
+
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/rest/RepositoryResource.java b/server-core/src/main/java/io/onedev/server/rest/RepositoryResource.java
index 14096df03c..745883a626 100644
--- a/server-core/src/main/java/io/onedev/server/rest/RepositoryResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/RepositoryResource.java
@@ -25,6 +25,7 @@ import javax.ws.rs.core.Response;
import org.apache.commons.codec.binary.Base64;
import org.apache.shiro.authz.UnauthorizedException;
+import org.bouncycastle.openpgp.PGPSecretKeyRing;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.lib.ObjectId;
@@ -40,7 +41,9 @@ import org.hibernate.validator.constraints.NotEmpty;
import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
+import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.git.Blob;
import io.onedev.server.git.BlobContent;
import io.onedev.server.git.BlobEdits;
@@ -49,6 +52,7 @@ import io.onedev.server.git.GitUtils;
import io.onedev.server.git.command.RevListCommand;
import io.onedev.server.git.exception.ObjectNotFoundException;
import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
import io.onedev.server.rest.annotation.Api;
import io.onedev.server.rest.exception.InvalidParamException;
import io.onedev.server.rest.support.FileCreateOrUpdateRequest;
@@ -67,10 +71,13 @@ public class RepositoryResource {
private static final int MAX_COMMITS = 10000;
private final ProjectManager projectManager;
+
+ private final SettingManager settingManager;
@Inject
- public RepositoryResource(ProjectManager projectManager) {
+ public RepositoryResource(ProjectManager projectManager, SettingManager settingManager) {
this.projectManager = projectManager;
+ this.settingManager = settingManager;
}
@Api(order=10, description="List all branches")
@@ -120,15 +127,22 @@ public class RepositoryResource {
@POST
public Response createBranch(@PathParam("projectId") Long projectId, @NotNull CreateBranchRequest request) {
Project project = projectManager.load(projectId);
- if (!SecurityUtils.canCreateBranch(project, request.getBranchName())) {
+ User user = SecurityUtils.getUser();
+ if (!SecurityUtils.canWriteCode(project))
throw new UnauthorizedException();
- }
-
- if (project.getBranchRef(request.getBranchName()) != null) {
+ else if (project.getBranchRef(request.getBranchName()) != null)
throw new InvalidParamException("Branch '" + request.getBranchName() + "' already exists");
- } else {
- project.createBranch(request.getBranchName(), request.getRevision());
+ else if (project.getHierarchyBranchProtection(request.getBranchName(), user).isPreventCreation())
+ throw new ExplicitException("Branch creation prohibited by branch protection rule");
+
+ if (!project.isCommitSignatureRequirementSatisfied(
+ user, request.getBranchName(),
+ project.getRevCommit(request.getRevision(), true))) {
+ throw new ExplicitException("Can not create this branch as branch protection setting "
+ + "requires valid signature on head commit");
}
+
+ project.createBranch(request.getBranchName(), request.getRevision());
return Response.ok().build();
}
@@ -203,8 +217,16 @@ public class RepositoryResource {
if (project.getTagRef(request.getTagName()) != null) {
throw new InvalidParamException("Tag '" + request.getTagName() + "' already exists");
} else {
+ PGPSecretKeyRing signingKey = settingManager.getGpgSetting().getSigningKey();
+
+ User user = SecurityUtils.getUser();
+ if (project.isTagSignatureRequired(user, request.getTagName()) && signingKey == null) {
+ throw new ExplicitException("Tag signature required per tag protection rule, "
+ + "please generate system GPG signing key first");
+ }
+
project.createTag(request.getTagName(), request.getRevision(),
- SecurityUtils.getUser().asPerson(), request.getTagMessage());
+ SecurityUtils.getUser().asPerson(), request.getTagMessage(), signingKey);
}
return Response.ok().build();
@@ -397,15 +419,17 @@ public class RepositoryResource {
));
}
- ObjectId newCommitId = new BlobEdits(oldPaths, newBlobs)
- .commit(
- repository,
- ref.getName(),
- oldCommitId,
- oldCommitId,
- SecurityUtils.getUser().asPerson(),
- request.getCommitMessage()
- );
+ User user = SecurityUtils.getUser();
+ PGPSecretKeyRing signingKey = settingManager.getGpgSetting().getSigningKey();
+
+ if (project.isCommitSignatureRequired(user, revisionAndPath.getRevision()) && signingKey == null) {
+ throw new ExplicitException("Signature required per branch protection rule, "
+ + "please generate system GPG signing key first");
+ }
+
+ ObjectId newCommitId = new BlobEdits(oldPaths, newBlobs).commit(
+ repository, ref.getName(), oldCommitId, oldCommitId,
+ user.asPerson(), request.getCommitMessage(), signingKey);
FileEditResponse response = new FileEditResponse();
response.commitHash = newCommitId.name();
diff --git a/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java b/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java
index 65a08aaf85..e8f7e99390 100644
--- a/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java
+++ b/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java
@@ -147,6 +147,7 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
public static boolean canModify(Project project, String branch, String file) {
User user = getUser();
return canWriteCode(project)
+ && !project.isCommitSignatureRequiredButNoSigningKey(user, branch)
&& !project.isReviewRequiredForModification(user, branch, file)
&& !project.isBuildRequiredForModification(user, branch, file);
}
@@ -338,7 +339,7 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
}
public static void bindAsSystem() {
- ThreadContext.bind(asSubject(User.SYSTEM_ID));
+ ThreadContext.bind(asSubject(User.ONEDEV_ID));
}
public static Runnable inheritSubject(Runnable task) {
diff --git a/server-core/src/main/java/io/onedev/server/util/GpgUtils.java b/server-core/src/main/java/io/onedev/server/util/GpgUtils.java
new file mode 100644
index 0000000000..8b37963f90
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/GpgUtils.java
@@ -0,0 +1,135 @@
+package io.onedev.server.util;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
+import java.security.SecureRandom;
+import java.util.Date;
+import java.util.Iterator;
+
+import org.bouncycastle.bcpg.HashAlgorithmTags;
+import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags;
+import org.bouncycastle.bcpg.sig.Features;
+import org.bouncycastle.bcpg.sig.KeyFlags;
+import org.bouncycastle.crypto.generators.RSAKeyPairGenerator;
+import org.bouncycastle.crypto.params.RSAKeyGenerationParameters;
+import org.bouncycastle.openpgp.PGPEncryptedData;
+import org.bouncycastle.openpgp.PGPException;
+import org.bouncycastle.openpgp.PGPKeyPair;
+import org.bouncycastle.openpgp.PGPKeyRingGenerator;
+import org.bouncycastle.openpgp.PGPPublicKey;
+import org.bouncycastle.openpgp.PGPPublicKeyRing;
+import org.bouncycastle.openpgp.PGPSignature;
+import org.bouncycastle.openpgp.PGPSignatureSubpacketGenerator;
+import org.bouncycastle.openpgp.PGPUtil;
+import org.bouncycastle.openpgp.jcajce.JcaPGPPublicKeyRingCollection;
+import org.bouncycastle.openpgp.operator.PBESecretKeyEncryptor;
+import org.bouncycastle.openpgp.operator.PGPDigestCalculator;
+import org.bouncycastle.openpgp.operator.bc.BcPBESecretKeyEncryptorBuilder;
+import org.bouncycastle.openpgp.operator.bc.BcPGPContentSignerBuilder;
+import org.bouncycastle.openpgp.operator.bc.BcPGPDigestCalculatorProvider;
+import org.bouncycastle.openpgp.operator.bc.BcPGPKeyPair;
+
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.commons.utils.StringUtils;
+
+public class GpgUtils {
+
+ public static PGPPublicKey parse(String publicKeyString) {
+ try (InputStream in = PGPUtil
+ .getDecoderStream(new ByteArrayInputStream(publicKeyString.getBytes(StandardCharsets.UTF_8)))) {
+ JcaPGPPublicKeyRingCollection ringCollection = new JcaPGPPublicKeyRingCollection(in);
+ Iterator<PGPPublicKeyRing> itRing = ringCollection.getKeyRings();
+ if (!itRing.hasNext())
+ throw new ExplicitException("No key ring found");
+ PGPPublicKeyRing ring = itRing.next();
+ Iterator<PGPPublicKey> itKey = ring.getPublicKeys();
+ if (!itKey.hasNext())
+ throw new ExplicitException("No public key found");
+ return itKey.next();
+ } catch (IOException | PGPException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public static String getEmailAddress(PGPPublicKey publicKey) {
+ Iterator<String> it = publicKey.getUserIDs();
+ if (it.hasNext())
+ return getEmailAddress(it.next());
+ else
+ throw new ExplicitException("No email found");
+ }
+
+ public static String getEmailAddress(String userId) {
+ return StringUtils.substringBefore(StringUtils.substringAfter(userId, "<"), ">");
+ }
+
+ public static String getKeyIDString(long keyId) {
+ return Long.toUnsignedString(keyId, 16).toUpperCase();
+ }
+
+ public static long getKeyID(String keyIdString) {
+ return Long.parseUnsignedLong(keyIdString, 16);
+ }
+
+ // Copied from https://bouncycastle-pgp-cookbook.blogspot.com/2013/01/generating-rsa-keys.html
+ public static PGPKeyRingGenerator generateKeyRingGenerator(String userId) throws PGPException {
+ // This object generates individual key-pairs.
+ RSAKeyPairGenerator kpg = new RSAKeyPairGenerator();
+
+ // Boilerplate RSA parameters, no need to change anything
+ // except for the RSA key-size (2048). You can use whatever
+ // key-size makes sense for you -- 4096, etc.
+ kpg.init(new RSAKeyGenerationParameters(BigInteger.valueOf(0x10001), new SecureRandom(), 2048, 12));
+
+ // First create the master (signing) key with the generator.
+ // Finally, create the keyring itself. The constructor
+ // takes parameters that allow it to generate the self
+ // signature.
+ PGPKeyRingGenerator keyRingGen;
+ PGPKeyPair rsakp_sign = new BcPGPKeyPair(PGPPublicKey.RSA_SIGN, kpg.generateKeyPair(), new Date());
+ // Then an encryption subkey.
+ PGPKeyPair rsakp_enc = new BcPGPKeyPair(PGPPublicKey.RSA_ENCRYPT, kpg.generateKeyPair(), new Date());
+
+ // Add a self-signature on the id
+ PGPSignatureSubpacketGenerator signhashgen = new PGPSignatureSubpacketGenerator();
+
+ // Add signed metadata on the signature.
+ // 1) Declare its purpose
+ signhashgen.setKeyFlags(false, KeyFlags.SIGN_DATA | KeyFlags.CERTIFY_OTHER);
+ // 2) Set preferences for secondary crypto algorithms to use
+ // when sending messages to this key.
+ signhashgen.setPreferredSymmetricAlgorithms(false, new int[] { SymmetricKeyAlgorithmTags.AES_256,
+ SymmetricKeyAlgorithmTags.AES_192, SymmetricKeyAlgorithmTags.AES_128 });
+ signhashgen.setPreferredHashAlgorithms(false, new int[] { HashAlgorithmTags.SHA256, HashAlgorithmTags.SHA1,
+ HashAlgorithmTags.SHA384, HashAlgorithmTags.SHA512, HashAlgorithmTags.SHA224, });
+ // 3) Request senders add additional checksums to the
+ // message (useful when verifying unsigned messages.)
+ signhashgen.setFeature(false, Features.FEATURE_MODIFICATION_DETECTION);
+
+ // Create a signature on the encryption subkey.
+ PGPSignatureSubpacketGenerator enchashgen = new PGPSignatureSubpacketGenerator();
+ // Add metadata to declare its purpose
+ enchashgen.setKeyFlags(false, KeyFlags.ENCRYPT_COMMS | KeyFlags.ENCRYPT_STORAGE);
+
+ // Objects used to encrypt the secret key.
+ PGPDigestCalculator sha1Calc = new BcPGPDigestCalculatorProvider().get(HashAlgorithmTags.SHA1);
+ PGPDigestCalculator sha256Calc = new BcPGPDigestCalculatorProvider().get(HashAlgorithmTags.SHA256);
+
+ // bcpg 1.48 exposes this API that includes s2kcount. Earlier
+ // versions use a default of 0x60.
+ PBESecretKeyEncryptor pske = (new BcPBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256, sha256Calc, 0xc0))
+ .build(new char[0]);
+
+ keyRingGen = new PGPKeyRingGenerator(PGPSignature.POSITIVE_CERTIFICATION, rsakp_sign,
+ userId, sha1Calc, signhashgen.generate(), null,
+ new BcPGPContentSignerBuilder(rsakp_sign.getPublicKey().getAlgorithm(), HashAlgorithmTags.SHA1), pske);
+
+ // Add our encryption subkey, together with its signature.
+ keyRingGen.addSubKey(rsakp_enc, enchashgen.generate(), null);
+
+ return keyRingGen;
+ }
+}
diff --git a/server-core/src/main/java/io/onedev/server/util/validation/UserNameValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/UserNameValidator.java
index bdbf8ea8af..edd63c4bf7 100644
--- a/server-core/src/main/java/io/onedev/server/util/validation/UserNameValidator.java
+++ b/server-core/src/main/java/io/onedev/server/util/validation/UserNameValidator.java
@@ -37,7 +37,7 @@ public class UserNameValidator implements ConstraintValidator<UserName, String>
}
constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();
return false;
- } else if (value.equals("new") || value.equals(User.SYSTEM_NAME.toLowerCase())
+ } else if (value.equals("new") || value.equals(User.ONEDEV_NAME.toLowerCase())
|| value.equals(User.UNKNOWN_NAME.toLowerCase())) {
constraintContext.disableDefaultConstraintViolation();
String message = this.message;
@@ -63,7 +63,7 @@ public class UserNameValidator implements ConstraintValidator<UserName, String>
if (suffix > 1)
suggestedUserName += suffix;
if (!suggestedUserName.equals("new")
- && !suggestedUserName.equals(User.SYSTEM_NAME)
+ && !suggestedUserName.equals(User.ONEDEV_NAME)
&& !suggestedUserName.equals(User.UNKNOWN_NAME)
&& userManager.findByName(suggestedUserName) == null) {
return suggestedUserName;
diff --git a/server-core/src/main/java/io/onedev/server/web/BaseUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/BaseUrlMapper.java
index 751ccf84b2..a50feae325 100644
--- a/server-core/src/main/java/io/onedev/server/web/BaseUrlMapper.java
+++ b/server-core/src/main/java/io/onedev/server/web/BaseUrlMapper.java
@@ -18,7 +18,8 @@ import io.onedev.server.web.page.admin.buildsetting.agent.AgentLogPage;
import io.onedev.server.web.page.admin.buildsetting.agent.AgentOverviewPage;
import io.onedev.server.web.page.admin.buildsetting.jobexecutor.JobExecutorsPage;
import io.onedev.server.web.page.admin.databasebackup.DatabaseBackupPage;
-import io.onedev.server.web.page.admin.generalsecuritysetting.GeneralSecuritySettingPage;
+import io.onedev.server.web.page.admin.gpgsigningkey.GpgSigningKeyPage;
+import io.onedev.server.web.page.admin.gpgtrustedkeys.GpgTrustedKeysPage;
import io.onedev.server.web.page.admin.groovyscript.GroovyScriptListPage;
import io.onedev.server.web.page.admin.group.GroupListPage;
import io.onedev.server.web.page.admin.group.authorization.GroupAuthorizationsPage;
@@ -39,12 +40,13 @@ import io.onedev.server.web.page.admin.pluginsettings.ContributedAdministrationS
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.servicedesk.ServiceDeskSettingPage;
-import io.onedev.server.web.page.admin.ssh.SshSettingPage;
-import io.onedev.server.web.page.admin.sso.SsoConnectorListPage;
-import io.onedev.server.web.page.admin.sso.SsoProcessPage;
+import io.onedev.server.web.page.admin.sshsetting.SshSettingPage;
+import io.onedev.server.web.page.admin.ssosetting.SsoConnectorListPage;
+import io.onedev.server.web.page.admin.ssosetting.SsoProcessPage;
import io.onedev.server.web.page.admin.systemsetting.SystemSettingPage;
import io.onedev.server.web.page.admin.user.UserListPage;
import io.onedev.server.web.page.admin.user.accesstoken.UserAccessTokenPage;
@@ -66,6 +68,7 @@ import io.onedev.server.web.page.issues.IssueListPage;
import io.onedev.server.web.page.my.accesstoken.MyAccessTokenPage;
import io.onedev.server.web.page.my.avatar.MyAvatarPage;
import io.onedev.server.web.page.my.emailaddresses.MyEmailAddressesPage;
+import io.onedev.server.web.page.my.gpgkeys.MyGpgKeysPage;
import io.onedev.server.web.page.my.password.MyPasswordPage;
import io.onedev.server.web.page.my.profile.MyProfilePage;
import io.onedev.server.web.page.my.sshkeys.MySshKeysPage;
@@ -181,6 +184,7 @@ public class BaseUrlMapper extends CompoundRequestMapper {
add(new DynamicPathPageMapper("my/avatar", MyAvatarPage.class));
add(new DynamicPathPageMapper("my/password", MyPasswordPage.class));
add(new DynamicPathPageMapper("my/ssh-keys", MySshKeysPage.class));
+ add(new DynamicPathPageMapper("my/gpg-keys", MyGpgKeysPage.class));
add(new DynamicPathPageMapper("my/access-token", MyAccessTokenPage.class));
add(new DynamicPathPageMapper("my/two-factor-authentication", MyTwoFactorAuthenticationPage.class));
}
@@ -256,10 +260,12 @@ public class BaseUrlMapper extends CompoundRequestMapper {
PullRequestNotificationTemplatePage.class));
add(new DynamicPathPageMapper("administration/settings/performance", PerformanceSettingPage.class));
add(new DynamicPathPageMapper("administration/settings/backup", DatabaseBackupPage.class));
- add(new DynamicPathPageMapper("administration/settings/security", GeneralSecuritySettingPage.class));
+ add(new DynamicPathPageMapper("administration/settings/security", SecuritySettingPage.class));
add(new DynamicPathPageMapper("administration/settings/authenticator", AuthenticatorPage.class));
add(new DynamicPathPageMapper("administration/settings/sso-connectors", SsoConnectorListPage.class));
add(new DynamicPathPageMapper("administration/settings/ssh", SshSettingPage.class));
+ add(new DynamicPathPageMapper("administration/settings/gpg-signing-key", GpgSigningKeyPage.class));
+ add(new DynamicPathPageMapper("administration/settings/gpg-trusted-keys", GpgTrustedKeysPage.class));
add(new DynamicPathPageMapper("administration/agents", AgentListPage.class));
add(new DynamicPathPageMapper("administration/agents/${agent}/overview", AgentOverviewPage.class));
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/locked.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/locked.svg
new file mode 100644
index 0000000000..a8ca7dd635
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/locked.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1648217714269" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="77909" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M385.150849 385.662338l-128.895105 0 0-150.377622q0-49.102897 19.436563-91.556444t53.706294-74.677323 80.815185-50.637363 101.786214-18.413586q49.102897 0 94.625375 18.413586t80.815185 50.637363 56.263736 74.677323 20.971029 91.556444l0 150.377622-123.78022 0 0-121.734266q0-64.447552-35.804196-99.74026t-97.182817-35.292707q-55.240759 0-88.999001 35.292707t-33.758242 99.74026l0 121.734266zM826.053946 447.040959q27.62038 0 47.568432 19.948052t19.948052 47.568432l0 317.122877q0 27.62038-9.718282 51.66034t-26.597403 41.942058-39.896104 28.131868-50.637363 10.22977l-516.603397 0q-27.62038 0-50.125874-10.22977t-38.361638-27.108891-24.551449-39.384615-8.695305-48.07992l0-324.283716q0-27.62038 19.436563-47.568432t47.056943-19.948052l61.378621 0 128.895105 0 255.744256 0 123.78022 0 61.378621 0z" p-id="77910"></path></svg>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/unlocked.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/unlocked.svg
new file mode 100644
index 0000000000..6864716ecb
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/unlocked.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1648217707996" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="77772" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M768.25422 0q48.810328 0 94.061569 18.303873t80.333664 50.33565 56.436941 74.740814 21.354518 91.519364l0 150.49851-123.042701 0 0-122.025819q0-64.063555-36.099305-99.654419t-97.112214-35.590864q-54.911619 0-88.468719 35.590864t-33.5571 99.654419l0 124.059583-128.12711 0 0-152.532274q0-48.810328 19.320755-91.519364t53.386296-74.740814 80.333664-50.33565 101.179742-18.303873zM766.220457 693.513406l0 87.451837 0 47.793446q0 27.455809-9.660377 51.860973t-26.438928 41.692155-39.658391 27.455809-50.33565 10.168818l-514.542205 0q-27.455809 0-49.82721-9.660377t-38.641509-26.438928-24.913605-39.14995-8.643496-47.793446l0-323.368421q0-28.472691 19.829196-47.793446t46.268123-19.320755l629.449851 0q28.472691 0 47.793446 19.320755t19.320755 47.793446l0 179.988083z" p-id="77773"></path></svg>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/avatar/DefaultAvatarManager.java b/server-core/src/main/java/io/onedev/server/web/avatar/DefaultAvatarManager.java
index 682c2d0ab6..290ee6c195 100644
--- a/server-core/src/main/java/io/onedev/server/web/avatar/DefaultAvatarManager.java
+++ b/server-core/src/main/java/io/onedev/server/web/avatar/DefaultAvatarManager.java
@@ -70,19 +70,18 @@ public class DefaultAvatarManager implements AvatarManager {
@Sessional
@Override
public String getAvatarUrl(PersonIdent personIdent) {
- if (StringUtils.isBlank(personIdent.getEmailAddress())) {
- if (personIdent.getName().equals(User.SYSTEM_NAME))
- return AVATARS_BASE_URL + "onedev.png";
- else
- return AVATARS_BASE_URL + "user.png";
+ if (personIdent.getName().equals(User.ONEDEV_NAME)) {
+ return AVATARS_BASE_URL + "onedev.png";
} else {
EmailAddress emailAddress = emailAddressManager.findByValue(personIdent.getEmailAddress());
- if (emailAddress != null && emailAddress.isVerified())
+ if (emailAddress != null && emailAddress.isVerified()) {
return getAvatarUrl(emailAddress.getOwner());
- else if (settingManager.getSystemSetting().isGravatarEnabled())
+ } else if (settingManager.getSystemSetting().isGravatarEnabled()
+ && StringUtils.isNotBlank(personIdent.getEmailAddress())) {
return Gravatar.getURL(personIdent.getEmailAddress(), GRAVATAR_SIZE);
- else
+ } else {
return generateAvatar(personIdent.getName(), personIdent.getEmailAddress());
+ }
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchPanel.java b/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchPanel.java
index 8ba1ada7ce..d5336d67fe 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchPanel.java
@@ -59,11 +59,19 @@ abstract class CreateBranchPanel extends Panel {
"Branch '" + branchName + "' already exists, please choose a different name");
target.add(form);
} else if (project.getHierarchyBranchProtection(branchName, user).isPreventCreation()) {
- editor.error(new Path(new PathNode.Named("name")), "Unable to create protected branch");
+ editor.error(new Path(new PathNode.Named("name")),
+ "Creation of this branch is prohibited per branch protection rule");
target.add(form);
} else {
- project.createBranch(branchName, revision);
- onCreate(target, branchName);
+ if (!project.isCommitSignatureRequirementSatisfied(user,
+ branchName, project.getRevCommit(revision, true))) {
+ editor.error(new Path(new PathNode.Named("name")),
+ "Valid signature required for head commit of this branch per branch protection rule");
+ target.add(form);
+ } else {
+ project.createBranch(branchName, revision);
+ onCreate(target, branchName);
+ }
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
index dacc7b6ba9..bb1d5ec3d1 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
@@ -78,7 +78,7 @@ import io.onedev.server.web.behavior.BuildQueryBehavior;
import io.onedev.server.web.behavior.WebSocketObserver;
import io.onedev.server.web.component.build.ParamValuesLabel;
import io.onedev.server.web.component.build.status.BuildStatusIcon;
-import io.onedev.server.web.component.datatable.OneDataTable;
+import io.onedev.server.web.component.datatable.DefaultDataTable;
import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;
import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.job.JobDefLink;
@@ -1044,7 +1044,7 @@ public abstract class BuildListPanel extends Panel {
}
});
- body.add(buildsTable = new OneDataTable<Build, Void>("builds", columns, dataProvider,
+ body.add(buildsTable = new DefaultDataTable<Build, Void>("builds", columns, dataProvider,
WebConstants.PAGE_SIZE, getPagingHistorySupport()));
body.add(new WebMarkupContainer("tips") {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
index bf800d4137..41396b6d93 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
@@ -59,7 +59,7 @@ import io.onedev.server.util.criteria.OrCriteria;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.WebSession;
import io.onedev.server.web.behavior.CodeCommentQueryBehavior;
-import io.onedev.server.web.component.datatable.OneDataTable;
+import io.onedev.server.web.component.datatable.DefaultDataTable;
import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;
import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.link.ActionablePageLink;
@@ -544,7 +544,7 @@ public abstract class CodeCommentListPanel extends Panel {
});
- body.add(commentsTable = new OneDataTable<CodeComment, Void>("comments", columns, dataProvider,
+ body.add(commentsTable = new DefaultDataTable<CodeComment, Void>("comments", columns, dataProvider,
WebConstants.PAGE_SIZE, getPagingHistorySupport()) {
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.html
index 8326574d63..22b6ba1d9a 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.html
@@ -46,7 +46,10 @@
<div wicket:id="contribution"></div>
</div>
<div class="actions d-flex ml-auto">
- <span wicket:id="buildStatus" class="build-status mr-2"></span>
+ <span class="btn-group mr-2">
+ <a wicket:id="signature" class="btn btn-outline-secondary"></a>
+ <a wicket:id="buildStatus" class="build-status btn btn-outline-secondary"></a>
+ </span>
<span class="btn-group hash mr-2 d-none d-xl-flex">
<a wicket:id="hashLink" class="btn btn-outline-secondary hash"><span wicket:id="hash"></span></a>
<a wicket:id="copyHash" class="btn btn-outline-secondary btn-icon"><wicket:svg href="copy" class="icon"></wicket:svg></a>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
index fecd58e516..a8bbaa20a2 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
@@ -43,6 +43,7 @@ import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
+import org.eclipse.jgit.revwalk.RevObject;
import org.eclipse.jgit.revwalk.RevWalk;
import org.joda.time.DateTime;
import org.slf4j.Logger;
@@ -74,8 +75,9 @@ import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.web.behavior.CommitQueryBehavior;
import io.onedev.server.web.behavior.RunTaskBehavior;
import io.onedev.server.web.component.commit.message.CommitMessagePanel;
-import io.onedev.server.web.component.commit.status.CommitStatusPanel;
+import io.onedev.server.web.component.commit.status.CommitStatusLink;
import io.onedev.server.web.component.contributorpanel.ContributorPanel;
+import io.onedev.server.web.component.gitsignature.GitSignaturePanel;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;
import io.onedev.server.web.component.savedquery.SavedQueriesClosed;
@@ -638,12 +640,17 @@ public abstract class CommitListPanel extends Panel {
item.add(new CopyToClipboardLink("copyHash", Model.of(commit.name())));
getCommitIdsToQueryStatus().add(commit.copy());
- CommitStatusPanel commitStatus = new CommitStatusPanel("buildStatus", commit.copy(), null) {
-
+
+ item.add(new GitSignaturePanel("signature") {
+
@Override
- protected String getCssClasses() {
- return "btn btn-outline-secondary";
+ protected RevObject getRevObject() {
+ return commitsModel.getObject().current.get(index);
}
+
+ });
+
+ item.add(new CommitStatusLink("buildStatus", commit.copy(), null) {
@Override
protected Project getProject() {
@@ -655,21 +662,8 @@ public abstract class CommitListPanel extends Panel {
return null;
}
- };
- item.add(commitStatus);
-
- item.add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {
-
- @Override
- protected String load() {
- commitStatus.configure();
- if (commitStatus.isVisible())
- return "commit with-status";
- else
- return "commit";
- }
-
- }));
+ });
+ item.add(AttributeAppender.append("class", "commit"));
} else {
item = new Fragment(itemId, "dateFrag", this);
DateTime dateTime = new DateTime(current.get(index+1).getCommitterIdent().getWhen());
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusLink.html b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusLink.html
new file mode 100644
index 0000000000..68a1d8be5c
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusLink.html
@@ -0,0 +1,3 @@
+<wicket:panel>
+ <svg wicket:id="icon"></svg>
+</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusLink.java
similarity index 71%
rename from server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java
rename to server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusLink.java
index 6ca2472cac..3ab6885f32 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusLink.java
@@ -9,10 +9,12 @@ import javax.annotation.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.markup.html.panel.IMarkupSourcingStrategy;
+import org.apache.wicket.markup.html.panel.PanelMarkupSourcingStrategy;
+import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.eclipse.jgit.lib.ObjectId;
@@ -34,9 +36,9 @@ import io.onedev.server.web.component.job.joblist.JobListPanel;
import io.onedev.server.web.component.link.DropdownLink;
@SuppressWarnings("serial")
-public abstract class CommitStatusPanel extends Panel {
+public abstract class CommitStatusLink extends DropdownLink {
- private static final Logger logger = LoggerFactory.getLogger(CommitStatusPanel.class);
+ private static final Logger logger = LoggerFactory.getLogger(CommitStatusLink.class);
private final ObjectId commitId;
@@ -73,7 +75,7 @@ public abstract class CommitStatusPanel extends Panel {
};
- public CommitStatusPanel(String id, ObjectId commitId, @Nullable String refName) {
+ public CommitStatusLink(String id, ObjectId commitId, @Nullable String refName) {
super(id);
this.commitId = commitId;
this.refName = refName;
@@ -88,67 +90,36 @@ public abstract class CommitStatusPanel extends Panel {
protected void onInitialize() {
super.onInitialize();
- DropdownLink statusLink = new DropdownLink("status") {
-
+ add(new BuildStatusIcon("icon", statusModel) {
+
@Override
- protected Component newContent(String id, FloatingPanel dropdown) {
- return new JobListPanel(id, commitId, refName, jobsModel.getObject()) {
-
- @Override
- protected Project getProject() {
- return CommitStatusPanel.this.getProject();
- }
-
- @Override
- protected void onRunJob(AjaxRequestTarget target) {
- dropdown.close();
- }
-
- @Override
- protected PullRequest getPullRequest() {
- return CommitStatusPanel.this.getPullRequest();
- }
-
- @Override
- protected String getPipeline() {
- return null;
- }
-
- };
+ protected Collection<String> getWebSocketObservables() {
+ return CommitStatusLink.this.getWebSocketObservables();
}
+
+ });
+
+ add(AttributeAppender.replace("title", new AbstractReadOnlyModel<String>() {
@Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
-
- String cssClasses = "commit-status text-nowrap ";
- String title;
+ public String getObject() {
Build.Status status = statusModel.getObject();
if (status != null) {
+ String title;
if (status != Status.SUCCESSFUL)
title = "Some builds are ";
else
title = "Builds are ";
title += status.toString().toLowerCase() + ", click for details";
+ return title;
} else {
- title = "No builds";
+ return "No builds";
}
- if (getCssClasses() != null)
- cssClasses += getCssClasses();
- tag.put("class", cssClasses);
- tag.put("title", title);
}
- };
- statusLink.add(new BuildStatusIcon("icon", statusModel) {
-
- @Override
- protected Collection<String> getWebSocketObservables() {
- return CommitStatusPanel.this.getWebSocketObservables();
- }
-
- });
- add(statusLink);
+ }));
+
+ add(AttributeAppender.append("class", "commit-status"));
}
protected Collection<String> getWebSocketObservables() {
@@ -158,6 +129,38 @@ public abstract class CommitStatusPanel extends Panel {
return new HashSet<>();
}
+ @Override
+ protected Component newContent(String id, FloatingPanel dropdown) {
+ return new JobListPanel(id, commitId, refName, jobsModel.getObject()) {
+
+ @Override
+ protected Project getProject() {
+ return CommitStatusLink.this.getProject();
+ }
+
+ @Override
+ protected void onRunJob(AjaxRequestTarget target) {
+ dropdown.close();
+ }
+
+ @Override
+ protected PullRequest getPullRequest() {
+ return CommitStatusLink.this.getPullRequest();
+ }
+
+ @Override
+ protected String getPipeline() {
+ return null;
+ }
+
+ };
+ }
+
+ @Override
+ protected IMarkupSourcingStrategy newMarkupSourcingStrategy() {
+ return new PanelMarkupSourcingStrategy(false);
+ }
+
@Override
protected void onDetach() {
jobsModel.detach();
@@ -177,9 +180,4 @@ public abstract class CommitStatusPanel extends Panel {
response.render(CssHeaderItem.forReference(new CommitStatusCssResourceReference()));
}
- @Nullable
- protected String getCssClasses() {
- return null;
- }
-
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.html b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.html
deleted file mode 100644
index 1e5e77de7d..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<wicket:panel>
- <a wicket:id="status"><svg wicket:id="icon"></svg> <wicket:svg href="arrow" class="icon rotate-90"></wicket:svg></a>
-</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.java b/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.java
index 4192d655d3..f96b5de581 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.java
@@ -9,9 +9,12 @@ import org.apache.wicket.feedback.FencedFeedbackPanel;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
+import org.bouncycastle.openpgp.PGPSecretKeyRing;
import com.google.common.base.Preconditions;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.git.GitUtils;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
@@ -62,11 +65,20 @@ public abstract class CreateTagPanel extends Panel {
"Tag '" + helperBean.getName() + "' already exists, please choose a different name.");
target.add(form);
} else if (project.getHierarchyTagProtection(tagName, user).isPreventCreation()) {
- editor.error(new Path(new PathNode.Named("name")), "Unable to create protected tag");
- target.add(form);
+ editor.error(new Path(new PathNode.Named("name")), "Unable to create protected tag");
+ target.add(form);
} else {
- project.createTag(tagName, revision, user.asPerson(), helperBean.getMessage());
- onCreate(target, tagName);
+ PGPSecretKeyRing signingKey = OneDev.getInstance(SettingManager.class)
+ .getGpgSetting().getSigningKey();
+ if (project.isTagSignatureRequired(user, tagName) && signingKey == null) {
+ editor.error(new Path(new PathNode.Named("name")),
+ "Tag signature required per tag protection rule, please generate system GPG "
+ + "signing key first");
+ target.add(form);
+ } else {
+ project.createTag(tagName, revision, user.asPerson(), helperBean.getMessage(), signingKey);
+ onCreate(target, tagName);
+ }
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datatable/OneDataTable.java b/server-core/src/main/java/io/onedev/server/web/component/datatable/DefaultDataTable.java
similarity index 93%
rename from server-core/src/main/java/io/onedev/server/web/component/datatable/OneDataTable.java
rename to server-core/src/main/java/io/onedev/server/web/component/datatable/DefaultDataTable.java
index eec4de83c2..4df1c044f8 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/datatable/OneDataTable.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/datatable/DefaultDataTable.java
@@ -21,9 +21,9 @@ import io.onedev.server.web.component.pagenavigator.OnePagingNavigator;
import io.onedev.server.web.util.PagingHistorySupport;
@SuppressWarnings("serial")
-public class OneDataTable<T, S> extends DataTable<T, S> {
+public class DefaultDataTable<T, S> extends DataTable<T, S> {
- public OneDataTable(final String id, final List<? extends IColumn<T, S>> columns,
+ public DefaultDataTable(final String id, final List<? extends IColumn<T, S>> columns,
final ISortableDataProvider<T, S> dataProvider, final int rowsPerPage,
@Nullable PagingHistorySupport pagingHistorySupport) {
super(id, columns, dataProvider, rowsPerPage);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/gitsignature/GitSignatureDetailPanel.html b/server-core/src/main/java/io/onedev/server/web/component/gitsignature/GitSignatureDetailPanel.html
new file mode 100644
index 0000000000..d314629ad1
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/gitsignature/GitSignatureDetailPanel.html
@@ -0,0 +1,17 @@
+<wicket:panel>
+ <div class="rev-signature-detail p-4">
+ <div wicket:id="message"></div>
+ <wicket:enclosure child="keyId">
+ <div class="d-flex justify-content-between flex-nowrap mt-3">
+ <div class="mr-4">
+ <div class="font-weight-bolder mb-2 text-nowrap">Signing Key ID</div>
+ <div wicket:id="keyId" class="text-nowrap"></div>
+ </div>
+ <div>
+ <div class="font-weight-bolder mb-2 text-nowrap">Signer Email Address</div>
+ <div wicket:id="emailAddress" class="text-nowrap"></div>
+ </div>
+ </div>
+ </wicket:enclosure>
+ </div>
+</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/gitsignature/GitSignatureDetailPanel.java b/server-core/src/main/java/io/onedev/server/web/component/gitsignature/GitSignatureDetailPanel.java
new file mode 100644
index 0000000000..6b58bcf149
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/gitsignature/GitSignatureDetailPanel.java
@@ -0,0 +1,72 @@
+package io.onedev.server.web.component.gitsignature;
+
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.eclipse.jgit.revwalk.RevObject;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.git.signature.SignatureUnverified;
+import io.onedev.server.git.signature.SignatureVerification;
+import io.onedev.server.git.signature.SignatureVerificationKey;
+import io.onedev.server.git.signature.SignatureVerified;
+import io.onedev.server.model.support.administration.GpgSetting;
+import io.onedev.server.util.GpgUtils;
+
+@SuppressWarnings("serial")
+abstract class GitSignatureDetailPanel extends Panel {
+
+ public GitSignatureDetailPanel(String id) {
+ super(id);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ SignatureVerificationKey key = getVerification().getVerificationKey();
+ if (getVerification() instanceof SignatureVerified) {
+ String message;
+ if (getVerification().getVerificationKey().shouldVerifyDataWriter()) {
+ if (getRevObject() instanceof RevCommit)
+ message = "Signature verified successfully with committer's GPG key";
+ else
+ message = "Signature verified successfully with tagger's GPG key";
+ } else if (getGpgSetting().getTrustedKey(key.getPublicKey().getKeyID()) != null) {
+ message = "Signature verified successfully with trusted GPG key";
+ } else {
+ message = "Signature verified successfully with OneDev GPG key";
+ }
+ add(new Label("message", message).add(AttributeAppender.append("class", "alert alert-light-success mb-0")));
+ } else {
+ SignatureUnverified unverified = (SignatureUnverified) getVerification();
+ if (key != null) {
+ add(new Label("message", unverified.getErrorMessage())
+ .add(AttributeAppender.append("class", "alert alert-light-danger mb-0")));
+ } else {
+ add(new Label("message", unverified.getErrorMessage())
+ .add(AttributeAppender.append("class", "text-danger")));
+ }
+ }
+
+ if (key != null) {
+ add(new Label("keyId", GpgUtils.getKeyIDString(key.getPublicKey().getKeyID())));
+ add(new Label("emailAddress", GpgUtils.getEmailAddress(key.getPublicKey())));
+ } else {
+ add(new WebMarkupContainer("keyId").setVisible(false));
+ add(new WebMarkupContainer("emailAddress").setVisible(false));
+ }
+ }
+
+ private GpgSetting getGpgSetting() {
+ return OneDev.getInstance(SettingManager.class).getGpgSetting();
+ }
+
+ protected abstract SignatureVerification getVerification();
+
+ protected abstract RevObject getRevObject();
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/gitsignature/GitSignaturePanel.java b/server-core/src/main/java/io/onedev/server/web/component/gitsignature/GitSignaturePanel.java
new file mode 100644
index 0000000000..b87ede6847
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/gitsignature/GitSignaturePanel.java
@@ -0,0 +1,106 @@
+package io.onedev.server.web.component.gitsignature;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.eclipse.jgit.revwalk.RevObject;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.git.GitUtils;
+import io.onedev.server.git.signature.SignatureVerification;
+import io.onedev.server.git.signature.SignatureVerificationKeyLoader;
+import io.onedev.server.git.signature.SignatureVerified;
+import io.onedev.server.web.component.floating.FloatingPanel;
+import io.onedev.server.web.component.link.DropdownLink;
+import io.onedev.server.web.component.svg.SpriteImage;
+
+@SuppressWarnings("serial")
+public abstract class GitSignaturePanel extends DropdownLink {
+
+ private IModel<SignatureVerification> model =
+ new LoadableDetachableModel<SignatureVerification>() {
+
+ @Override
+ protected SignatureVerification load() {
+ return GitUtils.verifySignature(getRevObject(),
+ OneDev.getInstance(SignatureVerificationKeyLoader.class));
+ }
+
+ };
+
+ public GitSignaturePanel(String id) {
+ super(id);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ setEscapeModelStrings(false);
+
+ add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {
+
+ @Override
+ public String getObject() {
+ if (model.getObject() instanceof SignatureVerified)
+ return "link-success";
+ else
+ return "link-danger";
+ }
+
+ }));
+ }
+
+ @Override
+ public IModel<?> getBody() {
+ return new LoadableDetachableModel<String>() {
+
+ @Override
+ protected String load() {
+ SignatureVerification verification = model.getObject();
+
+ String icon;
+ if (verification instanceof SignatureVerified)
+ icon = "locked";
+ else
+ icon = "unlocked";
+ return String.format(
+ "<svg class='icon'><use xlink:href='%s'/></svg>",
+ SpriteImage.getVersionedHref(icon));
+ }
+
+ };
+ }
+
+ @Override
+ protected void onConfigure() {
+ setVisible(model.getObject() != null);
+ }
+
+ @Override
+ protected void onDetach() {
+ model.detach();
+ super.onDetach();
+ }
+
+ @Override
+ protected Component newContent(String id, FloatingPanel dropdown) {
+ return new GitSignatureDetailPanel(id) {
+
+ @Override
+ protected SignatureVerification getVerification() {
+ return model.getObject();
+ }
+
+ @Override
+ protected RevObject getRevObject() {
+ return GitSignaturePanel.this.getRevObject();
+ }
+
+ };
+ }
+
+ protected abstract RevObject getRevObject();
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.html
index d20f257c41..a903b4345d 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.html
@@ -9,7 +9,10 @@
<div wicket:id="contribution"></div>
</div>
<div class="d-none d-lg-block flex-shrink-0">
- <span wicket:id="buildStatus" class="build-status mr-2"></span>
+ <span class="btn-group mr-2">
+ <a wicket:id="signature" class="btn btn-outline-secondary"></a>
+ <a wicket:id="buildStatus" class="build-status btn btn-outline-secondary"></a>
+ </span>
<span class="btn-group hash mr-2">
<a wicket:id="hashLink" class="btn btn-outline-secondary hash"><span wicket:id="hash"></span></a>
<a wicket:id="copyHash" class="btn btn-icon btn-outline-secondary"><wicket:svg href="copy" class="icon"></wicket:svg></a>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.java
index e84fb2b31d..27c0c5e857 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.java
@@ -17,6 +17,7 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.revwalk.RevCommit;
+import org.eclipse.jgit.revwalk.RevObject;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.git.GitUtils;
@@ -24,8 +25,9 @@ import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.web.component.commit.message.CommitMessagePanel;
-import io.onedev.server.web.component.commit.status.CommitStatusPanel;
+import io.onedev.server.web.component.commit.status.CommitStatusLink;
import io.onedev.server.web.component.contributorpanel.ContributorPanel;
+import io.onedev.server.web.component.gitsignature.GitSignaturePanel;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;
import io.onedev.server.web.component.user.contributoravatars.ContributorAvatars;
@@ -76,13 +78,16 @@ public class IssueCommitsPanel extends GenericPanel<Issue> {
item.add(new ContributorPanel("contribution", commit.getAuthorIdent(), commit.getCommitterIdent()));
- CommitStatusPanel commitStatus = new CommitStatusPanel("buildStatus", commit.copy(), null) {
-
+ item.add(new GitSignaturePanel("signature") {
+
@Override
- protected String getCssClasses() {
- return "btn btn-outline-secondary";
+ protected RevObject getRevObject() {
+ return item.getModelObject();
}
-
+
+ });
+ item.add(new CommitStatusLink("buildStatus", commit.copy(), null) {
+
@Override
protected Project getProject() {
return getIssue().getProject();
@@ -93,8 +98,7 @@ public class IssueCommitsPanel extends GenericPanel<Issue> {
return null;
}
- };
- item.add(commitStatus);
+ });
Project project = getIssue().getProject();
CommitDetailPage.State commitState = new CommitDetailPage.State();
@@ -110,18 +114,7 @@ public class IssueCommitsPanel extends GenericPanel<Issue> {
params = ProjectBlobPage.paramsOf(project, browseState);
item.add(new ViewStateAwarePageLink<Void>("browseCode", ProjectBlobPage.class, params));
- item.add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {
-
- @Override
- protected String load() {
- commitStatus.configure();
- if (commitStatus.isVisible())
- return "commit with-status";
- else
- return "commit";
- }
-
- }));
+ item.add(AttributeAppender.append("class", "commit"));
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
index 4f94e59059..dce4a1f2d0 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
@@ -87,7 +87,7 @@ import io.onedev.server.util.criteria.AndCriteria;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.WebSession;
import io.onedev.server.web.behavior.ProjectQueryBehavior;
-import io.onedev.server.web.component.datatable.OneDataTable;
+import io.onedev.server.web.component.datatable.DefaultDataTable;
import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;
import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.link.ActionablePageLink;
@@ -1346,7 +1346,7 @@ public class ProjectListPanel extends Panel {
});
- body.add(projectsTable = new OneDataTable<Project, Void>("projects", columns, dataProvider,
+ body.add(projectsTable = new DefaultDataTable<Project, Void>("projects", columns, dataProvider,
WebConstants.PAGE_SIZE, getPagingHistorySupport()));
setOutputMarkupId(true);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.java b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.java
index b7a9633d82..e0fcc00d02 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.java
@@ -35,6 +35,7 @@ import org.eclipse.jgit.errors.IncorrectObjectTypeException;
import org.eclipse.jgit.errors.RevisionSyntaxException;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.Ref;
+import org.eclipse.jgit.revwalk.RevCommit;
import org.unbescape.html.HtmlEscape;
import com.google.common.base.Preconditions;
@@ -44,6 +45,7 @@ import io.onedev.commons.utils.ExceptionUtils;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.RefInfo;
import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
@@ -275,19 +277,21 @@ public abstract class RevisionSelector extends Panel {
if (itemValues.size() < count && !found) {
Project project = projectModel.getObject();
try {
+ User user = SecurityUtils.getUser();
+ RevCommit commit = project.getRevCommit(revision, true);
if (project.getRepository().resolve(revInput) != null) {
itemValues.add(COMMIT_FLAG + revInput);
} else if (branchesActive) {
if (canCreateBranch) {
- if (SecurityUtils.canCreateBranch(project, revInput))
- itemValues.add(ADD_FLAG + revInput);
- }
- } else {
- if (canCreateTag) {
- if (SecurityUtils.canCreateTag(project, revInput)) {
+ if (SecurityUtils.canCreateBranch(project, revInput)
+ && project.isCommitSignatureRequirementSatisfied(user, revInput, commit)) {
itemValues.add(ADD_FLAG + revInput);
}
}
+ } else if (canCreateTag
+ && SecurityUtils.canCreateTag(project, revInput)
+ && !project.isTagSignatureRequiredButNoSigningKey(user, revInput)) {
+ itemValues.add(ADD_FLAG + revInput);
}
} catch (RevisionSyntaxException | AmbiguousObjectException | IncorrectObjectTypeException e) {
} catch (IOException e) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/card/PersonCardPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/card/PersonCardPanel.java
index 88d3e509c1..edc467a1e5 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/card/PersonCardPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/card/PersonCardPanel.java
@@ -1,6 +1,5 @@
package io.onedev.server.web.component.user.card;
-import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -49,17 +48,13 @@ public class PersonCardPanel extends Panel {
builder.append("<div>" + HtmlEscape.escapeHtml5(displayName) + " <i>(" + gitRole + ")</i></div>");
- if (StringUtils.isBlank(personIdent.getEmailAddress())) {
- if (personIdent.getName().equals(User.SYSTEM_NAME))
- builder.append("<i>System Account</i>");
- else
- builder.append("<i>No OneDev Account</i>");
- } else {
- if (emailAddress != null && emailAddress.isVerified())
- builder.append("<i>@" + HtmlEscape.escapeHtml5(emailAddress.getOwner().getName()) + "</i>");
- else
- builder.append("<i>No OneDev Account</i>");
- }
+ if (personIdent.getName().equals(User.ONEDEV_NAME))
+ builder.append("<i>System Account</i>");
+ else if (emailAddress != null && emailAddress.isVerified())
+ builder.append("<i>@" + HtmlEscape.escapeHtml5(emailAddress.getOwner().getName()) + "</i>");
+ else
+ builder.append("<i>No OneDev Account</i>");
+
container.add(new Label("info", builder.toString()).setEscapeModelStrings(false));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/gpgkey/GpgKeyCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/user/gpgkey/GpgKeyCssResourceReference.java
new file mode 100644
index 0000000000..c16b121ca0
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/gpgkey/GpgKeyCssResourceReference.java
@@ -0,0 +1,13 @@
+package io.onedev.server.web.component.user.gpgkey;
+
+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
+
+public class GpgKeyCssResourceReference extends BaseDependentCssResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public GpgKeyCssResourceReference() {
+ super(GpgKeyCssResourceReference.class, "gpg-key.css");
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/gpgkey/GpgKeyListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/user/gpgkey/GpgKeyListPanel.html
new file mode 100644
index 0000000000..4ee7a2d03a
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/gpgkey/GpgKeyListPanel.html
@@ -0,0 +1,6 @@
+<wicket:panel>
+ <table wicket:id="keys" class="gpg-key-list table table-hover"></table>
+ <wicket:fragment wicket:id="actionFrag">
+ <a wicket:id="delete" class="btn btn-xs btn-icon btn-light btn-hover-danger" title="Delete this key"><wicket:svg href="trash" class="icon"></wicket:svg></a>
+ </wicket:fragment>
+</wicket:panel>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/gpgkey/GpgKeyListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/gpgkey/GpgKeyListPanel.java
new file mode 100644
index 0000000000..4ca61a8e7a
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/gpgkey/GpgKeyListPanel.java
@@ -0,0 +1,162 @@
+package io.onedev.server.web.component.user.gpgkey;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.wicket.Session;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.html.panel.GenericPanel;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.GpgKeyManager;
+import io.onedev.server.model.GpgKey;
+import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.GpgUtils;
+import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
+import io.onedev.server.web.component.datatable.DefaultDataTable;
+import io.onedev.server.web.util.LoadableDetachableDataProvider;
+
+@SuppressWarnings("serial")
+public class GpgKeyListPanel extends GenericPanel<List<GpgKey>> {
+
+ private DataTable<GpgKey, Void> gpgKeysTable;
+
+ public GpgKeyListPanel(String id, IModel<List<GpgKey>> model) {
+ super(id, model);
+ }
+
+ private List<GpgKey> getKeys() {
+ return getModelObject();
+ }
+
+ @Override
+ public void onInitialize() {
+ super.onInitialize();
+
+ List<IColumn<GpgKey, Void>> columns = new ArrayList<>();
+
+ columns.add(new AbstractColumn<GpgKey, Void>(Model.of("Email Address")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<GpgKey>> cellItem, String componentId,
+ IModel<GpgKey> rowModel) {
+ cellItem.add(new Label(componentId, rowModel.getObject().getEmailAddress().getValue()));
+ }
+
+ });
+
+ columns.add(new AbstractColumn<GpgKey, Void>(Model.of("Key ID")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<GpgKey>> cellItem, String componentId,
+ IModel<GpgKey> rowModel) {
+ cellItem.add(new Label(componentId,
+ GpgUtils.getKeyIDString(rowModel.getObject().getPublicKey().getKeyID())));
+ }
+
+ });
+
+ columns.add(new AbstractColumn<GpgKey, Void>(Model.of("Created At")) {
+
+ @Override
+ public String getCssClass() {
+ return "expanded";
+ }
+
+ @Override
+ public void populateItem(Item<ICellPopulator<GpgKey>> cellItem, String componentId,
+ IModel<GpgKey> rowModel) {
+ cellItem.add(new Label(componentId, DateUtils.formatDateTime(rowModel.getObject().getCreatedAt())));
+ }
+
+ });
+
+ columns.add(new AbstractColumn<GpgKey, Void>(Model.of("")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<GpgKey>> cellItem, String componentId,
+ IModel<GpgKey> rowModel) {
+ Fragment fragment = new Fragment(componentId, "actionFrag", GpgKeyListPanel.this);
+
+ fragment.add(new AjaxLink<Void>("delete") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ GpgKey GpgKey = rowModel.getObject();
+ OneDev.getInstance(GpgKeyManager.class).delete(GpgKey);
+ Session.get().success("GPG key deleted");
+ target.add(gpgKeysTable);
+ }
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ String message = "Do you really want to delete this GPG key?";
+ attributes.getAjaxCallListeners().add(new ConfirmClickListener(message));
+ }
+
+ });
+
+ cellItem.add(fragment);
+ }
+
+ @Override
+ public String getCssClass() {
+ return "actions";
+ }
+
+ });
+
+ SortableDataProvider<GpgKey, Void> dataProvider = new LoadableDetachableDataProvider<GpgKey, Void>() {
+
+ @Override
+ public Iterator<? extends GpgKey> iterator(long first, long count) {
+ return getKeys().iterator();
+ }
+
+ @Override
+ public long calcSize() {
+ return getKeys().size();
+ }
+
+ @Override
+ public IModel<GpgKey> model(GpgKey gpgKey) {
+ Long id = gpgKey.getId();
+ return new LoadableDetachableModel<GpgKey>() {
+
+ @Override
+ protected GpgKey load() {
+ return OneDev.getInstance(GpgKeyManager.class).load(id);
+ }
+
+ };
+ }
+ };
+
+ add(gpgKeysTable = new DefaultDataTable<GpgKey, Void>("keys", columns, dataProvider,
+ Integer.MAX_VALUE, null));
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new GpgKeyCssResourceReference()));
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/gpgkey/InsertGpgKeyPanel.html b/server-core/src/main/java/io/onedev/server/web/component/user/gpgkey/InsertGpgKeyPanel.html
new file mode 100644
index 0000000000..aeca927f0c
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/gpgkey/InsertGpgKeyPanel.html
@@ -0,0 +1,17 @@
+<wicket:panel>
+ <div class="insert-gpg-key">
+ <div class="modal-header">
+ <h5 class="modal-title">Add a GPG Public Key</h5>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
+ </div>
+ <form wicket:id="form">
+ <div class="modal-body">
+ <div wicket:id="editor"></div>
+ </div>
+ <div class="modal-footer">
+ <input wicket:id="add" type="submit" class="btn btn-primary dirty-aware" value="Add">
+ <button wicket:id="cancel" type="button" class="btn btn-secondary">Cancel</button>
+ </div>
+ </form>
+ </div>
+</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/gpgkey/InsertGpgKeyPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/gpgkey/InsertGpgKeyPanel.java
new file mode 100644
index 0000000000..cdbe99eb8b
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/gpgkey/InsertGpgKeyPanel.java
@@ -0,0 +1,113 @@
+package io.onedev.server.web.component.user.gpgkey;
+
+import java.util.Date;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.panel.Panel;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.EmailAddressManager;
+import io.onedev.server.entitymanager.GpgKeyManager;
+import io.onedev.server.model.EmailAddress;
+import io.onedev.server.model.GpgKey;
+import io.onedev.server.model.User;
+import io.onedev.server.util.GpgUtils;
+import io.onedev.server.util.Path;
+import io.onedev.server.util.PathNode;
+import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.editable.BeanEditor;
+import io.onedev.server.web.page.my.MyPage;
+
+@SuppressWarnings("serial")
+public abstract class InsertGpgKeyPanel extends Panel {
+
+ public InsertGpgKeyPanel(String id) {
+ super(id);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new AjaxLink<Void>("close") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onCancel(target);
+ }
+
+ });
+
+ Form<?> form = new Form<Void>("form");
+
+ BeanEditor editor = BeanContext.edit("editor", new GpgKey());
+ form.add(editor);
+
+ form.add(new AjaxButton("add") {
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> myform) {
+ super.onSubmit(target, myform);
+
+ GpgKeyManager gpgKeyManager = OneDev.getInstance(GpgKeyManager.class);
+ GpgKey gpgKey = (GpgKey) editor.getModelObject();
+ gpgKey.setKeyId(gpgKey.getPublicKey().getKeyID());
+
+ if (gpgKeyManager.findByKeyId(gpgKey.getKeyId()) != null) {
+ editor.error(new Path(new PathNode.Named("content")), "This key is already in use");
+ target.add(form);
+ } else {
+ String emailAddressValue = GpgUtils.getEmailAddress(gpgKey.getPublicKey());
+ EmailAddress emailAddress = OneDev.getInstance(EmailAddressManager.class).findByValue(emailAddressValue);
+ if (emailAddress != null && emailAddress.isVerified() && emailAddress.getOwner().equals(getUser())) {
+ gpgKey.setEmailAddress(emailAddress);
+ gpgKey.setCreatedAt(new Date());
+ gpgKeyManager.save(gpgKey);
+ onSave(target);
+ } else {
+ String who = (getPage() instanceof MyPage)? "yours": "the user";
+ editor.error(new Path(new PathNode.Named("content")), "This key is associated with " + emailAddressValue
+ + ", however it is NOT a verified email address of " + who);
+ target.add(form);
+ }
+ }
+ }
+
+ @Override
+ protected void onError(AjaxRequestTarget target, Form<?> form) {
+ super.onError(target, form);
+ target.add(form);
+ }
+
+ });
+
+ form.add(new AjaxLink<Void>("cancel") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onCancel(target);
+ }
+
+ });
+
+ add(form.setOutputMarkupId(true));
+ }
+
+ protected abstract User getUser();
+
+ protected abstract void onSave(AjaxRequestTarget target);
+
+ protected abstract void onCancel(AjaxRequestTarget target);
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new GpgKeyCssResourceReference()));
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/gpgkey/gpg-key.css b/server-core/src/main/java/io/onedev/server/web/component/user/gpgkey/gpg-key.css
new file mode 100644
index 0000000000..a03b25b33d
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/gpgkey/gpg-key.css
@@ -0,0 +1,10 @@
+@media(max-width: 767px) {
+ .gpg-key-list .expanded {
+ display: none;
+ }
+}
+
+.insert-gpg-key textarea {
+ font-family: monospace;
+ height: 200px !important;
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/sshkey/SshKeyListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/sshkey/SshKeyListPanel.java
index 14584b104a..44e314e42b 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/sshkey/SshKeyListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/sshkey/SshKeyListPanel.java
@@ -28,7 +28,7 @@ import io.onedev.server.entitymanager.SshKeyManager;
import io.onedev.server.model.SshKey;
import io.onedev.server.util.DateUtils;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
-import io.onedev.server.web.component.datatable.OneDataTable;
+import io.onedev.server.web.component.datatable.DefaultDataTable;
import io.onedev.server.web.util.LoadableDetachableDataProvider;
@SuppressWarnings("serial")
@@ -151,7 +151,7 @@ public class SshKeyListPanel extends GenericPanel<List<SshKey>> {
}
};
- add(sshKeysTable = new OneDataTable<SshKey, Void>("keys", columns, dataProvider,
+ add(sshKeysTable = new DefaultDataTable<SshKey, Void>("keys", columns, dataProvider,
Integer.MAX_VALUE, null));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java
index 0eb5354d5a..26a200b38f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java
@@ -50,7 +50,7 @@ import io.onedev.server.util.criteria.OrCriteria;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.behavior.AgentQueryBehavior;
import io.onedev.server.web.component.AgentStatusBadge;
-import io.onedev.server.web.component.datatable.OneDataTable;
+import io.onedev.server.web.component.datatable.DefaultDataTable;
import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;
import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.link.DropdownLink;
@@ -1053,7 +1053,7 @@ class AgentListPanel extends Panel {
});
- body.add(agentsTable = new OneDataTable<Agent, Void>("agents", columns, dataProvider,
+ body.add(agentsTable = new DefaultDataTable<Agent, Void>("agents", columns, dataProvider,
WebConstants.PAGE_SIZE, getPagingHistorySupport()));
setOutputMarkupId(true);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/gpgsigningkey/GpgSigningKeyPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/gpgsigningkey/GpgSigningKeyPage.html
new file mode 100644
index 0000000000..7d341c4f19
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/gpgsigningkey/GpgSigningKeyPage.html
@@ -0,0 +1,27 @@
+<wicket:extend>
+ <div class="card gpg-signing-key">
+ <div class="card-body">
+ <div class="alert alert-light alert-notice mb-4">
+ GPG signing key will be used to sign commits generated by OneDev, including
+ pull request merge commits, user commits created via web UI or RESTful api.
+ </div>
+ <div wicket:id="content"></div>
+ </div>
+ </div>
+ <wicket:fragment wicket:id="undefinedFrag">
+ <a wicket:id="generate" class="btn btn-primary">Generate</a>
+ </wicket:fragment>
+ <wicket:fragment wicket:id="definedFrag">
+ <dl>
+ <dt>Email Address</dt>
+ <dd wicket:id="emailAddress"></dd>
+ <dt>Key ID</dt>
+ <dd wicket:id="keyID"></dd>
+ <dt class="mb-2">Public Key <a wicket:id="copyPublicKey" title="Copy public key"><wicket:svg href="copy" class="icon"/></a></dt>
+ <dd>
+ <pre wicket:id="publicKey" class="font-size-sm bg-light p-3 rounded"></pre>
+ </dd>
+ </dl>
+ <a wicket:id="delete" class="btn btn-light-danger">Delete</a>
+ </wicket:fragment>
+</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/gpgsigningkey/GpgSigningKeyPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/gpgsigningkey/GpgSigningKeyPage.java
new file mode 100644
index 0000000000..9c136f7057
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/gpgsigningkey/GpgSigningKeyPage.java
@@ -0,0 +1,125 @@
+package io.onedev.server.web.page.admin.gpgsigningkey;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.bouncycastle.bcpg.ArmoredOutputStream;
+import org.bouncycastle.openpgp.PGPException;
+import org.bouncycastle.openpgp.PGPKeyRingGenerator;
+import org.bouncycastle.openpgp.PGPSecretKeyRing;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.model.User;
+import io.onedev.server.model.support.administration.GpgSetting;
+import io.onedev.server.util.GpgUtils;
+import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;
+import io.onedev.server.web.component.modal.confirm.ConfirmModalPanel;
+import io.onedev.server.web.page.admin.AdministrationPage;
+
+@SuppressWarnings("serial")
+public class GpgSigningKeyPage extends AdministrationPage {
+
+ public GpgSigningKeyPage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ GpgSetting setting = getSettingManager().getGpgSetting();
+ PGPSecretKeyRing signingKey = setting.getSigningKey();
+ if (signingKey != null) {
+ Fragment fragment = new Fragment("content", "definedFrag", this);
+ fragment.add(new Label("keyID", GpgUtils.getKeyIDString(signingKey.getPublicKey().getKeyID())));
+ fragment.add(new Label("emailAddress", GpgUtils.getEmailAddress(signingKey.getPublicKey())));
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ try (ArmoredOutputStream aos = new ArmoredOutputStream(baos)) {
+ signingKey.getPublicKey().encode(aos);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+
+ String publicKey = new String(baos.toByteArray());
+ fragment.add(new Label("publicKey", publicKey));
+ fragment.add(new CopyToClipboardLink("copyPublicKey", Model.of(publicKey)));
+
+ fragment.add(new AjaxLink<Void>("delete") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ new ConfirmModalPanel(target) {
+
+ @Override
+ protected void onConfirm(AjaxRequestTarget target) {
+ GpgSetting setting = getSettingManager().getGpgSetting();
+ setting.setEncodedSigningKey(null);
+ getSettingManager().saveGpgSetting(setting);
+ setResponsePage(GpgSigningKeyPage.class);
+ }
+
+ @Override
+ protected String getConfirmMessage() {
+ return "Commits generated by OneDev previously will be shown as unverified if this key is deleted. "
+ + "Type <code>yes</code> below if you want to continue.";
+ }
+
+ @Override
+ protected String getConfirmInput() {
+ return "yes";
+ }
+
+ };
+ }
+
+ });
+
+ add(fragment);
+ } else {
+ Fragment fragment = new Fragment("content", "undefinedFrag", this);
+ fragment.add(new AjaxLink<Void>("generate") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ ByteArrayOutputStream baos;
+ try {
+ PGPKeyRingGenerator generator = GpgUtils.generateKeyRingGenerator(
+ User.ONEDEV_NAME + "<" + User.ONEDEV_EMAIL_ADDRESS + ">");
+
+ PGPSecretKeyRing secretKeyRing = generator.generateSecretKeyRing();
+ baos = new ByteArrayOutputStream();
+ secretKeyRing.encode(baos);
+ } catch (PGPException | IOException e) {
+ throw new RuntimeException(e);
+ }
+
+ GpgSetting setting = getSettingManager().getGpgSetting();
+ setting.setEncodedSigningKey(baos.toByteArray());
+ getSettingManager().saveGpgSetting(setting);
+ setResponsePage(GpgSigningKeyPage.class);
+ }
+
+ });
+ add(fragment);
+ }
+ }
+
+ private SettingManager getSettingManager() {
+ return OneDev.getInstance(SettingManager.class);
+ }
+
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "GPG Signing Key");
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/gpgtrustedkeys/GpgTrustedKeysCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/admin/gpgtrustedkeys/GpgTrustedKeysCssResourceReference.java
new file mode 100644
index 0000000000..8881dd8c62
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/gpgtrustedkeys/GpgTrustedKeysCssResourceReference.java
@@ -0,0 +1,13 @@
+package io.onedev.server.web.page.admin.gpgtrustedkeys;
+
+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
+
+public class GpgTrustedKeysCssResourceReference extends BaseDependentCssResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public GpgTrustedKeysCssResourceReference() {
+ super(GpgTrustedKeysCssResourceReference.class, "gpg-trusted-keys.css");
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/gpgtrustedkeys/GpgTrustedKeysPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/gpgtrustedkeys/GpgTrustedKeysPage.html
new file mode 100644
index 0000000000..c01e8b8372
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/gpgtrustedkeys/GpgTrustedKeysPage.html
@@ -0,0 +1,31 @@
+<wicket:extend>
+ <div class="card gpg-trusted-keys">
+ <div class="card-body">
+ <div class="alert alert-light alert-notice mb-4">
+ Add GPG public keys to be trusted here. Commits signed with trusted keys will be shown as verified.
+ </div>
+ <a wicket:id="newKey" class="btn btn-primary btn-icon mb-4" title="Add GPG Key"><wicket:svg href="plus" class="icon"></wicket:svg></a>
+ <table wicket:id="keys" class="table table-hover"></table>
+ </div>
+ </div>
+ <wicket:fragment wicket:id="actionFrag">
+ <a wicket:id="delete" class="btn btn-xs btn-icon btn-light btn-hover-danger" title="Delete this key"><wicket:svg href="trash" class="icon"></wicket:svg></a>
+ </wicket:fragment>
+ <wicket:fragment wicket:id="addKeyFrag">
+ <div class="add-gpg-trusted-key">
+ <div class="modal-header">
+ <h5 class="modal-title">Add a GPG Public Key</h5>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
+ </div>
+ <form wicket:id="form">
+ <div class="modal-body">
+ <div wicket:id="editor"></div>
+ </div>
+ <div class="modal-footer">
+ <input wicket:id="add" type="submit" class="btn btn-primary dirty-aware" value="Add">
+ <button wicket:id="cancel" type="button" class="btn btn-secondary">Cancel</button>
+ </div>
+ </form>
+ </div>
+ </wicket:fragment>
+</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/gpgtrustedkeys/GpgTrustedKeysPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/gpgtrustedkeys/GpgTrustedKeysPage.java
new file mode 100644
index 0000000000..43c750e592
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/gpgtrustedkeys/GpgTrustedKeysPage.java
@@ -0,0 +1,228 @@
+package io.onedev.server.web.page.admin.gpgtrustedkeys;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.Session;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.bouncycastle.openpgp.PGPPublicKey;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.model.support.BaseGpgKey;
+import io.onedev.server.model.support.administration.GpgSetting;
+import io.onedev.server.util.GpgUtils;
+import io.onedev.server.util.Path;
+import io.onedev.server.util.PathNode;
+import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
+import io.onedev.server.web.component.datatable.DefaultDataTable;
+import io.onedev.server.web.component.modal.ModalLink;
+import io.onedev.server.web.component.modal.ModalPanel;
+import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.editable.BeanEditor;
+import io.onedev.server.web.page.admin.AdministrationPage;
+import io.onedev.server.web.util.LoadableDetachableDataProvider;
+
+@SuppressWarnings("serial")
+public class GpgTrustedKeysPage extends AdministrationPage {
+
+ public GpgTrustedKeysPage(PageParameters params) {
+ super(params);
+ }
+
+ private DataTable<Long, Void> trustedKeysTable;
+
+ @Override
+ public void onInitialize() {
+ super.onInitialize();
+
+ add(new ModalLink("newKey") {
+
+ @Override
+ protected String getModalCssClass() {
+ return "modal-lg";
+ }
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ Fragment fragment = new Fragment(id, "addKeyFrag", GpgTrustedKeysPage.this);
+
+ fragment.add(new AjaxLink<Void>("close") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ });
+
+ Form<?> form = new Form<Void>("form");
+
+ BeanEditor editor = BeanContext.edit("editor", new BaseGpgKey());
+ form.add(editor);
+
+ form.add(new AjaxButton("add") {
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> myform) {
+ super.onSubmit(target, myform);
+
+ BaseGpgKey bean = (BaseGpgKey) editor.getModelObject();
+
+ GpgSetting setting = getSettingManager().getGpgSetting();
+ if (setting.getEncodedTrustedKeys().put(bean.getPublicKey().getKeyID(), bean.getContent()) != null) {
+ editor.error(new Path(new PathNode.Named(BaseGpgKey.PROP_CONTENT)), "This key is already added");
+ target.add(form);
+ } else {
+ getSettingManager().saveGpgSetting(setting);
+ target.add(trustedKeysTable);
+ modal.close();
+ }
+ }
+
+ @Override
+ protected void onError(AjaxRequestTarget target, Form<?> form) {
+ super.onError(target, form);
+ target.add(form);
+ }
+
+ });
+
+ form.add(new AjaxLink<Void>("cancel") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ });
+
+ fragment.add(form.setOutputMarkupId(true));
+
+ return fragment;
+ }
+
+ });
+
+ List<IColumn<Long, Void>> columns = new ArrayList<>();
+
+ columns.add(new AbstractColumn<Long, Void>(Model.of("Email Address")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<Long>> cellItem, String componentId,
+ IModel<Long> rowModel) {
+ cellItem.add(new Label(componentId,
+ GpgUtils.getEmailAddress(getPublicKey(rowModel.getObject()))));
+ }
+
+ });
+
+ columns.add(new AbstractColumn<Long, Void>(Model.of("Key ID")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<Long>> cellItem, String componentId,
+ IModel<Long> rowModel) {
+ cellItem.add(new Label(componentId,
+ GpgUtils.getKeyIDString(getPublicKey(rowModel.getObject()).getKeyID())));
+ }
+
+ });
+
+ columns.add(new AbstractColumn<Long, Void>(Model.of("")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<Long>> cellItem, String componentId,
+ IModel<Long> rowModel) {
+ Fragment fragment = new Fragment(componentId, "actionFrag", GpgTrustedKeysPage.this);
+
+ fragment.add(new AjaxLink<Void>("delete") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ GpgSetting setting = getSettingManager().getGpgSetting();
+ setting.getEncodedTrustedKeys().remove(rowModel.getObject());
+ getSettingManager().saveGpgSetting(setting);
+ Session.get().success("GPG key deleted");
+ target.add(trustedKeysTable);
+ }
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ String message = "Do you really want to delete this GPG key?";
+ attributes.getAjaxCallListeners().add(new ConfirmClickListener(message));
+ }
+
+ });
+
+ cellItem.add(fragment);
+ }
+
+ @Override
+ public String getCssClass() {
+ return "actions";
+ }
+
+ });
+
+ SortableDataProvider<Long, Void> dataProvider = new LoadableDetachableDataProvider<Long, Void>() {
+
+ @Override
+ public Iterator<? extends Long> iterator(long first, long count) {
+ return getSettingManager().getGpgSetting().getEncodedTrustedKeys().keySet().iterator();
+ }
+
+ @Override
+ public long calcSize() {
+ return getSettingManager().getGpgSetting().getEncodedTrustedKeys().size();
+ }
+
+ @Override
+ public IModel<Long> model(Long keyId) {
+ return Model.of(keyId);
+ }
+ };
+
+ add(trustedKeysTable = new DefaultDataTable<Long, Void>("keys", columns, dataProvider,
+ Integer.MAX_VALUE, null));
+ }
+
+ private PGPPublicKey getPublicKey(long keyId) {
+ return getSettingManager().getGpgSetting().getTrustedKey(keyId);
+ }
+
+ private SettingManager getSettingManager() {
+ return OneDev.getInstance(SettingManager.class);
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new GpgTrustedKeysCssResourceReference()));
+ }
+
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "GPG Trusted Keys");
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/gpgtrustedkeys/gpg-trusted-keys.css b/server-core/src/main/java/io/onedev/server/web/page/admin/gpgtrustedkeys/gpg-trusted-keys.css
new file mode 100644
index 0000000000..cbc0c2ded4
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/gpgtrustedkeys/gpg-trusted-keys.css
@@ -0,0 +1,4 @@
+.add-gpg-trusted-key textarea {
+ font-family: monospace;
+ height: 200px !important;
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java
index acb3506540..c8b843aaf0 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java
@@ -41,7 +41,7 @@ import io.onedev.server.web.WebConstants;
import io.onedev.server.web.WebSession;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
import io.onedev.server.web.behavior.OnTypingDoneBehavior;
-import io.onedev.server.web.component.datatable.OneDataTable;
+import io.onedev.server.web.component.datatable.DefaultDataTable;
import io.onedev.server.web.component.link.ActionablePageLink;
import io.onedev.server.web.page.admin.AdministrationPage;
import io.onedev.server.web.page.admin.group.create.NewGroupPage;
@@ -286,7 +286,7 @@ public class GroupListPage extends AdministrationPage {
};
- add(groupsTable = new OneDataTable<>("groups", columns, dataProvider,
+ add(groupsTable = new DefaultDataTable<>("groups", columns, dataProvider,
WebConstants.PAGE_SIZE, pagingHistorySupport));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/membership/GroupMembershipsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/group/membership/GroupMembershipsPage.java
index 8e58a1145d..ec8a91d5ba 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/membership/GroupMembershipsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/membership/GroupMembershipsPage.java
@@ -46,7 +46,7 @@ import io.onedev.server.util.match.MatchScoreUtils;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.behavior.OnTypingDoneBehavior;
import io.onedev.server.web.component.EmailAddressVerificationStatusBadge;
-import io.onedev.server.web.component.datatable.OneDataTable;
+import io.onedev.server.web.component.datatable.DefaultDataTable;
import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;
import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.menu.MenuItem;
@@ -392,7 +392,7 @@ public class GroupMembershipsPage extends GroupPage {
};
- add(membershipsTable = new OneDataTable<Membership, Void>("memberships", columns, dataProvider,
+ add(membershipsTable = new DefaultDataTable<Membership, Void>("memberships", columns, dataProvider,
WebConstants.PAGE_SIZE, pagingHistorySupport));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.java
index 50a7e9cf2d..00ef63f087 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.java
@@ -40,7 +40,7 @@ import io.onedev.server.web.WebConstants;
import io.onedev.server.web.WebSession;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
import io.onedev.server.web.behavior.OnTypingDoneBehavior;
-import io.onedev.server.web.component.datatable.OneDataTable;
+import io.onedev.server.web.component.datatable.DefaultDataTable;
import io.onedev.server.web.component.link.ActionablePageLink;
import io.onedev.server.web.page.admin.AdministrationPage;
import io.onedev.server.web.util.PagingHistorySupport;
@@ -273,7 +273,7 @@ public class RoleListPage extends AdministrationPage {
};
- add(rolesTable = new OneDataTable<>("roles", columns, dataProvider,
+ add(rolesTable = new DefaultDataTable<>("roles", columns, dataProvider,
WebConstants.PAGE_SIZE, pagingHistorySupport));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/generalsecuritysetting/GeneralSecuritySettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/securitysetting/SecuritySettingPage.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/page/admin/generalsecuritysetting/GeneralSecuritySettingPage.html
rename to server-core/src/main/java/io/onedev/server/web/page/admin/securitysetting/SecuritySettingPage.html
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/generalsecuritysetting/GeneralSecuritySettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/securitysetting/SecuritySettingPage.java
similarity index 82%
rename from server-core/src/main/java/io/onedev/server/web/page/admin/generalsecuritysetting/GeneralSecuritySettingPage.java
rename to server-core/src/main/java/io/onedev/server/web/page/admin/securitysetting/SecuritySettingPage.java
index 9cbc4ce278..943db8ec1a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/generalsecuritysetting/GeneralSecuritySettingPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/securitysetting/SecuritySettingPage.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.admin.generalsecuritysetting;
+package io.onedev.server.web.page.admin.securitysetting;
import org.apache.wicket.Component;
import org.apache.wicket.markup.html.basic.Label;
@@ -12,9 +12,9 @@ import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.page.admin.AdministrationPage;
@SuppressWarnings("serial")
-public class GeneralSecuritySettingPage extends AdministrationPage {
+public class SecuritySettingPage extends AdministrationPage {
- public GeneralSecuritySettingPage(PageParameters params) {
+ public SecuritySettingPage(PageParameters params) {
super(params);
}
@@ -32,7 +32,7 @@ public class GeneralSecuritySettingPage extends AdministrationPage {
OneDev.getInstance(SettingManager.class).saveSecuritySetting(securitySetting);
getSession().success("Security setting has been updated");
- setResponsePage(GeneralSecuritySettingPage.class);
+ setResponsePage(SecuritySettingPage.class);
}
};
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/ssh/SshSettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/sshsetting/SshSettingPage.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/page/admin/ssh/SshSettingPage.html
rename to server-core/src/main/java/io/onedev/server/web/page/admin/sshsetting/SshSettingPage.html
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/ssh/SshSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/sshsetting/SshSettingPage.java
similarity index 95%
rename from server-core/src/main/java/io/onedev/server/web/page/admin/ssh/SshSettingPage.java
rename to server-core/src/main/java/io/onedev/server/web/page/admin/sshsetting/SshSettingPage.java
index da49c57126..4f59855350 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/ssh/SshSettingPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/sshsetting/SshSettingPage.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.admin.ssh;
+package io.onedev.server.web.page.admin.sshsetting;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -71,7 +71,7 @@ public class SshSettingPage extends AdministrationPage {
@Override
protected Component newTopbarTitle(String componentId) {
- return new Label(componentId, "SSH Setting");
+ return new Label(componentId, "SSH Server Key");
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoConnectorBean.java b/server-core/src/main/java/io/onedev/server/web/page/admin/ssosetting/SsoConnectorBean.java
similarity index 92%
rename from server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoConnectorBean.java
rename to server-core/src/main/java/io/onedev/server/web/page/admin/ssosetting/SsoConnectorBean.java
index faa514532b..591c2745ef 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoConnectorBean.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/ssosetting/SsoConnectorBean.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.admin.sso;
+package io.onedev.server.web.page.admin.ssosetting;
import java.io.Serializable;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoConnectorEditPanel.html b/server-core/src/main/java/io/onedev/server/web/page/admin/ssosetting/SsoConnectorEditPanel.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoConnectorEditPanel.html
rename to server-core/src/main/java/io/onedev/server/web/page/admin/ssosetting/SsoConnectorEditPanel.html
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoConnectorEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/ssosetting/SsoConnectorEditPanel.java
similarity index 98%
rename from server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoConnectorEditPanel.java
rename to server-core/src/main/java/io/onedev/server/web/page/admin/ssosetting/SsoConnectorEditPanel.java
index 55e855581f..864cfe09fe 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoConnectorEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/ssosetting/SsoConnectorEditPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.admin.sso;
+package io.onedev.server.web.page.admin.ssosetting;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoConnectorListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/ssosetting/SsoConnectorListPage.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoConnectorListPage.html
rename to server-core/src/main/java/io/onedev/server/web/page/admin/ssosetting/SsoConnectorListPage.html
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoConnectorListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/ssosetting/SsoConnectorListPage.java
similarity index 99%
rename from server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoConnectorListPage.java
rename to server-core/src/main/java/io/onedev/server/web/page/admin/ssosetting/SsoConnectorListPage.java
index 1db60103b4..6a68b33990 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoConnectorListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/ssosetting/SsoConnectorListPage.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.admin.sso;
+package io.onedev.server.web.page.admin.ssosetting;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoProcessPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/ssosetting/SsoProcessPage.java
similarity index 98%
rename from server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoProcessPage.java
rename to server-core/src/main/java/io/onedev/server/web/page/admin/ssosetting/SsoProcessPage.java
index eea3ee6ef7..5f3b57661d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/sso/SsoProcessPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/ssosetting/SsoProcessPage.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.admin.sso;
+package io.onedev.server.web.page.admin.ssosetting;
import org.apache.shiro.authc.AuthenticationException;
import org.apache.wicket.RestartResponseAtInterceptPageException;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java
index bd3daf2b63..50c3f78492 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java
@@ -40,7 +40,7 @@ import io.onedev.server.web.WebSession;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
import io.onedev.server.web.behavior.OnTypingDoneBehavior;
import io.onedev.server.web.component.EmailAddressVerificationStatusBadge;
-import io.onedev.server.web.component.datatable.OneDataTable;
+import io.onedev.server.web.component.datatable.DefaultDataTable;
import io.onedev.server.web.component.link.ActionablePageLink;
import io.onedev.server.web.component.user.UserAvatar;
import io.onedev.server.web.page.admin.AdministrationPage;
@@ -337,7 +337,7 @@ public class UserListPage extends AdministrationPage {
};
- add(usersTable = new OneDataTable<User, Void>("users", columns, dataProvider,
+ add(usersTable = new DefaultDataTable<User, Void>("users", columns, dataProvider,
WebConstants.PAGE_SIZE, pagingHistorySupport));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/membership/UserMembershipsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/membership/UserMembershipsPage.java
index 9006ffd065..ee121c9dc4 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/membership/UserMembershipsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/membership/UserMembershipsPage.java
@@ -43,7 +43,7 @@ import io.onedev.server.util.match.MatchScoreProvider;
import io.onedev.server.util.match.MatchScoreUtils;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.behavior.OnTypingDoneBehavior;
-import io.onedev.server.web.component.datatable.OneDataTable;
+import io.onedev.server.web.component.datatable.DefaultDataTable;
import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;
import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.groupchoice.AbstractGroupChoiceProvider;
@@ -388,7 +388,7 @@ public class UserMembershipsPage extends UserPage {
};
- add(membershipsTable = new OneDataTable<Membership, Void>("memberships", columns, dataProvider,
+ add(membershipsTable = new DefaultDataTable<Membership, Void>("memberships", columns, dataProvider,
WebConstants.PAGE_SIZE, pagingHistorySupport));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html
index 038ee9b169..39b77bbc8c 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
@@ -82,6 +82,10 @@
<wicket:svg href="key" class="icon mr-2"></wicket:svg>
SSH Keys
</a>
+ <a wicket:id="myGpgKeys" class="dropdown-item">
+ <wicket:svg href="key" class="icon mr-2"></wicket:svg>
+ GPG Keys
+ </a>
<a wicket:id="myAccessToken" class="dropdown-item">
<wicket:svg href="token" class="icon mr-2"></wicket:svg>
Access Token
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
index 84dffa7801..6a21e4ad57 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
@@ -49,7 +49,8 @@ import io.onedev.server.web.page.admin.buildsetting.agent.AgentDetailPage;
import io.onedev.server.web.page.admin.buildsetting.agent.AgentListPage;
import io.onedev.server.web.page.admin.buildsetting.jobexecutor.JobExecutorsPage;
import io.onedev.server.web.page.admin.databasebackup.DatabaseBackupPage;
-import io.onedev.server.web.page.admin.generalsecuritysetting.GeneralSecuritySettingPage;
+import io.onedev.server.web.page.admin.gpgsigningkey.GpgSigningKeyPage;
+import io.onedev.server.web.page.admin.gpgtrustedkeys.GpgTrustedKeysPage;
import io.onedev.server.web.page.admin.groovyscript.GroovyScriptListPage;
import io.onedev.server.web.page.admin.group.GroupListPage;
import io.onedev.server.web.page.admin.group.GroupPage;
@@ -68,11 +69,12 @@ import io.onedev.server.web.page.admin.pluginsettings.ContributedAdministrationS
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.servicedesk.ServiceDeskSettingPage;
-import io.onedev.server.web.page.admin.ssh.SshSettingPage;
-import io.onedev.server.web.page.admin.sso.SsoConnectorListPage;
+import io.onedev.server.web.page.admin.sshsetting.SshSettingPage;
+import io.onedev.server.web.page.admin.ssosetting.SsoConnectorListPage;
import io.onedev.server.web.page.admin.systemsetting.SystemSettingPage;
import io.onedev.server.web.page.admin.user.UserListPage;
import io.onedev.server.web.page.admin.user.UserPage;
@@ -83,6 +85,7 @@ import io.onedev.server.web.page.my.MyPage;
import io.onedev.server.web.page.my.accesstoken.MyAccessTokenPage;
import io.onedev.server.web.page.my.avatar.MyAvatarPage;
import io.onedev.server.web.page.my.emailaddresses.MyEmailAddressesPage;
+import io.onedev.server.web.page.my.gpgkeys.MyGpgKeysPage;
import io.onedev.server.web.page.my.password.MyPasswordPage;
import io.onedev.server.web.page.my.profile.MyProfilePage;
import io.onedev.server.web.page.my.sshkeys.MySshKeysPage;
@@ -134,11 +137,17 @@ public abstract class LayoutPage extends BasePage {
List<SidebarMenuItem> securitySettingMenuItems = new ArrayList<>();
securitySettingMenuItems.add(new SidebarMenuItem.Page(null, "General Setting",
- GeneralSecuritySettingPage.class, new PageParameters()));
+ SecuritySettingPage.class, new PageParameters()));
securitySettingMenuItems.add(new SidebarMenuItem.Page(null, "External Authentication",
AuthenticatorPage.class, new PageParameters()));
securitySettingMenuItems.add(new SidebarMenuItem.Page(null, "Single Sign On",
SsoConnectorListPage.class, new PageParameters()));
+ securitySettingMenuItems.add(new SidebarMenuItem.Page(null, "SSH Server Key",
+ SshSettingPage.class, new PageParameters()));
+ securitySettingMenuItems.add(new SidebarMenuItem.Page(null, "GPG Signing Key",
+ GpgSigningKeyPage.class, new PageParameters()));
+ securitySettingMenuItems.add(new SidebarMenuItem.Page(null, "GPG Trusted Keys",
+ GpgTrustedKeysPage.class, new PageParameters()));
administrationMenuItems.add(new SidebarMenuItem.SubMenu(null, "Security Setting", securitySettingMenuItems));
@@ -156,9 +165,6 @@ public abstract class LayoutPage extends BasePage {
issueSettingMenuItems.add(new SidebarMenuItem.Page(null, "Description Templates",
IssueTemplateListPage.class, new PageParameters()));
- administrationMenuItems.add(new SidebarMenuItem.Page(null, "SSH Setting",
- SshSettingPage.class, new PageParameters()));
-
administrationMenuItems.add(new SidebarMenuItem.SubMenu(null, "Issue Setting", issueSettingMenuItems));
administrationMenuItems.add(new SidebarMenuItem.Page(null, "Job Executors",
@@ -396,6 +402,10 @@ public abstract class LayoutPage extends BasePage {
if (getPage() instanceof MySshKeysPage)
item.add(AttributeAppender.append("class", "active"));
+ userInfo.add(item = new ViewStateAwarePageLink<Void>("myGpgKeys", MyGpgKeysPage.class));
+ if (getPage() instanceof MyGpgKeysPage)
+ item.add(AttributeAppender.append("class", "active"));
+
userInfo.add(item = new ViewStateAwarePageLink<Void>("myAccessToken", MyAccessTokenPage.class));
if (getPage() instanceof MyAccessTokenPage)
item.add(AttributeAppender.append("class", "active"));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/gpgkeys/MyGpgKeysPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/gpgkeys/MyGpgKeysPage.html
new file mode 100644
index 0000000000..f44fbe5d56
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/my/gpgkeys/MyGpgKeysPage.html
@@ -0,0 +1,11 @@
+<wicket:extend>
+ <div class="p-5">
+ <div class="card">
+ <div class="card-body">
+ <div class="alert alert-light alert-notice mb-4">Add GPG keys here to verify commits/tags signed by you</div>
+ <a wicket:id="newKey" class="btn btn-primary btn-icon mb-4" title="Add GPG Key"><wicket:svg href="plus" class="icon"></wicket:svg></a>
+ <div wicket:id="keyList"></div>
+ </div>
+ </div>
+ </div>
+</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/gpgkeys/MyGpgKeysPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/gpgkeys/MyGpgKeysPage.java
new file mode 100644
index 0000000000..18de2f8e35
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/my/gpgkeys/MyGpgKeysPage.java
@@ -0,0 +1,81 @@
+package io.onedev.server.web.page.my.gpgkeys;
+
+import java.util.List;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import io.onedev.server.model.GpgKey;
+import io.onedev.server.model.User;
+import io.onedev.server.web.component.modal.ModalLink;
+import io.onedev.server.web.component.modal.ModalPanel;
+import io.onedev.server.web.component.user.gpgkey.GpgKeyListPanel;
+import io.onedev.server.web.component.user.gpgkey.InsertGpgKeyPanel;
+import io.onedev.server.web.page.my.MyPage;
+
+@SuppressWarnings("serial")
+public class MyGpgKeysPage extends MyPage {
+
+ private GpgKeyListPanel keyList;
+
+ public MyGpgKeysPage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new ModalLink("newKey") {
+
+ @Override
+ protected String getModalCssClass() {
+ return "modal-lg";
+ }
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ return new InsertGpgKeyPanel(id) {
+
+ @Override
+ protected void onSave(AjaxRequestTarget target) {
+ target.add(keyList);
+ modal.close();
+ }
+
+ @Override
+ protected User getUser() {
+ return getLoginUser();
+ }
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ };
+ }
+
+ });
+
+ keyList = new GpgKeyListPanel("keyList", new LoadableDetachableModel<List<GpgKey>>() {
+
+ @Override
+ protected List<GpgKey> load() {
+ return getLoginUser().getGpgKeys();
+ }
+
+ });
+
+ add(keyList.setOutputMarkupId(true));
+ }
+
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "My GPG Keys");
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
index 649265a201..34ac62ac60 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
@@ -234,10 +234,10 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {
buildSettingMenuItems.add(new SidebarMenuItem.Page(null, "Default Fixed Issue Filters",
DefaultFixedIssueFiltersPage.class, DefaultFixedIssueFiltersPage.paramsOf(getProject())));
- settingMenuItems.add(new SidebarMenuItem.SubMenu(null, "Build Setting", buildSettingMenuItems));
+ settingMenuItems.add(new SidebarMenuItem.SubMenu(null, "Build", buildSettingMenuItems));
- if (OneDev.getInstance(SettingManager.class).getServiceDeskSetting() != null && getProject().isIssueManagement()) {
- settingMenuItems.add(new SidebarMenuItem.Page(null, "Service Desk Setting",
+ if (getSettingManager().getServiceDeskSetting() != null && getProject().isIssueManagement()) {
+ settingMenuItems.add(new SidebarMenuItem.Page(null, "Service Desk",
ProjectServiceDeskSettingPage.class, ProjectServiceDeskSettingPage.paramsOf(getProject())));
}
@@ -277,6 +277,10 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {
return menus;
}
+ private SettingManager getSettingManager() {
+ return OneDev.getInstance(SettingManager.class);
+ }
+
@Override
protected void onDetach() {
projectModel.detach();
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.html
index ecc8557400..4337606256 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.html
@@ -3,7 +3,7 @@
<div class="head d-flex align-items-center justify-content-between flex-wrap px-3 flex-shrink-0">
<div class="d-flex flex-wrap align-items-center">
<a wicket:id="revisionPicker" class="revision-picker mr-3 py-2"></a>
- <div wicket:id="buildStatus" class="build-status mr-3 py-2"></div>
+ <a wicket:id="buildStatus" class="build-status mr-3 py-2"></a>
<div wicket:id="blobNavigator" class="blob-navigator mr-3 py-2"></div>
</div>
<div wicket:id="blobOperations" class="d-flex align-items-center py-2">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
index 1d92ba3cbf..40ebd7a6dd 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
@@ -46,6 +46,7 @@ import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandle
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;
+import org.bouncycastle.openpgp.PGPSecretKeyRing;
import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.revwalk.RevCommit;
@@ -101,7 +102,7 @@ import io.onedev.server.util.script.identity.ScriptIdentityAware;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.behavior.WebSocketObserver;
-import io.onedev.server.web.component.commit.status.CommitStatusPanel;
+import io.onedev.server.web.component.commit.status.CommitStatusLink;
import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.link.DropdownLink;
import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;
@@ -297,8 +298,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,
List<QueryHit> queryHits;
if (state.query != null) {
- int maxQueryEntries = OneDev.getInstance(SettingManager.class)
- .getPerformanceSetting().getMaxCodeSearchEntries();
+ int maxQueryEntries = getSettingManager().getPerformanceSetting().getMaxCodeSearchEntries();
BlobQuery query = new TextQuery.Builder()
.term(state.query)
.wholeWord(true)
@@ -421,6 +421,14 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,
logger.error("Error checking build requirement", e);
}
+ AtomicBoolean signatureRequiredButNoSigningKey = new AtomicBoolean(true);
+ try {
+ signatureRequiredButNoSigningKey.set(revision!=null
+ && getProject().isCommitSignatureRequiredButNoSigningKey(getLoginUser(), revision));
+ } catch (Exception e) {
+ logger.error("Error checking signature requirement", e);
+ }
+
blobOperations.add(new MenuLink("add") {
@Override
@@ -501,6 +509,9 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,
} else if (buildRequired.get()) {
tag.append("class", "disabled", " ");
tag.put("title", "Build required for this change. Submit pull request instead");
+ } else if (signatureRequiredButNoSigningKey.get()) {
+ tag.append("class", "disabled", " ");
+ tag.put("title", "Signature required for this change, please generate system GPG signing key first");
} else {
tag.put("title", "Add on branch " + state.blobIdent.revision);
}
@@ -515,7 +526,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,
&& isOnBranch() && state.blobIdent.isTree()
&& SecurityUtils.canWriteCode(project)) {
setVisible(true);
- setEnabled(!reviewRequired.get() && !buildRequired.get());
+ setEnabled(!reviewRequired.get() && !buildRequired.get() && !signatureRequiredButNoSigningKey.get());
} else {
setVisible(false);
}
@@ -864,7 +875,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,
private void newCommitStatus(@Nullable AjaxRequestTarget target) {
Component commitStatus;
if (resolvedRevision != null) {
- commitStatus = new CommitStatusPanel("buildStatus", resolvedRevision, getRefName()) {
+ commitStatus = new CommitStatusLink("buildStatus", resolvedRevision, getRefName()) {
@Override
protected Project getProject() {
@@ -915,7 +926,8 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,
} else if (!SecurityUtils.canWriteCode(project)) {
Session.get().warn("Code write permission is required for this operation");
} else if (project.isReviewRequiredForModification(user, branch, file)
- || project.isBuildRequiredForModification(user, branch, file)) {
+ || project.isBuildRequiredForModification(user, branch, file)
+ || project.isCommitSignatureRequiredButNoSigningKey(user, branch)) {
Session.get().warn("This operation is disallowed by branch protection rule");
} else {
onModeChange(target, Mode.ADD, BuildSpec.BLOB_PATH);
@@ -1570,6 +1582,8 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,
throw new BlobEditException("Review required for this change. Please submit pull request instead");
else if (getProject().isBuildRequiredForModification(user, blobIdent.revision, blobPath))
throw new BlobEditException("Build required for this change. Please submit pull request instead");
+ else if (getProject().isCommitSignatureRequiredButNoSigningKey(user, blobIdent.revision))
+ throw new BlobEditException("Signature required for this change, please generate system GPG signing key first");
BlobContent blobContent = new BlobContent.Immutable(upload.getBytes(), FileMode.REGULAR_FILE);
newBlobs.put(blobPath, blobContent);
@@ -1584,10 +1598,12 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,
else
prevCommitId = ObjectId.zeroId();
+ PGPSecretKeyRing signingKey = getSettingManager().getGpgSetting().getSigningKey();
+
while (true) {
try {
ObjectId newCommitId = blobEdits.commit(getProject().getRepository(), refName, prevCommitId,
- prevCommitId, user.asPerson(), commitMessage);
+ prevCommitId, user.asPerson(), commitMessage, signingKey);
return new RefUpdated(getProject(), refName, prevCommitId, newCommitId);
} catch (ObjectAlreadyExistsException|NotTreeException e) {
throw new BlobEditException(e.getMessage());
@@ -1596,6 +1612,10 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,
}
}
}
+
+ private SettingManager getSettingManager() {
+ return OneDev.getInstance(SettingManager.class);
+ }
@Override
protected boolean isPermitted() {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java
index b880c942d3..265b0177f1 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java
@@ -25,6 +25,7 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.panel.Panel;
+import org.bouncycastle.openpgp.PGPSecretKeyRing;
import org.eclipse.jgit.diff.DiffEntry;
import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.lib.ObjectId;
@@ -37,6 +38,8 @@ import org.unbescape.javascript.JavaScriptEscape;
import com.google.common.base.Objects;
import com.google.common.base.Preconditions;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.event.RefUpdated;
import io.onedev.server.git.BlobChange;
import io.onedev.server.git.BlobContent;
@@ -244,13 +247,16 @@ public class CommitOptionPanel extends Panel {
User user = Preconditions.checkNotNull(SecurityUtils.getUser());
String revision = context.getBlobIdent().revision;
-
- String refName = revision!=null?GitUtils.branch2ref(revision):"refs/heads/master";
ObjectId prevCommitId;
if (revision != null)
prevCommitId = context.getProject().getObjectId(revision, true);
else
prevCommitId = ObjectId.zeroId();
+
+ if (revision == null)
+ revision = "master";
+
+ String refName = GitUtils.branch2ref(revision);
Repository repository = context.getProject().getRepository();
ObjectId newCommitId = null;
@@ -258,14 +264,18 @@ public class CommitOptionPanel extends Panel {
Map<String, BlobContent> newBlobs = new HashMap<>();
if (newContentProvider != null) {
String newPath = context.getNewPath();
- if (revision != null && context.getProject().isReviewRequiredForModification(user, revision, newPath)) {
+ if (context.getProject().isReviewRequiredForModification(user, revision, newPath)) {
form.error("Review required for this change. Please submit pull request instead");
target.add(form);
return false;
- } else if (revision != null && context.getProject().isBuildRequiredForModification(user, revision, newPath)) {
+ } else if (context.getProject().isBuildRequiredForModification(user, revision, newPath)) {
form.error("Build required for this change. Please submit pull request instead");
target.add(form);
return false;
+ } else if (context.getProject().isCommitSignatureRequiredButNoSigningKey(user, revision)) {
+ form.error("Signature required for this change, but no signing key is specified");
+ target.add(form);
+ return false;
}
newBlobs.put(context.getNewPath(), new BlobContent() {
@@ -286,10 +296,13 @@ public class CommitOptionPanel extends Panel {
});
}
+ PGPSecretKeyRing signingKey = OneDev.getInstance(SettingManager.class)
+ .getGpgSetting().getSigningKey();
+
while(newCommitId == null) {
try {
newCommitId = new BlobEdits(oldPaths, newBlobs).commit(repository, refName,
- prevCommitId, prevCommitId, user.asPerson(), commitMessage);
+ prevCommitId, prevCommitId, user.asPerson(), commitMessage, signingKey);
} catch (ObjectAlreadyExistsException e) {
form.error("A path with same name already exists. "
+ "Please choose a different name and try again.");
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java
index cb75978666..da102b12b0 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java
@@ -74,6 +74,7 @@ public abstract class BlobViewPanel extends Panel {
String path = context.getBlobIdent().path;
boolean reviewRequired = project.isReviewRequiredForModification(user, revision, path);
boolean buildRequired = project.isBuildRequiredForModification(user, revision, path);
+ boolean signatureRequiredButNoSigningKey = project.isCommitSignatureRequiredButNoSigningKey(user, revision);
WebMarkupContainer edit = new WebMarkupContainer("edit");
changeActions.add(edit);
@@ -83,6 +84,8 @@ public abstract class BlobViewPanel extends Panel {
title = "Review required for this change. Submit pull request instead";
else if (buildRequired)
title = "Build required for this change. Submit pull request instead";
+ else if (signatureRequiredButNoSigningKey)
+ title = "Signature required for this change, please generate system GPG signing key first";
else
title = "Edit on branch " + context.getBlobIdent().revision;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.html
index 6f274d86ea..f0becaf42e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.html
@@ -20,7 +20,7 @@
<wicket:fragment wicket:id="branchFrag">
<div class="title my-2">
<a wicket:id="branchLink" class="name mr-2"><span wicket:id="name"></span></a>
- <span wicket:id="buildStatus" class="build-status mr-2"></span>
+ <a wicket:id="buildStatus" class="build-status mr-2"></a>
<span class="badge badge-info badge-sm mr-2" wicket:id="default">default</span>
</div>
<div class="commit-message mb-2">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
index e94b07ec8e..8c827b8f74 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
@@ -78,9 +78,9 @@ import io.onedev.server.util.ProjectAndBranch;
import io.onedev.server.web.asset.emoji.Emojis;
import io.onedev.server.web.behavior.OnTypingDoneBehavior;
import io.onedev.server.web.component.branch.choice.BranchSingleChoice;
-import io.onedev.server.web.component.commit.status.CommitStatusPanel;
+import io.onedev.server.web.component.commit.status.CommitStatusLink;
import io.onedev.server.web.component.contributorpanel.ContributorPanel;
-import io.onedev.server.web.component.datatable.OneDataTable;
+import io.onedev.server.web.component.datatable.DefaultDataTable;
import io.onedev.server.web.component.link.ArchiveMenuLink;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.modal.ModalLink;
@@ -454,11 +454,18 @@ public class ProjectBranchesPage extends ProjectPage {
editor.error(new Path(new PathNode.Named("name")), "Unable to create protected branch");
target.add(form);
} else {
- getProject().createBranch(branchName, helperBean.getRevision());
- modal.close();
- target.add(branchesTable);
-
- getSession().success("Branch '" + branchName + "' created");
+ RevCommit commit = getProject().getRevCommit(helperBean.getRevision(), true);
+ if (!getProject().isCommitSignatureRequirementSatisfied(user, branchName, commit)) {
+ editor.error(new Path(new PathNode.Named("name")),
+ "Valid signature required for head commit of this branch per branch protection rule");
+ target.add(form);
+ } else {
+ getProject().createBranch(branchName, helperBean.getRevision());
+ modal.close();
+ target.add(branchesTable);
+
+ getSession().success("Branch '" + branchName + "' created");
+ }
}
}
@@ -510,7 +517,7 @@ public class ProjectBranchesPage extends ProjectPage {
link.add(new Label("name", branch));
fragment.add(link);
- fragment.add(new CommitStatusPanel("buildStatus", ref.getRef().getObjectId(), ref.getRef().getName()) {
+ fragment.add(new CommitStatusLink("buildStatus", ref.getRef().getObjectId(), ref.getRef().getName()) {
@Override
protected Project getProject() {
@@ -760,7 +767,7 @@ public class ProjectBranchesPage extends ProjectPage {
}
};
- add(branchesTable = new OneDataTable<RefInfo, Void>("branches", columns, dataProvider,
+ add(branchesTable = new DefaultDataTable<RefInfo, Void>("branches", columns, dataProvider,
PAGE_SIZE, pagingHistorySupport) {
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.html
index 9270558e62..4fb99d0358 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.html
@@ -15,15 +15,16 @@
</li>
<li wicket:id="refs" class="list-group-item refs"></li>
<li class="list-group-item contribution-and-parents d-flex flex-wrap align-items-center">
- <div class="contribution mr-5">
- <span wicket:id="contributorAvatars" class="avatars mr-2"></span>
- <span wicket:id="contribution" class="name"></span>
+ <div class="contribution">
+ <span wicket:id="contributorAvatars" class="avatars"></span>
+ <span wicket:id="contribution" class="name ml-2"></span>
</div>
- <div class="commit mr-4">
+ <a wicket:id="signature" class="ml-2"></a>
+ <div class="commit ml-5">
<span wicket:id="hash" class="hash"></span>
<a wicket:id="copyHash" class="copy btn btn-xs btn-icon btn-light btn-hover-primary"><wicket:svg href="copy" class="icon"></wicket:svg></a>
</div>
- <div wicket:id="parents" class="parents"></div>
+ <div wicket:id="parents" class="parents ml-4"></div>
</li>
<wicket:enclosure child="jobs">
<li class="list-group-item refs d-flex flex-wrap">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
index 95f48d805c..7d8713682c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
@@ -36,6 +36,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.revwalk.RevCommit;
+import org.eclipse.jgit.revwalk.RevObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -74,6 +75,7 @@ import io.onedev.server.web.component.branch.create.CreateBranchLink;
import io.onedev.server.web.component.contributorpanel.ContributorPanel;
import io.onedev.server.web.component.createtag.CreateTagLink;
import io.onedev.server.web.component.diff.revision.RevisionDiffPanel;
+import io.onedev.server.web.component.gitsignature.GitSignaturePanel;
import io.onedev.server.web.component.job.jobinfo.JobInfoButton;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;
@@ -282,6 +284,15 @@ public class CommitDetailPage extends ProjectPage implements RevisionDiff.Annota
add(new ContributorAvatars("contributorAvatars", getCommit().getAuthorIdent(), getCommit().getCommitterIdent()));
add(new ContributorPanel("contribution", getCommit().getAuthorIdent(), getCommit().getCommitterIdent()));
+
+ add(new GitSignaturePanel("signature") {
+
+ @Override
+ protected RevObject getRevObject() {
+ return getCommit();
+ }
+
+ });
add(new Label("hash", GitUtils.abbreviateSHA(getCommit().name())));
add(new CopyToClipboardLink("copyHash", Model.of(getCommit().name())));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java
index f734a73a7e..e1b9096d7c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java
@@ -45,7 +45,7 @@ import io.onedev.server.util.MilestoneAndIssueState;
import io.onedev.server.util.MilestoneSort;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.WebSession;
-import io.onedev.server.web.component.datatable.OneDataTable;
+import io.onedev.server.web.component.datatable.DefaultDataTable;
import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.issue.statestats.StateStatsBar;
import io.onedev.server.web.component.link.ActionablePageLink;
@@ -364,7 +364,7 @@ public class MilestoneListPage extends ProjectPage {
};
- add(milestonesTable = new OneDataTable<Milestone, Void>("milestones", columns, dataProvider,
+ add(milestonesTable = new DefaultDataTable<Milestone, Void>("milestones", columns, dataProvider,
WebConstants.PAGE_SIZE, pagingHistorySupport));
milestonesTable.setOutputMarkupId(true);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
index 1130a1edfb..b7552732c3 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
@@ -59,6 +59,9 @@
Please follow <a wicket:id="resolveInstructions" class="link-primary" href="javascript:void(0);">this instruction</a> to resolve the conflicts
</wicket:enclosure>
</div>
+ <div wicket:id="noValidCommitSignature" class="no-valid-commit-signature text-danger">
+ <wicket:svg href="times-circle" class="icon"></wicket:svg> Pull request can not be merged now as valid signature is required for head commit
+ </div>
<div wicket:id="requestedForChanges" class="requested-for-changes text-danger">
<wicket:svg href="times-circle" class="icon"></wicket:svg> Pull request can not be merged now as it was <a class="more-info d-inline link-primary">requested for changes</a>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
index 2e9eda8bd6..df81824fd1 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
@@ -512,6 +512,15 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
});
+ summaryContainer.add(new WebMarkupContainer("noValidCommitSignature") {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(getPullRequest().isOpen() && !getPullRequest().isSignatureRequirementSatisfied());
+ }
+
+ });
summaryContainer.add(new WebMarkupContainer("requestedForChanges") {
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.html
index 0f41854fab..2501decd9f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.html
@@ -11,7 +11,10 @@
<div wicket:id="message"></div>
</div>
<div class="actions flex-shrink-0 ml-auto d-none d-lg-block">
- <span wicket:id="buildStatus" class="build-status mr-1"></span>
+ <span class="btn-group mr-1">
+ <a wicket:id="signature" class="btn btn-sm btn-outline-secondary"></a>
+ <a wicket:id="buildStatus" class="btn btn-outline-secondary btn-sm build-status"></a>
+ </span>
<span class="btn-group hash mr-1">
<a wicket:id="hashLink" class="hash btn btn-sm btn-outline-secondary"><span wicket:id="hash"></span></a>
<a wicket:id="copyHash" class="btn btn-sm btn-outline-secondary btn-icon"><wicket:svg href="copy" class="icon"></wicket:svg></a>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java
index 76eb63e4db..2b37a99c7b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java
@@ -16,6 +16,7 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.revwalk.RevCommit;
+import org.eclipse.jgit.revwalk.RevObject;
import com.google.common.collect.Sets;
@@ -28,7 +29,8 @@ import io.onedev.server.util.DateUtils;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.behavior.WebSocketObserver;
import io.onedev.server.web.component.commit.message.CommitMessagePanel;
-import io.onedev.server.web.component.commit.status.CommitStatusPanel;
+import io.onedev.server.web.component.commit.status.CommitStatusLink;
+import io.onedev.server.web.component.gitsignature.GitSignaturePanel;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;
import io.onedev.server.web.component.user.ident.Mode;
@@ -91,13 +93,16 @@ class PullRequestUpdatedPanel extends GenericPanel<PullRequestUpdate> {
});
- CommitStatusPanel commitStatus = new CommitStatusPanel("buildStatus", commit.copy(), null) {
-
+ item.add(new GitSignaturePanel("signature") {
+
@Override
- protected String getCssClasses() {
- return "btn btn-outline-secondary btn-sm";
+ protected RevObject getRevObject() {
+ return item.getModelObject();
}
-
+
+ });
+ item.add(new CommitStatusLink("buildStatus", commit.copy(), null) {
+
@Override
protected Project getProject() {
return getUpdate().getRequest().getTarget().getProject();
@@ -108,8 +113,7 @@ class PullRequestUpdatedPanel extends GenericPanel<PullRequestUpdate> {
return null;
}
- };
- item.add(commitStatus);
+ });
Project project = getUpdate().getRequest().getTarget().getProject();
CommitDetailPage.State commitState = new CommitDetailPage.State();
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.java
index 91e6ce600f..77ab6de8be 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.java
@@ -26,7 +26,7 @@ import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.build.actionauthorization.ActionAuthorization;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
-import io.onedev.server.web.component.datatable.OneDataTable;
+import io.onedev.server.web.component.datatable.DefaultDataTable;
import io.onedev.server.web.component.modal.ModalPanel;
@SuppressWarnings("serial")
@@ -191,7 +191,7 @@ public class ActionAuthorizationsPage extends ProjectBuildSettingPage {
}
};
- add(authorizationsTable = new OneDataTable<>("authorizations", columns, dataProvider,
+ add(authorizationsTable = new DefaultDataTable<>("authorizations", columns, dataProvider,
Integer.MAX_VALUE, null));
authorizationsTable.setOutputMarkupId(true);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.java
index 3bb64dea1d..cd9a2c4a77 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.java
@@ -27,7 +27,7 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.support.build.JobSecret;
import io.onedev.server.model.support.inputspec.SecretInput;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
-import io.onedev.server.web.component.datatable.OneDataTable;
+import io.onedev.server.web.component.datatable.DefaultDataTable;
import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.component.svg.SpriteImage;
@@ -211,7 +211,7 @@ public class JobSecretsPage extends ProjectBuildSettingPage {
}
};
- add(secretsTable = new OneDataTable<>("secrets", columns, dataProvider, Integer.MAX_VALUE, null));
+ add(secretsTable = new DefaultDataTable<>("secrets", columns, dataProvider, Integer.MAX_VALUE, null));
secretsTable.setOutputMarkupId(true);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css b/server-core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css
index 4df5299f04..a6711e8808 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css
@@ -4,7 +4,7 @@
display: block;
}
-.project-setting .job-secrets .job-secret-edit textarea {
+.job-secret-edit textarea {
font-family: monospace;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.html
index 938c87ce6c..6c9841f95c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.html
@@ -17,7 +17,8 @@
<wicket:fragment wicket:id="tagFrag">
<div class="title my-2">
<a wicket:id="tagLink" class="name mr-2"><span wicket:id="name"></span></a>
- <span wicket:id="buildStatus" class="build-status mr-2"></span>
+ <a wicket:id="signature" class="mr-2"></a>
+ <a wicket:id="buildStatus" class="build-status mr-2"></a>
<span wicket:id="annotated" class="annotated"></span>
</div>
<div class="commit-message mb-2">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java
index de78398c19..af8c5bfd48 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java
@@ -36,10 +36,12 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.protocol.http.WebSession;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.bouncycastle.openpgp.PGPSecretKeyRing;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.revwalk.RevCommit;
+import org.eclipse.jgit.revwalk.RevObject;
import org.eclipse.jgit.revwalk.RevTag;
import com.google.common.base.Preconditions;
@@ -48,6 +50,7 @@ import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.RefInfo;
@@ -61,9 +64,10 @@ import io.onedev.server.web.WebConstants;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
import io.onedev.server.web.asset.emoji.Emojis;
import io.onedev.server.web.behavior.OnTypingDoneBehavior;
-import io.onedev.server.web.component.commit.status.CommitStatusPanel;
+import io.onedev.server.web.component.commit.status.CommitStatusLink;
import io.onedev.server.web.component.contributorpanel.ContributorPanel;
-import io.onedev.server.web.component.datatable.OneDataTable;
+import io.onedev.server.web.component.datatable.DefaultDataTable;
+import io.onedev.server.web.component.gitsignature.GitSignaturePanel;
import io.onedev.server.web.component.link.ArchiveMenuLink;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.modal.ModalLink;
@@ -238,11 +242,20 @@ public class ProjectTagsPage extends ProjectPage {
editor.error(new Path(new PathNode.Named("name")), "Unable to create protected tag");
target.add(form);
} else {
- getProject().createTag(tagName, helperBean.getRevision(), user.asPerson(), helperBean.getMessage());
- modal.close();
- target.add(tagsTable);
-
- getSession().success("Tag '" + tagName + "' created");
+ PGPSecretKeyRing signingKey = OneDev.getInstance(SettingManager.class)
+ .getGpgSetting().getSigningKey();
+ if (getProject().isTagSignatureRequired(user, tagName) && signingKey == null) {
+ editor.error(new Path(new PathNode.Named("name")), "Tag signature required per "
+ + "tag protection rule, please generate system GPG signing key first");
+ target.add(form);
+ } else {
+ getProject().createTag(tagName, helperBean.getRevision(), user.asPerson(),
+ helperBean.getMessage(), signingKey);
+ modal.close();
+ target.add(tagsTable);
+
+ getSession().success("Tag '" + tagName + "' created");
+ }
}
}
@@ -300,7 +313,7 @@ public class ProjectTagsPage extends ProjectPage {
link.add(new Label("name", tagName));
fragment.add(link);
- fragment.add(new CommitStatusPanel("buildStatus", ref.getPeeledObj().copy(), ref.getRef().getName()) {
+ fragment.add(new CommitStatusLink("buildStatus", ref.getPeeledObj().copy(), ref.getRef().getName()) {
@Override
protected Project getProject() {
@@ -315,6 +328,15 @@ public class ProjectTagsPage extends ProjectPage {
});
if (ref.getObj() instanceof RevTag) {
+ fragment.add(new GitSignaturePanel("signature") {
+
+ @Override
+ protected RevObject getRevObject() {
+ return rowModel.getObject().getObj();
+ }
+
+ });
+
RevTag revTag = (RevTag) ref.getObj();
Fragment annotatedFragment = new Fragment("annotated", "annotatedFrag", ProjectTagsPage.this);
if (revTag.getTaggerIdent() != null)
@@ -332,6 +354,7 @@ public class ProjectTagsPage extends ProjectPage {
fragment.add(annotatedFragment);
} else {
+ fragment.add(new WebMarkupContainer("signature").setVisible(false));
fragment.add(new WebMarkupContainer("annotated").setVisible(false));
}
@@ -431,7 +454,7 @@ public class ProjectTagsPage extends ProjectPage {
}
};
- add(tagsTable = new OneDataTable<RefInfo, Void>("tags", columns, dataProvider,
+ add(tagsTable = new DefaultDataTable<RefInfo, Void>("tags", columns, dataProvider,
WebConstants.PAGE_SIZE, pagingHistorySupport) {
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/security/LoginPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/security/LoginPage.java
index e8a777c5a9..a02d73be4f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/simple/security/LoginPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/security/LoginPage.java
@@ -1,7 +1,7 @@
package io.onedev.server.web.page.simple.security;
-import static io.onedev.server.web.page.admin.sso.SsoProcessPage.MOUNT_PATH;
-import static io.onedev.server.web.page.admin.sso.SsoProcessPage.STAGE_INITIATE;
+import static io.onedev.server.web.page.admin.ssosetting.SsoProcessPage.MOUNT_PATH;
+import static io.onedev.server.web.page.admin.ssosetting.SsoProcessPage.STAGE_INITIATE;
import org.apache.shiro.authc.AuthenticationException;
import org.apache.shiro.authc.AuthenticationToken;
diff --git a/server-core/src/test/java/io/onedev/server/git/BlobEditsTest.java b/server-core/src/test/java/io/onedev/server/git/BlobEditsTest.java
index 55e32d420a..eb870e4976 100644
--- a/server-core/src/test/java/io/onedev/server/git/BlobEditsTest.java
+++ b/server-core/src/test/java/io/onedev/server/git/BlobEditsTest.java
@@ -44,7 +44,8 @@ public class BlobEditsTest extends AbstractGitTest {
ObjectId oldCommitId = git.getRepository().resolve(refName);
BlobEdits edits = new BlobEdits(Sets.newHashSet("/server/src/com/example/a//a.java"), Maps.newHashMap());
- ObjectId newCommitId = edits.commit(git.getRepository(), refName, oldCommitId, oldCommitId, user, "test delete");
+ ObjectId newCommitId = edits.commit(git.getRepository(), refName, oldCommitId, oldCommitId,
+ user, "test delete", null);
try (RevWalk revWalk = new RevWalk(git.getRepository())) {
RevTree revTree = revWalk.parseCommit(newCommitId).getTree();
@@ -71,7 +72,8 @@ public class BlobEditsTest extends AbstractGitTest {
BlobEdits edits = new BlobEdits(Sets.newHashSet("/server/src/com/example/c//c.java"), Maps.newHashMap());
try {
- edits.commit(git.getRepository(), refName, oldCommitId, oldCommitId, user, "test delete");
+ edits.commit(git.getRepository(), refName, oldCommitId, oldCommitId,
+ user, "test delete", null);
assertTrue("An ObjectNotExistException should be thrown", false);
} catch (ObjectNotFoundException e) {
}
@@ -97,7 +99,8 @@ public class BlobEditsTest extends AbstractGitTest {
newBlobs.put("client/c.java", new BlobContent.Immutable("a".getBytes(), FileMode.REGULAR_FILE));
newBlobs.put("client/d.java", new BlobContent.Immutable("a".getBytes(), FileMode.REGULAR_FILE));
BlobEdits edits = new BlobEdits(oldPaths, newBlobs);
- ObjectId newCommitId = edits.commit(git.getRepository(), refName, oldCommitId, oldCommitId, user, "test rename");
+ ObjectId newCommitId = edits.commit(git.getRepository(), refName, oldCommitId, oldCommitId,
+ user, "test rename", null);
try (RevWalk revWalk = new RevWalk(git.getRepository())) {
RevTree revTree = revWalk.parseCommit(newCommitId).getTree();
assertNotNull(TreeWalk.forPath(git.getRepository(), "client/a.java", revTree));
@@ -127,7 +130,7 @@ public class BlobEditsTest extends AbstractGitTest {
newBlobs.put("client/c.java", new BlobContent.Immutable("a".getBytes(), FileMode.REGULAR_FILE));
BlobEdits edits = new BlobEdits(Sets.newHashSet("server/src/com/example/a"), newBlobs);
ObjectId newCommitId = edits.commit(git.getRepository(), refName, oldCommitId, oldCommitId, user,
- "test rename");
+ "test rename", null);
try (RevWalk revWalk = new RevWalk(git.getRepository())) {
RevTree revTree = revWalk.parseCommit(newCommitId).getTree();
assertNotNull(TreeWalk.forPath(git.getRepository(), "client/c.java", revTree));
@@ -150,10 +153,12 @@ public class BlobEditsTest extends AbstractGitTest {
ObjectId oldCommitId = git.getRepository().resolve(refName);
Map<String, BlobContent> newBlobs = new HashMap<>();
- newBlobs.put("client/a.java/a.java", new BlobContent.Immutable("a".getBytes(), FileMode.REGULAR_FILE));
+ newBlobs.put("client/a.java/a.java",
+ new BlobContent.Immutable("a".getBytes(), FileMode.REGULAR_FILE));
BlobEdits edits = new BlobEdits(Sets.newHashSet("server/src/com/example/a/a.java"), newBlobs);
try {
- edits.commit(git.getRepository(), refName, oldCommitId, oldCommitId, user, "test rename tree");
+ edits.commit(git.getRepository(), refName, oldCommitId, oldCommitId,
+ user, "test rename tree", null);
assertTrue("A NotTreeException should be thrown", false);
} catch (NotTreeException e) {
}
@@ -174,10 +179,13 @@ public class BlobEditsTest extends AbstractGitTest {
ObjectId oldCommitId = git.getRepository().resolve(refName);
Map<String, BlobContent> newBlobs = new HashMap<>();
- newBlobs.put("/server/src/com/example/c/c.java", new BlobContent.Immutable("c".getBytes(), FileMode.REGULAR_FILE));
- newBlobs.put("/server/src/com/example/d/d.java", new BlobContent.Immutable("d".getBytes(), FileMode.REGULAR_FILE));
+ newBlobs.put("/server/src/com/example/c/c.java",
+ new BlobContent.Immutable("c".getBytes(), FileMode.REGULAR_FILE));
+ newBlobs.put("/server/src/com/example/d/d.java",
+ new BlobContent.Immutable("d".getBytes(), FileMode.REGULAR_FILE));
BlobEdits edits = new BlobEdits(Sets.newHashSet(), newBlobs);
- ObjectId newCommitId = edits.commit(git.getRepository(), refName, oldCommitId, oldCommitId, user, "test add");
+ ObjectId newCommitId = edits.commit(git.getRepository(), refName, oldCommitId, oldCommitId,
+ user, "test add", null);
try (RevWalk revWalk = new RevWalk(git.getRepository())) {
RevTree revTree = revWalk.parseCommit(newCommitId).getTree();
@@ -193,7 +201,8 @@ public class BlobEditsTest extends AbstractGitTest {
newBlobs = new HashMap<>();
newBlobs.put("/common/common.java", new BlobContent.Immutable("common".getBytes(), FileMode.REGULAR_FILE));
edits = new BlobEdits(Sets.newHashSet(), newBlobs);
- newCommitId = edits.commit(git.getRepository(), refName, oldCommitId, oldCommitId, user, "test add");
+ newCommitId = edits.commit(git.getRepository(), refName, oldCommitId, oldCommitId,
+ user, "test add", null);
try (RevWalk revWalk = new RevWalk(git.getRepository())) {
RevTree revTree = revWalk.parseCommit(newCommitId).getTree();
@@ -218,7 +227,8 @@ public class BlobEditsTest extends AbstractGitTest {
newBlobs.put("/dir/file/a.java", new BlobContent.Immutable("d".getBytes(), FileMode.REGULAR_FILE));
BlobEdits edits = new BlobEdits(Sets.newHashSet(), newBlobs);
try {
- edits.commit(git.getRepository(), refName, oldCommitId, oldCommitId, user, "test add");
+ edits.commit(git.getRepository(), refName, oldCommitId, oldCommitId,
+ user, "test add", null);
assertTrue("An ObjectAlreadyException should be thrown", false);
} catch (ObjectAlreadyExistsException e) {
}
@@ -234,16 +244,25 @@ public class BlobEditsTest extends AbstractGitTest {
ObjectId oldCommitId = git.getRepository().resolve(refName);
Map<String, BlobContent> newBlobs = new HashMap<>();
- newBlobs.put("client/dir2/file4", new BlobContent.Immutable("c".getBytes(), FileMode.REGULAR_FILE));
- newBlobs.put("client/security/dir1/file2", new BlobContent.Immutable("d".getBytes(), FileMode.REGULAR_FILE));
- newBlobs.put("client/security/dir2/file3", new BlobContent.Immutable("d".getBytes(), FileMode.REGULAR_FILE));
- newBlobs.put("client/dir1/file1", new BlobContent.Immutable("d".getBytes(), FileMode.REGULAR_FILE));
- newBlobs.put("client/security/dir1/subdir/file", new BlobContent.Immutable("d".getBytes(), FileMode.REGULAR_FILE));
- newBlobs.put("client/dir1/file0", new BlobContent.Immutable("d".getBytes(), FileMode.REGULAR_FILE));
- newBlobs.put("server/file2", new BlobContent.Immutable("d".getBytes(), FileMode.REGULAR_FILE));
- newBlobs.put("server/file1", new BlobContent.Immutable("d".getBytes(), FileMode.REGULAR_FILE));
+ newBlobs.put("client/dir2/file4",
+ new BlobContent.Immutable("c".getBytes(), FileMode.REGULAR_FILE));
+ newBlobs.put("client/security/dir1/file2",
+ new BlobContent.Immutable("d".getBytes(), FileMode.REGULAR_FILE));
+ newBlobs.put("client/security/dir2/file3",
+ new BlobContent.Immutable("d".getBytes(), FileMode.REGULAR_FILE));
+ newBlobs.put("client/dir1/file1",
+ new BlobContent.Immutable("d".getBytes(), FileMode.REGULAR_FILE));
+ newBlobs.put("client/security/dir1/subdir/file",
+ new BlobContent.Immutable("d".getBytes(), FileMode.REGULAR_FILE));
+ newBlobs.put("client/dir1/file0",
+ new BlobContent.Immutable("d".getBytes(), FileMode.REGULAR_FILE));
+ newBlobs.put("server/file2",
+ new BlobContent.Immutable("d".getBytes(), FileMode.REGULAR_FILE));
+ newBlobs.put("server/file1",
+ new BlobContent.Immutable("d".getBytes(), FileMode.REGULAR_FILE));
BlobEdits edits = new BlobEdits(Sets.newHashSet(), newBlobs);
- ObjectId newCommitId = edits.commit(git.getRepository(), refName, oldCommitId, oldCommitId, user, "test add");
+ ObjectId newCommitId = edits.commit(git.getRepository(), refName,
+ oldCommitId, oldCommitId, user, "test add", null);
List<String> paths = new ArrayList<>();
try ( RevWalk revWalk = new RevWalk(git.getRepository());
@@ -290,9 +309,11 @@ public class BlobEditsTest extends AbstractGitTest {
}
Map<String, BlobContent> newBlobs = new HashMap<>();
- newBlobs.put("a.b/file2.java", new BlobContent.Immutable("hello".getBytes(), FileMode.REGULAR_FILE));
+ newBlobs.put("a.b/file2.java",
+ new BlobContent.Immutable("hello".getBytes(), FileMode.REGULAR_FILE));
BlobEdits edits = new BlobEdits(Sets.newHashSet("a.b/file2.java"), newBlobs);
- ObjectId newCommitId = edits.commit(git.getRepository(), refName, oldCommitId, oldCommitId, user, "test modify");
+ ObjectId newCommitId = edits.commit(git.getRepository(), refName, oldCommitId, oldCommitId,
+ user, "test modify", null);
List<String> newPaths = new ArrayList<>();
try ( RevWalk revWalk = new RevWalk(git.getRepository());
@@ -321,13 +342,16 @@ public class BlobEditsTest extends AbstractGitTest {
Set<String> oldPaths = Sets.newHashSet("server/src/com/example/b/b.java");
Map<String, BlobContent> newBlobs = new HashMap<>();
- newBlobs.put("client/a.java", new BlobContent.Immutable("a".getBytes(), FileMode.REGULAR_FILE));
- newBlobs.put("server/src/a.java", new BlobContent.Immutable("a".getBytes(), FileMode.REGULAR_FILE));
- newBlobs.put("server/src/com/example/b/b.java", new BlobContent.Immutable("a".getBytes(), FileMode.REGULAR_FILE));
+ newBlobs.put("client/a.java",
+ new BlobContent.Immutable("a".getBytes(), FileMode.REGULAR_FILE));
+ newBlobs.put("server/src/a.java",
+ new BlobContent.Immutable("a".getBytes(), FileMode.REGULAR_FILE));
+ newBlobs.put("server/src/com/example/b/b.java",
+ new BlobContent.Immutable("a".getBytes(), FileMode.REGULAR_FILE));
BlobEdits edits = new BlobEdits(oldPaths, newBlobs);
ObjectId newCommitId = edits.commit(git.getRepository(), refName,
- oldCommitId, oldCommitId, user, "test rename tree");
+ oldCommitId, oldCommitId, user, "test rename tree", null);
List<String> paths = new ArrayList<>();
try ( RevWalk revWalk = new RevWalk(git.getRepository());
@@ -359,10 +383,11 @@ public class BlobEditsTest extends AbstractGitTest {
ObjectId newCommitId = git.getRepository().resolve(refName);
Map<String, BlobContent> newBlobs = new HashMap<>();
- newBlobs.put("/server/src/com/example/c/c.java", new BlobContent.Immutable("c".getBytes(), FileMode.REGULAR_FILE));
+ newBlobs.put("/server/src/com/example/c/c.java",
+ new BlobContent.Immutable("c".getBytes(), FileMode.REGULAR_FILE));
BlobEdits edits = new BlobEdits(Sets.newHashSet(), newBlobs);
try {
- edits.commit(git.getRepository(), refName, oldCommitId, oldCommitId, user, "test add");
+ edits.commit(git.getRepository(), refName, oldCommitId, oldCommitId, user, "test add", null);
assertTrue("An ObsoleteCommitException should be thrown", false);
} catch (ObsoleteCommitException e) {
assertTrue(newCommitId.equals(e.getOldCommitId()));
diff --git a/server-core/src/test/java/io/onedev/server/git/GitUtilsTest.java b/server-core/src/test/java/io/onedev/server/git/GitUtilsTest.java
index b6c8062d96..aec8dd60be 100644
--- a/server-core/src/test/java/io/onedev/server/git/GitUtilsTest.java
+++ b/server-core/src/test/java/io/onedev/server/git/GitUtilsTest.java
@@ -7,9 +7,14 @@ import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.InputStream;
+import java.util.HashMap;
import java.util.HashSet;
+import java.util.Map;
import java.util.Set;
+import org.bouncycastle.openpgp.PGPKeyRingGenerator;
+import org.bouncycastle.openpgp.PGPPublicKey;
+import org.bouncycastle.openpgp.PGPSecretKeyRing;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.lib.ObjectId;
@@ -22,6 +27,11 @@ import com.google.common.collect.Sets;
import com.google.common.io.Resources;
import io.onedev.commons.utils.FileUtils;
+import io.onedev.server.git.command.GetRawCommitCommand;
+import io.onedev.server.git.signature.SignatureVerificationKey;
+import io.onedev.server.git.signature.SignatureVerificationKeyLoader;
+import io.onedev.server.git.signature.SignatureVerified;
+import io.onedev.server.util.GpgUtils;
public class GitUtilsTest extends AbstractGitTest {
@@ -452,4 +462,49 @@ public class GitUtilsTest extends AbstractGitTest {
deleteDir(tempDir, 3);
}
}
+
+ @Test
+ public void testSignature() throws Exception {
+ PGPKeyRingGenerator ringGenerator = GpgUtils.generateKeyRingGenerator("[email protected]");
+ PGPSecretKeyRing signingKey = ringGenerator.generateSecretKeyRing();
+
+ addFileAndCommit("file", "", "first commit");
+
+ String refName = "refs/heads/master";
+ ObjectId oldCommitId = git.getRepository().resolve(refName);
+
+ Map<String, BlobContent> newBlobs = new HashMap<>();
+ newBlobs.put("file",
+ new BlobContent.Immutable("content".getBytes(), FileMode.REGULAR_FILE));
+ BlobEdits edits = new BlobEdits(Sets.newHashSet(), newBlobs);
+ edits.commit(git.getRepository(), refName, oldCommitId, oldCommitId,
+ user, "\r\r\n\r\nsecond\n \ncommit\n\r\n", signingKey);
+
+ SignatureVerificationKeyLoader keyLoader = new SignatureVerificationKeyLoader() {
+
+ @Override
+ public SignatureVerificationKey getSignatureVerificationKey(long keyId) {
+ return new SignatureVerificationKey() {
+
+ @Override
+ public boolean shouldVerifyDataWriter() {
+ return false;
+ }
+
+ @Override
+ public PGPPublicKey getPublicKey() {
+ return signingKey.getPublicKey();
+ }
+
+ };
+ }
+
+ };
+
+ GetRawCommitCommand getRawCommit = new GetRawCommitCommand(gitDir, null);
+ byte[] raw = getRawCommit.revision("master").call();
+
+ assertTrue(GitUtils.verifyCommitSignature(raw, keyLoader) instanceof SignatureVerified);
+ }
+
}
diff --git a/server-core/src/test/java/io/onedev/server/git/command/GetRawCommitCommandTest.java b/server-core/src/test/java/io/onedev/server/git/command/GetRawCommitCommandTest.java
new file mode 100644
index 0000000000..9b800fc0a8
--- /dev/null
+++ b/server-core/src/test/java/io/onedev/server/git/command/GetRawCommitCommandTest.java
@@ -0,0 +1,51 @@
+package io.onedev.server.git.command;
+
+import static org.junit.Assert.assertArrayEquals;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.bouncycastle.openpgp.PGPKeyRingGenerator;
+import org.bouncycastle.openpgp.PGPSecretKeyRing;
+import org.eclipse.jgit.lib.FileMode;
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.eclipse.jgit.revwalk.RevWalk;
+import org.junit.Test;
+
+import com.google.common.collect.Sets;
+
+import io.onedev.server.git.AbstractGitTest;
+import io.onedev.server.git.BlobContent;
+import io.onedev.server.git.BlobEdits;
+import io.onedev.server.util.GpgUtils;
+
+public class GetRawCommitCommandTest extends AbstractGitTest {
+
+ @Test
+ public void test() throws Exception {
+ PGPKeyRingGenerator ringGenerator = GpgUtils.generateKeyRingGenerator("[email protected]");
+ PGPSecretKeyRing signingKey = ringGenerator.generateSecretKeyRing();
+
+ addFileAndCommit("initial", "", "initial");
+
+ String refName = "refs/heads/master";
+ ObjectId oldCommitId = git.getRepository().resolve(refName);
+
+ Map<String, BlobContent> newBlobs = new HashMap<>();
+ newBlobs.put("readme.md",
+ new BlobContent.Immutable("hello".getBytes(), FileMode.REGULAR_FILE));
+ BlobEdits edits = new BlobEdits(Sets.newHashSet(), newBlobs);
+ ObjectId newCommitId = edits.commit(git.getRepository(), refName, oldCommitId, oldCommitId,
+ user, "\n\nhello\r\n world\r\n\r\n", signingKey);
+
+ byte[] raw = new GetRawCommitCommand(git.getRepository().getDirectory(), new HashMap<>())
+ .revision("master").call();
+
+ try (RevWalk revWalk = new RevWalk(git.getRepository())) {
+ RevCommit newCommit = revWalk.parseCommit(newCommitId);
+ assertArrayEquals(newCommit.getRawBuffer(), raw);
+ }
+ }
+
+}
diff --git a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java
index 2ade46191a..7c18ac1a7c 100644
--- a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java
+++ b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java
@@ -57,7 +57,7 @@ import io.onedev.server.model.support.administration.sso.SsoConnector;
import io.onedev.server.util.validation.annotation.UrlSegment;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Password;
-import io.onedev.server.web.page.admin.sso.SsoProcessPage;
+import io.onedev.server.web.page.admin.ssosetting.SsoProcessPage;
import net.minidev.json.JSONArray;
import net.minidev.json.JSONObject;
diff --git a/server-product/dummy.skr b/server-product/dummy.skr
new file mode 100644
index 0000000000..60cb979535
Binary files /dev/null and b/server-product/dummy.skr differ
diff --git a/server-product/src/test/java/io/onedev/server/product/Test.java b/server-product/src/test/java/io/onedev/server/product/Test.java
index 1ec5b8348a..a96bf27a34 100644
--- a/server-product/src/test/java/io/onedev/server/product/Test.java
+++ b/server-product/src/test/java/io/onedev/server/product/Test.java
@@ -1,13 +1,9 @@
package io.onedev.server.product;
-import java.io.IOException;
-
-import org.bouncycastle.openpgp.PGPException;
-
public class Test {
@org.junit.Test
- public void test() throws IOException, PGPException {
+ public void test() {
}
}
\ No newline at end of file