allow int and string for vmid

This commit is contained in:
Jonas Leder 2025-01-11 13:37:15 +01:00
commit 8abf6563aa
3 changed files with 32 additions and 11 deletions

View file

@ -58,5 +58,26 @@ func RegisterDevSetup(r *gin.Engine) {
`, domain, url.QueryEscape("?payload="+jwt), encrypt)))
})
r.GET("/dump", func(ctx *gin.Context) {
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
}
configuration := encryption.DecryptMessage(jwtClain.EncryptedPayload)
log.Log.Info(string(configuration))
ctx.String(http.StatusOK, "The decoded payload has been dumped to the console")
})
}

View file

@ -132,7 +132,7 @@ func main() {
defer conn.Close()
metrics.VncSessionsHandled.Inc()
metrics.CurrentActiveSessions.Inc()
metrics.Sessions.WithLabelValues(vncConfig.NodeName, vncConfig.VmID).Set(1)
metrics.Sessions.WithLabelValues(vncConfig.NodeName, types.ConvertToString(vncConfig.VmID)).Set(1)
// Channels to signal when forwarding is done
done1 := make(chan struct{})
@ -143,16 +143,16 @@ func main() {
// Start bridging WebSocket 2 -> WebSocket 1
go bridgeConnections(conn, pveConn, done2)
currentActiveConnectionList[vncConfig.NodeName] = append(currentActiveConnectionList[vncConfig.NodeName], vncConfig.VmID)
currentActiveConnectionList[vncConfig.NodeName] = append(currentActiveConnectionList[vncConfig.NodeName], types.ConvertToString(vncConfig.VmID))
select {
case <-done1:
log.Log.Info("Bridge from PVE to Client closed for ", vncConfig.VmID)
case <-done2:
log.Log.Info("Bridge from Client to PVE closed for ", vncConfig.VmID)
}
currentActiveConnectionList[vncConfig.NodeName] = removeElement(currentActiveConnectionList[vncConfig.NodeName], vncConfig.VmID)
currentActiveConnectionList[vncConfig.NodeName] = removeElement(currentActiveConnectionList[vncConfig.NodeName], types.ConvertToString(vncConfig.VmID))
metrics.CurrentActiveSessions.Dec()
metrics.Sessions.WithLabelValues(vncConfig.NodeName, vncConfig.VmID).Set(0)
metrics.Sessions.WithLabelValues(vncConfig.NodeName, types.ConvertToString(vncConfig.VmID)).Set(0)
})
metrics.InitPrometheus(r)

View file

@ -12,7 +12,7 @@ import (
type VncConfig struct {
Virtualization string `json:"virtualization"`
VmID string `json:"vmId"`
VmID any `json:"vmId"`
VncProxyPort string `json:"vncProxyPort"`
VncProxyTicket string `json:"vncProxyTicket"`
NodeName string `json:"nodeName"`
@ -25,7 +25,7 @@ type VncConfig struct {
}
func (v *VncConfig) GetVncUrl() string {
return fmt.Sprintf("wss://%s:%s/api2/json/nodes/%s/%s/%s/vncwebsocket?port=%s&vncticket=%s", v.NodeUrl, convertToString(v.NodePort), v.NodeName, v.Virtualization, v.VmID, v.VncProxyPort, url.QueryEscape(v.VncProxyTicket))
return fmt.Sprintf("wss://%s:%s/api2/json/nodes/%s/%s/%s/vncwebsocket?port=%s&vncticket=%s", v.NodeUrl, ConvertToString(v.NodePort), v.NodeName, v.Virtualization, ConvertToString(v.VmID), v.VncProxyPort, url.QueryEscape(v.VncProxyTicket))
}
func (v *VncConfig) GenerateVncTicket() {
@ -34,17 +34,17 @@ func (v *VncConfig) GenerateVncTicket() {
if os.Getenv("PVE_IGNORE_SSL") == "true" {
client.SetTLSClientConfig(&tls.Config{InsecureSkipVerify: true})
}
client.SetBaseURL(fmt.Sprintf("https://%s:%s/", v.NodeUrl, convertToString(v.NodePort)))
client.SetBaseURL(fmt.Sprintf("https://%s:%s/", v.NodeUrl, ConvertToString(v.NodePort)))
resp, err := client.R().SetResult(PveVncTicketResponse{}).SetHeaders(map[string]string{
"Cookie": "PVEAuthCookie=" + url.QueryEscape(v.ApiTicket) + ";",
"CSRFPreventionToken": v.CSRFPreventionToken,
}).Post("/api2/json/nodes/" + v.NodeName + "/" + v.Virtualization + "/" + v.VmID + "/vncproxy")
}).Post("/api2/json/nodes/" + v.NodeName + "/" + v.Virtualization + "/" + ConvertToString(v.VmID) + "/vncproxy")
if err != nil {
log.Log.Error("Failed generating vnc ticket to PVE: ", err.Error())
return
}
v.VncProxyTicket = resp.Result().(*PveVncTicketResponse).Data.Ticket
v.VncProxyPort = convertToString(resp.Result().(*PveVncTicketResponse).Data.Port)
v.VncProxyPort = ConvertToString(resp.Result().(*PveVncTicketResponse).Data.Port)
}
func (v *VncConfig) GenerateApiTicket() {
@ -52,7 +52,7 @@ func (v *VncConfig) GenerateApiTicket() {
if os.Getenv("PVE_IGNORE_SSL") == "true" {
client.SetTLSClientConfig(&tls.Config{InsecureSkipVerify: true})
}
client.SetBaseURL(fmt.Sprintf("https://%s:%s/", v.NodeUrl, convertToString(v.NodePort)))
client.SetBaseURL(fmt.Sprintf("https://%s:%s/", v.NodeUrl, ConvertToString(v.NodePort)))
resp, err := client.R().SetFormData(map[string]string{
"username": v.NodeUser,
"password": v.NodePassword,
@ -65,7 +65,7 @@ func (v *VncConfig) GenerateApiTicket() {
v.CSRFPreventionToken = resp.Result().(*PveLoginResponse).Data.CSRFPreventionToken
}
func convertToString(v any) string {
func ConvertToString(v any) string {
switch v := v.(type) {
case string:
return v