Serve web console from same port as API by default and allow configuring console's context root

[jwforres]

No description provided.

[jwforres]

@liggitt @smarterclayton

[jwforres]

Is there a better place to put this?

[jwforres]

implemented all review feedback except for the ongoing discussion about CORS [test]

[openshift-bot]

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_openshift3/1472/)

[liggitt]

Add a TODO to build these paths in a non-hardcoded way

[liggitt]

Integration test for root redirect with "accept: text/html" and json otherwise?
https://gist.github.com/liggitt/602ad5b5cfab6d156c90

[liggitt]

Also, add a TODO in the integration test file to add a test when the asset config is nil, once David's changes to let you manipulate the config are available

[jwforres]

@liggitt squashed down to two commits, your initial changes and then all my follow-up changes, ready for a final glance-over before merge

[jwforres]

[merge]

[openshift-bot]

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_requests_openshift3/1310/) (Image: devenv-fedora_1142)

[openshift-bot]

Evaluated for origin up to 22045ca

[bparees]

impacts the sample app readme, right?
"Optional: View the OpenShift web console in your browser by browsing to https://:8444. Login using the user test-admin and any password."

[jwforres]

@bparees you are correct, I was about to add info about the console to the main readme, will fix that at the same time

[soltysh]

@jwforres I'd say this might be error prone, looking at this http spec, which allows you to specify the accept header in quite sophisticated way. Eg. if I'd send Accept: text/html; q=0.2, application/json you'd classify this as web request, whereas actually text/html option has q=0.2 and application/json has q=1 which means is the preferred one. Other example would be that there is possibility the header will contain */* which may go with text/html but will not with this. I couldn't find any go lib to cover this, but here implementation of this in python. I'm willing to help with this or provide more details on it as I've spent quite some time digging into this some time ago. On the other hand maybe something has changed in the mean time.

[liggitt]

We're aware this isn't fully spec compliant. Feel free to add a todo or open a pull request, but it's working well enough for now (browsers get redirected, curl and requests that don't accept text/html explicitly get the JSON.

[soltysh]

I've created an issue to track this
#1480

On Thu, Mar 26, 2015 at 11:40 PM Jordan Liggitt [email protected]
wrote:

In pkg/cmd/server/origin/master.go
#1458 (comment):

@@ -273,6 +271,55 @@ func initAPIVersionRoute(root *restful.WebService, version string) {
Consumes(restful.MIME_JSON))
}

+// If we know the location of the asset server, redirect to it when / is requested
+// and the Accept header supports text/html
+func assetServerRedirect(handler http.Handler, assetPublicURL string) http.Handler {

• return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {

•   accept := req.Header.Get("Accept")
  

•   if req.URL.Path == "/" && strings.Contains(accept, "text/html") {
  

We're aware this isn't fully spec compliant. Feel free to add a todo or
open a pull request, but it's working well enough for now (browsers get
redirected, curl and requests that don't accept text/html explicitly get
the JSON.

—
Reply to this email directly or view it on GitHub
https://github.com/openshift/origin/pull/1458/files#r27263311.