diff --git a/.env.schema b/.env.schema index 9596f8f..8a4adb3 100644 --- a/.env.schema +++ b/.env.schema @@ -1,5 +1,6 @@ SSH_KEY_NAME= DIGITAL_OCEAN_TOKEN= +SESSION_SECRET= DOCKER_USERNAME= POSTGRES_USERNAME= POSTGRES_PASSWORD= diff --git a/Vagrantfile b/Vagrantfile index 6991007..73c4888 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -27,6 +27,7 @@ Vagrant.configure("2") do |config| server.vm.provision "shell", inline: 'echo "export GRAFANA_PASSWORD=' + "'" + ENV["GRAFANA_PASSWORD"] + "'" + '" >> ~/.bash_profile' server.vm.provision "shell", inline: 'echo "export ELASTIC_USERNAME=' + "'" + ENV["ELASTIC_USERNAME"] + "'" + '" >> ~/.bash_profile' server.vm.provision "shell", inline: 'echo "export ELASTIC_PASSWORD=' + "'" + ENV["ELASTIC_PASSWORD"] + "'" + '" >> ~/.bash_profile' + server.vm.provision "shell", inline: 'echo "export SESSION_SECRET=' + "'" + ENV["SESSION_SECRET"] + "'" + '" >> ~/.bash_profile' server.vm.provision "shell", inline: <<-SHELL sudo apt-get -y install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin cd /vagrant diff --git a/globals/globals.go b/globals/globals.go index f7c5583..92d5ad8 100644 --- a/globals/globals.go +++ b/globals/globals.go @@ -17,7 +17,7 @@ import ( "gorm.io/gorm" ) -var Secret = []byte("secret") +var Secret = []byte(os.Getenv("SESSION_SECRET")) const ENV_KEY = "GO_ENV" @@ -55,7 +55,6 @@ func GetDatabasePath() gorm.Dialector { connectionString := fmt.Sprintf("postgresql://%s:%s@postgres/db", os.Getenv("POSTGRES_USERNAME"), os.Getenv("POSTGRES_PASSWORD")) - fmt.Println(connectionString) return postgres.Open(connectionString) } return sqlite.Open("itu-minitwit.db") diff --git a/routes/router.go b/routes/router.go index 67ac5e5..e81d1dd 100644 --- a/routes/router.go +++ b/routes/router.go @@ -20,6 +20,7 @@ func SetupRouter() *gin.Engine { "gravatarUrl": helpers.GravatarUrl, }) router.LoadHTMLGlob(filepath.Join(globals.Root, "templates/*.html")) + router.Use(sessions.Sessions("session", cookie.NewStore(globals.Secret))) router.Use(middleware.MeasueRequestTimeMiddleware)