handleUSER reorg

handle_auth.go

@@ -6,9 +6,9 @@ import (
 )
 
 // Handle the "USER" command
-func (c *clientHandler) handleUSER(param string) error {
+func (c *clientHandler) handleUSER(user string) error {
 	if verifier, ok := c.server.driver.(MainDriverExtensionUserVerifier); ok {
-		err := verifier.PreAuthUser(c, param)
+		err := verifier.PreAuthUser(c, user)
 
 		if err != nil {
 			c.writeMessage(StatusNotLoggedIn, fmt.Sprintf("User rejected: %v", err))
@@ -26,32 +26,48 @@ func (c *clientHandler) handleUSER(param string) error {
 	}
 
 	if c.HasTLSForControl() {
-		if verifier, ok := c.server.driver.(MainDriverExtensionTLSVerifier); ok {
-			if tlsConn, ok := c.conn.(*tls.Conn); ok {
-				driver, err := verifier.VerifyConnection(c, param, tlsConn)
+		if c.handleUserTLS(user) {
+			return nil
+		}
+	}
 
-				if err != nil {
-					c.writeMessage(StatusNotLoggedIn, fmt.Sprintf("TLS verification failed: %v", err))
-					c.disconnect()
+	c.user = user
+	c.writeMessage(StatusUserOK, "OK")
 
-					return nil
-				}
+	return nil
+}
 
-				if driver != nil {
-					c.user = param
-					c.driver = driver
-					c.writeMessage(StatusUserLoggedIn, "TLS certificate ok, continue")
+func (c *clientHandler) handleUserTLS(user string) bool {
+	verifier, ok := c.server.driver.(MainDriverExtensionTLSVerifier)
 
-					return nil
-				}
-			}
-		}
+	if !ok {
+		return false
 	}
 
-	c.user = param
-	c.writeMessage(StatusUserOK, "OK")
+	tlsConn, ok := c.conn.(*tls.Conn)
 
-	return nil
+	if !ok {
+		return false
+	}
+
+	driver, err := verifier.VerifyConnection(c, user, tlsConn)
+
+	if err != nil {
+		c.writeMessage(StatusNotLoggedIn, fmt.Sprintf("TLS verification failed: %v", err))
+		c.disconnect()
+
+		return true
+	}
+
+	if driver != nil {
+		c.user = user
+		c.driver = driver
+		c.writeMessage(StatusUserLoggedIn, "TLS certificate ok, continue")
+
+		return true
+	}
+
+	return false
 }
 
 // Handle the "PASS" command