add bcrypt support

dataprovider/dataprovider.go

@@ -22,6 +22,7 @@ const (
 
 	logSender                = "dataProvider"
 	argonPwdPrefix           = "$argon2id$"
+	bcryptPwdPrefix          = "$2a$"
 	manageUsersDisabledError = "please set manage_users to 1 in sftpgo.conf to enable this method"
 	trackQuotaDisabledError  = "please enable track_quota in sftpgo.conf to use this method"
 )

dataprovider/sqlcommon.go

@@ -10,6 +10,8 @@ import (
 	"golang.org/x/crypto/ssh"
 
 	"github.com/alexedwards/argon2id"
+	"golang.org/x/crypto/bcrypt"
+
 	"github.com/drakkan/sftpgo/logger"
 	"github.com/drakkan/sftpgo/utils"
 )
@@ -44,6 +46,15 @@ func sqlCommonValidateUserAndPass(username string, password string) (User, error
 				logger.Warn(logSender, "error comparing password with argon hash: %v", err)
 				return user, err
 			}
+
+		} else if strings.HasPrefix(user.Password, bcryptPwdPrefix){
+			err = bcrypt.CompareHashAndPassword([]byte(user.Password), []byte(password))
+			if err != nil {
+				logger.Warn(logSender, "error comparing password with bcrypt hash: %v", err)
+				return user, err
+			}else{
+				match = true
+			}
 		} else {
 			// clear text password match
 			match = (user.Password == password)