Skip to content

[JENKINS-76310] Make secret token work with CSP enforced #149

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
Puffy1215 merged 3 commits into from
Dec 4, 2025
Merged

[JENKINS-76310] Make secret token work with CSP enforced #149

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
7de49d5
[JENKINS-76310] Make secret token work with CSP enforced
daniel-beck Nov 25, 2025
77f6ea7
Update Jenkins version to 2.540
daniel-beck Dec 2, 2025
5c0ae56
Generate this secret client-side
daniel-beck Dec 2, 2025
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
17 changes: 0 additions & 17 deletions src/main/java/com/gitee/jenkins/trigger/GiteePushTrigger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,13 @@
import net.sf.json.JSONObject;
import org.jenkinsci.Symbol;
import org.kohsuke.stapler.Ancestor;
import org.kohsuke.stapler.AncestorInPath;
import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.DataBoundSetter;
import org.kohsuke.stapler.Stapler;
import org.kohsuke.stapler.StaplerRequest2;
import org.kohsuke.stapler.StaplerResponse2;

import java.io.IOException;
import java.io.ObjectStreamException;
import java.security.SecureRandom;

import static com.gitee.jenkins.trigger.filter.BranchFilterConfig.BranchFilterConfigBuilder.branchFilterConfig;
import static com.gitee.jenkins.trigger.handler.pull.PullRequestHookTriggerHandlerFactory.newPullRequestHookTriggerHandler;
Expand All @@ -61,9 +58,6 @@
*
*/
public class GiteePushTrigger extends Trigger<Job<?, ?>> {

private static final SecureRandom RANDOM = new SecureRandom();

private boolean triggerOnPush = true;
private boolean triggerOnCommitComment = false;
private boolean triggerOnOpenPullRequest = true;
Expand Down Expand Up @@ -682,16 +676,5 @@ public boolean configure(StaplerRequest2 req, JSONObject formData) throws FormEx
save();
return super.configure(req, formData);
}

public void doGenerateSecretToken(@AncestorInPath final Job<?, ?> project, StaplerResponse2 response) {
byte[] random = new byte[16]; // 16x8=128bit worth of randomness, since we use md5 digest as the API token
RANDOM.nextBytes(random);
String secretToken = Util.toHexString(random);
response.setHeader("script", "document.getElementById('giteeSecretToken').value='" + secretToken + "'");
}

public void doClearSecretToken(@AncestorInPath final Job<?, ?> project, StaplerResponse2 response) {
response.setHeader("script", "document.getElementById('giteeSecretToken').value=''");
}
}
}
13 changes: 13 additions & 0 deletions src/main/resources/com/gitee/jenkins/trigger/GiteePushTrigger/adjunct.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Behaviour.specify("BUTTON.gitee-generate", "gitee-generate", 0, function (e) {
e.onclick = function (evt) {
document.getElementById('giteeSecretToken').value = [...Array(32)].map(() => Math.floor(Math.random() * 16).toString(16)).join('');
evt.preventDefault();
};
});

Behaviour.specify("BUTTON.gitee-clear", "gitee-clear", 0, function (e) {
e.onclick = function (evt) {
document.getElementById('giteeSecretToken').value = "";
evt.preventDefault();
};
});
12 changes: 6 additions & 6 deletions src/main/resources/com/gitee/jenkins/trigger/GiteePushTrigger/config.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core"
xmlns:f="/lib/form">
xmlns:f="/lib/form"
xmlns:st="jelly:stapler">
<f:entry title="${%Enabled.Gitee.Triggers}" help="/plugin/gitee/help/help-pull-request-refspec.html">
<table>
<f:entry title="${%Push}" field="triggerOnPush">
Expand Down Expand Up @@ -119,10 +120,9 @@
</table>
</f:entry>
<f:entry title="${%Secret.Token}" help="/plugin/gitee/help/help-secretToken.html">
<table>
<f:readOnlyTextbox field="secretToken" id="giteeSecretToken"/>
<f:validateButton title="${%Generate}" method="generateSecretToken"/>
<f:validateButton title="${%Clear}" method="clearSecretToken"/>
</table>
<st:adjunct includes="com.gitee.jenkins.trigger.GiteePushTrigger.adjunct"/>
<f:readOnlyTextbox field="secretToken" id="giteeSecretToken"/>
<button class="jenkins-button gitee-generate jenkins-!-margin-right-1 jenkins-!-margin-top-1">${%Generate}</button>
<button class="jenkins-button gitee-clear jenkins-!-margin-top-1">${%Clear}</button>
</f:entry>
</j:jelly>
Loading