Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,9 @@ according to your preferences.
<br >You can set the vulnerability severity alert level to `Error` or `Warning` for inline notifications of detected
vulnerabilities.

- **Proxy Configuration** :
<br >From IntelliJ IDEA Appearance & Behavior > System Settings > HTTP Proxy, you can configure a proxy for all HTTP requests made by the plugin. This is useful when your environment requires going through a proxy to access external services. For example:`http://proxy.example.com:8080`

## Features

- **Component analysis**
Expand Down
30 changes: 30 additions & 0 deletions src/main/java/org/jboss/tools/intellij/exhort/ApiService.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.extensions.PluginDescriptor;
import com.intellij.openapi.extensions.PluginId;
import com.intellij.util.net.ProxyConfiguration;
import com.intellij.util.net.ProxySettings;
import com.redhat.exhort.Api;
import com.redhat.exhort.api.v4.AnalysisReport;
import com.redhat.exhort.impl.ExhortApi;
Expand All @@ -26,6 +28,7 @@
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionException;
import java.util.concurrent.ExecutionException;
Expand Down Expand Up @@ -211,5 +214,32 @@ private void setRequestProperties(final String manifestName) {
if (!"go.mod".equals(manifestName) && !"requirements.txt".equals(manifestName)) {
System.clearProperty("MATCH_MANIFEST_VERSIONS");
}
Optional<String> proxyUrlOpt = getProxyUrl();
if (proxyUrlOpt.isPresent()) {
System.setProperty("EXHORT_PROXY_URL", proxyUrlOpt.get());
} else {
System.clearProperty("EXHORT_PROXY_URL");
}
}

public static Optional<String> getProxyUrl() {
// This API only works in 2024.2+ versions.
ProxyConfiguration proxyConfiguration = ProxySettings.getInstance().getProxyConfiguration();

if (proxyConfiguration instanceof ProxyConfiguration.StaticProxyConfiguration) {
ProxyConfiguration.StaticProxyConfiguration staticProxyConfiguration =
(ProxyConfiguration.StaticProxyConfiguration) proxyConfiguration;

String protocol = staticProxyConfiguration.getProtocol().toString().toLowerCase(); // e.g., "http" or "socks"
String host = staticProxyConfiguration.getHost();
int port = staticProxyConfiguration.getPort();

if (host != null && !host.isBlank() && port > 0 && protocol.equals("http")) {
String proxyUrl = protocol + "://" + host.trim() + ":" + port;
return Optional.of(proxyUrl);
}
}

return Optional.empty();
}
}
10 changes: 10 additions & 0 deletions src/main/java/org/jboss/tools/intellij/image/ApiService.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,15 @@
import java.nio.file.Path;
import java.util.Collection;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.CompletionException;
import java.util.concurrent.ExecutionException;
import java.util.function.Function;
import java.util.stream.Collectors;

import static org.jboss.tools.intellij.exhort.ApiService.getProxyUrl;

@Service(Service.Level.APP)
public final class ApiService {

Expand Down Expand Up @@ -163,5 +166,12 @@ private void setServiceEnvironment() {
} else {
System.clearProperty("EXHORT_IMAGE_PLATFORM");
}

Optional<String> proxyUrlOpt = getProxyUrl();
if (proxyUrlOpt.isPresent()) {
System.setProperty("EXHORT_PROXY_URL", proxyUrlOpt.get());
} else {
System.clearProperty("EXHORT_PROXY_URL");
}
}
}
Loading