ass logrus as logger

This commit is contained in:
Jonas Leder 2024-10-10 19:20:03 +02:00
commit 1e8f66ba16
7 changed files with 50 additions and 15 deletions

View file

@ -5,6 +5,7 @@ import (
"os"
"github.com/golang-jwt/jwt/v5"
"jonasled.dev/jonasled/hostware-vnc-proxy/log"
"jonasled.dev/jonasled/hostware-vnc-proxy/types"
)
@ -19,6 +20,7 @@ func DecodePayload(payload string) (*types.PayloadClaim, error) {
claims, _ := token.Claims.(*types.PayloadClaim)
return claims, nil
} else {
log.Log.Error("Failed decoding JWT, invalid token provided")
return nil, fmt.Errorf("invalid token")
}

View file

@ -4,10 +4,11 @@ import (
"crypto/aes"
"crypto/cipher"
"encoding/hex"
"log"
"os"
"regexp"
"strings"
"jonasled.dev/jonasled/hostware-vnc-proxy/log"
)
func DecryptMessage(text string) []byte {
@ -21,12 +22,14 @@ func DecryptMessage(text string) []byte {
// Create AES cipher block
block, err := aes.NewCipher([]byte(os.Getenv("JWT_SIGN_KEY")))
if err != nil {
log.Fatal(err)
log.Log.Error("Failed creating AES Cipher: ", err.Error())
return []byte{}
}
// Create AES decryption stream
if len(iv) != ivLength {
log.Fatal("Invalid IV length")
log.Log.Error("Failed decrypting message, invalid IV length")
return []byte{}
}
stream := cipher.NewCBCDecrypter(block, iv)

2
go.mod
View file

@ -8,6 +8,8 @@ require (
github.com/golang-jwt/jwt/v5 v5.2.1
github.com/gorilla/websocket v1.5.3
github.com/joho/godotenv v1.5.1
github.com/sirupsen/logrus v1.9.3
github.com/toorop/gin-logrus v0.0.0-20210225092905-2c785434f26f
)
require (

5
go.sum
View file

@ -55,6 +55,8 @@ github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6
github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
@ -67,6 +69,8 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/toorop/gin-logrus v0.0.0-20210225092905-2c785434f26f h1:oqdnd6OGlOUu1InG37hWcCB3a+Jy3fwjylyVboaNMwY=
github.com/toorop/gin-logrus v0.0.0-20210225092905-2c785434f26f/go.mod h1:X3Dd1SB8Gt1V968NTzpKFjMM6O8ccta2NPC6MprOxZQ=
github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
@ -78,6 +82,7 @@ golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=

17
log/logrus.go Normal file
View file

@ -0,0 +1,17 @@
package log
import (
"os"
"github.com/sirupsen/logrus"
)
var Log = logrus.New()
func Init() {
Log.SetOutput(os.Stdout)
Log.SetLevel(logrus.InfoLevel)
Log.SetFormatter(&logrus.TextFormatter{
FullTimestamp: true,
})
}

27
main.go
View file

@ -4,7 +4,6 @@ import (
"crypto/tls"
"encoding/json"
"fmt"
"log"
"net/http"
"net/url"
"os"
@ -12,7 +11,9 @@ import (
"github.com/gin-gonic/gin"
"github.com/gorilla/websocket"
_ "github.com/joho/godotenv/autoload"
ginlogrus "github.com/toorop/gin-logrus"
"jonasled.dev/jonasled/hostware-vnc-proxy/encryption"
"jonasled.dev/jonasled/hostware-vnc-proxy/log"
"jonasled.dev/jonasled/hostware-vnc-proxy/types"
)
@ -27,20 +28,22 @@ func bridgeConnections(src, dest *websocket.Conn, done chan struct{}) {
for {
messageType, message, err := src.ReadMessage()
if err != nil {
log.Println("Error reading from source WebSocket:", err)
log.Log.Error("Error reading from WebSocket")
return
}
err = dest.WriteMessage(messageType, message)
if err != nil {
log.Println("Error writing to destination WebSocket:", err)
log.Log.Error("Error writing to WebSocket")
return
}
}
}
func main() {
log.Init()
r := gin.Default()
r := gin.New()
r.Use(ginlogrus.Logger(log.Log), gin.Recovery())
r.GET("/status", func(ctx *gin.Context) {
ctx.String(http.StatusOK, "OK")
@ -51,11 +54,13 @@ func main() {
payload := ctx.Query("payload")
if payload == "" {
log.Log.Info("Received Request with missing Payload parameter")
ctx.String(http.StatusBadRequest, "Missing payload parameter")
return
}
jwtClain, err := encryption.DecodePayload(payload)
if err != nil {
log.Log.Info("Received Request with invalid Payload parameter")
ctx.String(http.StatusBadRequest, "Invalid Payload provided")
fmt.Println(err.Error())
return
@ -66,10 +71,11 @@ func main() {
err = json.Unmarshal(configuration, &vncConfig)
if err != nil {
ctx.String(http.StatusBadRequest, "Failed decoding VNC config")
log.Println("Failed decoding VNC config", err.Error())
log.Log.Error("Failed decoding VNC config", err.Error())
return
}
log.Log.Info("Starting VNC Proxy for ", vncConfig.VmID)
dialer := websocket.Dialer{
TLSClientConfig: &tls.Config{
@ -83,16 +89,14 @@ func main() {
header.Add("CSRFPreventionToken", vncConfig.CSRFPreventionToken)
pveConn, resp, err := dialer.Dial(vncConfig.GetVncUrl(), header)
if err != nil {
log.Println("Error connecting to WebSocket:", err)
fmt.Println("Response Status:" + resp.Status)
log.Log.Error("Error connecting to PVE WebSocket:", err, " Status Message: ", resp.Status)
return
}
defer pveConn.Close()
conn, err := upgrader.Upgrade(ctx.Writer, ctx.Request, nil)
if err != nil {
log.Println("WebSocket upgrade error:", err)
log.Log.Info("Failed upgrading WebSocket:", err)
pveConn.Close()
return
}
@ -109,11 +113,12 @@ func main() {
go bridgeConnections(conn, pveConn, done2)
select {
case <-done1:
log.Println("Bridge from WebSocket 1 to WebSocket 2 closed")
log.Log.Info("Bridge from PVE to Client closed for ", vncConfig.VmID)
case <-done2:
log.Println("Bridge from WebSocket 2 to WebSocket 1 closed")
log.Log.Info("Bridge from Client to PVE closed for ", vncConfig.VmID)
}
})
log.Log.Info("Start listening on port 8080")
r.Run(":8080")
}

View file

@ -7,6 +7,7 @@ import (
"os"
"github.com/go-resty/resty/v2"
"jonasled.dev/jonasled/hostware-vnc-proxy/log"
)
type VncConfig struct {
@ -38,7 +39,7 @@ func (v *VncConfig) GenerateApiTicket() {
"password": v.NodePassword,
}).SetResult(PveLoginResponse{}).Post("/api2/json/access/ticket")
if err != nil {
fmt.Println(err.Error())
log.Log.Error("Failed authenticating to PVE: ", err.Error())
return
}
v.ApiTicket = resp.Result().(*PveLoginResponse).Data.Ticket