update go mod, remove tls insecure skip verifies
This commit is contained in:
+14
-5
@@ -2,6 +2,7 @@ package app
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
"log"
|
||||||
"os"
|
"os"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -34,15 +35,23 @@ type Config struct {
|
|||||||
PVE PVEConfig `json:"pve"`
|
PVE PVEConfig `json:"pve"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetConfig(configPath string) (Config, error) {
|
func GetConfig(configPath string) Config {
|
||||||
content, err := os.ReadFile(configPath)
|
root, err := os.OpenRoot(".")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return Config{}, err
|
log.Fatal("Error when opening root dir: ", err)
|
||||||
}
|
}
|
||||||
|
defer root.Close()
|
||||||
|
|
||||||
|
content, err := root.ReadFile(configPath)
|
||||||
|
if err != nil {
|
||||||
|
log.Fatal("Error when opening config file: ", err)
|
||||||
|
}
|
||||||
|
|
||||||
var config Config
|
var config Config
|
||||||
err = json.Unmarshal(content, &config)
|
err = json.Unmarshal(content, &config)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return Config{}, err
|
log.Fatal("Error during parsing config file: ", err)
|
||||||
}
|
}
|
||||||
return config, nil
|
|
||||||
|
return config
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -25,7 +25,7 @@ func NewClientFromCredentials(config common.LDAPConfig, username common.Username
|
|||||||
}
|
}
|
||||||
|
|
||||||
if config.StartTLS {
|
if config.StartTLS {
|
||||||
err = LDAPConn.StartTLS(&tls.Config{InsecureSkipVerify: true})
|
err = LDAPConn.StartTLS(&tls.Config{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, http.StatusInternalServerError, err
|
return nil, http.StatusInternalServerError, err
|
||||||
}
|
}
|
||||||
|
|||||||
+10
-4
@@ -14,14 +14,20 @@ type DB struct {
|
|||||||
|
|
||||||
func LoadDB(localDBPath string) (DB, error) {
|
func LoadDB(localDBPath string) (DB, error) {
|
||||||
db := DB{}
|
db := DB{}
|
||||||
content, err := os.ReadFile(localDBPath)
|
|
||||||
|
root, err := os.OpenRoot(".")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
//log.Fatal("Error when opening file: ", err)
|
|
||||||
return db, err
|
return db, err
|
||||||
}
|
}
|
||||||
|
defer root.Close()
|
||||||
|
|
||||||
|
content, err := root.ReadFile(localDBPath)
|
||||||
|
if err != nil {
|
||||||
|
return db, err
|
||||||
|
}
|
||||||
|
|
||||||
err = json.Unmarshal(content, &db.data)
|
err = json.Unmarshal(content, &db.data)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
//log.Fatal("Error during Unmarshal(): ", err)
|
|
||||||
return db, err
|
return db, err
|
||||||
}
|
}
|
||||||
return db, nil
|
return db, nil
|
||||||
@@ -32,7 +38,7 @@ func SaveDB(localDBPath string, db DB) error {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
err = os.WriteFile(localDBPath, []byte(json), 0644)
|
err = os.WriteFile(localDBPath, []byte(json), 0600)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+3
-7
@@ -30,10 +30,8 @@ var Realms map[string]Realm
|
|||||||
func Run(configPath *string, localDBPath *string) {
|
func Run(configPath *string, localDBPath *string) {
|
||||||
// load config values
|
// load config values
|
||||||
var err error
|
var err error
|
||||||
Config, err = common.GetConfig(*configPath)
|
Config = common.GetConfig(*configPath)
|
||||||
if err != nil {
|
// already exits if failed
|
||||||
log.Fatalf("Error when reading config file: %s\n", err)
|
|
||||||
}
|
|
||||||
log.Printf("Read in config from %s\n", *configPath)
|
log.Printf("Read in config from %s\n", *configPath)
|
||||||
|
|
||||||
// load localdb
|
// load localdb
|
||||||
@@ -551,9 +549,7 @@ func GetRealmsFromPVE(config *common.Config) map[string]Realm {
|
|||||||
|
|
||||||
HTTPClient := http.Client{
|
HTTPClient := http.Client{
|
||||||
Transport: &http.Transport{
|
Transport: &http.Transport{
|
||||||
TLSClientConfig: &tls.Config{
|
TLSClientConfig: &tls.Config{},
|
||||||
InsecureSkipVerify: true,
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
token := fmt.Sprintf(`%s@%s!%s`, config.PVE.Token.User, config.PVE.Token.Realm, config.PVE.Token.ID)
|
token := fmt.Sprintf(`%s@%s!%s`, config.PVE.Token.User, config.PVE.Token.Realm, config.PVE.Token.ID)
|
||||||
|
|||||||
+1
-3
@@ -21,9 +21,7 @@ type ProxmoxClient struct {
|
|||||||
func NewClientFromCredentials(config common.PVEConfig, username common.Username, password string) (*ProxmoxClient, int, error) {
|
func NewClientFromCredentials(config common.PVEConfig, username common.Username, password string) (*ProxmoxClient, int, error) {
|
||||||
HTTPClient := http.Client{
|
HTTPClient := http.Client{
|
||||||
Transport: &http.Transport{
|
Transport: &http.Transport{
|
||||||
TLSClientConfig: &tls.Config{
|
TLSClientConfig: &tls.Config{},
|
||||||
InsecureSkipVerify: true,
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ require (
|
|||||||
github.com/gin-contrib/sessions v1.1.0
|
github.com/gin-contrib/sessions v1.1.0
|
||||||
github.com/gin-gonic/gin v1.12.0
|
github.com/gin-gonic/gin v1.12.0
|
||||||
github.com/go-ldap/ldap/v3 v3.4.13
|
github.com/go-ldap/ldap/v3 v3.4.13
|
||||||
github.com/luthermonson/go-proxmox v0.5.1
|
github.com/luthermonson/go-proxmox v0.6.0
|
||||||
github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d
|
github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d
|
||||||
proxmoxaas-common-lib v0.0.0
|
proxmoxaas-common-lib v0.0.0
|
||||||
)
|
)
|
||||||
@@ -50,9 +50,9 @@ require (
|
|||||||
github.com/ugorji/go/codec v1.3.1 // indirect
|
github.com/ugorji/go/codec v1.3.1 // indirect
|
||||||
go.mongodb.org/mongo-driver/v2 v2.6.0 // indirect
|
go.mongodb.org/mongo-driver/v2 v2.6.0 // indirect
|
||||||
golang.org/x/arch v0.27.0 // indirect
|
golang.org/x/arch v0.27.0 // indirect
|
||||||
golang.org/x/crypto v0.51.0 // indirect
|
golang.org/x/crypto v0.52.0 // indirect
|
||||||
golang.org/x/net v0.54.0 // indirect
|
golang.org/x/net v0.55.0 // indirect
|
||||||
golang.org/x/sys v0.44.0 // indirect
|
golang.org/x/sys v0.45.0 // indirect
|
||||||
golang.org/x/text v0.37.0 // indirect
|
golang.org/x/text v0.37.0 // indirect
|
||||||
google.golang.org/protobuf v1.36.11 // indirect
|
google.golang.org/protobuf v1.36.11 // indirect
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user