foomo/contentfulproxy
1
0
Fork 0
mirror of https://github.com/foomo/contentfulproxy.git synced 2025-10-16 12:25:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* fixed missing stripping of path-segment

Browse Source 
* added logging of error messages
This commit is contained in:
Daniel Thomas 2021-11-23 16:42:24 +01:00
parent 84693b15a1
commit 4dc8b8fcd5
4 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile
View File

@ -25,6 +25,7 @@ RUN upx /src/bin/contentfulproxy
##############################
###### STAGE: PACKAGE ######
##############################
# TODO: use non-root
FROM alpine:latest
ENV CONTENTFULPROXY_SERVER_ADDR=0.0.0.0:80

8
proxy/cache.go
View File

@ -85,8 +85,8 @@ func NewCache(l *zap.Logger, webHooks func() []string) *Cache {
return c
}
func getCacheIDForRequest(r *http.Request) cacheID {
id := r.URL.RequestURI()
func getCacheIDForRequest(r *http.Request, pathPrefix func() string) cacheID {
id := stripPrefixFromUrl(r.URL.RequestURI(), pathPrefix)
keys := make([]string, len(r.Header))
i := 0
for k := range r.Header {
@ -107,3 +107,7 @@ func getCacheIDForRequest(r *http.Request) cacheID {
id = hex.EncodeToString(hash.Sum(nil))
return cacheID(id)
}
func stripPrefixFromUrl(url string, pathPrefix func() string) string {
return strings.Replace(url, pathPrefix(), "", 1)
}

13
proxy/jobs.go
View File

@ -1,6 +1,10 @@
package proxy
import "net/http"
import (
"github.com/foomo/contentfulproxy/packages/go/log"
"go.uber.org/zap"
"net/http"
)
type requestJobDone struct {
cachedResponse *cachedResponse
@ -15,9 +19,12 @@ type requestJob struct {
type jobRunner func(job requestJob, id cacheID)
func getJobRunner(c *Cache, backendURL func() string, chanJobDone chan requestJobDone) jobRunner {
func getJobRunner(l *zap.Logger, c *Cache, backendURL func() string, pathPrefix func() string, chanJobDone chan requestJobDone) jobRunner {
return func(job requestJob, id cacheID) {
req, err := http.NewRequest("GET", backendURL()+job.request.URL.RequestURI(), nil)
// backend url is the contentful api domain like https://cdn.contenful.com
calledURL := backendURL() + stripPrefixFromUrl(job.request.URL.RequestURI(), pathPrefix)
l.Info("URL called by job-runner", log.FURL(calledURL))
req, err := http.NewRequest("GET", calledURL, nil)
if err != nil {
chanJobDone <- requestJobDone{
id: id,

16
proxy/proxy.go
View File

@ -10,6 +10,7 @@ import (
"github.com/prometheus/client_golang/prometheus"
"github.com/foomo/contentfulproxy/packages/go/log"
keellog "github.com/foomo/keel/log"
"go.uber.org/zap"
)
@ -56,7 +57,7 @@ func (p *Proxy) ServeHTTP(w http.ResponseWriter, r *http.Request) {
case http.MethodGet:
p.l.Info("serve get request", zap.String("url", r.RequestURI))
p.metrics.NumProxyRequest.Inc()
cacheID := getCacheIDForRequest(r)
cacheID := getCacheIDForRequest(r, p.pathPrefix)
cachedResponse, ok := p.cache.get(cacheID)
if !ok {
chanDone := make(chan requestJobDone)
@ -66,15 +67,17 @@ func (p *Proxy) ServeHTTP(w http.ResponseWriter, r *http.Request) {
}
jobDone := <-chanDone
if jobDone.err != nil {
p.l.Error("Cache / job error", zap.String("url", r.RequestURI))
keellog.WithError(p.l, jobDone.err).Error("Cache / job error")
http.Error(w, "Cache / job error", http.StatusInternalServerError)
return
}
cachedResponse = jobDone.cachedResponse
p.l.Info("serve response after cache creation", log.FURL(r.RequestURI), log.FCacheID(string(cacheID)))
p.l.Info("length of response", keellog.FValue(len(cachedResponse.response)))
p.metrics.NumAPIRequest.Inc()
} else {
p.l.Info("serve response from cache", log.FURL(r.RequestURI), log.FCacheID(string(cacheID)))
p.l.Info("length of response", keellog.FValue(len(cachedResponse.response)))
}
for key, values := range cachedResponse.header {
for _, value := range values {
@ -83,7 +86,7 @@ func (p *Proxy) ServeHTTP(w http.ResponseWriter, r *http.Request) {
}
_, err := w.Write(cachedResponse.response)
if err != nil {
p.l.Info("writing cached response failed", log.FURL(r.RequestURI), log.FCacheID(string(cacheID)))
keellog.WithError(p.l, err).Error("writing cached response failed", log.FCacheID(string(cacheID)))
}
default:
http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
@ -94,7 +97,7 @@ func NewProxy(ctx context.Context, l *zap.Logger, backendURL func() string, path
chanRequest := make(chan requestJob)
chanFlush := make(chan requestFlush)
c := NewCache(l, webHooks)
go getLoop(ctx, l, backendURL, c, chanRequest, chanFlush)
go getLoop(ctx, l, backendURL, pathPrefix, c, chanRequest, chanFlush)
return &Proxy{
l: l,
cache: c,
@ -110,13 +113,14 @@ func getLoop(
ctx context.Context,
l *zap.Logger,
backendURL func() string,
pathPrefix func() string,
c *Cache,
chanRequestJob chan requestJob,
chanFlush chan requestFlush,
) {
pendingRequests := map[cacheID][]chan requestJobDone{}
chanJobDone := make(chan requestJobDone)
jobRunner := getJobRunner(c, backendURL, chanJobDone)
jobRunner := getJobRunner(l, c, backendURL, pathPrefix, chanJobDone)
for {
select {
case <-chanFlush:
@ -124,7 +128,7 @@ func getLoop(
c.update()
c.callWebHooks()
case nextJob := <-chanRequestJob:
cacheID := getCacheIDForRequest(nextJob.request)
cacheID := getCacheIDForRequest(nextJob.request, pathPrefix)
pendingRequests[cacheID] = append(pendingRequests[cacheID], nextJob.chanDone)
requests := pendingRequests[cacheID]
if len(requests) == 1 {