Lexically quote routes when generating CORS-support handlers (in case routes contain backslash) (goadesign#1069)

Author: xeger

design/apidsl/api.go

@@ -161,7 +161,7 @@ func BasePath(val string) {
 //                Credentials()                        // Sets Access-Control-Allow-Credentials header
 //        })
 //
-//        Origin("/[api|swagger].goa.design/", func() {}) // Define CORS policy with a regular expression
+//        Origin("/(api|swagger)[.]goa[.]design/", func() {}) // Define CORS policy with a regular expression
 func Origin(origin string, dsl func()) {
 	cors := &design.CORSDefinition{Origin: origin}
 

goagen/gen_app/writers.go

@@ -699,7 +699,7 @@ func Mount{{ .Resource }}Controller(service *goa.Service, ctrl {{ .Resource }}Co
 	initService(service)
 	var h goa.Handler
 {{ $res := .Resource }}{{ if .Origins }}{{ range .PreflightPaths }}{{/*
-*/}}	service.Mux.Handle("OPTIONS", "{{ . }}", ctrl.MuxHandler("preflight", handle{{ $res }}Origin(cors.HandlePreflight()), nil))
+*/}}	service.Mux.Handle("OPTIONS", {{ printf "%q" . }}, ctrl.MuxHandler("preflight", handle{{ $res }}Origin(cors.HandlePreflight()), nil))
 {{ end }}{{ end }}{{ range .Actions }}{{ $action := . }}
 	h = func(ctx context.Context, rw http.ResponseWriter, req *http.Request) error {
 		// Check if there was an error loading the request

goagen/gen_app/writers_test.go

@@ -946,14 +946,15 @@ var _ = Describe("ControllersWriter", func() {
 				BeforeEach(func() {
 					origins = []*design.CORSDefinition{
 						{
+							// NB: including backslash to ensure proper escaping
 							Origin:      "here.example.com",
 							Headers:     []string{"X-One", "X-Two"},
 							Methods:     []string{"GET", "POST"},
 							Exposed:     []string{"X-Three"},
 							Credentials: true,
 						},
 					}
-					preflightPaths = []string{"/public/*filepath"}
+					preflightPaths = []string{"/public/star\\*star/*filepath"}
 				})
 
 				It("writes the OPTIONS handler code", func() {
@@ -2134,7 +2135,7 @@ type PublicController interface {
 }
 `
 
-	fileServerOptionsHandler = `service.Mux.Handle("OPTIONS", "/public/*filepath", ctrl.MuxHandler("preflight", handlePublicOrigin(cors.HandlePreflight()), nil))`
+	fileServerOptionsHandler = `service.Mux.Handle("OPTIONS", "/public/star\\*star/*filepath", ctrl.MuxHandler("preflight", handlePublicOrigin(cors.HandlePreflight()), nil))`
 
 	simpleController = `// BottlesController is the controller interface for the Bottles actions.
 type BottlesController interface {