Release v1.0.2

.github/workflows/go.yml

@@ -5,9 +5,9 @@ name: Server
 
 on:
   push:
-    branches: ["main"]
+    branches: ["main", "develop"]
   pull_request:
-    branches: ["main"]
+    branches: ["main", "develop"]
   workflow_dispatch: {}
 
 jobs:

.github/workflows/next.yml

@@ -4,9 +4,11 @@ on:
   push:
     branches:
       - main
+      - develop
   pull_request:
     branches:
       - main
+      - develop
   workflow_dispatch:
     inputs:
       node-version:

server/auth/passwords.go

@@ -4,13 +4,15 @@ import (
 	"crypto/hmac"
 	"crypto/sha256"
 	"fmt"
+	"github.com/FachschaftMathPhysInfo/kummerkasten/utils"
 	"golang.org/x/crypto/bcrypt"
 	"log"
-	"os"
 )
 
+var envConf = utils.EnvConfig
+
 func HashPassword(password string) (string, error) {
-	toHash := []byte(password + os.Getenv("PEPPER"))
+	toHash := []byte(password + envConf.Pepper)
 	secretHmac := hmac.New(sha256.New, toHash)
 	secretHmac.Write(toHash)
 	hash, err := bcrypt.GenerateFromPassword(toHash, bcrypt.DefaultCost)
@@ -23,7 +25,7 @@ func HashPassword(password string) (string, error) {
 }
 
 func VerifyPassword(storedHash, providedPassword string) error {
-	toHash := []byte(providedPassword + os.Getenv("PEPPER"))
+	toHash := []byte(providedPassword + envConf.Pepper)
 	secretHmac := hmac.New(sha256.New, toHash)
 	secretHmac.Write(toHash)
 

server/db/init.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"github.com/FachschaftMathPhysInfo/kummerkasten/utils"
 	"log"
-	"os"
 	"time"
 
 	"github.com/FachschaftMathPhysInfo/kummerkasten/models"
@@ -16,10 +16,11 @@ import (
 )
 
 var (
-	db     *bun.DB
-	sqldb  *sql.DB
-	err    error
-	tables = []interface{}{
+	envConf = utils.EnvConfig
+	db      *bun.DB
+	sqldb   *sql.DB
+	err     error
+	tables  = []interface{}{
 		(*models.User)(nil),
 		(*models.Label)(nil),
 		(*models.Setting)(nil),
@@ -39,11 +40,11 @@ const PingIntervalDBConnection = 5 * time.Second
 func Init(ctx context.Context) (*sql.DB, *bun.DB) {
 
 	dsn := fmt.Sprintf("postgres://%s:%s@%s:%s/%s?sslmode=disable",
-		os.Getenv("POSTGRES_USER"),
-		os.Getenv("POSTGRES_PASSWORD"),
-		os.Getenv("POSTGRES_HOST"),
-		os.Getenv("POSTGRES_PORT"),
-		os.Getenv("POSTGRES_DB"))
+		envConf.PostgresUser,
+		envConf.PostgresPassword,
+		envConf.PostgresHost,
+		envConf.PostgresPort,
+		envConf.PostgresDB)
 
 	sqldb = sql.OpenDB(pgdriver.NewConnector(pgdriver.WithDSN(dsn)))