Skip to content

The Unified and Autonomous Development Platform

Fix issue #520 - Convert EOL in multi-line secret value from CRLF to LF

Robin Shen277b73607291
diff --git a/server-core/src/main/java/io/onedev/server/util/JobSecretAuthorizationContext.java b/server-core/src/main/java/io/onedev/server/util/JobSecretAuthorizationContext.java
index bcbebbbc2d..1c367c7a08 100644
--- a/server-core/src/main/java/io/onedev/server/util/JobSecretAuthorizationContext.java
+++ b/server-core/src/main/java/io/onedev/server/util/JobSecretAuthorizationContext.java
@@ -66,7 +66,7 @@ public class JobSecretAuthorizationContext {
for (JobSecret secret: project.getHierarchyJobSecrets()) {
if (secret.getName().equals(secretName)) {
if (isOnBranches(secret.getAuthorizedBranches())) {
- return secret.getValue();
+ return secret.getValue().replace("\r\n", "\n");
} else {
throw new ExplicitException(String.format(
"Job secret not authorized (project: %s, job secret: %s)",
@@ -108,7 +108,7 @@ public class JobSecretAuthorizationContext {
"Job secret not authorized (project: %s, job secret: %s)",
project.getPath(), secretName));
}
- return secret.getValue();
+ return secret.getValue().replace("\r\n", "\n");
}
}