Merge pull request #27

Fix JVM proxy parsing for pip invoked by Maven/Gradle plugins

Author: steve-s

integration-tests/test_gradle_plugin.py

@@ -496,6 +496,29 @@ def check_gradle_python_resources_dir_and_external_dir_error(self):
             util.check_ouput("Cannot set both 'externalDirectory' and 'resourceDirectory' at the same time", out)
             assert return_code != 0, out
 
+    def check_proxy_settings(self):
+        with TemporaryTestDirectory() as tmpdir:
+            target_dir = os.path.join(str(tmpdir), "proxy_test" + self.target_dir_name_sufix())
+            self.generate_app(target_dir)
+            build_file = os.path.join(target_dir, self.build_file_name)
+            append(build_file, self.packages_termcolor())
+
+            # Create gradle.properties with dummy proxy
+            properties_path = os.path.join(target_dir, "gradle.properties")
+            with open(properties_path, 'a') as f:
+                f.write("\nsystemProp.http.proxyHost=somethingnonexisting.oracle.com\n")
+                f.write("systemProp.http.proxyPort=1234\n")
+                f.write("systemProp.https.proxyHost=somethingnonexisting.oracle.com\n")
+                f.write("systemProp.https.proxyPort=1234\n")
+
+            log = Logger()
+            gradlew_cmd = util.get_gradle_wrapper(target_dir, self.env)
+            cmd = gradlew_cmd + ["--info", "assemble"]
+            out, return_code = util.run_cmd(cmd, self.env, cwd=target_dir, logger=log)
+            assert return_code != 0, out
+            expected_proxy = "--proxy http://somethingnonexisting.oracle.com:1234"
+            util.check_ouput(expected_proxy, out, contains=True, logger=log)
+
 
     def app1_with_namespaced_vfs(self):
         pass
@@ -615,6 +638,9 @@ def test_gradle_python_resources_dir_deprecation(self):
     def test_gradle_python_resources_dir_and_external_dir_error(self):
         self.check_gradle_python_resources_dir_and_external_dir_error()
 
+    def test_proxy_settings(self):
+        self.check_proxy_settings()
+
     def target_dir_name_sufix(self):
         return "_groovy"
 
@@ -775,6 +801,9 @@ def test_gradle_python_resources_dir_deprecation(self):
     def test_gradle_python_resources_dir_and_external_dir_error(self):
         self.check_gradle_python_resources_dir_and_external_dir_error()
 
+    def test_proxy_settings(self):
+        self.check_proxy_settings()
+
     def target_dir_name_sufix(self):
         return "_kotlin"
 

org.graalvm.python.embedding.tools/src/main/java/org/graalvm/python/embedding/tools/exec/GraalPyRunner.java

@@ -55,6 +55,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
+import java.net.InetSocketAddress;
 
 public class GraalPyRunner {
 
@@ -137,30 +138,20 @@ private static void runVenvBin(Path venvDirectory, String command, BuildToolLog
 	}
 
 	private static void addProxy(ArrayList<String> args) {
-		// if set, pip takes environment variables http_proxy and https_proxy
 		if (System.getenv("http_proxy") == null && System.getenv("https_proxy") == null) {
-			// if not set, use --proxy param
 			ProxySelector proxySelector = ProxySelector.getDefault();
 			List<Proxy> proxies = proxySelector.select(URI.create("https://pypi.org"));
-
-			String proxyAddr = null;
 			for (Proxy proxy : proxies) {
-				if (proxy.type() == Proxy.Type.HTTP) {
-					proxyAddr = fixProtocol(proxy.address().toString(), "http");
-					break;
+				if (proxy.type() == Proxy.Type.HTTP && proxy.address() instanceof InetSocketAddress addr) {
+					String proxyAddr = "http://" + addr.getHostName() + ":" + addr.getPort();
+					args.add("--proxy");
+					args.add(proxyAddr);
+					return;
 				}
 			}
-			if (proxyAddr != null) {
-				args.add("--proxy");
-				args.add(proxyAddr);
-			}
 		}
 	}
 
-	private static String fixProtocol(String proxyAddress, String protocol) {
-		return proxyAddress.startsWith(protocol) ? proxyAddress : protocol + "://" + proxyAddress;
-	}
-
 	private static void runProcess(ProcessBuilder pb, BuildToolLog log) throws IOException, InterruptedException {
 		Process process = pb.start();
 		Thread outputReader = new Thread(() -> {