Skip to content
This repository was archived by the owner on Feb 13, 2020. It is now read-only.

WIP Proxy to devconsole api #86

Open
sbose78 wants to merge 5 commits into
base: master-next
Choose a base branch
from
Open

WIP Proxy to devconsole api #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a869461
Proxy to devconsole api
sbose78 May 10, 2019
00df126
make it in-cluster
sbose78 May 10, 2019
92619a6
fix service name
sbose78 May 10, 2019
68360b9
removing println
tinakurian May 14, 2019
e4dabc0
removing addition
tinakurian May 14, 2019
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
13 changes: 13 additions & 0 deletions cmd/bridge/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ const (

// Well-known location of Alert Manager service for OpenShift. This is only accessible in-cluster.
openshiftAlertManagerHost = "alertmanager-main.openshift-monitoring.svc:9094"

// Well-known location of DevConsole App Service for OpenShift. This is only accessible in-cluster after
// the developer perspective is enabled using the operator.
openshiftDevConsoleAppServiceHost = "devconsole.openshift-operators.svc:8080" // TODO:use a different namespace?
)

func main() {
Expand Down Expand Up @@ -271,6 +275,14 @@ func main() {
}
}

srv.DevConsoleAppServiceProxyConfig = &proxy.Config{
TLSClientConfig: &tls.Config{
InsecureSkipVerify: *fK8sModeOffClusterSkipVerifyTLS,
},
HeaderBlacklist: []string{"Cookie", "X-CSRFToken"},
Endpoint: &url.URL{Scheme: "http", Host: openshiftDevConsoleAppServiceHost, Path: ""},
}

case "off-cluster":
k8sEndpoint = validateFlagIsURL("k8s-mode-off-cluster-endpoint", *fK8sModeOffClusterEndpoint)

Expand All @@ -281,6 +293,7 @@ func main() {
HeaderBlacklist: []string{"Cookie", "X-CSRFToken"},
Endpoint: k8sEndpoint,
}

default:
flagFatalf("k8s-mode", "must be one of: in-cluster, off-cluster")
}
Expand Down
87 changes: 56 additions & 31 deletions server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,40 +23,42 @@ const (
indexPageTemplateName = "index.html"
tokenizerPageTemplateName = "tokener.html"

authLoginEndpoint = "/auth/login"
AuthLoginCallbackEndpoint = "/auth/callback"
AuthLoginSuccessEndpoint = "/"
AuthLoginErrorEndpoint = "/error"
authLogoutEndpoint = "/auth/logout"
k8sProxyEndpoint = "/api/kubernetes/"
prometheusProxyEndpoint = "/api/prometheus"
prometheusTenancyProxyEndpoint = "/api/prometheus-tenancy"
alertManagerProxyEndpoint = "/api/alertmanager"
authLoginEndpoint = "/auth/login"
AuthLoginCallbackEndpoint = "/auth/callback"
AuthLoginSuccessEndpoint = "/"
AuthLoginErrorEndpoint = "/error"
authLogoutEndpoint = "/auth/logout"
k8sProxyEndpoint = "/api/kubernetes/"
prometheusProxyEndpoint = "/api/prometheus"
prometheusTenancyProxyEndpoint = "/api/prometheus-tenancy"
alertManagerProxyEndpoint = "/api/alertmanager"
devConsoleAppServiceProxyEndpoint = "/api/devconsole/"
)

var (
plog = capnslog.NewPackageLogger("github.com/openshift/console", "server")
)

