Skip to content

Remove default-allowlist entries for Groovy source files related to Declarative #538

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jglick merged 3 commits into from
Jan 3, 2024
Merged

Remove default-allowlist entries for Groovy source files related to Declarative #538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7231c3b
Remove DefaultAllowlist entries for Groovy source files related to De…
dwnusbaum May 17, 2022
faa94c1
Merge branch 'master' into post-SECURITY-359
dwnusbaum Nov 4, 2022
efaa62c
Merge branch 'master' into post-SECURITY-359
dwnusbaum Jan 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovySourceFileAllowlist.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,13 @@
import hudson.Extension;
import hudson.ExtensionList;
import hudson.ExtensionPoint;
import hudson.Main;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Enumeration;
import java.util.List;
Expand Down Expand Up @@ -188,15 +186,6 @@ public DefaultAllowlist() throws IOException {
}
}
loadDefaultAllowlist(ALLOWED_SOURCE_FILES);
// Some plugins use test-specific Groovy DSLs.
if (Main.isUnitTest) {
ALLOWED_SOURCE_FILES.addAll(List.of(
// pipeline-model-definition
"/org/jenkinsci/plugins/pipeline/modeldefinition/agent/impl/LabelAndOtherFieldAgentScript.groovy",
"/org/jenkinsci/plugins/pipeline/modeldefinition/parser/GlobalStageNameTestConditionalScript.groovy",
"/org/jenkinsci/plugins/pipeline/modeldefinition/parser/GlobalStepCountTestConditionalScript.groovy"
));
}
}

private static void loadDefaultAllowlist(List<String> allowlist) throws IOException {
Expand Down
30 changes: 0 additions & 30 deletions .../resources/org/jenkinsci/plugins/workflow/cps/GroovySourceFileAllowlist/default-allowlist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,4 @@
# This list is ordered from most popular to least popular plugin to minimize performance impact.
# pipeline-model-definition
/org/jenkinsci/plugins/pipeline/modeldefinition/ModelInterpreter.groovy
/org/jenkinsci/plugins/pipeline/modeldefinition/agent/impl/AnyScript.groovy
/org/jenkinsci/plugins/pipeline/modeldefinition/agent/impl/LabelScript.groovy
/org/jenkinsci/plugins/pipeline/modeldefinition/agent/impl/NoneScript.groovy
/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/AbstractChangelogConditionalScript.groovy
/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/AllOfConditionalScript.groovy
/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/AnyOfConditionalScript.groovy
/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/BranchConditionalScript.groovy
/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/ChangeLogConditionalScript.groovy
/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/ChangeRequestConditionalScript.groovy
/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/ChangeSetConditionalScript.groovy
/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/EnvironmentConditionalScript.groovy
/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/EqualsConditionalScript.groovy
/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/ExpressionConditionalScript.groovy
/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/IsRestartedRunConditionalScript.groovy
/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/NotConditionalScript.groovy
/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/TagConditionalScript.groovy
/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/TriggeredByConditionalScript.groovy
# pipeline-model-extensions
/org/jenkinsci/plugins/pipeline/modeldefinition/agent/CheckoutScript.groovy
# docker-workflow
/org/jenkinsci/plugins/docker/workflow/Docker.groovy
/org/jenkinsci/plugins/docker/workflow/declarative/AbstractDockerPipelineScript.groovy
/org/jenkinsci/plugins/docker/workflow/declarative/DockerPipelineFromDockerfileScript.groovy
/org/jenkinsci/plugins/docker/workflow/declarative/DockerPipelineScript.groovy
# kubernetes
/org/csanchez/jenkins/plugins/kubernetes/pipeline/KubernetesDeclarativeAgentScript.groovy
# amazon-ecs
/com/cloudbees/jenkins/plugins/amazonecs/pipeline/ECSDeclarativeAgentScript.groovy
# workflow-remote-loader:
/org/jenkinsci/plugins/workflow/remoteloader/FileLoaderDSL/FileLoaderDSLImpl.groovy
# confluence-publisher
Expand Down