The Unified and Autonomous Development Platform
fix: RCE vulnerability may be exploited by any user
Robin Shen5c1ce95032f5
diff --git a/server-core/src/main/java/io/onedev/server/annotation/Code.java b/server-core/src/main/java/io/onedev/server/annotation/Code.javaindex fbc18b3a8e..fa375871ba 100644--- a/server-core/src/main/java/io/onedev/server/annotation/Code.java+++ b/server-core/src/main/java/io/onedev/server/annotation/Code.java@@ -13,14 +13,10 @@ import java.lang.annotation.Retention;import java.lang.annotation.RetentionPolicy;import java.lang.annotation.Target;-import javax.validation.Constraint;import javax.validation.Payload;-import io.onedev.server.validation.validator.CodeValidator;-@Target({ElementType.METHOD, ElementType.FIELD})@Retention(RetentionPolicy.RUNTIME)-@Constraint(validatedBy=CodeValidator.class)public @interface Code {String GROOVY = "Groovy";diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/CodeValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/CodeValidator.javadeleted file mode 100644index ea62ab1eb0..0000000000--- a/server-core/src/main/java/io/onedev/server/validation/validator/CodeValidator.java+++ /dev/null@@ -1,69 +0,0 @@-package io.onedev.server.validation.validator;--import java.util.List;--import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;--import org.apache.commons.lang3.StringUtils;--import groovy.text.SimpleTemplateEngine;-import io.onedev.server.util.GroovyUtils;-import io.onedev.server.annotation.Code;--public class CodeValidator implements ConstraintValidator<Code, Object> {-- private String language;-- private String message;-- @Override- public void initialize(Code constaintAnnotation) {- language = constaintAnnotation.language();- message = constaintAnnotation.message();- }-- @SuppressWarnings("unchecked")- @Override- public boolean isValid(Object value, ConstraintValidatorContext constraintContext) {- if (value instanceof String && StringUtils.isNotBlank((String)value)- || value instanceof List && !((List<?>)value).isEmpty()) {- String code;- if (value instanceof String)- code = (String) value;- else- code = StringUtils.join((List<String>)value, "\n");- if (language.equals(Code.GROOVY_TEMPLATE)) {- try {- new SimpleTemplateEngine().createTemplate(code);- } catch (Exception e) {- constraintContext.disableDefaultConstraintViolation();-- String message = this.message;- if (message.length() == 0)- message = e.getMessage();- if (StringUtils.isBlank(message))- message = "Malformed groovy template";- constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();- return false;- }- } else if (language.equals(Code.GROOVY)) {- try {- GroovyUtils.compile(code);- } catch (Exception e) {- constraintContext.disableDefaultConstraintViolation();-- String message = this.message;- if (message.length() == 0)- message = e.getMessage();- if (StringUtils.isBlank(message))- message = "Failed to compile groovy script";- constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();- return false;- }- }- }- return true;- }--}