[FIXED JENKINS-24112] Support authentication proxy

jenkinsci · Aug 5, 2014 · 227bd79 · 227bd79
1 parent 30e87a3
commit 227bd79
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/gitclient/CliGitAPIImpl.java b/src/main/java/org/jenkinsci/plugins/gitclient/CliGitAPIImpl.java
@@ -1184,10 +1184,21 @@ private String launchCommandWithCredentials(ArgumentListBuilder args, File workD
                     }
                     if(shouldProxy) {
                         env = new EnvVars(env);
-                        String http_proxy = "http://" + proxy.name + ":" + proxy.port + "/";
-                        listener.getLogger().println("Setting http proxy: " + http_proxy);
-                        env.put("http_proxy", http_proxy);
-                        env.put("https_proxy", http_proxy);
+                        listener.getLogger().println("Setting http proxy: " + proxy.name + ":" + proxy.port);
+                        String userInfo = null;
+                        if (proxy.getUserName() != null) {
+                            userInfo = proxy.getUserName();
+                            if (proxy.getPassword() != null) {
+                                userInfo += ":" + proxy.getPassword();
+                            }
+                        }
+                        try {
+                            URI http_proxy = new URI("http", userInfo, proxy.name, proxy.port, null, null, null);
+                            env.put("http_proxy", http_proxy.toString());
+                            env.put("https_proxy", http_proxy.toString());
+                        } catch (URISyntaxException ex) {
+                            throw new GitException("Failed to create http proxy uri", ex);
+                        }
                     }
                 }
             }