Merge pull request #63 from Remitly/static-assets

Static assets now built into the binary

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: circleci/golang:1.9
+      - image: circleci/golang:1.10
     working_directory: /go/src/github.com/buzzfeed/sso
     steps:
       - checkout
@@ -15,7 +15,7 @@ jobs:
           command: |
             cp Godeps /tmp/Godeps
             cp gpm /tmp/gpm
-            cd /tmp && ./gpm
+            cd /tmp && ./gpm install
       - run:
           name: copy source
           command: |
@@ -38,4 +38,4 @@ jobs:
               if [[ -n $DOCKER_USER ]]; then
                 docker login -u $DOCKER_USER -p $DOCKER_PASS
                 make imagepush
-              fi
+              fi

Dockerfile

@@ -28,5 +28,4 @@ RUN cd cmd/sso-proxy && go build -o /bin/sso-proxy
 FROM debian:stable-slim
 RUN apt-get update && apt-get install -y ca-certificates && rm -rf /var/lib/apt/lists/*
 WORKDIR /sso
-COPY ./static ./static
 COPY --from=build /bin/sso-* /bin/

Godeps

@@ -12,3 +12,4 @@ github.com/benbjohnson/clock             7dc76406b6d3c05b5f71a86293cbcf3c4ea03b1
 github.com/kelseyhightower/envconfig     v1.3.0
 github.com/miscreant/miscreant-go        6b98fbe3dd42dfd24a8ecbabdb3586ada20dc5f8
 github.com/sirupsen/logrus               e54a77765aca7bbdd8e56c1c54f60579968b2dc9
+github.com/rakyll/statik                 v0.1.4

Makefile

@@ -6,10 +6,12 @@ build: dist/sso-auth dist/sso-proxy
 
 dist/sso-auth:
 	mkdir -p dist
+	go generate ./...
 	go build -o dist/sso-auth ./cmd/sso-auth
 
 dist/sso-proxy:
 	mkdir -p dist
+	go generate ./...
 	go build -o dist/sso-proxy ./cmd/sso-proxy
 
 test:

internal/auth/authenticator.go

@@ -164,6 +164,8 @@ func NewAuthenticator(opts *Options, optionFuncs ...func(*Authenticator) error)
 }
 
 func (p *Authenticator) newMux() http.Handler {
+	logger := log.NewLogEntry()
+
 	mux := http.NewServeMux()
 
 	// we setup global endpoints that should respond to any hostname
@@ -181,8 +183,11 @@ func (p *Authenticator) newMux() http.Handler {
 	serviceMux.HandleFunc("/validate", p.withMethods(p.validateClientID(p.validateClientSecret(p.ValidateToken)), "GET"))
 	serviceMux.HandleFunc("/redeem", p.withMethods(p.validateClientID(p.validateClientSecret(p.Redeem)), "POST"))
 	serviceMux.HandleFunc("/refresh", p.withMethods(p.validateClientID(p.validateClientSecret(p.Refresh)), "POST"))
-	// serve static files but prevent directory listings, see static_files.go
-	serviceMux.Handle("/static/", http.StripPrefix("/static/", http.FileServer(noDirectoryFS{http.Dir("./static")})))
+	fsHandler, err := loadFSHandler()
+	if err != nil {
+		logger.Fatal(err)
+	}
+	serviceMux.Handle("/static/", http.StripPrefix("/static/", fsHandler))
 
 	// NOTE: we have to include trailing slash for the router to match the host header
 	host := p.Host

internal/auth/static_files.go

@@ -3,6 +3,11 @@ package auth
 import (
 	"net/http"
 	"os"
+
+	"github.com/rakyll/statik/fs"
+
+	// Statik makes assets available via a blank import
+	_ "github.com/buzzfeed/sso/internal/auth/statik"
 )
 
 // noDirectoryFilesystem is used to prevent an http.FileServer from providing directory listings
@@ -29,3 +34,14 @@ func (fs noDirectoryFS) Open(name string) (http.File, error) {
 
 	return f, nil
 }
+
+//go:generate $GOPATH/bin/statik -src=./static
+
+func loadFSHandler() (http.Handler, error) {
+	statikFS, err := fs.New()
+	if err != nil {
+		return nil, err
+	}
+
+	return http.FileServer(noDirectoryFS{statikFS}), nil
+}