Merge pull request #995 from jglick/settersOnClosures

[JENKINS-75353] Ignore `Closure` metaproperties

Author: jglick

plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/LoggingInvoker.java

@@ -134,12 +134,14 @@ private void maybeRecord(Class<?> clazz, Supplier<String> message) {
         return delegate.getProperty(lhs, name);
     }
 
+    private static final Set<String> CLOSURE_METAPROPS = Set.of("delegate", "directive", "resolveStrategy");
+
     @Override public void setProperty(Object lhs, String name, Object value) throws Throwable {
         Class<?> clazz = classOf(lhs);
         maybeRecord(clazz, () -> clazz.getName() + "." + name);
         delegate.setProperty(lhs, name, value);
         if (SystemProperties.getBoolean(LoggingInvoker.class.getName() + ".fieldSetWarning", true)) {
-            if (value != null) {
+            if (value != null && !CLOSURE_METAPROPS.contains(name)) {
                 var owner = findOwner(lhs);
                 if (owner instanceof CpsScript) {
                     try {

plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/LoggingInvokerTest.java

@@ -76,4 +76,10 @@ private void assertInternalCalls(String script, boolean sandbox, String... calls
         assertThat(exec.getInternalCalls(), containsInAnyOrder(calls));
     }
 
+    @Test public void settersOnClosures() throws Exception {
+        var p = r.createProject(WorkflowJob.class);
+        p.setDefinition(new CpsFlowDefinition("def c1 = {}; def c2 = {echo 'OK ran'}; c1.delegate = c2; c1.resolveStrategy = Closure.DELEGATE_FIRST; c1()", true));
+        r.assertLogNotContains("`def`", r.buildAndAssertSuccess(p));
+    }
+
 }