Skip to content

The Unified and Autonomous Development Platform

feat(migration): Implement GPG signing key regeneration in DataMigrator

Robin Shenf7ad93c5be1f
diff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
index f75d114a71..2edc2a521a 100644
--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
@@ -5,6 +5,7 @@ import static java.nio.charset.StandardCharsets.UTF_8;
import static java.util.Comparator.comparing;
import static java.util.Comparator.naturalOrder;
+import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -81,6 +82,7 @@ import io.onedev.server.service.SettingService;
import io.onedev.server.ssh.SshKeyUtils;
import io.onedev.server.util.CryptoUtils;
import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.GpgUtils;
import io.onedev.server.util.Pair;
import io.onedev.server.util.ParsedEmailAddress;
import io.onedev.server.util.SiteSyncUtils;
@@ -9261,6 +9263,24 @@ public class DataMigrator {
valueElement.addElement("noreplyEmailDomain")
.setText(SystemSetting.DEFAULT_NOREPLY_EMAIL_DOMAIN);
}
+ } else if (element.elementTextTrim("key").equals("GPG")) {
+ Element valueElement = element.element("value");
+ if (valueElement != null) {
+ Element encodedSigningKeyElement = valueElement.element("encodedSigningKey");
+ if (encodedSigningKeyElement != null) {
+ try {
+ var generator = GpgUtils.generateKeyRingGenerator(
+ User.SYSTEM_NAME + "<" + User.SYSTEM_NAME.toLowerCase() + "@"
+ + SystemSetting.DEFAULT_NOREPLY_EMAIL_DOMAIN + ">");
+ var baos = new ByteArrayOutputStream();
+ generator.generateSecretKeyRing().encode(baos);
+ encodedSigningKeyElement.setText(
+ JVM.getBase64Codec().encode(baos.toByteArray()));
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
}
}
dom.writeToFile(file, false);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/EmailAddressesPanel.html b/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/EmailAddressesPanel.html
index c9483b9455..cb2a8ff65a 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/EmailAddressesPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/EmailAddressesPanel.html
@@ -1,7 +1,7 @@
<wicket:panel>
<div wicket:id="ordinary" class="email-addresses">
- <section class="mb-5 border-bottom pb-5">
- <h6 class="mb-3"><wicket:t>Primary Email Address</wicket:t></h6>
+ <section class="mb-4 border-bottom pb-4">
+ <div class="font-weight-boldest mb-2"><wicket:t>Primary Email Address</wicket:t></div>
<p class="text-muted font-size-sm"><wicket:t>The primary email address is used to receive notifications and show your gravatar (if enabled). It is also used for web-based Git operations unless email addresses are kept private.</wicket:t></p>
<form wicket:id="primaryForm">
<div class="form-inline">
@@ -17,8 +17,8 @@
</form>
</section>
- <section wicket:id="backupEmailAddresses" class="mb-5 border-bottom pb-5">
- <h6 class="mb-3"><wicket:t>Backup Email Addresses</wicket:t></h6>
+ <section wicket:id="backupEmailAddresses" class="mb-4 border-bottom pb-4">
+ <div class="font-weight-boldest mb-3"><wicket:t>Backup Email Addresses</wicket:t></div>
<p class="text-muted font-size-sm"><wicket:t>Verified backup email addresses can be used for password recovery and to identify your commits.</wicket:t></p>
<wicket:enclosure child="list">
<table class="table table-borderless w-auto mb-3">
@@ -44,7 +44,7 @@
</section>
<section>
- <h6 class="mb-3"><wicket:t>Email Address Privacy</wicket:t></h6>
+ <div class="font-weight-boldest mb-3"><wicket:t>Email Address Privacy</wicket:t></div>
<form wicket:id="privacyForm">
<div class="checkbox-inline mb-3">
<label wicket:id="label" class="checkbox">
diff --git a/server-product/system/incompatibilities/incompatibilities.md b/server-product/system/incompatibilities/incompatibilities.md
index 0d987ca30e..317f3c541c 100644
--- a/server-product/system/incompatibilities/incompatibilities.md
+++ b/server-product/system/incompatibilities/incompatibilities.md
@@ -1,3 +1,9 @@
+# 16.5.0
+
+### GPG Signing
+
+Default system GPG signing email changed from `system@onedev` to `[email protected]`. The system GPG signing key is regenerated as a result; previously signed commits will show as unverified.
+
# 16.4.0
### Helm Chart