type jsGlobals struct {
ConsoleVersion string `json:"consoleVersion"`
AuthDisabled bool `json:"authDisabled"`
KubectlClientID string `json:"kubectlClientID"`
BasePath string `json:"basePath"`
LoginURL string `json:"loginURL"`
LoginSuccessURL string `json:"loginSuccessURL"`
LoginErrorURL string `json:"loginErrorURL"`
LogoutURL string `json:"logoutURL"`
LogoutRedirect string `json:"logoutRedirect"`
KubeAdminLogoutURL string `json:"kubeAdminLogoutURL"`
KubeAPIServerURL string `json:"kubeAPIServerURL"`
PrometheusBaseURL string `json:"prometheusBaseURL"`
PrometheusTenancyBaseURL string `json:"prometheusTenancyBaseURL"`
AlertManagerBaseURL string `json:"alertManagerBaseURL"`
Branding string `json:"branding"`
DocumentationBaseURL string `json:"documentationBaseURL"`
GoogleTagManagerID string `json:"googleTagManagerID"`
LoadTestFactor int `json:"loadTestFactor"`
ConsoleVersion string `json:"consoleVersion"`
AuthDisabled bool `json:"authDisabled"`
KubectlClientID string `json:"kubectlClientID"`
BasePath string `json:"basePath"`
LoginURL string `json:"loginURL"`
LoginSuccessURL string `json:"loginSuccessURL"`
LoginErrorURL string `json:"loginErrorURL"`
LogoutURL string `json:"logoutURL"`
LogoutRedirect string `json:"logoutRedirect"`
KubeAdminLogoutURL string `json:"kubeAdminLogoutURL"`
KubeAPIServerURL string `json:"kubeAPIServerURL"`
PrometheusBaseURL string `json:"prometheusBaseURL"`
PrometheusTenancyBaseURL string `json:"prometheusTenancyBaseURL"`
AlertManagerBaseURL string `json:"alertManagerBaseURL"`
Branding string `json:"branding"`
DocumentationBaseURL string `json:"documentationBaseURL"`
GoogleTagManagerID string `json:"googleTagManagerID"`
LoadTestFactor int `json:"loadTestFactor"`
DevConsoleAppServiceBaseURL string `json:"devConsoleAppService"`
}

type Server struct {
Expand All @@ -76,16 +78,21 @@ type Server struct {
LoadTestFactor int
DexClient api.DexClient
// A client with the correct TLS setup for communicating with the API server.
K8sClient *http.Client
PrometheusProxyConfig *proxy.Config
PrometheusTenancyProxyConfig *proxy.Config
AlertManagerProxyConfig *proxy.Config
K8sClient *http.Client
PrometheusProxyConfig *proxy.Config
PrometheusTenancyProxyConfig *proxy.Config
AlertManagerProxyConfig *proxy.Config
DevConsoleAppServiceProxyConfig *proxy.Config
}

func (s *Server) authDisabled() bool {
return s.Auther == nil
}

func (s *Server) devConsoleAppServiceProxyEnabled() bool {
return s.DevConsoleAppServiceProxyConfig != nil
}

func (s *Server) prometheusProxyEnabled() bool {
return s.PrometheusProxyConfig != nil && s.PrometheusTenancyProxyConfig != nil
}
Expand Down Expand Up @@ -214,6 +221,20 @@ func (s *Server) HTTPHandler() http.Handler {
)
}

if s.devConsoleAppServiceProxyEnabled() {
devConsoleAppServiceProxyAPIPath := devConsoleAppServiceProxyEndpoint
devConsoleAppServiceProxy := proxy.NewProxy(s.DevConsoleAppServiceProxyConfig)

handle(devConsoleAppServiceProxyAPIPath, http.StripPrefix(
proxy.SingleJoiningSlash(s.BaseURL.Path, devConsoleAppServiceProxyAPIPath),
authHandlerWithUser(func(user *auth.User, w http.ResponseWriter, r *http.Request) {
r.Header.Set("Authorization", fmt.Sprintf("Bearer %s", user.Token))
devConsoleAppServiceProxy.ServeHTTP(w, r)
})),
)
fmt.Println("enabling proxy for " + proxy.SingleJoiningSlash(s.BaseURL.Path, devConsoleAppServiceProxyAPIPath))
}

handle("/api/tectonic/version", authHandler(s.versionHandler))
mux.HandleFunc(s.BaseURL.Path, s.indexHandler)

Expand Down Expand Up @@ -272,6 +293,10 @@ func (s *Server) indexHandler(w http.ResponseWriter, r *http.Request) {
jsg.AlertManagerBaseURL = proxy.SingleJoiningSlash(s.BaseURL.Path, alertManagerProxyEndpoint)
}

if s.devConsoleAppServiceProxyEnabled() {
jsg.DevConsoleAppServiceBaseURL = proxy.SingleJoiningSlash(s.BaseURL.Path, devConsoleAppServiceProxyEndpoint)
}

if !s.authDisabled() {
s.Auther.SetCSRFCookie(s.BaseURL.Path, &w)
}
Expand Down