From 5f27eefc9e4d8405d9e96f209f1e486fb6b5a3e0 Mon Sep 17 00:00:00 2001
From: HimbeerserverDE <himbeerserverde@gmail.com>
Date: Thu, 22 Apr 2021 13:40:56 +0200
Subject: [PATCH] Support PostgreSQL for auth

---
 auth.go  | 12 ++++++++----
 ban.go   |  8 ++++----
 db.go    | 22 ++++++++++++++++------
 privs.go | 10 ++++++----
 4 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/auth.go b/auth.go
index 0a7860b..5575459 100644
--- a/auth.go
+++ b/auth.go
@@ -117,8 +117,8 @@ func CreateUser(name string, verifier, salt []byte) error {
 	name,
 	password
 ) VALUES (
-	?,
-	?
+	$1,
+	$2
 );`, name, pwd)
 	return err
 }
@@ -132,11 +132,15 @@ func Password(name string) ([]byte, []byte, error) {
 	defer db.Close()
 
 	var pwd string
-	err = db.QueryRow(`SELECT password FROM auth WHERE name = ?;`, name).Scan(&pwd)
+	err = db.QueryRow(`SELECT password FROM auth WHERE name = $1;`, name).Scan(&pwd)
 	if err != nil && !errors.Is(err, sql.ErrNoRows) {
 		return nil, nil, err
 	}
 
+	if pwd == "" {
+		return nil, nil, nil
+	}
+
 	salt, verifier, err := decodeVerifierAndSalt(pwd)
 	return verifier, salt, err
 }
@@ -151,7 +155,7 @@ func SetPassword(name string, verifier, salt []byte) error {
 
 	pwd := encodeVerifierAndSalt(salt, verifier)
 
-	_, err = db.Exec(`UPDATE auth SET password = ? WHERE name = ?;`, pwd, name)
+	_, err = db.Exec(`UPDATE auth SET password = $1 WHERE name = $2;`, pwd, name)
 	return err
 }
 
diff --git a/ban.go b/ban.go
index a4b4574..8801dd4 100644
--- a/ban.go
+++ b/ban.go
@@ -48,7 +48,7 @@ func IsBanned(addr string) (bool, string, error) {
 	defer db.Close()
 
 	var name string
-	err = db.QueryRow(`SELECT name FROM ban WHERE addr = ?;`, addr).Scan(&name)
+	err = db.QueryRow(`SELECT name FROM ban WHERE addr = $1;`, addr).Scan(&name)
 	if err != nil && !errors.Is(err, sql.ErrNoRows) {
 		return true, "", err
 	}
@@ -84,8 +84,8 @@ func Ban(addr, name string) error {
 	addr,
 	name
 ) VALUES (
-	?,
-	?
+	$1,
+	$2
 );`, addr, name)
 	return err
 }
@@ -118,6 +118,6 @@ func Unban(id string) error {
 	}
 	defer db.Close()
 
-	_, err = db.Exec(`DELETE FROM ban WHERE name = ? OR addr = ?;`, id, id)
+	_, err = db.Exec(`DELETE FROM ban WHERE name = $1 OR addr = $2;`, id, id)
 	return err
 }
diff --git a/db.go b/db.go
index fd1d0b7..8d579e2 100644
--- a/db.go
+++ b/db.go
@@ -4,7 +4,7 @@ import (
 	"database/sql"
 	"fmt"
 	"os"
-	"strings"
+	"regexp"
 
 	_ "github.com/lib/pq"
 	_ "github.com/mattn/go-sqlite3"
@@ -65,16 +65,26 @@ func (db *DB) Type() int { return db.dbType }
 
 // Exec executes a SQL statement
 func (db *DB) Exec(sql string, values ...interface{}) (sql.Result, error) {
-	if db.Type() == DBTypePSQL {
-		sql = strings.ReplaceAll(sql, "?", "$x")
+	if db.Type() == DBTypeSQLite3 {
+		r, err := regexp.Compile("\\$+[0-9]")
+		if err != nil {
+			return nil, err
+		}
+
+		sql = r.ReplaceAllString(sql, "?")
 	}
 	return db.DB.Exec(sql, values...)
 }
 
-// Query executes a SQL statement and stores the results
+// QueryRow executes a SQL statement and stores the results
 func (db *DB) QueryRow(sql string, values ...interface{}) *sql.Row {
-	if db.Type() == DBTypePSQL {
-		sql = strings.ReplaceAll(sql, "?", "$x")
+	if db.Type() == DBTypeSQLite3 {
+		r, err := regexp.Compile("\\$+[0-9]")
+		if err != nil {
+			return nil
+		}
+
+		sql = r.ReplaceAllString(sql, "?")
 	}
 	return db.DB.QueryRow(sql, values...)
 }
diff --git a/privs.go b/privs.go
index f815083..6ae2dbc 100644
--- a/privs.go
+++ b/privs.go
@@ -56,7 +56,7 @@ func Privs(name string) (map[string]bool, error) {
 	defer db.Close()
 
 	var eprivs string
-	err = db.QueryRow(`SELECT privileges FROM privileges WHERE name = ?;`, name).Scan(&eprivs)
+	err = db.QueryRow(`SELECT privileges FROM privileges WHERE name = $1;`, name).Scan(&eprivs)
 	if err != nil && !errors.Is(err, sql.ErrNoRows) {
 		return make(map[string]bool), err
 	}
@@ -77,13 +77,15 @@ func SetPrivs(name string, privs map[string]bool) error {
 	}
 	defer db.Close()
 
-	_, err = db.Exec(`REPLACE INTO privileges (
+	_, err = db.Exec(`INSERT INTO privileges (
 	name,
 	privileges
 ) VALUES (
-	?,
-	?
+	$1,
+	$2
 );`, name, encodePrivs(privs))
+	_, err = db.Exec(`UPDATE privileges SET privileges = $1 WHERE name = $2;`, encodePrivs(privs), name)
+
 	return err
 }