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
2 changes: 1 addition & 1 deletion client/download.go
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ func (c *Client) download(
req.Header.Add("User-Agent", "geoipupdate/"+vars.Version)
req.SetBasicAuth(strconv.Itoa(c.accountID), c.licenseKey)

response, err := c.httpClient.Do(req)
response, err := c.httpClient.Do(req) //nolint:gosec // URL is from known config
if err != nil {
return nil, time.Time{}, fmt.Errorf("performing download request: %w", err)
}
Expand Down
2 changes: 1 addition & 1 deletion client/metadata.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func (c *Client) getMetadata(
req.Header.Add("User-Agent", "geoipupdate/"+vars.Version)
req.SetBasicAuth(strconv.Itoa(c.accountID), c.licenseKey)

response, err := c.httpClient.Do(req)
response, err := c.httpClient.Do(req) //nolint:gosec // URL is from known config
if err != nil {
return nil, fmt.Errorf("performing metadata request: %w", err)
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/geoipupdate/args.go
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ func getArgs() *Args {
}

func printUsage() {
log.Printf("Usage: %s <arguments>\n", os.Args[0])
log.Printf("Usage: %s <arguments>\n", os.Args[0]) //nolint:gosec // logging program name
flag.PrintDefaults()
//nolint: revive // deep exit from main package
os.Exit(1)
Expand Down
4 changes: 2 additions & 2 deletions internal/geoipupdate/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ func setConfigFromEnv(config *Config) error {
if value := os.Getenv("GEOIPUPDATE_ACCOUNT_ID_FILE"); value != "" {
var err error

accountID, err := os.ReadFile(filepath.Clean(value))
accountID, err := os.ReadFile(filepath.Clean(value)) //nolint:gosec // path from env var
if err != nil {
return fmt.Errorf("failed to open GEOIPUPDATE_ACCOUNT_ID_FILE: %w", err)
}
Expand Down Expand Up @@ -333,7 +333,7 @@ func setConfigFromEnv(config *Config) error {
if value := os.Getenv("GEOIPUPDATE_LICENSE_KEY_FILE"); value != "" {
var err error

licenseKey, err := os.ReadFile(filepath.Clean(value))
licenseKey, err := os.ReadFile(filepath.Clean(value)) //nolint:gosec // path from env var
if err != nil {
return fmt.Errorf("failed to open GEOIPUPDATE_LICENSE_KEY_FILE: %w", err)
}
Expand Down
8 changes: 4 additions & 4 deletions internal/geoipupdate/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -959,11 +959,11 @@ func TestParseProxy(t *testing.T) {
Proxy: "ftp://127.0.0.1:8888",
Err: "unsupported proxy type: ftp",
},
{
{ //nolint:gosec // test data
Proxy: "login:password@127.0.0.1",
Output: "http://login:password@127.0.0.1:1080",
},
{
{ //nolint:gosec // test data
Proxy: "login:password@127.0.0.1",
UserPassword: "something:else",
Output: "http://login:password@127.0.0.1:1080",
Expand All @@ -978,12 +978,12 @@ func TestParseProxy(t *testing.T) {
UserPassword: "something:else",
Output: "http://something:else@127.0.0.1:8888",
},
{
{ //nolint:gosec // test data
Proxy: "user:password@127.0.0.1:8888",
UserPassword: "user2:password2",
Output: "http://user:password@127.0.0.1:8888",
},
{
{ //nolint:gosec // test data
Proxy: "http://user:password@127.0.0.1:8888",
UserPassword: "user2:password2",
Output: "http://user:password@127.0.0.1:8888",
Expand Down
4 changes: 2 additions & 2 deletions internal/geoipupdate/database/local_file_writer.go
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ func (w *fileWriter) close() error {
}
}

err := os.Remove(w.file.Name())
err := os.Remove(w.file.Name()) //nolint:gosec // path from config
if err != nil && !errors.Is(err, os.ErrNotExist) {
return fmt.Errorf("removing temporary file: %w", err)
}
Expand Down Expand Up @@ -222,7 +222,7 @@ func (w *fileWriter) syncAndRename(name string) error {
if err := w.file.Close(); err != nil {
return fmt.Errorf("closing temporary file: %w", err)
}
if err := os.Rename(w.file.Name(), name); err != nil {
if err := os.Rename(w.file.Name(), name); err != nil { //nolint:gosec // path from config
return fmt.Errorf("moving database into place: %w", err)
}
return nil
Expand Down
Loading