Skip to content

The Unified and Autonomous Development Platform

fix: Arbitrary object deserialization from untrusted source via Yaml (OD-2660)

Robin Shen8f2c6dc8c2c8
diff --git a/server-plugin/server-plugin-buildspec-python/src/main/java/io/onedev/server/plugin/buildspec/python/PythonJobSuggestion.java b/server-plugin/server-plugin-buildspec-python/src/main/java/io/onedev/server/plugin/buildspec/python/PythonJobSuggestion.java
index 2ca7cfcb5c..8351e54ccb 100644
--- a/server-plugin/server-plugin-buildspec-python/src/main/java/io/onedev/server/plugin/buildspec/python/PythonJobSuggestion.java
+++ b/server-plugin/server-plugin-buildspec-python/src/main/java/io/onedev/server/plugin/buildspec/python/PythonJobSuggestion.java
@@ -1,14 +1,34 @@
package io.onedev.server.plugin.buildspec.python;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.eclipse.jgit.lib.FileMode;
+import org.eclipse.jgit.lib.ObjectId;
+import org.jspecify.annotations.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.yaml.snakeyaml.LoaderOptions;
+import org.yaml.snakeyaml.Yaml;
+import org.yaml.snakeyaml.constructor.SafeConstructor;
+
import com.google.common.collect.Lists;
import com.moandjiezana.toml.Toml;
+
import io.onedev.commons.utils.StringUtils;
import io.onedev.k8shelper.ExecuteCondition;
import io.onedev.server.buildspec.job.Job;
import io.onedev.server.buildspec.job.JobSuggestion;
import io.onedev.server.buildspec.job.trigger.BranchUpdateTrigger;
import io.onedev.server.buildspec.job.trigger.PullRequestUpdateTrigger;
-import io.onedev.server.buildspec.step.*;
+import io.onedev.server.buildspec.step.CheckoutStep;
+import io.onedev.server.buildspec.step.CommandStep;
+import io.onedev.server.buildspec.step.GenerateChecksumStep;
+import io.onedev.server.buildspec.step.SetBuildVersionStep;
+import io.onedev.server.buildspec.step.SetupCacheStep;
import io.onedev.server.buildspec.step.commandinterpreter.ShellInterpreter;
import io.onedev.server.git.Blob;
import io.onedev.server.git.BlobIdent;
@@ -17,18 +37,6 @@ import io.onedev.server.plugin.report.cobertura.PublishCoberturaReportStep;
import io.onedev.server.plugin.report.coverage.PublishCoverageReportStep;
import io.onedev.server.plugin.report.junit.PublishJUnitReportStep;
import io.onedev.server.plugin.report.ruff.PublishRuffReportStep;
-import org.eclipse.jgit.lib.FileMode;
-import org.eclipse.jgit.lib.ObjectId;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.yaml.snakeyaml.Yaml;
-
-import org.jspecify.annotations.Nullable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
public class PythonJobSuggestion implements JobSuggestion {
@@ -353,7 +361,8 @@ public class PythonJobSuggestion implements JobSuggestion {
job.getSteps().add(setupCache);
var blobContent = blob.getText().getContent();
- Map<String, Object> environments = new Yaml().load(blobContent);
+ var options = new LoaderOptions();
+ Map<String, Object> environments = new Yaml(new SafeConstructor(options)).load(blobContent);
CommandStep buildAndTest = new CommandStep();
buildAndTest.setName("build and test");
buildAndTest.setImage("1dev/conda:1.0.4");
diff --git a/server-plugin/server-plugin-pack-helm/src/main/java/io/onedev/server/plugin/pack/helm/HelmPackHandler.java b/server-plugin/server-plugin-pack-helm/src/main/java/io/onedev/server/plugin/pack/helm/HelmPackHandler.java
index 7f46d8f2fc..eb843a2295 100644
--- a/server-plugin/server-plugin-pack-helm/src/main/java/io/onedev/server/plugin/pack/helm/HelmPackHandler.java
+++ b/server-plugin/server-plugin-pack-helm/src/main/java/io/onedev/server/plugin/pack/helm/HelmPackHandler.java
@@ -21,28 +21,30 @@ import javax.inject.Singleton;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import io.onedev.server.pack.PackHandler;
import org.apache.commons.fileupload.FileUploadException;
import org.apache.commons.fileupload.servlet.ServletFileUpload;
import org.apache.shiro.authz.UnauthorizedException;
import org.apache.tools.tar.TarEntry;
import org.apache.tools.tar.TarInputStream;
+import org.yaml.snakeyaml.LoaderOptions;
import org.yaml.snakeyaml.Yaml;
+import org.yaml.snakeyaml.constructor.SafeConstructor;
import io.onedev.commons.utils.LockUtils;
import io.onedev.commons.utils.StringUtils;
-import io.onedev.server.service.BuildService;
-import io.onedev.server.service.PackBlobService;
-import io.onedev.server.service.PackService;
-import io.onedev.server.service.ProjectService;
import io.onedev.server.exception.DataTooLargeException;
import io.onedev.server.model.Build;
import io.onedev.server.model.Pack;
import io.onedev.server.model.PackBlob;
import io.onedev.server.model.Project;
+import io.onedev.server.pack.PackHandler;
import io.onedev.server.persistence.SessionService;
import io.onedev.server.persistence.TransactionService;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.service.BuildService;
+import io.onedev.server.service.PackBlobService;
+import io.onedev.server.service.PackService;
+import io.onedev.server.service.ProjectService;
import io.onedev.server.util.IOUtils;
import io.onedev.server.util.Pair;
@@ -190,9 +192,12 @@ public class HelmPackHandler implements PackHandler {
while ((entry = is.getNextEntry()) != null) {
String entryName = entry.getName();
if (entryName.equals("Chart.yaml") || entryName.endsWith("/Chart.yaml")) {
+ if (entry.getSize() > MAX_FILE_SIZE)
+ throw new ClientException(SC_BAD_REQUEST, "Chart.yaml is too large");
byte[] content = new byte[(int) entry.getSize()];
is.read(content);
- metadata = new Yaml().load(new ByteArrayInputStream(content));
+ var options = new LoaderOptions();
+ metadata = new Yaml(new SafeConstructor(options)).load(new ByteArrayInputStream(content));
break;
}
}