From 882443961072825e5e98374479e02874d114f174 Mon Sep 17 00:00:00 2001
From: Ezra Buehler <ezra.buehler@husqvarnagroup.com>
Date: Sat, 7 Oct 2023 17:12:41 +0200
Subject: [PATCH 1/3] Update golang Docker image to 1.21.2

This in order to fix the following bug:

https://github.com/golang/go/issues/53640
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 4b2816a1..cd3e3078 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # build
-FROM golang:1.18.0 as builder
+FROM golang:1.21.2 as builder
 ENV             GO111MODULE=on
 WORKDIR         /go/src/moul.io/sshportal
 COPY            go.mod go.sum ./

From 34d6b52211daf0f77a93fb9b041ae17867630b1f Mon Sep 17 00:00:00 2001
From: Ezra Buehler <ezra.buehler@husqvarnagroup.com>
Date: Thu, 13 Oct 2022 19:41:26 +0200
Subject: [PATCH 2/3] Fix DB logging

---
 server.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/server.go b/server.go
index 9bd8c1ee..f9457dc8 100644
--- a/server.go
+++ b/server.go
@@ -84,8 +84,12 @@ func dbConnect(c *serverConfig, config gorm.Option) (*gorm.DB, error) {
 func server(c *serverConfig) (err error) {
 	// configure db logging
 
+	logMode := logger.Silent
+	if c.debug {
+		logMode = logger.Info
+	}
 	db, _ := dbConnect(c, &gorm.Config{
-		Logger: logger.Default.LogMode(logger.Silent),
+		Logger: logger.Default.LogMode(logMode),
 	})
 	sqlDB, err := db.DB()
 

From 8ffc0653fbcf94294d46a6c9855abadb0c486084 Mon Sep 17 00:00:00 2001
From: Ezra Buehler <ezra.buehler@husqvarnagroup.com>
Date: Fri, 20 Oct 2023 16:24:55 +0200
Subject: [PATCH 3/3] Add missing DB migration for Host.Name

Commit 44559f0 ("fix: increase size of name fields") changed the size of
the `Host.Name` DB field but did not add a migration.
---
 pkg/bastion/dbinit.go | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/pkg/bastion/dbinit.go b/pkg/bastion/dbinit.go
index c47468d4..5204ec91 100644
--- a/pkg/bastion/dbinit.go
+++ b/pkg/bastion/dbinit.go
@@ -536,6 +536,28 @@ func DBInit(db *gorm.DB) error {
 				return tx.AutoMigrate(&ACL{})
 			},
 			Rollback: func(tx *gorm.DB) error { return fmt.Errorf("not implemented") },
+		}, {
+			ID: "33",
+			Migrate: func(tx *gorm.DB) error {
+				type Host struct {
+					gorm.Model
+					Name     string                `gorm:"index:uix_hosts_name,unique;type:varchar(255)" valid:"required,length(1|255)"`
+					Addr     string
+					User     string
+					Password string
+					URL      string
+					SSHKey   *dbmodels.SSHKey      `gorm:"ForeignKey:SSHKeyID"`
+					SSHKeyID uint                  `gorm:"index"`
+					HostKey  []byte                `sql:"size:10000"`
+					Groups   []*dbmodels.HostGroup `gorm:"many2many:host_host_groups;"`
+					Comment  string
+					Hop      *dbmodels.Host
+					Logging  string
+					HopID    uint
+				}
+				return tx.AutoMigrate(&Host{})
+			},
+			Rollback: func(tx *gorm.DB) error { return fmt.Errorf("not implemented") },
 		},
 	})
 	if err := m.Migrate(); err != nil {