erik/converge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

password of converge now configurable through

Browse Source 
CONVERGE_USERNAME and CONVERGE_PASSWORD environment
variables.
This commit is contained in:
Erik Brakkee 2024-07-26 20:51:05 +02:00
parent 514e57768f
commit d02b7eade3
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/converge/server.go → cmd/converge/converge.go
View File

@ -1,6 +1,7 @@
package main package main
import ( import (
"converge/pkg/comms"
"converge/pkg/converge" "converge/pkg/converge"
"converge/pkg/websocketutil" "converge/pkg/websocketutil"
"fmt" "fmt"
@ -70,6 +71,16 @@ func main() {
printHelp("") printHelp("")
} }
username, ok := os.LookupEnv("CONVERGE_USERNAME")
if !ok {
username = "abc"
}
password, ok := os.LookupEnv("CONVERGE_PASSWORD")
if !ok {
password = "123"
}
admin := converge.NewAdmin() admin := converge.NewAdmin()
registrationService := websocketutil.WebSocketService{ registrationService := websocketutil.WebSocketService{
Handler: func(w http.ResponseWriter, r *http.Request, conn net.Conn) { Handler: func(w http.ResponseWriter, r *http.Request, conn net.Conn) {
@ -79,7 +90,8 @@ func main() {
return return
} }
log.Printf("Got registration connection: '%s'\n", publicId) log.Printf("Got registration connection: '%s'\n", publicId)
err = admin.Register(publicId, conn) err = admin.Register(publicId, conn,
comms.UserPassword{Username: username, Password: password})
if err != nil { if err != nil {
log.Printf("Error %v\n", err) log.Printf("Error %v\n", err)
} }

5
pkg/converge/admin.go
View File

@ -168,7 +168,8 @@ func (admin *Admin) RemoveClient(client *Client) error {
return nil return nil
} }
func (admin *Admin) Register(publicId string, conn io.ReadWriteCloser) error { func (admin *Admin) Register(publicId string, conn io.ReadWriteCloser,
userPassword comms.UserPassword) error {
defer conn.Close() defer conn.Close()
// TODO: remove agent return value // TODO: remove agent return value
agent, err := admin.addAgent(publicId, conn) agent, err := admin.addAgent(publicId, conn)
@ -180,7 +181,7 @@ func (admin *Admin) Register(publicId string, conn io.ReadWriteCloser) error {
}() }()
log.Println("Sending username and password to agent") log.Println("Sending username and password to agent")
comms.Send(agent.commChannel, comms.UserPassword{Username: "abc", Password: "123"}) comms.Send(agent.commChannel, userPassword)
go func() { go func() {
comms.ListenForAgentEvents(agent.commChannel, comms.ListenForAgentEvents(agent.commChannel,