[#69457338] Use HttpHandler for /recent

Signed-off-by: Alex Jackson <ajackson@pivotallabs.com>

src/trafficcontroller/output_proxy.go

@@ -26,12 +26,12 @@ type WebsocketHandler interface {
 	HandleWebSocket(string, string, []*hasher.Hasher)
 }
 
-var NewProxyHandlerProvider func(*websocket.Conn, *gosteno.Logger) WebsocketHandler
+var NewProxyHandlerProvider func(*websocket.Conn, *gosteno.Logger) WebsocketHandler = func(ws *websocket.Conn, logger *gosteno.Logger) WebsocketHandler {
+	return NewProxyHandler(ws, logger)
+}
 
-func init() {
-	NewProxyHandlerProvider = func(ws *websocket.Conn, logger *gosteno.Logger) WebsocketHandler {
-		return NewProxyHandler(ws, logger)
-	}
+var NewHttpHandlerProvider func(hashers []*hasher.Hasher, logger *gosteno.Logger) http.Handler = func(hashers []*hasher.Hasher, logger *gosteno.Logger) http.Handler {
+	return NewHttpHandler(hashers, logger)
 }
 
 func NewProxy(host string, hashers []*hasher.Hasher, authorizer authorization.LogAccessAuthorizer, logger *gosteno.Logger) *Proxy {
@@ -113,6 +113,13 @@ func (proxy *Proxy) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
 		fmt.Fprintf(rw, "You are not authorized. %s", errorMessage)
 		return
 	}
+
+	if recentViaHttp(r) {
+		h := NewHttpHandlerProvider(proxy.hashers, proxy.logger)
+		h.ServeHTTP(rw, r)
+		return
+	}
+
 	ws := upgrade(rw, r)
 	if ws == nil {
 		return
@@ -132,3 +139,7 @@ func extractAuthTokenFromUrl(u *url.URL) string {
 	}
 	return authorization
 }
+
+func recentViaHttp(r *http.Request) bool {
+	return r.URL.Path == "/recent"
+}

src/trafficcontroller/output_proxy_test.go

@@ -28,14 +28,23 @@ func (f *fakeProxyHandler) CallParams() [][]interface{} {
 	copy(copyOfParams, f.callParams)
 	return copyOfParams
 }
+
 func (f *fakeProxyHandler) HandleWebSocket(appid, requestUri string, hashers []*hasher.Hasher) {
 	f.Lock()
 	defer f.Unlock()
 	f.callParams = append(f.callParams, []interface{}{appid, requestUri, hashers})
 	f.WebsocketConnection.Close()
 }
 
-var _ = Describe("OutPutProxy", func() {
+type fakeHttpHandler struct {
+	called bool
+}
+
+func (f *fakeHttpHandler) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
+	f.called = true
+}
+
+var _ = Describe("OutputProxy", func() {
 
 	var fph *fakeProxyHandler
 	var hashers []*hasher.Hasher
@@ -47,6 +56,7 @@ var _ = Describe("OutPutProxy", func() {
 			fph.WebsocketConnection = ws
 			return fph
 		}
+
 		hashers = []*hasher.Hasher{hasher.NewHasher([]string{"localhost:62038"})}
 		proxy := trafficcontroller.NewProxy(
 			"localhost:"+PORT,
@@ -106,6 +116,28 @@ var _ = Describe("OutPutProxy", func() {
 		})
 	})
 
+	Context("/recent", func() {
+		var fhh *fakeHttpHandler
+
+		BeforeEach(func() {
+			fhh = &fakeHttpHandler{}
+
+			trafficcontroller.NewHttpHandlerProvider = func(hashers []*hasher.Hasher, logger *gosteno.Logger) http.Handler {
+				return fhh
+			}
+		})
+
+		It("should use HttpHandler instead of ProxyHandler", func() {
+			url := "http://localhost:" + PORT + "/recent?app=myApp"
+			r, _ := http.NewRequest("GET", url, nil)
+			r.Header = http.Header{"Authorization": []string{testhelpers.VALID_AUTHENTICATION_TOKEN}}
+			client := &http.Client{}
+			_, err := client.Do(r)
+
+			Expect(err).NotTo(HaveOccurred())
+			Expect(fhh.called).To(BeTrue())
+		})
+	})
 })
 
 func assertAuthorizationError(resp *http.Response, err error, msg string) {