Skip to content

Add UUID parameter to safe parameter names #391

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
tomasbjerre merged 1 commit into from
May 16, 2026
Merged

Add UUID parameter to safe parameter names #391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 5 additions & 4 deletions src/main/java/org/jenkinsci/plugins/gwt/ParameterActionUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,13 @@
import hudson.model.StringParameterValue;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;

public class ParameterActionUtil {

private static final String UUID_PARAMETER_NAME = "jenkins-generic-webhook-trigger-plugin_uuid";

public static ParametersAction createParameterAction(
final ParametersDefinitionProperty parametersDefinitionProperty,
final Map<String, String> resolvedVariables,
Expand All @@ -25,11 +28,9 @@ public static ParametersAction createParameterAction(
final boolean triggerOneBuildPerInvocation = !allowSeveralTriggersPerBuild;
if (triggerOneBuildPerInvocation) {
parameterList.add(new StringParameterValue(
"jenkins-generic-webhook-trigger-plugin_uuid",
UUID.randomUUID().toString(),
null));
UUID_PARAMETER_NAME, UUID.randomUUID().toString(), null));
}
return new ParametersAction(parameterList);
return new ParametersAction(parameterList, Set.of(UUID_PARAMETER_NAME));
}

/** To keep any default values set there. */
Expand Down
22 changes: 22 additions & 0 deletions src/test/java/org/jenkinsci/plugins/gwt/ParameterActionUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,19 @@

import static org.assertj.core.api.Assertions.assertThat;
import static org.jenkinsci.plugins.gwt.ParameterActionUtil.createParameterAction;
import static org.mockito.Mockito.mock;

import com.google.common.collect.ImmutableMap;
import hudson.model.BooleanParameterDefinition;
import hudson.model.FreeStyleBuild;
import hudson.model.FreeStyleProject;
import hudson.model.ParametersAction;
import hudson.model.ParametersDefinitionProperty;
import hudson.model.StringParameterDefinition;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;

class ParameterActionUtilTest {
Expand Down Expand Up @@ -113,4 +118,21 @@ void testThatUniqueParameterIsAddedWhenallowSeveralTriggersPerBuildFalse() {
assertThat(actualWithFalse.getAllParameters().get(0).getValue()) //
.isNotNull();
}

@Test
void testThatParameterIsAccessible() throws IOException {
final ParametersDefinitionProperty parametersDefinitionProperty = new ParametersDefinitionProperty();
final ParametersAction actualWithFalse = createParameterAction(parametersDefinitionProperty, Map.of(), false);
FreeStyleBuild mockBuild = new FreeStyleBuild(mock(FreeStyleProject.class));
actualWithFalse.onAttached(mockBuild);
assertThat(actualWithFalse.getParameters()) //
.hasSize(1);
assertThat(actualWithFalse.getParameters().get(0).getValue()) //
.isNotNull();
}

@AfterEach
void tearDown() {
System.clearProperty(ParametersAction.KEEP_UNDEFINED_PARAMETERS_SYSTEM_PROPERTY_NAME);
}
}
Loading