Prefix IPv6 WEBIRC addresses with 0 rather than [wrapping] them

prawnsalad · prawnsalad · commit f525072e42df · 2018-07-07T23:07:56.000+01:00
diff --git a/pkg/webircgateway/client.go b/pkg/webircgateway/client.go
@@ -334,10 +334,10 @@ func (c *Client) connectUpstream() {
 		}
 
 		remoteAddr := client.RemoteAddr
-		// Wrap IPv6 addresses so they can be sent as an individual IRC parameter
-		// eg. ::1 would not parse correctly as a parameter, while [::1] will
-		if strings.Contains(remoteAddr, ":") {
-			remoteAddr = "[" + remoteAddr + "]"
+		// Prefix IPv6 addresses that start with a : so they can be sent as an individual IRC
+		//  parameter. eg. ::1 would not parse correctly as a parameter, while 0::1 will
+		if strings.HasPrefix(remoteAddr, ":") {
+			remoteAddr = "0" + remoteAddr
 		}
 
 		webircLine := fmt.Sprintf(

Original file line number	Diff line number	Diff line change
`@@ -334,10 +334,10 @@ func (c *Client) connectUpstream() {`
`334`	`334`	`}`
`335`	`335`
`336`	`336`	`remoteAddr := client.RemoteAddr`
`337`		`- // Wrap IPv6 addresses so they can be sent as an individual IRC parameter`
`338`		`- // eg. ::1 would not parse correctly as a parameter, while [::1] will`
`339`		`- if strings.Contains(remoteAddr, ":") {`
`340`		`- remoteAddr = "[" + remoteAddr + "]"`
	`337`	`+ // Prefix IPv6 addresses that start with a : so they can be sent as an individual IRC`
	`338`	`+ // parameter. eg. ::1 would not parse correctly as a parameter, while 0::1 will`
	`339`	`+ if strings.HasPrefix(remoteAddr, ":") {`
	`340`	`+ remoteAddr = "0" + remoteAddr`
`341`	`341`	`}`
`342`	`342`
`343`	`343`	`webircLine := fmt.Sprintf(`