parsed env variables for pwd & users, created a hasher pkg

Author: Hadi T

deploy/docker/docker-compose.yml

@@ -7,8 +7,10 @@ services:
       dockerfile: deploy/docker/golang/Dockerfile
     container_name: oauth_app
     environment:
-      DATABASE_USR: oauth_usr
-      DATABASE_PWD: DummyPassword1
+      POSTGRES_USER: oauth_usr
+      POSTGRES_PASSWORD: DummyPassword1
+      POSTGRES_DB: oauth
+      REDIS_PASSWORD: SyniolIsTheFuture
     ports:
       - "8080:8080"
     networks:
@@ -25,7 +27,7 @@ services:
       POSTGRES_USER: oauth_usr
       POSTGRES_DB: oauth
     volumes:
-      - database_volume:/var/lib/postgresql/data
+      - database_data:/var/lib/postgresql/data
     networks:
       - oauth_authentication
 
@@ -35,14 +37,16 @@ services:
       context: ../..
       dockerfile: deploy/docker/redis/Dockerfile
     container_name: oauth_cache
+    environment:
+      REDIS_PASSWORD: SyniolIsTheFuture
     volumes:
-      - cache_volume:/data
+      - cache_data:/data
     networks:
       - oauth_authentication
 
 volumes:
-  database_volume:
-  cache_volume:
+  database_data:
+  cache_data:
 
 networks:
   oauth_authentication:

deploy/docker/redis/Dockerfile

@@ -13,7 +13,6 @@ RUN apk add --update-cache openssl \
     && rm gen-test-certs.sh
 
 ENV ALLOW_EMPTY_PASSWORD=false
-ENV REDIS_PASSWORD=SyniolIsTheFuture
 ENV REDIS_DISABLE_COMMANDS=FLUSHDB,FLUSHALL
 ENV REDIS_TLS_CERT_FILE=/usr/local/etc/redis/tls/redis.crt
 ENV REDIS_TLS_KEY_FILE=/usr/local/etc/redis/tls/redis.key

pkg/cache/redis.go

@@ -41,7 +41,7 @@ func newRedisClient(ctx context.Context) Cache {
 
 			return "cache:6379"
 		}(),
-		Password: "SyniolIsTheFuture",
+		Password: os.Getenv("REDIS_PASSWORD"),
 		DB:       0, // use default DB
 	})
 

pkg/database/database.go

@@ -22,11 +22,10 @@ func NewDatabase(ctx context.Context) (*Database, error) {
 
 	// https://www.postgresql.org/docs/current/libpq-ssl.html
 	connStr := fmt.Sprintf(
-		"postgresql://%s:%s@%s/oauth?sslmode=require",
-		//os.Getenv("DATABASE_USR"),
-		"oauth_usr",
-		//os.Getenv("DATABASE_PWD"),
-		"DummyPassword1",
+		"postgresql://%s:%s@%s/%s?sslmode=require",
+		os.Getenv("POSTGRES_USER"),
+		os.Getenv("POSTGRES_PASSWORD"),
+		os.Getenv("POSTGRES_DB"),
 		func() string {
 			if len(os.Getenv("DEBUG")) > 0 {
 				return "127.0.0.1"

pkg/hash/hash.go

@@ -0,0 +1,26 @@
+package hash
+
+import (
+	"encoding/base64"
+	"encoding/hex"
+)
+
+func Encode(msg []byte) []byte {
+	hexHash := make([]byte, hex.EncodedLen(len(msg)))
+	hex.Encode(hexHash, msg)
+
+	hash := make([]byte, base64.StdEncoding.EncodedLen(len(hexHash)))
+	base64.StdEncoding.Encode(hash, hexHash)
+
+	return hash
+}
+
+func Decode(msg []byte) []byte {
+	base64Hash := make([]byte, base64.StdEncoding.DecodedLen(len(msg)))
+	base64.StdEncoding.Decode(base64Hash, msg)
+
+	hash := make([]byte, hex.DecodedLen(len(base64Hash)))
+	hex.Decode(hash, base64Hash)
+
+	return hash
+}