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
4 changes: 3 additions & 1 deletion pkg/urlutil/urlerrorhelper.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ func RemoveUrlFromErr(err error) error {
}

func IsValidUrl(urlstring string) bool {
u, parseError := url.Parse(urlstring)
// Remove leading and trailing quotes
noQuotes := strings.Trim(urlstring, `"'`)
u, parseError := url.Parse(noQuotes)
if parseError == nil && u.Scheme != "" && u.Host != "" {
return true
}
Expand Down
9 changes: 9 additions & 0 deletions pkg/urlutil/urlerrorhelper_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import (
"fmt"
"strings"
"testing"

"github.com/stretchr/testify/require"
)

func Test_expectedErrorString(t *testing.T) {
Expand All @@ -19,6 +21,13 @@ func Test_expectedErrorString(t *testing.T) {
}
}

func Test_TrailingLeadingQuotes(t *testing.T) {
errorString := "Get \"https://rm-agent.prod.manageddevops.microsoft.com/1223456/AngryChipmunk-x64.tar.gz?expires=12345&keyId=mykey&signature=notasignature\": EOF' :"
inputErr := fmt.Errorf("%s", errorString)
outputErr := RemoveUrlFromErr(inputErr)
require.Equal(t, "Get [REDACTED] EOF' :", outputErr.Error())
}

func Test_nonHttpsSchema(t *testing.T) {
errorString := `Gethttps://aaaaaaaa.blob.core.windows.net/nodeagentpackage-version9-0-0-381/Ubuntu-16.04/batch_config-ubuntu-16.04-1.5.9.tar.gz?sv=2018-03-28&sr=b&sig=a%secret%2Bsecret&st=2019-05-17T01%3A25%3A42Z&se=2021-05-24T01%3A25%3A42Z&sp=r: dial tcp 13.68.165.64:443: i/o timeout`
inputErr := fmt.Errorf("%s", errorString)
Expand Down
Loading