chore(ci): Lint improvement (#439)

Author: fclairamb

.github/workflows/build.yml

@@ -6,6 +6,7 @@ on:
   push:
     branches:
       - main
+      - chore/lint-*
   pull_request:
 
 permissions:

.golangci.yml

@@ -145,7 +145,18 @@ linters-settings:
       allow-trailing-comment: false
       # Force newlines in end of case at this limit (0 = never).
       force-case-trailing-whitespace: 0
-  
+    depguard:
+      rules:
+        prevent_unmaintained_packages:
+          list-mode: lax # allow unless explicitely denied
+          files:
+            - $all
+            - "!$test"
+          allow:
+            - $gostd
+          deny:
+            - pkg: io/ioutil
+              desc: "replaced by io and os packages since Go 1.16: https://tip.golang.org/doc/go1.16#ioutil"
 linters:
     disable-all: true
     enable:

asciiconverter.go

@@ -37,7 +37,7 @@ func (c *asciiConverter) Read(p []byte) (n int, err error) {
 	} else {
 		data, _, err = c.reader.ReadLine()
 		if err != nil {
-			return
+			return n, err
 		}
 	}
 
@@ -64,7 +64,7 @@ func (c *asciiConverter) Read(p []byte) (n int, err error) {
 	// client transfers it in ASCII mode
 	err = c.reader.UnreadByte()
 	if err != nil {
-		return
+		return n, err
 	}
 
 	lastByte, err := c.reader.ReadByte()

client_handler.go

@@ -574,7 +574,7 @@ func (c *clientHandler) writeLine(line string) {
 		c.logger.Debug("Sending answer", "line", line)
 	}
 
-	if _, err := c.writer.WriteString(fmt.Sprintf("%s\r\n", line)); err != nil {
+	if _, err := fmt.Fprintf(c.writer, "%s\r\n", line); err != nil {
 		c.logger.Warn(
 			"Answer couldn't be sent",
 			"line", line,

client_handler_test.go

@@ -239,6 +239,7 @@ func TestClientContextConcurrency(t *testing.T) {
 		for counter < 100 {
 			_, err := c.Getwd()
 			assert.NoError(t, err)
+
 			counter++
 		}
 
@@ -350,11 +351,11 @@ type testNetConn struct {
 	remoteAddr net.Addr
 }
 
-func (*testNetConn) Read(b []byte) (n int, err error) {
+func (*testNetConn) Read(_ []byte) (n int, err error) {
 	return
 }
 
-func (*testNetConn) Write(b []byte) (n int, err error) {
+func (*testNetConn) Write(_ []byte) (n int, err error) {
 	return
 }
 
@@ -370,15 +371,15 @@ func (c *testNetConn) RemoteAddr() net.Addr {
 	return c.remoteAddr
 }
 
-func (*testNetConn) SetDeadline(t time.Time) error {
+func (*testNetConn) SetDeadline(_ time.Time) error {
 	return nil
 }
 
-func (*testNetConn) SetReadDeadline(t time.Time) error {
+func (*testNetConn) SetReadDeadline(_ time.Time) error {
 	return nil
 }
 
-func (*testNetConn) SetWriteDeadline(t time.Time) error {
+func (*testNetConn) SetWriteDeadline(_ time.Time) error {
 	return nil
 }
 

control_unix.go

@@ -10,7 +10,7 @@ import (
 )
 
 // Control defines the function to use as dialer Control to reuse the same port/address
-func Control(network, address string, c syscall.RawConn) error {
+func Control(_, _ string, c syscall.RawConn) error {
 	var errSetOpts error
 
 	err := c.Control(func(fd uintptr) {

driver_test.go

@@ -60,6 +60,7 @@ func NewTestServerWithDriver(t *testing.T, driver *TestServerDriver) *FtpServer
 		if err := os.MkdirAll(dir, 0750); err != nil {
 			panic(err)
 		}
+
 		driver.fs = afero.NewBasePathFs(afero.NewOsFs(), dir)
 	}
 
@@ -342,12 +343,12 @@ func (driver *TestServerDriver) GetTLSConfig() (*tls.Config, error) {
 	return nil, errNoTLS
 }
 
-func (driver *TestServerDriver) PreAuthUser(cc ClientContext, user string) error {
+func (driver *TestServerDriver) PreAuthUser(cc ClientContext, _ string) error {
 	return cc.SetTLSRequirement(driver.TLSRequirement)
 }
 
-func (driver *TestServerDriver) VerifyConnection(cc ClientContext, user string,
-	tlsConn *tls.Conn) (ClientDriver, error) {
+func (driver *TestServerDriver) VerifyConnection(_ ClientContext, _ string,
+	_ *tls.Conn) (ClientDriver, error) {
 	switch driver.TLSVerificationReply {
 	case tlsVerificationFailed:
 		return nil, errInvalidTLSCertificate

handle_auth.go

@@ -76,7 +76,7 @@ func (c *clientHandler) handlePASS(param string) error {
 
 		c.writeMessage(StatusNotLoggedIn, msg)
 		c.disconnect()
-	case err == nil:
+	default: // err == nil && c.driver != nil
 		if msg == "" {
 			msg = "Password ok, continue"
 		}

handle_dirs.go

@@ -140,7 +140,7 @@ func (c *clientHandler) handleRMDIR(params string) {
 	}
 }
 
-func (c *clientHandler) handleCDUP(param string) error {
+func (c *clientHandler) handleCDUP(_ string) error {
 	parent, _ := path.Split(c.Path())
 	if parent != "/" && strings.HasSuffix(parent, "/") {
 		parent = parent[0 : len(parent)-1]
@@ -156,7 +156,7 @@ func (c *clientHandler) handleCDUP(param string) error {
 	return nil
 }
 
-func (c *clientHandler) handlePWD(param string) error {
+func (c *clientHandler) handlePWD(_ string) error {
 	c.writeMessage(StatusPathCreated, fmt.Sprintf(`"%s" is the current directory`, quoteDoubling(c.Path())))
 
 	return nil

handle_files.go

@@ -154,6 +154,7 @@ func (c *clientHandler) doFileTransfer(tr net.Conn, file io.ReadWriter, write bo
 			"Stream copy finished",
 			"writtenBytes", written,
 		)
+
 		if written == 0 {
 			_, err = out.Write([]byte{})
 		}
@@ -293,6 +294,7 @@ func (c *clientHandler) handleCHOWN(params string) {
 	{
 		usergroup := strings.Split(spl[0], ":")
 		userName := usergroup[0]
+
 		if id, err := strconv.ParseInt(userName, 10, 32); err == nil {
 			userID = int(id)
 		} else {
@@ -432,6 +434,7 @@ func (c *clientHandler) handleSTATFile(param string) error {
 
 					return nil
 				}
+
 				files, errList = directory.Readdir(-1)
 				c.closeDirectory(directoryPath, directory)
 			}