Skip to content

Commit

Permalink
Merge pull request #7 from Zimperium/ESCALATED-3242
Browse files Browse the repository at this point in the history 
Fix for Escalated-3242: newly submitted app not visible in console
  • Loading branch information
@exlegalalien
exlegalalien authored Oct 1, 2024
2 parents dfaac18 + b3f4e20 commit 472b13c
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 7 deletions.
44 changes: 40 additions & 4 deletions src/main/java/com/zimperium/plugins/zDevJenkinsUploadPlugin/ZDevUploadPlugin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import hudson.tasks.Recorder;
import hudson.util.FormValidation;
import hudson.util.Secret;
import jenkins.model.Jenkins;
import jenkins.tasks.SimpleBuildStep;
import net.sf.json.JSONObject;
import okhttp3.*;
Expand Down Expand Up @@ -236,6 +237,12 @@ public void perform(Run<?, ?> run, FilePath workspace, Launcher launcher, TaskLi
// If teamID is empty, find the correct team id by name
if(teamId.isEmpty()) {
log(console, "Application " + zdevAppId + " does not belong to a team. Assigning it to the " + teamName + " team.");

// need to wait a bit; otherwise we can get 404
synchronized(this) {
wait(checkInterval * 1000);
}

// get the list of teams to figure out team id
Call<ResponseBody> teamsCall = service.listTeams(authToken);
Response<ResponseBody> teamList = teamsCall.execute();
Expand Down Expand Up @@ -287,17 +294,30 @@ public void perform(Run<?, ?> run, FilePath workspace, Launcher launcher, TaskLi
else {
log(console, "Unable to assign this app to a team. Please review team name setting and retry.");
if(assignResponse.errorBody() != null) {
log(console, "HTTP " + assignResponse.code() + ": " + assignResponse.errorBody());
log(console, "HTTP " + assignResponse.code() + ": " + assignResponse.errorBody().string());
}
}
}
else {
log(console, "Unable to assign this app to a team. Please review team name setting and retry.");
}
}
else {
log(console, "Unable to assign this app to a team. Unexpected response from the server.");
if(teamList.body() != null) {
log(console, "HTTP " + teamList.code() + ": " + teamList.body().string());
}
}
}
else {
log(console, "Unable to assign this app to a team. Please review team name setting and credentials, and retry.");
if(teamList.errorBody() != null) {
log(console, "HTTP " + teamList.code() + ": " + teamList.errorBody().string());
}
}
}
catch(RuntimeException e) {
log(console, "Unexpected runtime exception: " + e.getLocalizedMessage());
throw e;
}
catch(Exception e) {
Expand Down Expand Up @@ -355,6 +375,15 @@ public void perform(Run<?, ?> run, FilePath workspace, Launcher launcher, TaskLi
break;
}
}
else if (statusResponse.code() != 404) {
log(console, "Unable to get assessment report. Please check credentials and try again.");
if(statusResponse.errorBody() != null) {
log(console, "HTTP " + statusResponse.code() + ": " + statusResponse.errorBody().string());
}
run.setResult(Result.UNSTABLE);
// move on to the next one
break;
}

wait(checkInterval * 1000);
}
Expand Down Expand Up @@ -419,6 +448,7 @@ public void perform(Run<?, ?> run, FilePath workspace, Launcher launcher, TaskLi
}
}
catch(RuntimeException e) {
log(console, "Unexpected runtime exception: " + e.getLocalizedMessage());
throw e;
}
catch(Exception e) {
Expand Down Expand Up @@ -480,8 +510,10 @@ public String getDisplayName() {
return "Upload build artifacts to zScan";
}

// TODO: Add server validation logic
public FormValidation doCheckEndpoint(@QueryParameter String value) throws IOException, ServletException {
if (value.isBlank()) {
return FormValidation.error("Endpoint cannot be blank.");
}
return FormValidation.ok();
}

Expand Down Expand Up @@ -546,7 +578,6 @@ public String getDefaultTeamName() {
// Validate credentials by trying to obtain access token
// This method can be executed by anyone since the token is not saved or logged anywhere
// Only the response code is checked
@SuppressWarnings("lgtm[jenkins/no-permission-check]")
@POST
public FormValidation doValidateCredentials(
@QueryParameter("endpoint") final String endpoint,
Expand All @@ -555,6 +586,8 @@ public FormValidation doValidateCredentials(
@AncestorInPath Job<?,?> job) {

try {
Jenkins.get().checkPermission(hudson.security.Permission.CONFIGURE);

OkHttpClient okHttpClient = new OkHttpClient().newBuilder()
.writeTimeout(2, TimeUnit.MINUTES)
.readTimeout(60, TimeUnit.SECONDS)
Expand All @@ -575,11 +608,14 @@ public FormValidation doValidateCredentials(
return FormValidation.error("Unable to login with provided Client ID and Client Secret to " + endpoint);
}
}
catch(hudson.security.AccessDeniedException3 e) {
return FormValidation.error("User not authorized to check credentials.");
}
catch(java.net.UnknownHostException e) {
return FormValidation.error("Unknown host: " + endpoint);
}
catch(java.io.IOException e) {
return FormValidation.error("Unable to connect to the provided endpoint: " + endpoint);
return FormValidation.error("Unable to connect to the provided endpoint: " + endpoint + "(" + e.getLocalizedMessage() + ")");
}
catch(Exception e) {
return FormValidation.error("Error validating credentials: " + e.getLocalizedMessage());
Expand Down
6 changes: 3 additions & 3 deletions ...main/java/com/zimperium/plugins/zDevJenkinsUploadPlugin/services/UploadPluginService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public interface UploadPluginService {
@POST("api/auth/v1/api_keys/access")
Call<LoginResponse> refreshAccess(@Body RefreshCredentials body);

@POST("api/zdev-upload/v1/uploads/build")
@POST("api/zdev-upload/public/v1/uploads/build")
Call<ResponseBody> upload(@Header("Authorization") String clientSecret, @Body RequestBody body);

@PUT("api/zdev-app/public/v1/apps/{appId}/upload")
Expand All @@ -30,10 +30,10 @@ public interface UploadPluginService {
@GET("api/auth/public/v1/teams")
Call<ResponseBody> listTeams(@Header("Authorization") String clientSecret);

@GET("api/zdev-app/pub/v1/assessments/status")
@GET("api/zdev-app/public/v1/assessments/status")
Call<ResponseBody> checkStatus(@Query("buildId") String buildId, @Header("Authorization") String clientSecret);

@GET("api/zdev-app/pub/v1/assessments/{assessmentId}/{report_format}")
@GET("api/zdev-app/public/v1/assessments/{assessmentId}/{report_format}")
@Streaming
Call<ResponseBody> downloadReport(@Path("assessmentId") String assessmentId, @Path("report_format") String reportFormat, @Header("Authorization") String clientSecret);
}

0 comments on commit 472b13c

Please sign in to comment.