Fixed some PostgreSQL authentication method errors and reverted connection-related TrimSuffix back to TrimRight.

Author: numbleroot

auth/postgres.go

@@ -96,8 +96,11 @@ func (p *PostgresAuthenticator) AuthenticatePlain(username string, password stri
 	// Encode the hashed text with base64.
 	encHashedPassword := base64.StdEncoding.EncodeToString(hashedPassword)
 
+	// Prepare query for database.
+	query := fmt.Sprintf("SELECT id FROM users WHERE username = '%s' AND password = '{SHA512}%s'", username, encHashedPassword)
+
 	// Query database for user matching all criteria.
-	err = p.Conn.QueryRow("SELECT id FROM users WHERE username = '$1' AND password = '$2'", username, encHashedPassword).Scan(&dbUserID)
+	err = p.Conn.QueryRow(query).Scan(&dbUserID)
 	if err != nil {
 
 		// Check what type of error we received.

comm/connection.go

@@ -155,5 +155,5 @@ func InternalReceive(reader *bufio.Reader) (string, error) {
 		return "", err
 	}
 
-	return strings.TrimSuffix(text, "\r\n"), nil
+	return strings.TrimRight(text, "\r\n"), nil
 }

imap/connection.go

@@ -85,7 +85,7 @@ func (c *Connection) Receive() (string, error) {
 		return "", err
 	}
 
-	return strings.TrimSuffix(text, "\r\n"), nil
+	return strings.TrimRight(text, "\r\n"), nil
 }
 
 // Send takes in an answer text from server as a

imap/distributor.go

@@ -49,7 +49,7 @@ func InitDistributor(config *config.Config) (*Distributor, error) {
 		// Open authentication file and read user information.
 		distr.AuthAdapter, err = auth.NewFileAuthenticator(config.Distributor.AuthFile.File, config.Distributor.AuthFile.Separator)
 
-	} else if config.Distributor.AuthAdapter == "Postgres" {
+	} else if config.Distributor.AuthAdapter == "AuthPostgres" {
 
 		// Connect to PostgreSQL database.
 		distr.AuthAdapter, err = auth.NewPostgresAuthenticator(config.Distributor.AuthPostgres.IP, config.Distributor.AuthPostgres.Port, config.Distributor.AuthPostgres.Database, config.Distributor.AuthPostgres.User, config.Distributor.AuthPostgres.Password, config.Distributor.AuthPostgres.UseTLS)