Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix ipv6 handling #20

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix ipv6 handling #20

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc1485d
Fix: Properly handle IPv6 addresses in connection strings
chaturvedikna Jun 17, 2024
ca43bc4
Fix: Properly handle IPv6 addresses in connection strings
chaturvedikna Jun 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions main/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,38 @@ func GetAgentConfigMetadata() map[string][]config.Parameter {
return elements
}

func processConnectionString(connection string) string {
// Check if the connection string contains an "@" character, indicating credentials
if strings.Contains(connection, "@") {
// Split the connection string into protocol part and host:port part
parts := strings.SplitN(connection, "@", 2)
if len(parts) == 2 {
protocol := parts[0] + "@"
hostPort := parts[1]

// Split the host:port into host and port
hostPortParts := strings.SplitN(hostPort, ":", 2)
if len(hostPortParts) == 2 {
host := hostPortParts[0]
port := hostPortParts[1]

// Further processing of host and port, including handling IPv6 brackets if necessary
if strings.Contains(host, ":") {
if !strings.HasPrefix(host, "[") && !strings.HasSuffix(host, "]") {
host = "[" + host + "]"
}
}

// Reconstruct the connection string with corrected formatting
return protocol + host + ":" + port
}
}
}

// Return the original connection string if no modifications were made
return connection
}

func main() {
debug := flag.Bool("debug", false, "enables debugging logs")
verbose := flag.Bool("verbose", false, "enables informational logs")
Expand Down Expand Up @@ -258,6 +290,9 @@ func main() {
if sect, ok := cfg.Sections["sensu"]; ok {
if opt, ok := sect.Options["connection"]; ok {
if len(opt.GetString()) > 0 {
connection := opt.GetString()
connection = processConnectionString(connection)
sect.Options["connection"] = config.NewConfigOption(connection
sensuConnector, err = connector.ConnectSensu(cfg, log)
if err != nil {
log.Metadata(map[string]interface{}{"error": err, "connection": opt.GetString()})
Expand All @@ -278,6 +313,9 @@ func main() {
if sect, ok := cfg.Sections["amqp1"]; ok {
if opt, ok := sect.Options["connection"]; ok {
if len(opt.GetString()) > 0 {
connection := opt.GetString()
connection = processConnectionString(connection)
sect.Options["connection"] = config.NewConfigOption(connection)
amqpConnector, err = amqp10.ConnectAMQP10("sensubility", cfg, log)
if err != nil {
log.Metadata(map[string]interface{}{"error": err, "connection": opt.GetString()})
Expand Down