Skip to content

Update CxScanBuilder.java #111

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

Open
swatiawate1 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update CxScanBuilder.java #111

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
d129e85
Update CxScanBuilder.java
swatiawate1 Sep 27, 2022
d056a3d
Update jobMain.jelly
swatiawate1 Sep 28, 2022
4402da6
Update jobMain.jelly
swatiawate1 Sep 28, 2022
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
4 changes: 2 additions & 2 deletions src/main/java/com/checkmarx/jenkins/CxScanBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1722,7 +1722,7 @@ private void printConfiguration(CxScanConfig config, CxLoggerAdapter log) {
log.info("enable Project Policy Enforcement: " + config.getEnablePolicyViolations());
log.info("continue build when timed out: " + config.getContinueBuild());
log.info("post scan action: " + config.getPostScanActionId());
log.info("is force scan: " + config.getForceScan());
//log.info("is force scan: " + config.getForceScan());
log.info("scan level custom fields: " + config.getCustomFields());

ScannerType scannerType = getDependencyScannerType(config);
Expand Down Expand Up @@ -2552,7 +2552,7 @@ public FormValidation doCheckCustomFields(@QueryParameter String value,@Ancestor
Pattern pattern = Pattern.compile("(^([a-zA-Z0-9#._]*):([a-zA-Z0-9#._]*)+(,([a-zA-Z0-9#._]*):([a-zA-Z0-9#._]*)+)*$)");
Matcher match = pattern.matcher(value);
if (!StringUtil.isNullOrEmpty(value) && !match.find()) {
return FormValidation.error("Custom Fields must have given format: key1:val1,key2:val2. \nCustom field allows to use these special characters: # . _ ");
return FormValidation.error("Custom Fields must have given format: key1:val1,key2:val2. Custom field allows to use these special characters: # . _ ");
}

return FormValidation.ok();
Expand Down
6 changes: 2 additions & 4 deletions src/main/resources/com/checkmarx/jenkins/CxProjectResult/jobMain.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,9 @@
<j:if test="${result.isRemoveAsyncHtml()}">
<div id="async-note">
<div class="async-note"><div class="async-note-title">Note:</div>
<div class="async-note-body" id="async-note-body">Job is configured to run Checkmarx scan asynchronously. Displayed results are of the previous successful scan.</div></div>
</div>
<div>
${result.getHtmlReport()}
<div class="async-note-body" id="async-note-body">Job is configured to run Checkmarx scan asynchronously.</div></div>
</div>

</j:if>

<j:if test="${!result.isRemoveAsyncHtml()}">
Expand Down