Removed support/http/server package files

services/bridge/main.go

@@ -21,7 +21,7 @@ import (
  "github.com/stellar/go/services/bridge/internal/submitter"
  supportConfig "github.com/stellar/go/support/config"
  "github.com/stellar/go/support/errors"
- "github.com/stellar/go/support/http/server"
+ supportHttp "github.com/stellar/go/support/http"
  "github.com/zenazn/goji/graceful"
  "github.com/zenazn/goji/web"
  "github.com/zenazn/goji/web/middleware"
@@ -243,8 +243,8 @@ func (a *App) Serve() {
  // Middlewares
  var headers http.Header
  headers.Set("Content-Type", "application/json")
- bridge.Use(server.StripTrailingSlashMiddleware("/admin"))
- bridge.Use(server.HeadersMiddleware(headers, "/admin/"))
+ bridge.Use(supportHttp.StripTrailingSlashMiddleware("/admin"))
+ bridge.Use(supportHttp.HeadersMiddleware(headers, "/admin/"))
 
  if a.config.APIKey != "" {
  bridge.Use(apiKeyMiddleware(a.config.APIKey))

services/compliance/main.go

@@ -20,7 +20,7 @@ import (
  "github.com/stellar/go/services/compliance/internal/handlers"
  supportConfig "github.com/stellar/go/support/config"
  "github.com/stellar/go/support/errors"
- "github.com/stellar/go/support/http/server"
+ supportHttp "github.com/stellar/go/support/http"
  "github.com/zenazn/goji/graceful"
  "github.com/zenazn/goji/web"
 )
@@ -172,8 +172,8 @@ func (a *App) Serve() {
  var headers http.Header
  headers.Set("Content-Type", "application/json")
 
- external.Use(server.StripTrailingSlashMiddleware())
- external.Use(server.HeadersMiddleware(headers))
+ external.Use(supportHttp.StripTrailingSlashMiddleware())
+ external.Use(supportHttp.HeadersMiddleware(headers))
 
  external.Post("/", a.requestHandler.HandlerAuth)
  external.Get("/tx_status", httpauth.SimpleBasicAuth(a.config.TxStatusAuth.Username, a.config.TxStatusAuth.Password)(http.HandlerFunc(a.requestHandler.HandlerTxStatus)))
@@ -200,8 +200,8 @@ func (a *App) Serve() {
  // Internal endpoints
  internal := web.New()
 
- internal.Use(server.StripTrailingSlashMiddleware("/admin"))
- internal.Use(server.HeadersMiddleware(headers, "/admin/"))
+ internal.Use(supportHttp.StripTrailingSlashMiddleware("/admin"))
+ internal.Use(supportHttp.HeadersMiddleware(headers, "/admin/"))
 
  internal.Post("/send", a.requestHandler.HandlerSend)
  internal.Post("/receive", a.requestHandler.HandlerReceive)

support/http/headers_middleware.go

@@ -0,0 +1,25 @@
+package http
+
+import (
+ stdhttp "net/http"
+ "strings"
+)
+
+// HeadersMiddleware sends headers
+func HeadersMiddleware(headers stdhttp.Header, ignoredPrefixes ...string) func(next stdhttp.Handler) stdhttp.Handler {
+ return func(next stdhttp.Handler) stdhttp.Handler {
+ fn := func(w stdhttp.ResponseWriter, r *stdhttp.Request) {
+ // Do not change ignored prefixes
+ for _, prefix := range ignoredPrefixes {
+ if strings.HasPrefix(r.URL.Path, prefix) {
+ next.ServeHTTP(w, r)
+ return
+ }
+ }
+
+ headers.Write(w)
+ next.ServeHTTP(w, r)
+ }
+ return stdhttp.HandlerFunc(fn)
+ }
+}

support/http/server/middleware_strip_trailing_slash.go → support/http/strip_trailing_slash_middleware.go

@@ -1,14 +1,14 @@
-package server
+package http
 
 import (
- "net/http"
+ stdhttp "net/http"
  "strings"
 )
 
 // StripTrailingSlashMiddleware strips trailing slash.
-func StripTrailingSlashMiddleware(ignoredPrefixes ...string) func(next http.Handler) http.Handler {
- return func(next http.Handler) http.Handler {
- fn := func(w http.ResponseWriter, r *http.Request) {
+func StripTrailingSlashMiddleware(ignoredPrefixes ...string) func(next stdhttp.Handler) stdhttp.Handler {
+ return func(next stdhttp.Handler) stdhttp.Handler {
+ fn := func(w stdhttp.ResponseWriter, r *stdhttp.Request) {
  path := r.URL.Path
 
  // Do not change ignored prefixes
@@ -29,6 +29,6 @@ func StripTrailingSlashMiddleware(ignoredPrefixes ...string) func(next http.Hand
 
  next.ServeHTTP(w, r)
  }
- return http.HandlerFunc(fn)
+ return stdhttp.HandlerFunc(fn)
  }
 }