opensource/graylog-project-cli
1
0
Fork 0
mirror of https://github.com/Graylog2/graylog-project-cli.git synced 2026-03-13 08:02:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

utils.NameFromRepository: Handle user:password in URI

Browse Source 
Add colon to the username removal regex to also account
for the use of passwords encoded in the URI.
This commit is contained in:
Janosch Rux
2019-06-25 16:01:40 +02:00
parent e185379c24
commit 2c899255ed
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
utils/utils.go
View File

@@ -84,7 +84,7 @@ func NameFromRepository(repository string) string {
if needle != nil {
name = name[needle[1]:]
}
user := regexp.MustCompile("^[a-zA-Z0-9_.-]+@")
user := regexp.MustCompile("^[a-zA-Z0-9_.-:]+@")
needle = user.FindStringIndex(name)
if needle != nil {
name = name[needle[1]:]

1
utils/utils_test.go
View File

@@ -18,6 +18,7 @@ var repos = [...]string {
"user@example.org:graylog2-server",
"user@example.org:graylog2-server/",
"../../graylog2-server",
"https://user:password@example.org/External/Graylog2/graylog2-server.git",
}
func TestNameFromRepository(t *testing.T) {