Skip to content

Commit 2308f4c

Browse files
authored
Fix all gosec linter warnings (#43)
1 parent b05fdd0 commit 2308f4c

15 files changed

Lines changed: 48 additions & 37 deletions

internal/apiclient/client_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525

2626
const (
2727
jobID = "1234"
28-
jobToken = "hey-dependabot-api-its-me-ur-brother"
28+
jobToken = "hey-dependabot-api-its-me-ur-brother" //nolint:gosec // test credential
2929
)
3030

3131
func TestClient_ReportMetrics_Success(t *testing.T) {

internal/cache/handlers.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ func New(enabled bool, cacheDir string) (*DB, error) {
125125
if !enabled {
126126
return nil, nil
127127
}
128-
if err := os.Mkdir(cacheDir, 0755); err != nil && !os.IsExist(err) {
128+
if err := os.Mkdir(cacheDir, 0750); err != nil && !os.IsExist(err) {
129129
cacheDir = filepath.Join(os.TempDir(), "cache")
130130
}
131131
db := &DB{
@@ -134,7 +134,7 @@ func New(enabled bool, cacheDir string) (*DB, error) {
134134
}
135135

136136
// attempt to load pre-existing DB
137-
f, err := os.Open(filepath.Join(cacheDir, "db.yaml"))
137+
f, err := os.Open(filepath.Clean(filepath.Join(cacheDir, "db.yaml")))
138138
if err != nil {
139139
return db, nil
140140
}
@@ -225,7 +225,7 @@ func (d *DB) OnResponse(resp *http.Response, ctx *goproxy.ProxyCtx) *http.Respon
225225
}
226226

227227
fileName := fmt.Sprintf("%06d-%v", d.nextNumber(), sanitize(resp.Request.Host))
228-
f, err := os.Create(filepath.Join(d.cacheDir, fileName))
228+
f, err := os.Create(filepath.Clean(filepath.Join(d.cacheDir, fileName)))
229229
if err != nil {
230230
logrus.Warnln("Failed to write to cache:", err.Error())
231231
return resp
@@ -276,7 +276,7 @@ func (d *DB) WriteToDisk() error {
276276
d.Lock()
277277
defer d.Unlock()
278278

279-
f, err := os.Create(filepath.Join(d.cacheDir, "db.yaml"))
279+
f, err := os.Create(filepath.Clean(filepath.Join(d.cacheDir, "db.yaml")))
280280
if err != nil {
281281
logrus.Errorln("Failed to create db file:", err.Error())
282282
return err

internal/config/config.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"encoding/json"
55
"net/url"
66
"os"
7+
"path/filepath"
78
"strings"
89
)
910

@@ -96,7 +97,7 @@ func Parse(path string) (*Config, error) {
9697
reader = os.Stdin
9798
} else {
9899
var err error
99-
reader, err = os.Open(path)
100+
reader, err = os.Open(filepath.Clean(path))
100101
if err != nil {
101102
return nil, err
102103
}

internal/config/config_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func TestParse(t *testing.T) {
3535
} else {
3636
configPath = path.Join(temp, fname)
3737
d1 := []byte(tc.input)
38-
err := os.WriteFile(configPath, d1, 0644)
38+
err := os.WriteFile(configPath, d1, 0600)
3939
require.NoError(t, err)
4040
}
4141

internal/handlers/cargo_registry_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ func TestCargoRegistryHandler(t *testing.T) {
1414
validURLWithPathBase := "https://valid-url-path.example.com"
1515
validURLWithPath := validURLWithPathBase + "/path"
1616
invalidURL := "asdf"
17-
noTokenURL := "https://no-token.example.com"
17+
noTokenURL := "https://no-token.example.com" //nolint:gosec // test URL, not a credential
1818

19-
token := "Bearer abc123"
19+
token := "Bearer abc123" //nolint:gosec // test credential
2020

2121
credentials := config.Credentials{
2222
config.Credential{

internal/handlers/git_server_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ func TestGitServerHandler_AuthenticatedAccessToGitHubRepos(t *testing.T) {
132132
installationToken2 := "v1.token2"
133133
privateRepo2Cred := testGitSourceCred("github.com", "x-access-token", installationToken2, withAccessibleRepos([]string{"github/private-repo-2"}))
134134

135-
userToken := "ghp_fakefakefakesuperfake1"
135+
userToken := "ghp_fakefakefakesuperfake1" //nolint:gosec // test credential
136136
privateRepo3Cred := testGitSourceCred("github.com", "x-access-token", userToken, withAccessibleRepos([]string{"github/private-repo-3"}))
137137

138138
tests := []struct {
@@ -246,8 +246,8 @@ func TestGitServerHandlerNoRetry(t *testing.T) {
246246

247247
func TestGitServerHandler_TokenFallback(t *testing.T) {
248248
installationToken := "v1.token"
249-
userToken1 := "ghp_fakefakefakesuperfake1"
250-
userToken2 := "ghp_fakefakefakesuperfake2"
249+
userToken1 := "ghp_fakefakefakesuperfake1" //nolint:gosec // test credential
250+
userToken2 := "ghp_fakefakefakesuperfake2" //nolint:gosec // test credential
251251
credentials := config.Credentials{
252252
testGitSourceCred("github.com", "x-access-token", installationToken),
253253
testGitSourceCred("github.com", "x-access-token", userToken1),
@@ -347,7 +347,7 @@ func TestGitServerHandler_TokenFallback(t *testing.T) {
347347

348348
func TestGitServerHandler_TokenFallbackWithPost(t *testing.T) {
349349
installationToken := "v1.token"
350-
userToken := "ghp_fakefakefakesuperfake"
350+
userToken := "ghp_fakefakefakesuperfake" //nolint:gosec // test credential
351351
credentials := config.Credentials{
352352
testGitSourceCred("github.com", "x-access-token", installationToken),
353353
testGitSourceCred("github.com", "x-access-token", userToken),

internal/handlers/github_api_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ func TestGitHubAPIHandler_AuthenticatedAccessToGitHubRepos(t *testing.T) {
111111
installationToken2 := "v1.token2"
112112
privateRepo2Cred := testGitSourceCred("github.com", "x-access-token", installationToken2, withAccessibleRepos([]string{"github/private-repo-2"}))
113113

114-
userToken := "ghp_fakefakefakesuperfake1"
114+
userToken := "ghp_fakefakefakesuperfake1" //nolint:gosec // test credential
115115
privateRepo3Cred := testGitSourceCred("github.com", "x-access-token", userToken, withAccessibleRepos([]string{"github/private-repo-3"}))
116116

117117
tests := []struct {
@@ -312,8 +312,8 @@ func TestGitHubAPIHandler_TokenFallback(t *testing.T) {
312312
installationToken1 := "v1.token1"
313313
installationToken2 := "v1.token2"
314314
installationToken3 := "v1.token3"
315-
userToken1 := "ghp_fakefakefakesuperfake1"
316-
userToken2 := "ghp_fakefakefakesuperfake2"
315+
userToken1 := "ghp_fakefakefakesuperfake1" //nolint:gosec // test credential
316+
userToken2 := "ghp_fakefakefakesuperfake2" //nolint:gosec // test credential
317317
credentials := config.Credentials{
318318
testGitSourceCred("github.com", "x-access-token", installationToken1),
319319
testGitSourceCred("github.com", "x-access-token", installationToken2, withAccessibleRepos([]string{"foo/qux"})),
@@ -430,8 +430,8 @@ func TestGitHubAPIHandler_TokenFallback(t *testing.T) {
430430

431431
func TestGitHubAPIHandler_TokenFallback_In_Proxima(t *testing.T) {
432432
installationToken := "v1.token"
433-
userToken1 := "ghp_fakefakefakesuperfake1"
434-
userToken2 := "ghp_fakefakefakesuperfake2"
433+
userToken1 := "ghp_fakefakefakesuperfake1" //nolint:gosec // test credential
434+
userToken2 := "ghp_fakefakefakesuperfake2" //nolint:gosec // test credential
435435
credentials := config.Credentials{
436436
testGitSourceCred("foo.ghe.com", "x-access-token", installationToken),
437437
testGitSourceCred("foo.ghe.com", "x-access-token", userToken1),

internal/handlers/oidc_handling_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1001,7 +1001,7 @@ func TestOIDCURLsAreAuthenticated(t *testing.T) {
10011001
}
10021002

10031003
// mock GitHub OIDC token request
1004-
tokenUrl := "https://token.actions.example.com"
1004+
tokenUrl := "https://token.actions.example.com" //nolint:gosec // test URL
10051005
httpmock.RegisterResponder("GET", tokenUrl,
10061006
httpmock.NewStringResponder(200, `{
10071007
"count": 1,

internal/handlers/pub_repository_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ func TestPubRepositoryHandler(t *testing.T) {
1414
validURLWithPathBase := "https://valid-url-path.example.com"
1515
validURLWithPath := validURLWithPathBase + "/path"
1616
invalidURL := "asdf"
17-
noTokenURL := "https://no-token.example.com"
17+
noTokenURL := "https://no-token.example.com" //nolint:gosec // test URL, not a credential
1818

19-
token := "abc123"
19+
token := "abc123" //nolint:gosec // test credential
2020

2121
credentials := config.Credentials{
2222
config.Credential{

internal/handlers/python_index_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
)
1010

1111
func TestPythonIndexHandler(t *testing.T) {
12-
dependabotToken := "123"
13-
dependabotSecToken := "dependabot:sec123"
12+
dependabotToken := "123" //nolint:gosec // test credential
13+
dependabotSecToken := "dependabot:sec123" //nolint:gosec // test credential
1414
simpleSecToken := "simple:sec245"
1515
deltaForceUser := "some-user"
1616
deltaForcePassword := "456"

0 commit comments

Comments
 (0)