Merge pull request #258 from rabbitmq/fix/uri_string

Fix string function of URI

tls_test.go

@@ -82,6 +82,24 @@ func startTLSServer(t *testing.T, cfg *tls.Config) tlsServer {
 	return s
 }
 
+func TestTlsConfigFromUriPushdownServerNameIndication(t *testing.T) {
+	uri := "amqps://user:pass@example.com:5671?server_name_indication=another-hostname.com"
+	parsedUri, err := ParseURI(uri)
+	if err != nil {
+		t.Fatalf("expected to parse URI successfully, got error: %s", err)
+	}
+
+	tlsConf, err := tlsConfigFromURI(parsedUri)
+	if err != nil {
+		t.Fatalf("expected tlsConfigFromURI to succeed, got error: %s", err)
+	}
+
+	const expectedServerName = "another-hostname.com"
+	if tlsConf.ServerName != expectedServerName {
+		t.Fatalf("expected tlsConf server name to equal Uri servername: want %s, got %s", expectedServerName, tlsConf.ServerName)
+	}
+}
+
 // Tests opening a connection of a TLS enabled socket server
 func TestTLSHandshake(t *testing.T) {
 	srv := startTLSServer(t, tlsServerConfig(t))

uri.go

@@ -226,5 +226,29 @@ func (uri URI) String() string {
 		authority.Path = "/"
 	}
 
+	if uri.CertFile != "" || uri.KeyFile != "" || uri.CACertFile != "" || uri.ServerName != "" {
+		rawQuery := strings.Builder{}
+		if uri.CertFile != "" {
+			rawQuery.WriteString("certfile=")
+			rawQuery.WriteString(uri.CertFile)
+			rawQuery.WriteRune('&')
+		}
+		if uri.KeyFile != "" {
+			rawQuery.WriteString("keyfile=")
+			rawQuery.WriteString(uri.KeyFile)
+			rawQuery.WriteRune('&')
+		}
+		if uri.CACertFile != "" {
+			rawQuery.WriteString("cacertfile=")
+			rawQuery.WriteString(uri.CACertFile)
+			rawQuery.WriteRune('&')
+		}
+		if uri.ServerName != "" {
+			rawQuery.WriteString("server_name_indication=")
+			rawQuery.WriteString(uri.ServerName)
+		}
+		authority.RawQuery = rawQuery.String()
+	}
+
 	return authority.String()
 }

uri_test.go

@@ -413,3 +413,31 @@ func TestURIParameters(t *testing.T) {
 		t.Fatal("ChannelMax name not set")
 	}
 }
+
+func TestURI_ParseUriToString(t *testing.T) {
+	tests := []struct {
+		name string
+		uri  string
+		want string
+	}{
+		{name: "virtual host is set", uri: "amqp://example.com/foobar", want: "amqp://example.com/foobar"},
+		{name: "non-default port", uri: "amqp://foo.bar:1234/example", want: "amqp://foo.bar:1234/example"},
+		{
+			name: "TLS with URI parameters",
+			uri:  "amqps://some-host.com/foobar?certfile=/foo/%D0%BF%D1%80%D0%B8%D0%B2%D0%B5%D1%82/cert.pem&keyfile=/foo/%E4%BD%A0%E5%A5%BD/key.pem&cacertfile=C:%5Ccerts%5Cca.pem&server_name_indication=example.com",
+			want: "amqps://some-host.com/foobar?certfile=/foo/привет/cert.pem&keyfile=/foo/你好/key.pem&cacertfile=C:\\certs\\ca.pem&server_name_indication=example.com",
+		},
+		{name: "only server name indication", uri: "amqps://foo.bar?server_name_indication=example.com", want: "amqps://foo.bar/?server_name_indication=example.com"},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			amqpUri, err := ParseURI(tt.uri)
+			if err != nil {
+				t.Errorf("ParseURI() error = %v", err)
+			}
+			if got := amqpUri.String(); got != tt.want {
+				t.Errorf("String() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}