diff --git a/pom.xml b/pom.xml index 10dab61..387cd92 100644 --- a/pom.xml +++ b/pom.xml @@ -13,8 +13,8 @@ The not-very-obvious `version` value is found in this table: https://github.com/jenkinsci/bom?tab=readme-ov-file#depending-on-older-versions --> - bom-2.387.x - 2543.vfb_1a_5fb_9496d + bom-2.452.x + 3358.vea_fa_1f41504d import pom @@ -42,26 +42,21 @@ org.jenkins-ci.plugins plugin - 4.86 + 4.87 io.jenkins.plugins zscan-upload - 2.1.0 + 2.1.1 hpi - 2.440.3 + 2.452.4 Upload to zScan This plugin uploads build artifacts to Zimperium zScan for app analysis diff --git a/src/main/java/com/zimperium/plugins/zDevJenkinsUploadPlugin/ZDevUploadPlugin.java b/src/main/java/com/zimperium/plugins/zDevJenkinsUploadPlugin/ZDevUploadPlugin.java index 7542a3f..651dfef 100644 --- a/src/main/java/com/zimperium/plugins/zDevJenkinsUploadPlugin/ZDevUploadPlugin.java +++ b/src/main/java/com/zimperium/plugins/zDevJenkinsUploadPlugin/ZDevUploadPlugin.java @@ -22,6 +22,7 @@ import hudson.tasks.Publisher; import hudson.tasks.Recorder; import hudson.util.FormValidation; +import hudson.util.Secret; import jenkins.tasks.SimpleBuildStep; import net.sf.json.JSONObject; import okhttp3.*; @@ -69,7 +70,7 @@ public class ZDevUploadPlugin extends Recorder implements SimpleBuildStep{ public String excludedFile; public String endpoint; public String clientId; - public String clientSecret; + public Secret clientSecret; // optional private Boolean waitForReport; @@ -78,7 +79,7 @@ public class ZDevUploadPlugin extends Recorder implements SimpleBuildStep{ private String teamName; @DataBoundConstructor - public ZDevUploadPlugin(String sourceFile, String excludedFile, String endpoint, String clientId, String clientSecret) { + public ZDevUploadPlugin(String sourceFile, String excludedFile, String endpoint, String clientId, Secret clientSecret) { this.sourceFile = sourceFile; this.excludedFile = excludedFile; this.endpoint = endpoint; @@ -173,7 +174,7 @@ public void perform(Run run, FilePath workspace, Launcher launcher, TaskLi } // Login and obtain a token - Call loginResponseCall = service.login(new LoginCredentials(this.clientId, this.clientSecret)); + Call loginResponseCall = service.login(new LoginCredentials(this.clientId, Secret.toString(this.clientSecret))); Response response = loginResponseCall.execute(); if (!response.isSuccessful() || response.body() == null) { @@ -343,7 +344,7 @@ public void perform(Run run, FilePath workspace, Launcher launcher, TaskLi if(scanStatus.equals("Done")) { assessmentId = statusObject.get("id").getAsString(); // need to pause before continuing to make sure reports are available - log(console, "Waiting for the report to become available."); + log(console, "Waiting for the report to become available..."); wait(checkInterval * 1000); break; }