diff --git a/src/main/java/com/checkmarx/jenkins/CxScanBuilder.java b/src/main/java/com/checkmarx/jenkins/CxScanBuilder.java index 17ed3212..11beacdc 100644 --- a/src/main/java/com/checkmarx/jenkins/CxScanBuilder.java +++ b/src/main/java/com/checkmarx/jenkins/CxScanBuilder.java @@ -52,13 +52,11 @@ import javax.annotation.Nonnull; import javax.naming.ConfigurationException; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.UnsupportedEncodingException; +import java.io.*; import java.net.URL; import java.net.URLDecoder; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Optional; @@ -92,7 +90,7 @@ public class CxScanBuilder extends Builder implements SimpleBuildStep { private static final String PDF_URL_TEMPLATE = "/%scheckmarx/pdfReport"; private static final String PDF_URL = "checkmarx/pdfReport"; private static final String REQUEST_ORIGIN = "Jenkins"; - + private static final String SUPPRESS_BENIGN_ERRORS = "suppressBenignErrors"; ////////////////////////////////////////////////////////////////////////////////////// @@ -200,7 +198,7 @@ public class CxScanBuilder extends Builder implements SimpleBuildStep { private Boolean generateXmlReport = true; public static final int MINIMUM_TIMEOUT_IN_MINUTES = 1; - public static final String REPORTS_FOLDER = "Checkmarx/Reports"; + public static final String REPORTS_FOLDER = "Checkmarx" + File.separator + "Reports"; @DataBoundConstructor public CxScanBuilder( @@ -816,15 +814,16 @@ public void setDependencyScanConfig(DependencyScanConfig dependencyScanConfig) { public void setHideDebugLogs(Boolean hideDebugLogs) { this.hideDebugLogs = hideDebugLogs; } + /** * Using environment injection plugin you can add the JVM proxy settings. * For example using EnvInject plugin the following can be applied under 'Properties Content': - * - * http.proxyHost={HOST} - * http.proxyPass={PORT} - * http.proxyUser={USER} - * http.proxyPassword={PASS} - * http.nonProxyHosts={HOSTS} + *

+ * http.proxyHost={HOST} + * http.proxyPass={PORT} + * http.proxyUser={USER} + * http.proxyPassword={PASS} + * http.nonProxyHosts={HOSTS} */ private void setJvmVars(EnvVars env) { for (Map.Entry entry : env.entrySet()) { @@ -837,6 +836,7 @@ private void setJvmVars(EnvVars env) { } } } + private Map getAllFsaVars(EnvVars env) { Map sumFsaVars = new HashMap<>(); // As job environment variable @@ -923,9 +923,8 @@ public void perform(@Nonnull Run run, @Nonnull FilePath workspace, @Nonnul Jenkins instance = Jenkins.getInstance(); final CxScanCallable action; if (instance != null && instance.proxy != null && - ((!isCxURLinNoProxyHost(useOwnServerCredentials ? this.serverUrl : getDescriptor().getServerUrl(), instance.proxy.getNoProxyHostPatterns())) - || (config.isScaProxy()))) - { + ((!isCxURLinNoProxyHost(useOwnServerCredentials ? this.serverUrl : getDescriptor().getServerUrl(), instance.proxy.getNoProxyHostPatterns())) + || (config.isScaProxy()))) { action = new CxScanCallable(config, listener, instance.proxy, isHideDebugLogs(), fsaVars); } else { action = new CxScanCallable(config, listener, isHideDebugLogs(), fsaVars); @@ -990,9 +989,9 @@ public void perform(@Nonnull Run run, @Nonnull FilePath workspace, @Nonnul OSAResults osaResults = scanResults.getOsaResults(); AstScaResults scaResults = scanResults.getScaResults(); if (osaResults != null && osaResults.isOsaResultsReady()) { - createOsaReports(osaResults, checkmarxBuildDir); + createOsaReports(osaResults, workspace); } else if (scaResults != null && scaResults.isScaResultReady()) { - createScaReports(scaResults, checkmarxBuildDir); + createScaReports(scaResults, workspace); } return; } @@ -1072,7 +1071,6 @@ private void overrideConfigAsCode(ConfigAsCode configAsCodeFromFile, CxScanConfi } } - private void mapScaConfiguration(Optional sca, CxScanConfig scanConfig, Map overridesResults) { AtomicReference fileInclude = new AtomicReference<>(""); @@ -1222,11 +1220,10 @@ private void mapSastConfiguration(Optional sast, CxScanConfig scanCo }); } - - private void createScaReports(AstScaResults scaResults, File checkmarxBuildDir) { - writeJsonObjectToFile(scaResults.getSummary(), new File(checkmarxBuildDir, SCA_SUMMERY_JSON), "OSA summary json report"); - writeJsonObjectToFile(scaResults.getPackages(), new File(checkmarxBuildDir, SCA_LIBRARIES_JSON), "OSA libraries json report"); - writeJsonObjectToFile(scaResults.getFindings(), new File(checkmarxBuildDir, SCA_VULNERABILITIES_JSON), "OSA vulnerabilities json report"); + private void createScaReports(AstScaResults scaResults, FilePath checkmarxBuildDir) { + writeJsonObjectToFile(scaResults.getSummary(), checkmarxBuildDir, SCA_SUMMERY_JSON); + writeJsonObjectToFile(scaResults.getPackages(), checkmarxBuildDir, SCA_LIBRARIES_JSON); + writeJsonObjectToFile(scaResults.getFindings(), checkmarxBuildDir, SCA_VULNERABILITIES_JSON); } /** @@ -1277,7 +1274,7 @@ private String getJenkinURLForTheJob(EnvVars env) { } else { hostName = jenURL; } - passedURL = "Jenkins/" + CxConfig.version()+ " " + hostName + " " + jobName; + passedURL = "Jenkins/" + CxConfig.version() + " " + hostName + " " + jobName; // 50 is the maximum number of characters allowed by SAST server if (passedURL.length() > 50) { passedURL = passedURL.substring(0, 45); @@ -1303,14 +1300,16 @@ private String getCxOriginUrl(EnvVars env, CxLoggerAdapter log) { } return originUrl; } + private Boolean verifyCustomCharacters(String inputString) { - Pattern pattern = Pattern.compile("(^([a-zA-Z0-9#._]*):([a-zA-Z0-9#._]*)+(,([a-zA-Z0-9#._]*):([a-zA-Z0-9#._]*)+)*$)"); - Matcher match = pattern.matcher(inputString); - if (!StringUtil.isNullOrEmpty(inputString) && !match.find()) { - return false; - } - return true; + Pattern pattern = Pattern.compile("(^([a-zA-Z0-9#._]*):([a-zA-Z0-9#._]*)+(,([a-zA-Z0-9#._]*):([a-zA-Z0-9#._]*)+)*$)"); + Matcher match = pattern.matcher(inputString); + if (!StringUtil.isNullOrEmpty(inputString) && !match.find()) { + return false; + } + return true; } + private CxScanConfig resolveConfiguration(Run run, DescriptorImpl descriptor, EnvVars env, CxLoggerAdapter log) throws IOException { CxScanConfig ret = new CxScanConfig(); @@ -1326,20 +1325,20 @@ private CxScanConfig resolveConfiguration(Run run, DescriptorImpl descript log.info(" ORIGIN FROM JENKIN :: " + jenkinURL); log.info(" ORIGIN URL FROM JENKIN :: " + originUrl); - if(getPostScanActionId() == 0) - ret.setPostScanActionId(null); + if (getPostScanActionId() == 0) + ret.setPostScanActionId(null); else - ret.setPostScanActionId(getPostScanActionId()); - + ret.setPostScanActionId(getPostScanActionId()); + ret.setDisableCertificateValidation(!descriptor.isEnableCertificateValidation()); ret.setMvnPath(descriptor.getMvnPath()); ret.setOsaGenerateJsonReport(false); - - if(StringUtils.isNotEmpty(getCustomFields())) { - if(!verifyCustomCharacters(getCustomFields())) { - throw new CxClientException("Custom Fields must have given format: key1:val1,key2:val2. \\nCustom field allows to use these special characters: # . _ "); - } - ret.setCustomFields(apiFormat(getCustomFields())); + + if (StringUtils.isNotEmpty(getCustomFields())) { + if (!verifyCustomCharacters(getCustomFields())) { + throw new CxClientException("Custom Fields must have given format: key1:val1,key2:val2. \\nCustom field allows to use these special characters: # . _ "); + } + ret.setCustomFields(apiFormat(getCustomFields())); } ret.setForceScan(isForceScan()); @@ -1475,17 +1474,17 @@ private CxScanConfig resolveConfiguration(Run run, DescriptorImpl descript enableProjectPolicyEnforcement = false; } ret.setEnablePolicyViolations(enableProjectPolicyEnforcement); - + // Set the Continue build flag to Configuration object if Option from UI is choosen as useContinueBuildOnError if (useContinueBuildOnError(getDescriptor())) { ret.setContinueBuild(Boolean.TRUE); } - + //Ignore errors that can be suppressed for ex. duplicate scan,source folder is empty, no files to zip. String suppressBenignErrors = System.getProperty(SUPPRESS_BENIGN_ERRORS); - if(suppressBenignErrors == null || Boolean.parseBoolean(suppressBenignErrors)) - ret.setIgnoreBenignErrors(true); - + if (suppressBenignErrors == null || Boolean.parseBoolean(suppressBenignErrors)) + ret.setIgnoreBenignErrors(true); + return ret; } @@ -1635,8 +1634,7 @@ private AstScaConfig getScaConfig(Run run, EnvVars env, DependencyScanConf // scaResolverPathExist(dsConfig.pathToScaResolver); validateScaResolverParams(dsConfig.scaResolverAddParameters); result.setEnableScaResolver(true); - } - else + } else result.setEnableScaResolver(false); result.setPathToScaResolver(dsConfig.pathToScaResolver); @@ -1761,7 +1759,7 @@ private void printConfiguration(CxScanConfig config, CxLoggerAdapter log) { log.info(" OSA archive includes: " + config.getOsaArchiveIncludePatterns()); log.info(" OSA run Execute dependency managers install packages command before Scan: " + config.getOsaRunInstall()); } - if (config.isAstScaEnabled() && config.getAstScaConfig() != null){ + if (config.isAstScaEnabled() && config.getAstScaConfig() != null) { log.info("Use CxSCA dependency scanner is enabled"); log.info("CxSCA API URL: " + config.getAstScaConfig().getApiUrl()); log.info("Access control server URL: " + config.getAstScaConfig().getAccessControlUrl()); @@ -1812,10 +1810,10 @@ private void createSastReports(SASTResults sastResults, File checkmarxBuildDir, } } - private void createOsaReports(OSAResults osaResults, File checkmarxBuildDir) { - writeJsonObjectToFile(osaResults.getResults(), new File(checkmarxBuildDir, OSA_SUMMERY_JSON), "OSA summery json report"); - writeJsonObjectToFile(osaResults.getOsaLibraries(), new File(checkmarxBuildDir, OSA_LIBRARIES_JSON), "OSA libraries json report"); - writeJsonObjectToFile(osaResults.getOsaVulnerabilities(), new File(checkmarxBuildDir, OSA_VULNERABILITIES_JSON), "OSA vulnerabilities json report"); + private void createOsaReports(OSAResults osaResults, FilePath checkmarxBuildDir) { + writeJsonObjectToFile(osaResults.getResults(), checkmarxBuildDir, OSA_SUMMERY_JSON); + writeJsonObjectToFile(osaResults.getOsaLibraries(), checkmarxBuildDir, OSA_LIBRARIES_JSON); + writeJsonObjectToFile(osaResults.getOsaVulnerabilities(), checkmarxBuildDir, OSA_VULNERABILITIES_JSON); } private String generateHTMLReport(@Nonnull FilePath workspace, File checkmarxBuildDir, CxScanConfig config, ScanResults results) { @@ -1842,16 +1840,23 @@ private String generateHTMLReport(@Nonnull FilePath workspace, File checkmarxBui return reportName; } - private void writeJsonObjectToFile(Object jsonObj, File to, String description) { + private void writeJsonObjectToFile(Object jsonObj, FilePath to, String fileName) { + String remoteDirPath = to.getRemote() + File.separator + REPORTS_FOLDER; + InputStream is = null; try { ObjectMapper objectMapper = new ObjectMapper(); String json = null; json = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(jsonObj); - FileUtils.writeStringToFile(to, json); - log.info("Copying file [" + to.getName() + "] to workspace [" + to.getAbsolutePath() + "]"); - } catch (Exception e) { - log.error("Failed to write " + description + " to [" + to.getAbsolutePath() + "]"); + is = IOUtils.toInputStream(json, StandardCharsets.UTF_8); + String remoteFilePath = remoteDirPath + File.separator + fileName; + log.info("Copying file {} to workspace {}", fileName, remoteFilePath); + FilePath remoteFile = new FilePath(to.getChannel(), remoteFilePath); + remoteFile.copyFrom(is); + } catch (Exception e) { + log.error("Failed to write '" + fileName + "' to [" + to.getRemote() + "]", e); + } finally { + IOUtils.closeQuietly(is); } } @@ -1900,14 +1905,12 @@ private void printBuildFailure(String thDescription, ScanResults ret, CxLoggerAd log.error(""); } - private void logError(Exception ex) { if (ex != null) { log.error(ex.getMessage()); } } - private void addEnvVarAction(Run run, SASTResults sastResults) { EnvVarAction envVarAction = new EnvVarAction(); envVarAction.setCxSastResults(sastResults.getHigh(), @@ -1928,24 +1931,19 @@ private int parseInt(String number, CxLoggerAdapter log, String templateMessage, } private void writeFileToWorkspaceReports(FilePath workspace, File file) { - - String remoteDirPath = workspace.getRemote() + "/" + REPORTS_FOLDER; + String remoteDirPath = workspace.getRemote() + File.separator + REPORTS_FOLDER; FileInputStream fis = null; - try { - String remoteFilePath = remoteDirPath + "/" + file.getName(); + String remoteFilePath = remoteDirPath + File.separator + file.getName(); log.info("Copying file {} to workspace {}", file.getName(), remoteFilePath); FilePath remoteFile = new FilePath(workspace.getChannel(), remoteFilePath); fis = new FileInputStream(file); remoteFile.copyFrom(fis); - } catch (Exception e) { log.warn("Failed to write file [" + file.getName() + "] to workspace: " + e.getMessage()); - } finally { IOUtils.closeQuietly(fis); } - } private boolean shouldUseGlobalThreshold() { @@ -2028,13 +2026,12 @@ private boolean isSkipScan(final Run run) { private boolean scaResolverPathExist(String pathToResolver) { pathToResolver = pathToResolver + File.separator + "ScaResolver"; - if(!SystemUtils.IS_OS_UNIX) + if (!SystemUtils.IS_OS_UNIX) pathToResolver = pathToResolver + ".exe"; File file = new File(pathToResolver); - if(!file.exists()) - { - throw new CxClientException("SCA Resolver path does not exist. Path="+file.getAbsolutePath()); + if (!file.exists()) { + throw new CxClientException("SCA Resolver path does not exist. Path=" + file.getAbsolutePath()); } return true; } @@ -2044,20 +2041,20 @@ private void validateScaResolverParams(String additionalParams) { String[] arguments = additionalParams.split(" "); Map params = new HashMap<>(); - for (int i = 0; i < arguments.length ; i++) { - if(arguments[i].startsWith("-") && (i+1 != arguments.length && !arguments[i+1].startsWith("-"))) - params.put(arguments[i], arguments[i+1]); + for (int i = 0; i < arguments.length; i++) { + if (arguments[i].startsWith("-") && (i + 1 != arguments.length && !arguments[i + 1].startsWith("-"))) + params.put(arguments[i], arguments[i + 1]); else params.put(arguments[i], ""); } String dirPath = params.get("-s"); - if(StringUtils.isEmpty(dirPath)) + if (StringUtils.isEmpty(dirPath)) throw new CxClientException("Source code path (-s ) is not provided."); // fileExists(dirPath); String projectName = params.get("-n"); - if(StringUtils.isEmpty(projectName)) + if (StringUtils.isEmpty(projectName)) throw new CxClientException("Project name parameter (-n ) must be provided to ScaResolver."); } @@ -2469,9 +2466,9 @@ public String getCurrentTime() { public FormValidation doTestConnection(@QueryParameter final String serverUrl, @QueryParameter final String password, @QueryParameter final String username, @QueryParameter final String timestamp, @QueryParameter final String credentialsId, @QueryParameter final boolean isProxy, @AncestorInPath Item item) { - if(item==null){ + if (item == null) { Jenkins.getInstance().checkPermission(Jenkins.ADMINISTER); - }else if(item!=null){ + } else if (item != null) { item.checkPermission(Item.CONFIGURE); } // timestamp is not used in code, it is one of the arguments to invalidate Internet Explorer cache @@ -2525,11 +2522,11 @@ public FormValidation doTestConnection(@QueryParameter final String serverUrl, @ * browser. */ @POST - public FormValidation doCheckScaSASTProjectID(@QueryParameter String value, @QueryParameter String scaSASTProjectFullPath,@AncestorInPath Item item) { - if (item == null) { + public FormValidation doCheckScaSASTProjectID(@QueryParameter String value, @QueryParameter String scaSASTProjectFullPath, @AncestorInPath Item item) { + if (item == null) { return FormValidation.ok(); - } - item.checkPermission(Item.CONFIGURE); + } + item.checkPermission(Item.CONFIGURE); if (StringUtil.isNullOrEmpty(value) && StringUtil.isNullOrEmpty(scaSASTProjectFullPath)) { return FormValidation.error("Must provide value for either 'Project Full Path' or 'Project Id'."); } @@ -2544,15 +2541,15 @@ public FormValidation doCheckScaSASTProjectID(@QueryParameter String value, @Que * @return */ @POST - public FormValidation doCheckCustomFields(@QueryParameter String value,@AncestorInPath Item item) { - if (item == null) { + public FormValidation doCheckCustomFields(@QueryParameter String value, @AncestorInPath Item item) { + if (item == null) { return FormValidation.ok(); - } + } item.checkPermission(Item.CONFIGURE); 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. \nCustom field allows to use these special characters: # . _ "); } return FormValidation.ok(); @@ -2564,10 +2561,10 @@ public FormValidation doCheckCustomFields(@QueryParameter String value,@Ancestor * @param value * @return */ - public FormValidation doCheckForceScan(@QueryParameter boolean value, @QueryParameter boolean incremental,@AncestorInPath Item item) { - if (item == null) { + public FormValidation doCheckForceScan(@QueryParameter boolean value, @QueryParameter boolean incremental, @AncestorInPath Item item) { + if (item == null) { return FormValidation.ok(); - } + } item.checkPermission(Item.CONFIGURE); if (incremental && value) { return FormValidation.error("Force scan and incremental scan can not be configured in pair for SAST"); @@ -2582,10 +2579,10 @@ public FormValidation doCheckForceScan(@QueryParameter boolean value, @QueryPara * @param value * @return */ - public FormValidation doCheckIncremental(@QueryParameter boolean value, @QueryParameter boolean forceScan,@AncestorInPath Item item) { - if (item == null) { + public FormValidation doCheckIncremental(@QueryParameter boolean value, @QueryParameter boolean forceScan, @AncestorInPath Item item) { + if (item == null) { return FormValidation.ok(); - } + } item.checkPermission(Item.CONFIGURE); if (forceScan && value) { forceScan = false; @@ -2601,9 +2598,9 @@ public FormValidation doTestScaSASTConnection(@QueryParameter final String scaSa @QueryParameter final String username, @QueryParameter final String timestamp, @QueryParameter final String sastCredentialsId, @QueryParameter final boolean isProxy, @AncestorInPath Item item) { - if(item==null){ + if (item == null) { Jenkins.getInstance().checkPermission(Jenkins.ADMINISTER); - }else if(item!=null){ + } else if (item != null) { item.checkPermission(Item.CONFIGURE); } // timestamp is not used in code, it is one of the arguments to @@ -2678,9 +2675,9 @@ public FormValidation doTestScaConnection(@QueryParameter String scaServerUrl, @QueryParameter String scaTenant, @QueryParameter Integer scaTimeout, @AncestorInPath Item item) { - if(item==null){ + if (item == null) { Jenkins.getInstance().checkPermission(Jenkins.ADMINISTER); - }else if(item!=null){ + } else if (item != null) { item.checkPermission(Item.CONFIGURE); } @@ -2769,9 +2766,9 @@ public ListBoxModel doFillPostScanActionIdItems(@QueryParameter final boolean us @QueryParameter final String username, @QueryParameter final String password, @QueryParameter final String timestamp, @QueryParameter final String credentialsId, @QueryParameter final boolean isProxy, @AncestorInPath Item item) { - if (item == null) { + if (item == null) { return new ListBoxModel(); - } + } item.checkPermission(Item.CONFIGURE); // timestamp is not used in code, it is one of the arguments to invalidate Internet Explorer cache ListBoxModel listBoxModel = new ListBoxModel(); @@ -2781,13 +2778,13 @@ public ListBoxModel doFillPostScanActionIdItems(@QueryParameter final boolean us StringEscapeUtils.escapeHtml4(getPasswordPlainText(password)), credentialsId, isProxy, this, item); commonClient = prepareLoggedInClient(connDetails); List teamList = commonClient.getPostScanActionList(); - if (listBoxModel.isEmpty() && !listBoxModel.contains("")){ + if (listBoxModel.isEmpty() && !listBoxModel.contains("")) { listBoxModel.add(new ListBoxModel.Option("", Integer.toString(0))); } for (PostAction postAction : teamList) { - if (postAction.getType().contains("POST_SCAN_COMMAND")){ + if (postAction.getType().contains("POST_SCAN_COMMAND")) { listBoxModel.add(new ListBoxModel.Option(postAction.getName(), Integer.toString(postAction.getId()))); - }else { + } else { continue; } @@ -2815,9 +2812,9 @@ public ComboBoxModel doFillProjectNameItems(@QueryParameter final boolean useOwn @QueryParameter final String username, @QueryParameter final String password, @QueryParameter final String timestamp, @QueryParameter final String credentialsId, @QueryParameter final boolean isProxy, @AncestorInPath Item item) { - if (item == null) { + if (item == null) { return new ComboBoxModel(); - } + } item.checkPermission(Item.CONFIGURE); // timestamp is not used in code, it is one of the arguments to invalidate Internet Explorer cache ComboBoxModel projectNames = new ComboBoxModel(); @@ -2862,9 +2859,9 @@ public ListBoxModel doFillPresetItems(@QueryParameter final boolean useOwnServer @QueryParameter final String username, @QueryParameter final String password, @QueryParameter final String timestamp, @QueryParameter final String credentialsId, @QueryParameter final boolean isProxy, @AncestorInPath Item item) { - if (item == null) { + if (item == null) { return new ListBoxModel(); - } + } item.checkPermission(Item.CONFIGURE); // timestamp is not used in code, it is one of the arguments to invalidate Internet Explorer cache ListBoxModel listBoxModel = new ListBoxModel(); @@ -2900,10 +2897,10 @@ public ListBoxModel doFillPresetItems(@QueryParameter final boolean useOwnServer * shared state to avoid synchronization issues. */ @POST - public FormValidation doCheckFullScanCycle(@QueryParameter final int value , @AncestorInPath Item item) { - if (item == null) { + public FormValidation doCheckFullScanCycle(@QueryParameter final int value, @AncestorInPath Item item) { + if (item == null) { return FormValidation.ok(); - } + } item.checkPermission(Item.CONFIGURE); if (value >= FULL_SCAN_CYCLE_MIN && value <= FULL_SCAN_CYCLE_MAX) { return FormValidation.ok(); @@ -2917,9 +2914,9 @@ public ListBoxModel doFillSourceEncodingItems(@QueryParameter final boolean useO @QueryParameter final String username, @QueryParameter final String password, @QueryParameter final String timestamp, @QueryParameter final String credentialsId, @QueryParameter final boolean isProxy, @AncestorInPath Item item) { - if (item == null) { + if (item == null) { return new ListBoxModel(); - } + } item.checkPermission(Item.CONFIGURE); // timestamp is not used in code, it is one of the arguments to invalidate Internet Explorer cache ListBoxModel listBoxModel = new ListBoxModel(); @@ -2960,9 +2957,9 @@ public ListBoxModel doFillGroupIdItems(@QueryParameter final boolean useOwnServe @QueryParameter final String username, @QueryParameter final String password, @QueryParameter final String timestamp, @QueryParameter final String credentialsId, @QueryParameter final boolean isProxy, @AncestorInPath Item item) { - if (item == null) { + if (item == null) { return new ListBoxModel(); - } + } item.checkPermission(Item.CONFIGURE); // timestamp is not used in code, it is one of the arguments to invalidate Internet Explorer cache ListBoxModel listBoxModel = new ListBoxModel(); @@ -2973,8 +2970,8 @@ public ListBoxModel doFillGroupIdItems(@QueryParameter final boolean useOwnServe commonClient = prepareLoggedInClient(connDetails); commonClient.getTeamList().stream().sorted( - (firstElmnt, secondElmnt) -> - firstElmnt.getFullName().compareToIgnoreCase(secondElmnt.fullName)) + (firstElmnt, secondElmnt) -> + firstElmnt.getFullName().compareToIgnoreCase(secondElmnt.fullName)) .forEach(team -> listBoxModel.add(new ListBoxModel.Option(team.getFullName(), team.getId()))); @@ -2991,11 +2988,12 @@ public ListBoxModel doFillGroupIdItems(@QueryParameter final boolean useOwnServe } } } + @POST public ListBoxModel doFillFailBuildOnNewSeverityItems(@AncestorInPath Item item) { - if (item == null) { + if (item == null) { return new ListBoxModel(); - } + } item.checkPermission(Item.CONFIGURE); ListBoxModel listBoxModel = new ListBoxModel(); listBoxModel.add(new ListBoxModel.Option("High", "HIGH")); @@ -3007,9 +3005,9 @@ public ListBoxModel doFillFailBuildOnNewSeverityItems(@AncestorInPath Item item) @POST public ListBoxModel doFillVulnerabilityThresholdResultItems(@AncestorInPath Item item) { - if (item == null) { + if (item == null) { return new ListBoxModel(); - } + } item.checkPermission(Item.CONFIGURE); ListBoxModel listBoxModel = new ListBoxModel(); @@ -3028,10 +3026,10 @@ public ListBoxModel doFillVulnerabilityThresholdResultItems(@AncestorInPath Item * avoid synchronization issues. */ @POST - public FormValidation doCheckHighThreshold(@QueryParameter final Integer value,@AncestorInPath Item item) { - if (item == null) { + public FormValidation doCheckHighThreshold(@QueryParameter final Integer value, @AncestorInPath Item item) { + if (item == null) { return FormValidation.ok(); - } + } item.checkPermission(Item.CONFIGURE); return checkNonNegativeValue(value); } @@ -3041,10 +3039,10 @@ public FormValidation doCheckHighThreshold(@QueryParameter final Integer value,@ * avoid synchronization issues. */ @POST - public FormValidation doCheckMediumThreshold(@QueryParameter final Integer value,@AncestorInPath Item item) { - if (item == null) { + public FormValidation doCheckMediumThreshold(@QueryParameter final Integer value, @AncestorInPath Item item) { + if (item == null) { return FormValidation.ok(); - } + } item.checkPermission(Item.CONFIGURE); return checkNonNegativeValue(value); } @@ -3054,10 +3052,10 @@ public FormValidation doCheckMediumThreshold(@QueryParameter final Integer value * avoid synchronization issues. */ @POST - public FormValidation doCheckLowThreshold(@QueryParameter final Integer value,@AncestorInPath Item item) { - if (item == null) { + public FormValidation doCheckLowThreshold(@QueryParameter final Integer value, @AncestorInPath Item item) { + if (item == null) { return FormValidation.ok(); - } + } item.checkPermission(Item.CONFIGURE); return checkNonNegativeValue(value); } @@ -3098,10 +3096,10 @@ public FormValidation doCheckLowThresholdEnforcement(@QueryParameter final Integ */ @POST - public FormValidation doCheckOsaHighThreshold(@QueryParameter final Integer value,@AncestorInPath Item item) { - if (item == null) { + public FormValidation doCheckOsaHighThreshold(@QueryParameter final Integer value, @AncestorInPath Item item) { + if (item == null) { return FormValidation.ok(); - } + } item.checkPermission(Item.CONFIGURE); return checkNonNegativeValue(value); } @@ -3111,10 +3109,10 @@ public FormValidation doCheckOsaHighThreshold(@QueryParameter final Integer valu * avoid synchronization issues. */ @POST - public FormValidation doCheckOsaMediumThreshold(@QueryParameter final Integer value,@AncestorInPath Item item) { - if (item == null) { + public FormValidation doCheckOsaMediumThreshold(@QueryParameter final Integer value, @AncestorInPath Item item) { + if (item == null) { return FormValidation.ok(); - } + } item.checkPermission(Item.CONFIGURE); return checkNonNegativeValue(value); } @@ -3124,16 +3122,16 @@ public FormValidation doCheckOsaMediumThreshold(@QueryParameter final Integer va * avoid synchronization issues. */ @POST - public FormValidation doCheckOsaLowThreshold(@QueryParameter final Integer value,@AncestorInPath Item item) { - if (item == null) { + public FormValidation doCheckOsaLowThreshold(@QueryParameter final Integer value, @AncestorInPath Item item) { + if (item == null) { return FormValidation.ok(); - } + } item.checkPermission(Item.CONFIGURE); return checkNonNegativeValue(value); } @POST - public FormValidation doCheckOsaHighThresholdEnforcement(@QueryParameter final Integer value) { + public FormValidation doCheckOsaHighThresholdEnforcement(@QueryParameter final Integer value) { Jenkins.getInstance().checkPermission(Jenkins.ADMINISTER); return checkNonNegativeValue(value); } @@ -3258,9 +3256,9 @@ public void setLockVulnerabilitySettings(boolean lockVulnerabilitySettings) { @POST public ListBoxModel doFillCredentialsIdItems(@AncestorInPath Item item, @QueryParameter String credentialsId) { - if(item==null){ + if (item == null) { Jenkins.getInstance().checkPermission(Jenkins.ADMINISTER); - }else if(item!=null){ + } else if (item != null) { item.checkPermission(Item.CONFIGURE); } return getCredentialList(item, credentialsId); @@ -3268,9 +3266,9 @@ public ListBoxModel doFillCredentialsIdItems(@AncestorInPath Item item, @QueryPa @POST public ListBoxModel doFillScaCredentialsIdItems(@AncestorInPath Item item, @QueryParameter String scaCredentialsId) { - if(item==null){ + if (item == null) { Jenkins.getInstance().checkPermission(Jenkins.ADMINISTER); - }else if(item!=null){ + } else if (item != null) { item.checkPermission(Item.CONFIGURE); } return getCredentialList(item, scaCredentialsId); @@ -3278,9 +3276,9 @@ public ListBoxModel doFillScaCredentialsIdItems(@AncestorInPath Item item, @Quer @POST public ListBoxModel doFillSastCredentialsIdItems(@AncestorInPath Item item, @QueryParameter String sastCredentialsId) { - if(item==null){ + if (item == null) { Jenkins.getInstance().checkPermission(Jenkins.ADMINISTER); - }else if(item!=null){ + } else if (item != null) { item.checkPermission(Item.CONFIGURE); } return getCredentialList(item, sastCredentialsId);