-
Notifications
You must be signed in to change notification settings - Fork 38
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/dev' into curation_go_support
- Loading branch information
Showing
10 changed files
with
203 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| package utils | ||
|
|
||
| import ( | ||
| gofrogcmd "github.com/jfrog/gofrog/io" | ||
| "strings" | ||
| ) | ||
|
|
||
| // #nosec G101 -- False positive - no hardcoded credentials. | ||
| const CredentialsInUrlRegexp = `(?:http|https|git)://.+@` | ||
|
|
||
| // Remove the credentials information from the line. | ||
| func RemoveCredentials(pattern *gofrogcmd.CmdOutputPattern) (string, error) { | ||
| splitResult := strings.Split(pattern.MatchedResults[0], "//") | ||
| return strings.ReplaceAll(pattern.Line, pattern.MatchedResults[0], splitResult[0]+"//***@"), nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,6 +2,8 @@ package pythonutils | |
|
|
||
| import ( | ||
| "fmt" | ||
| "github.com/jfrog/build-info-go/utils" | ||
| "regexp" | ||
| "strings" | ||
| "testing" | ||
|
|
||
|
|
@@ -77,6 +79,20 @@ Collecting PyYAML==5.1.2 (from jfrog-python-example==1.0) | |
| Installing build dependencies: started`, | ||
| expectedCapture: `PyYAML-5.1.2.tar.gz`, | ||
| }, | ||
| { | ||
| name: "Downloading - multi line captures", | ||
| startCapturePattern: startDownloadingPattern, | ||
| captureGroupPattern: downloadingCaptureGroup, | ||
| endCapturePattern: endPattern, | ||
| text: ` Preparing metadata (pyproject.toml): finished with status 'done' | ||
| Collecting PyYAML==5.1.2 (from jfrog-python-example==1.0) | ||
| Downloading http://localhost:8081/artifactory/api/pypi/cli-pypi-virtual-1698 | ||
| 829558/packages/packages/e3/e8/b3212641ee2718d556df0f23f78de8303f068fe29cdaa7a91018849 | ||
| 582fe/PyYAML-5.1.2%2Bsp1.tar.gz (265 kB) | ||
| ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 265.0/265.0 kB 364.4 MB/s eta 0:00:00 | ||
| Installing build dependencies: started`, | ||
| expectedCapture: `PyYAML-5.1.2+sp1.tar.gz`, | ||
| }, | ||
| } | ||
|
|
||
| for _, testCase := range tests { | ||
|
|
@@ -125,3 +141,79 @@ func runDummyTextStream(t *testing.T, txt string, parsers []*gofrogcmd.CmdOutput | |
| } | ||
| } | ||
| } | ||
|
|
||
| func TestMaskPreKnownCredentials(t *testing.T) { | ||
| tests := []struct { | ||
| name string | ||
| inputText string | ||
| credentialsArgument string | ||
| }{ | ||
| { | ||
| name: "Single line credentials", | ||
| inputText: ` | ||
| Preparing Installation of "toml==0.10.2; python_version >= '2.6' and | ||
| python_version not in '3.0, 3.1, 3.2' | ||
| --hash=sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b | ||
| --hash=sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f" | ||
| $ | ||
| /usr/local/Cellar/pipenv/2023.12.1/libexec/lib/python3.12/site-packages/pipenv/p | ||
| atched/pip/__pip-runner__.py install -i | ||
| https://user:[email protected]/artifactory/api/pypi/cli-pipenv-pypi-virtual-1715766379/simple | ||
| --no-input --upgrade --no-deps -r | ||
| /var/folders/2c/cdvww2550p90b0sdbz6w6jqc0000gn/T/pipenv-bs956chg-requirements/pi | ||
| penv-hejkfcsj-hashed-reqs.txt`, | ||
| credentialsArgument: "https://user:[email protected]/artifactory/api/pypi/cli-pipenv-pypi-virtual-1715766379/simple", | ||
| }, | ||
| { | ||
| name: "Multiline credentials", | ||
| inputText: ` | ||
| Preparing Installation of "toml==0.10.2; python_version >= '2.6' and | ||
| python_version not in '3.0, 3.1, 3.2' | ||
| --hash=sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b | ||
| --hash=sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f" | ||
| $ | ||
| /usr/local/Cellar/pipenv/2023.12.1/libexec/lib/python3.12/site-packages/pipenv/p | ||
| atched/pip/__pip-runner__.py install -i | ||
| https://user:not.an.actual.token.not.an.actual.token.not.an.actual.token.not.an. | ||
| actual.token.not.an.actual.token.not.an.actual.token.not.an.actual.token.not.an. | ||
| actual.token.not.an.actual.token.not.an.actual.token.not.an.actual.token.not.an. | ||
| [email protected]/artifactory/api/pypi/cli-pipenv-pypi-virtual-17 | ||
| 15766379/simple | ||
| --no-input --upgrade --no-deps -r | ||
| /var/folders/2c/cdvww2550p90b0sdbz6w6jqc0000gn/T/pipenv-bs956chg-requirements/pi | ||
| penv-hejkfcsj-hashed-reqs.txt`, | ||
| credentialsArgument: "https://user:not.an.actual.token.not.an.actual.token.not.an.actual.token.not.an." + | ||
| "actual.token.not.an.actual.token.not.an.actual.token.not.an.actual.token.not.an." + | ||
| "actual.token.not.an.actual.token.not.an.actual.token.not.an.actual.token.not.an." + | ||
| "[email protected]/artifactory/api/pypi/cli-pipenv-pypi-virtual-17" + | ||
| "15766379/simple", | ||
| }, | ||
| } | ||
|
|
||
| for _, testCase := range tests { | ||
| t.Run(testCase.name, func(t *testing.T) { | ||
| assert.Contains(t, getOnelinerText(testCase.inputText), testCase.credentialsArgument) | ||
| outputText := maskCredentialsInText(t, testCase.inputText, testCase.credentialsArgument) | ||
| assert.NotContains(t, getOnelinerText(outputText), testCase.credentialsArgument) | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| // This method mimics RunCmdWithOutputParser, in which the masking parsers will be used. | ||
| func maskCredentialsInText(t *testing.T, text, credentialsArgument string) string { | ||
| lines := strings.Split(text, "\n") | ||
| credentialsRegex := regexp.MustCompile(utils.CredentialsInUrlRegexp) | ||
| lineBuffer := "" | ||
| outputText := "" | ||
|
|
||
| for _, line := range lines { | ||
| outputLine, err := handlePotentialCredentialsInLogLine(line, credentialsArgument, &lineBuffer, credentialsRegex) | ||
| assert.NoError(t, err) | ||
| outputText += outputLine + "\n" | ||
| } | ||
| return outputText | ||
| } | ||
|
|
||
| func getOnelinerText(inputText string) string { | ||
| return strings.ReplaceAll(inputText, "\n", "") | ||
| } | ||