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.

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

always use non-TLS credentials to connect over unix domain socket #1268

Merged
merged 1 commit into from
Jul 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion cmd/app/http.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,9 @@ func createHTTPServer(ctx context.Context, serverEndpoint string, grpcServer, le

if legacyGRPCServer != nil {
endpoint := fmt.Sprintf("unix:%v", legacyGRPCServer.grpcServerEndpoint)
if err := legacy_gw.RegisterCAHandlerFromEndpoint(ctx, mux, endpoint, opts); err != nil {
// we are connecting over a unix domain socket, therefore we won't ever need TLS
unixDomainSocketOpts := []grpc.DialOption{grpc.WithTransportCredentials(insecure.NewCredentials())}
if err := legacy_gw.RegisterCAHandlerFromEndpoint(ctx, mux, endpoint, unixDomainSocketOpts); err != nil {
log.Logger.Fatal(err)
}
}
Expand Down
69 changes: 69 additions & 0 deletions cmd/app/http_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ import (
"net"
"net/http"
"net/url"
"os"
"path/filepath"
"strings"
"testing"

Expand Down Expand Up @@ -70,6 +72,56 @@ func setupHTTPServer(t *testing.T) (httpServer, string) {

}

// setup with GRPC TLS enabled
func setupHTTPServerWithGRPCTLS(t *testing.T) (httpServer, string) {
t.Helper()
httpListen, err := net.Listen("tcp", ":0")
if err != nil {
t.Error(err)
}

tlsPKIDir := t.TempDir()
certPath := filepath.Join(tlsPKIDir, "cert.pem")
os.WriteFile(certPath, []byte(certPEM), 0644)
keyPath := filepath.Join(tlsPKIDir, "key.pem")
os.WriteFile(keyPath, []byte(keyPEM), 0644)

viper.Set("grpc-tls-certificate", certPath)
viper.Set("grpc-tls-key", keyPath)

viper.Set("grpc-host", "")
viper.Set("grpc-port", 0)
grpcServer, err := createGRPCServer(nil, nil, &TrivialCertificateAuthority{}, nil)
if err != nil {
t.Error(err)
}
grpcServer.startTCPListener()
conn, err := grpc.Dial(grpcServer.grpcServerEndpoint, grpc.WithTransportCredentials(insecure.NewCredentials()))
defer func() {
if conn != nil {
_ = conn.Close()
}
}()
if err != nil {
t.Error(err)
}
legacyGRPCServer, err := createLegacyGRPCServer(nil, grpcServer.caService)
if err != nil {
t.Fatal(err)
}
legacyGRPCServer.startUnixListener()

httpHost := httpListen.Addr().String()
httpServer := createHTTPServer(context.Background(), httpHost, grpcServer, legacyGRPCServer)
go func() {
_ = httpServer.Serve(httpListen)
grpcServer.GracefulStop()
}()

return httpServer, fmt.Sprintf("http://%s", httpHost)

}

func TestHTTPCORSSupport(t *testing.T) {
httpServer, host := setupHTTPServer(t)
defer httpServer.Close()
Expand Down Expand Up @@ -109,6 +161,23 @@ func TestHTTPDoesntLeakGRPCHeaders(t *testing.T) {
}
}

func TestIssue1267(t *testing.T) {
httpServer, host := setupHTTPServerWithGRPCTLS(t)
defer httpServer.Close()

url, _ := url.Parse(host + "/api/v1/rootCert")
req := http.Request{
Method: "GET",
URL: url,
}

resp, err := http.DefaultClient.Do(&req)
if err != nil || resp.StatusCode != http.StatusOK {
t.Errorf("unexpected response: %v, %v", resp, err)
}
defer resp.Body.Close()
}

// Trivial CA service that returns junk
type TrivialCertificateAuthority struct {
}
Expand Down
Loading