Skip to content

Fix problems found by SonarQube #1

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
taskinen wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix problems found by SonarQube #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 23 additions & 22 deletions core/src/main/java/hudson/tools/ZipExtractionInstaller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,16 +83,16 @@ public String getSubdir() {
}

@Override
public FilePath performInstallation(ToolInstallation tool, Node node, TaskListener log) throws IOException, InterruptedException {
public FilePath performInstallation(ToolInstallation tool, Node node, TaskListener log)
throws IOException, InterruptedException {
FilePath dir = preferredLocation(tool, node);
if (dir.installIfNecessaryFrom(new URL(url), log, "Unpacking " + url + " to " + dir + " on " + node.getDisplayName())) {
if (dir.installIfNecessaryFrom(
new URL(url),
log,
"Unpacking " + url + " to " + dir + " on " + node.getDisplayName())) {
dir.act(new ChmodRecAPlusX());
}
if (subdir == null) {
return dir;
} else {
return dir.child(subdir);
}
return (subdir == null) ? dir : dir.child(subdir);
}

@Extension @Symbol("zip")
Expand All @@ -119,6 +119,7 @@ public FormValidation doCheckUrl(@QueryParameter String value) throws Interrupte
} catch (URISyntaxException e) {
return FormValidation.error(e, Messages.ZipExtractionInstaller_malformed_url());
}

if (uri.getScheme() != null && !uri.getScheme().startsWith("http")) {
try {
Path.of(uri);
Expand All @@ -127,17 +128,19 @@ public FormValidation doCheckUrl(@QueryParameter String value) throws Interrupte
return FormValidation.error(e, Messages.ZipExtractionInstaller_malformed_url());
}
}
HttpClient httpClient = ProxyConfiguration.newHttpClient();
HttpRequest httpRequest;
try {
httpRequest = ProxyConfiguration.newHttpRequestBuilder(uri)
.method("HEAD", HttpRequest.BodyPublishers.noBody())
.build();
} catch (IllegalArgumentException e) {
return FormValidation.error(e, Messages.ZipExtractionInstaller_malformed_url());
}
try {
HttpResponse<Void> httpResponse = httpClient.send(httpRequest, HttpResponse.BodyHandlers.discarding());

try (HttpClient httpClient = ProxyConfiguration.newHttpClient()) {
HttpRequest httpRequest;
try {
httpRequest = ProxyConfiguration.newHttpRequestBuilder(uri)
.method("HEAD", HttpRequest.BodyPublishers.noBody())
.build();
} catch (IllegalArgumentException e) {
return FormValidation.error(e, Messages.ZipExtractionInstaller_malformed_url());
}

HttpResponse<Void> httpResponse =
httpClient.send(httpRequest, HttpResponse.BodyHandlers.discarding());
if (httpResponse.statusCode() == HttpURLConnection.HTTP_OK) {
return FormValidation.ok();
}
Expand All @@ -146,20 +149,19 @@ public FormValidation doCheckUrl(@QueryParameter String value) throws Interrupte
return FormValidation.error(e, Messages.ZipExtractionInstaller_could_not_connect());
}
}

}

/**
* Sets execute permission on all files, since unzip etc. might not do this.
* Hackish, is there a better way?
*/
static class ChmodRecAPlusX extends MasterToSlaveFileCallable<Void> {
private static final long serialVersionUID = 1L;

@Override
public Void invoke(File d, VirtualChannel channel) throws IOException {
if (!Functions.isWindows())
if (!Functions.isWindows()) {
process(d);
}
return null;
}

Expand All @@ -176,5 +178,4 @@ private void process(File f) {
}
}
}

}