From 07ae9cf2ac1ee1ba9ffab7ab7722321a1e40564b Mon Sep 17 00:00:00 2001
From: Nathan Coad <nathan@thecoads.com>
Date: Tue, 9 Jan 2024 21:54:10 +1100
Subject: [PATCH] fix audit table definition

---
 models/secret.go | 15 ++-------------
 models/setup.go  | 17 +++++++++--------
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/models/secret.go b/models/secret.go
index 88200a0..b68e3b7 100644
--- a/models/secret.go
+++ b/models/secret.go
@@ -15,6 +15,8 @@ import (
 	"github.com/jmoiron/sqlx"
 )
 
+const nonceSize = 12
+
 // We use the json:"-" field tag to prevent showing these details to the user
 type Secret struct {
 	SecretId       int    `db:"SecretId"`
@@ -34,8 +36,6 @@ type UserSecret struct {
 	Permission
 }
 
-const nonceSize = 12
-
 func (s *Secret) SaveSecret() (*Secret, error) {
 
 	var err error
@@ -56,20 +56,9 @@ func (s *Secret) SaveSecret() (*Secret, error) {
 }
 
 func SecretsGetAllowed(s *Secret, userId int) ([]UserSecret, error) {
-	// Query based on group
-	// SELECT users.UserId, users.GroupId, permissions.ReadOnly, permissions.SafeId, safes.SafeName, secrets.* FROM users INNER JOIN groups ON users.GroupId = groups.GroupId INNER JOIN permissions ON groups.GroupId = permissions.GroupId INNER JOIN safes on permissions.SafeId = safes.SafeId INNER JOIN secrets on secrets.SafeId = safes.SafeId WHERE users.UserId = 2
 	var err error
 	var secretResults []UserSecret
 
-	/*
-		// Make sure at least one parameter was specified
-		if s.DeviceName == "" && s.DeviceCategory == "" && s.UserName == "" {
-			err = errors.New("no search parameters specified")
-			log.Println(err)
-			return secretResults, err
-		}
-	*/
-
 	// Query for group access
 	queryArgs := []interface{}{}
 	query := `
diff --git a/models/setup.go b/models/setup.go
index 1ac41f0..d087af2 100644
--- a/models/setup.go
+++ b/models/setup.go
@@ -32,7 +32,7 @@ const createRoles string = `
 
 const createUsers string = `
 	CREATE TABLE IF NOT EXISTS users (
-		UserId INTEGER PRIMARY KEY ASC,
+		UserId INTEGER PRIMARY KEY AUTOINCREMENT,
 		GroupId INTEGER,
 		UserName VARCHAR,
 		Password VARCHAR,
@@ -44,14 +44,14 @@ const createUsers string = `
 
 const createSafes string = `
 	CREATE TABLE IF NOT EXISTS safes (
-		SafeId INTEGER PRIMARY KEY ASC,
+		SafeId INTEGER PRIMARY KEY AUTOINCREMENT,
 		SafeName VARCHAR
 	);
 `
 
 const createGroups string = `
 	CREATE TABLE IF NOT EXISTS groups (
-		GroupId INTEGER PRIMARY KEY ASC,
+		GroupId INTEGER PRIMARY KEY AUTOINCREMENT,
 		GroupName VARCHAR,
 		LdapGroup BOOLEAN DEFAULT 0,
 		LdapDN VARCHAR DEFAULT '',
@@ -61,7 +61,7 @@ const createGroups string = `
 
 const createPermissions = `
 	CREATE TABLE IF NOT EXISTS permissions (
-		PermissionId INTEGER PRIMARY KEY ASC,
+		PermissionId INTEGER PRIMARY KEY AUTOINCREMENT,
 		Description VARCHAR DEFAULT '',
 		ReadOnly BOOLEAN DEFAULT 0,
 		SafeId INTEGER,
@@ -73,7 +73,7 @@ const createPermissions = `
 
 const createSecrets string = `
 	CREATE TABLE IF NOT EXISTS secrets (
-		SecretId INTEGER PRIMARY KEY ASC,
+		SecretId INTEGER PRIMARY KEY AUTOINCREMENT,
 		SafeId INTEGER,
 		DeviceName VARCHAR,
 		DeviceCategory VARCHAR,
@@ -91,6 +91,7 @@ const createSchema string = `
 
 const createAudit string = `
 	CREATE TABLE IF NOT EXISTS audit (
+		EventId INTEGER PRIMARY KEY AUTOINCREMENT,
 		UserName VARCHAR,
 		EventText VARCHAR,
 		EventTime INTEGER
@@ -272,7 +273,7 @@ func CreateTables() {
 		ALTER TABLE users RENAME TO _users_old;
 		CREATE TABLE users
 		(
-			UserId INTEGER PRIMARY KEY ASC,
+			UserId INTEGER PRIMARY KEY AUTOINCREMENT,
 			GroupId INTEGER,
 			UserName VARCHAR,
 			Password VARCHAR,
@@ -310,7 +311,7 @@ func CreateTables() {
 		ALTER TABLE secrets RENAME TO _secrets_old;
 		CREATE TABLE secrets
 		(
-			SecretId INTEGER PRIMARY KEY ASC,
+			SecretId INTEGER PRIMARY KEY AUTOINCREMENT,
 			RoleId INTEGER,
 			SafeId INTEGER,
 			DeviceName VARCHAR,
@@ -361,7 +362,7 @@ func CreateTables() {
 		ALTER TABLE permissions RENAME TO _permissions_old;
 		CREATE TABLE permissions
 		(
-			PermissionId INTEGER PRIMARY KEY ASC,
+			PermissionId INTEGER PRIMARY KEY AUTOINCREMENT,
 			Description VARCHAR DEFAULT '',
 			ReadOnly BOOLEAN DEFAULT 0,
 			SafeId INTEGER,