Fix linter errors

This commit is contained in:
Daniel 2023-04-25 14:37:29 +02:00
parent 34e035858d
commit 5bb2813459
14 changed files with 17 additions and 14 deletions
.golangci.yml
cmds
integrationtest
portmaster-start
firewall
api.go
interception/nfq
prompt.go
intel/geoip
netenv
netquery
network/socket
profile
resolver

View file

@ -22,6 +22,7 @@ linters:
- interfacer
- ireturn
- lll
- musttag
- nestif
- nilnil
- nlreturn

View file

@ -4,13 +4,12 @@ import (
"fmt"
"time"
processInfo "github.com/shirou/gopsutil/process"
"github.com/spf13/cobra"
"github.com/safing/portmaster/network/packet"
"github.com/safing/portmaster/network/socket"
"github.com/safing/portmaster/network/state"
processInfo "github.com/shirou/gopsutil/process"
)
func init() {

View file

@ -17,7 +17,7 @@ import (
)
func initializeLogFile(logFilePath string, identifier string, version string) *os.File {
logFile, err := os.OpenFile(logFilePath, os.O_RDWR|os.O_CREATE, 0o0440)
logFile, err := os.OpenFile(logFilePath, os.O_RDWR|os.O_CREATE, 0o0440) //nolint:gosec // As desired.
if err != nil {
log.Printf("failed to create log file %s: %s\n", logFilePath, err)
return nil

View file

@ -149,7 +149,7 @@ func authenticateAPIRequest(ctx context.Context, pktInfo *packet.Info) (retry bo
originalPid = proc.Pid
var previousPid int
// Go up up to two levels, if we don't match the path.
// Find parent for up to two levels, if we don't match the path.
checkLevels := 2
checkLevelsLoop:
for i := 0; i < checkLevels+1; i++ {

View file

@ -90,7 +90,7 @@ func New(qid uint16, v6 bool) (*Queue, error) { //nolint:gocognit
return q, nil
}
// open opens a new netlink socket and and creates a new nfqueue.
// open opens a new netlink socket and creates a new nfqueue.
// Upon success, the new nfqueue is atomically stored in Queue.nf.
// Users must use Queue.getNfq to access it. open does not care about
// any other value or queue that might be stored in Queue.nf at

View file

@ -135,7 +135,7 @@ func createPrompt(ctx context.Context, conn *network.Connection) (n *notificatio
n.Unlock()
// If the notification is still active, extend and return.
// This can can happen because user input (prompts changing the endpoint
// This can happen because user input (prompts changing the endpoint
// lists) can happen any time - also between checking the endpoint lists
// and now.
if state == notifications.Active {

View file

@ -16,7 +16,7 @@ const (
)
// Location holds information regarding the geographical and network location of an IP address.
// TODO: We are currently re-using the Continent-Code for the region. Update this and and all dependencies.
// TODO: We are currently re-using the Continent-Code for the region. Update this and all dependencies.
type Location struct {
Continent struct {
Code string `maxminddb:"code"`

View file

@ -22,6 +22,7 @@ func (l *Location) IsRegionalNeighbor(other *Location) bool {
return false
}
// Region defines a geographic region and neighboring regions.
type Region struct {
ID string
Name string

View file

@ -10,7 +10,7 @@ import (
// domain parameter of dhcp
// TODO: get dhcp servers on windows:
// windows: https://msdn.microsoft.com/en-us/library/windows/desktop/aa365917
// doc: https://msdn.microsoft.com/en-us/library/windows/desktop/aa365917
// this info might already be included in the interfaces api provided by golang!
// Nameserver describes a system assigned namserver.

View file

@ -19,7 +19,7 @@ delivered correctly, or need special permissions and or sockets to receive
them. This is the case when doing a traceroute.
In order to keep it simple, the system is only designed to be used by one
"user" at at time. Further calls to ListenToICMP will wait for the previous
"user" at a time. Further calls to ListenToICMP will wait for the previous
operation to complete.
*/

View file

@ -21,7 +21,7 @@ type (
// It is implemented by the *Database type of this package.
ConnectionStore interface {
// Save is called to perists the new or updated connection. If required,
// It's up the the implementation to figure out if the operation is an
// It's up to the implementation to figure out if the operation is an
// insert or an update.
// The ID of Conn is unique and can be trusted to never collide with other
// connections of the save device.

View file

@ -114,5 +114,7 @@ func (i *BindInfo) GetUIDandInode() (int, int) {
}
// Compile time checks.
var _ Info = new(ConnectionInfo)
var _ Info = new(BindInfo)
var (
_ Info = new(ConnectionInfo)
_ Info = new(BindInfo)
)

View file

@ -70,7 +70,7 @@ type Profile struct { //nolint:maligned // not worth the effort
// WarningLastUpdated holds the timestamp when the Warning field was last
// updated.
WarningLastUpdated time.Time
// Homepage may refer the the website of the application
// Homepage may refer to the website of the application
// vendor.
Homepage string
// Icon holds the icon of the application. The value

View file

@ -149,7 +149,7 @@ func (tr *TCPResolver) getOrCreateResolverConn(ctx context.Context) (*tcpResolve
netenv.ReportFailedConnection()
log.Debugf("resolver: failed to connect to %s: %s", tr.resolver.Info.DescriptiveName(), err)
return nil, fmt.Errorf("%w: failed to connect to %s: %s", ErrFailure, tr.resolver.Info.DescriptiveName(), err)
return nil, fmt.Errorf("%w: failed to connect to %s: %w", ErrFailure, tr.resolver.Info.DescriptiveName(), err)
}
// Hint network environment at successful connection.