seg_yinzy
/
che-operator
mirror of https://github.com/eclipse-che/che-operator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix protocol removing for Java proxy opts (#315) 

Signed-off-by: Mykola Morhun <mmorhun@redhat.com>
pull/316/head
Mykola Morhun 2020-06-19 09:07:17 +03:00 committed by GitHub
parent 912fd52fc4
commit aee5ca3567
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/util/util.go
View File

@ -253,7 +253,15 @@ func GenerateProxyJavaOpts(proxyURL string, proxyPort string, nonProxyHosts stri
}
}
proxyHost := strings.TrimLeft(proxyURL, "https://")
var proxyHost string
if strings.HasPrefix(proxyURL, "https://") {
proxyHost = strings.TrimPrefix(proxyURL, "https://")
} else if strings.HasPrefix(proxyURL, "http://") {
proxyHost = strings.TrimPrefix(proxyURL, "http://")
} else {
proxyHost = proxyURL
}
proxyUserPassword := ""
if len(proxyUser) > 1 && len(proxyPassword) > 1 {
proxyUserPassword =

20
pkg/util/util_test.go
View File

@ -12,10 +12,11 @@
package util
import (
"github.com/sirupsen/logrus"
"os"
"reflect"
"testing"
"github.com/sirupsen/logrus"
)
const (
@ -58,19 +59,24 @@ func TestGenerateProxyJavaOpts(t *testing.T) {
expectedJavaOpts := " -Dhttp.proxyHost=myproxy.com -Dhttp.proxyPort=1234 -Dhttps.proxyHost=myproxy.com " +
"-Dhttps.proxyPort=1234 -Dhttp.nonProxyHosts='localhost|myhost.com' -Dhttp.proxyUser=user " +
"-Dhttp.proxyPassword=password -Dhttps.proxyUser=user -Dhttps.proxyPassword=password"
if !reflect.DeepEqual(javaOpts,expectedJavaOpts) {
if !reflect.DeepEqual(javaOpts, expectedJavaOpts) {
t.Errorf("Test failed. Expected '%s' but got '%s'", expectedJavaOpts, javaOpts)
}
javaOpts, _ = GenerateProxyJavaOpts(proxyHost, proxyPort, nonProxyHosts, "", proxyPassword, "", "")
expectedJavaOptsWithoutUsernamePassword := " -Dhttp.proxyHost=myproxy.com -Dhttp.proxyPort=1234 -Dhttps.proxyHost=myproxy.com " +
"-Dhttps.proxyPort=1234 -Dhttp.nonProxyHosts='localhost|myhost.com'"
if !reflect.DeepEqual(javaOpts ,expectedJavaOptsWithoutUsernamePassword) {
if !reflect.DeepEqual(javaOpts, expectedJavaOptsWithoutUsernamePassword) {
t.Errorf("Test failed. Expected '%s' but got '%s'", expectedJavaOptsWithoutUsernamePassword, javaOpts)
}
javaOpts, _ = GenerateProxyJavaOpts("http://myproxy.com", proxyPort, nonProxyHosts, "", proxyPassword, "", "")
expectedJavaOptsWithoutUsernamePassword = " -Dhttp.proxyHost=myproxy.com -Dhttp.proxyPort=1234 -Dhttps.proxyHost=myproxy.com " +
"-Dhttps.proxyPort=1234 -Dhttp.nonProxyHosts='localhost|myhost.com'"
if !reflect.DeepEqual(javaOpts, expectedJavaOptsWithoutUsernamePassword) {
t.Errorf("Test failed. Expected '%s' but got '%s'", expectedJavaOptsWithoutUsernamePassword, javaOpts)
}
}
func TestGeneratePasswd(t *testing.T) {
@ -83,7 +89,7 @@ func TestGeneratePasswd(t *testing.T) {
}
passwd1 := GeneratePasswd(12)
if reflect.DeepEqual (passwd, passwd1) {
if reflect.DeepEqual(passwd, passwd1) {
t.Errorf("Test failed. Passwords are identical, %s: %s", passwd, passwd1)
}
}