X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/1dee1aad0573bf3a54d536c8dd3693a352cf0cbe..dc021c3b57dcdebe464c148d55f9990a74e8246b:/lib/controller/railsproxy/railsproxy.go diff --git a/lib/controller/railsproxy/railsproxy.go b/lib/controller/railsproxy/railsproxy.go index 54257cffc5..ff9de36b75 100644 --- a/lib/controller/railsproxy/railsproxy.go +++ b/lib/controller/railsproxy/railsproxy.go @@ -8,12 +8,11 @@ package railsproxy import ( "fmt" - "net/http" "net/url" "strings" - "git.curoverse.com/arvados.git/lib/controller/rpc" - "git.curoverse.com/arvados.git/sdk/go/arvados" + "git.arvados.org/arvados.git/lib/controller/rpc" + "git.arvados.org/arvados.git/sdk/go/arvados" ) // For now, FindRailsAPI always uses the rails API running on this @@ -38,10 +37,5 @@ func NewConn(cluster *arvados.Cluster) *rpc.Conn { if err != nil { panic(err) } - conn := rpc.NewConn(cluster.ClusterID, url, insecure, rpc.PassthroughTokenProvider) - // If Rails is running with force_ssl=true, this - // "X-Forwarded-Proto: https" header prevents it from - // redirecting our internal request to an invalid https URL. - conn.SendHeader = http.Header{"X-Forwarded-Proto": []string{"https"}} - return conn + return rpc.NewConn(cluster.ClusterID, url, insecure, rpc.PassthroughTokenProvider) }