feat(rest): support cors

api/pb/auth.pb.go

@@ -51,8 +51,7 @@ func (m *AuthAuthenticateRequest) GetPassword() string {
 }
 
 type AuthStatusResponse struct {
-	IsAuthenticated bool               `protobuf:"varint,1,opt,name=is_authenticated,json=isAuthenticated" json:"is_authenticated,omitempty"`
-	User            *UserResponse_User `protobuf:"bytes,2,opt,name=user" json:"user,omitempty"`
+	User *UserResponse_User `protobuf:"bytes,1,opt,name=user" json:"user,omitempty"`
 }
 
 func (m *AuthStatusResponse) Reset()                    { *m = AuthStatusResponse{} }
@@ -60,13 +59,6 @@ func (m *AuthStatusResponse) String() string            { return proto.CompactTe
 func (*AuthStatusResponse) ProtoMessage()               {}
 func (*AuthStatusResponse) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{2} }
 
-func (m *AuthStatusResponse) GetIsAuthenticated() bool {
-	if m != nil {
-		return m.IsAuthenticated
-	}
-	return false
-}
-
 func (m *AuthStatusResponse) GetUser() *UserResponse_User {
 	if m != nil {
 		return m.User
@@ -205,25 +197,24 @@ var _AuthService_serviceDesc = grpc.ServiceDesc{
 func init() { proto.RegisterFile("auth.proto", fileDescriptor3) }
 
 var fileDescriptor3 = []byte{
-	// 306 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x91, 0xc1, 0x4e, 0x32, 0x31,
-	0x14, 0x85, 0x33, 0xe4, 0xff, 0x09, 0x5e, 0x4c, 0x90, 0x2a, 0x42, 0x2a, 0x0b, 0xd2, 0x95, 0xb8,
-	0x60, 0x14, 0x77, 0xee, 0x7c, 0x03, 0xc5, 0xb8, 0x36, 0x85, 0xb9, 0x81, 0x8a, 0xb6, 0x75, 0x6e,
-	0x07, 0xf7, 0xbe, 0x82, 0xaf, 0xe5, 0xce, 0x57, 0xf0, 0x41, 0x4c, 0xdb, 0x19, 0x32, 0x11, 0x16,
-	0x93, 0xcc, 0xe9, 0xb9, 0x73, 0xbe, 0x33, 0xb7, 0x00, 0xb2, 0x70, 0xab, 0x89, 0xcd, 0x8d, 0x33,
-	0xac, 0x61, 0xe7, 0x7c, 0xb8, 0x34, 0x66, 0xf9, 0x82, 0xa9, 0xb4, 0x2a, 0x95, 0x5a, 0x1b, 0x27,
-	0x9d, 0x32, 0x9a, 0xe2, 0x04, 0x87, 0x82, 0x30, 0x8f, 0xef, 0xe2, 0x18, 0xba, 0xb7, 0x85, 0x5b,
-	0x3d, 0x38, 0xe9, 0x0a, 0x9a, 0xe1, 0x5b, 0x81, 0xe4, 0xc4, 0x3d, 0xf4, 0xfd, 0xa1, 0x7f, 0x50,
-	0x3b, 0xb5, 0x90, 0x0e, 0x4b, 0x8b, 0x71, 0x68, 0xf9, 0xaf, 0xb5, 0x7c, 0xc5, 0x41, 0x32, 0x4a,
-	0xce, 0x0f, 0x66, 0x5b, 0xed, 0x3d, 0x2b, 0x89, 0xde, 0x4d, 0x9e, 0x0d, 0x1a, 0xd1, 0xab, 0xb4,
-	0x78, 0x06, 0x56, 0xe7, 0x90, 0x35, 0x9a, 0x90, 0x8d, 0xe1, 0x48, 0xd1, 0x93, 0xac, 0x71, 0xb2,
-	0x90, 0xda, 0x9a, 0x75, 0x14, 0xd5, 0xf1, 0x19, 0x1b, 0xc3, 0x3f, 0x0f, 0x0a, 0xc1, 0xed, 0x69,
-	0x6f, 0x62, 0xe7, 0x93, 0x47, 0xc2, 0xbc, 0x8a, 0x8a, 0x22, 0x8c, 0x88, 0x4b, 0x18, 0xec, 0xd6,
-	0x2f, 0x89, 0x27, 0xf0, 0xdf, 0x99, 0x35, 0xea, 0xb2, 0x7c, 0x14, 0xd3, 0xaf, 0x04, 0xda, 0xa1,
-	0x1e, 0xe6, 0x1b, 0xb5, 0x40, 0x76, 0x07, 0xcd, 0xd8, 0x94, 0x05, 0xd0, 0xce, 0x86, 0xf8, 0xe9,
-	0xdf, 0xe3, 0x18, 0x2f, 0xfa, 0x1f, 0xdf, 0x3f, 0x9f, 0x8d, 0x2e, 0xeb, 0xa4, 0x9b, 0xab, 0xd4,
-	0xff, 0x57, 0x4a, 0x31, 0x67, 0x0d, 0x87, 0xf5, 0x3e, 0xec, 0xac, 0x0a, 0xd8, 0xb3, 0x64, 0x3e,
-	0xdc, 0x6f, 0x96, 0x8c, 0x51, 0x60, 0x70, 0xd1, 0xdb, 0x32, 0xea, 0x0b, 0xbc, 0x49, 0x2e, 0xe6,
-	0xcd, 0x70, 0xb7, 0xd7, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xeb, 0x1c, 0xc4, 0x9d, 0x17, 0x02,
-	0x00, 0x00,
+	// 289 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x91, 0x41, 0x4e, 0xf3, 0x30,
+	0x10, 0x85, 0x95, 0xe8, 0xff, 0x2b, 0x98, 0x22, 0xa1, 0x1a, 0x4a, 0x23, 0xd3, 0x45, 0xe5, 0x15,
+	0xb0, 0x48, 0xa0, 0xec, 0xd8, 0x20, 0x6e, 0x00, 0x45, 0x1c, 0xc0, 0x29, 0xa3, 0x36, 0x2a, 0xd8,
+	0x26, 0x1e, 0x97, 0x3d, 0x57, 0xe0, 0x5a, 0xec, 0xb8, 0x02, 0x07, 0x41, 0xb6, 0x93, 0x2a, 0xa2,
+	0x5d, 0x44, 0xca, 0x9b, 0x37, 0xf3, 0xbe, 0xc9, 0x04, 0x40, 0x3a, 0x5a, 0xe6, 0xa6, 0xd6, 0xa4,
+	0x59, 0x6a, 0x4a, 0x3e, 0x5e, 0x68, 0xbd, 0x78, 0xc1, 0x42, 0x9a, 0xaa, 0x90, 0x4a, 0x69, 0x92,
+	0x54, 0x69, 0x65, 0x63, 0x07, 0x07, 0x67, 0xb1, 0x8e, 0xef, 0xe2, 0x08, 0x06, 0x77, 0x8e, 0x96,
+	0x8f, 0x24, 0xc9, 0xd9, 0x19, 0xbe, 0x39, 0xb4, 0x24, 0x1e, 0x60, 0xe4, 0x8b, 0xfe, 0x41, 0x45,
+	0xd5, 0x5c, 0x12, 0x36, 0x16, 0xe3, 0xb0, 0xe7, 0xa7, 0x95, 0x7c, 0xc5, 0x2c, 0x99, 0x24, 0x67,
+	0xfb, 0xb3, 0x8d, 0xf6, 0x9e, 0x91, 0xd6, 0xbe, 0xeb, 0xfa, 0x39, 0x4b, 0xa3, 0xd7, 0x6a, 0x71,
+	0x0b, 0xac, 0xcb, 0xb1, 0x46, 0x2b, 0x8b, 0xec, 0x1c, 0xfe, 0xf9, 0xe9, 0x90, 0xd4, 0x9f, 0x0e,
+	0x73, 0x53, 0xe6, 0x4f, 0x16, 0xeb, 0xd6, 0x8f, 0x22, 0xb4, 0x88, 0x4b, 0xc8, 0xb6, 0x77, 0x6a,
+	0x62, 0x8e, 0xe1, 0x3f, 0xe9, 0x15, 0xaa, 0x66, 0xa3, 0x28, 0xa6, 0x5f, 0x09, 0xf4, 0x03, 0x13,
+	0xeb, 0x75, 0x35, 0x47, 0x76, 0x0f, 0xbd, 0x88, 0x67, 0x01, 0xb4, 0xf5, 0xd9, 0xfc, 0xe4, 0x6f,
+	0x39, 0xc6, 0x8b, 0xd1, 0xc7, 0xf7, 0xcf, 0x67, 0x3a, 0x60, 0x87, 0xc5, 0xfa, 0xaa, 0xf0, 0x97,
+	0x2e, 0x6c, 0xcc, 0x59, 0xc1, 0x41, 0x77, 0x1f, 0x76, 0xda, 0x06, 0xec, 0xb8, 0x1c, 0x1f, 0xef,
+	0x36, 0x1b, 0xc6, 0x24, 0x30, 0xb8, 0x18, 0x6e, 0x18, 0xb2, 0xd3, 0x76, 0x93, 0x5c, 0x94, 0xbd,
+	0xf0, 0xc3, 0xae, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x4d, 0x24, 0x8e, 0x73, 0xec, 0x01, 0x00,
+	0x00,
 }

api/pb/auth.proto

@@ -28,8 +28,7 @@ service AuthService {
 }
 
 message AuthStatusResponse {
-  bool is_authenticated = 1;
-  UserResponse.User user = 2;
+  UserResponse.User user = 1;
 }
 
 message AuthAuthenticateResponse {

api/rest.go

@@ -3,6 +3,7 @@ package api
 import (
 	"fmt"
 	"net/http"
+	"strings"
 
 	"github.com/Sirupsen/logrus"
 	"github.com/asaskevich/govalidator"
@@ -24,7 +25,7 @@ func NewRESTServer(grpcPort string) (http.Handler, context.CancelFunc, error) {
 	}
 	endPoint := fmt.Sprintf("localhost:%s", grpcPort)
 	ctx = NewOriginTypeContext(ctx, OriginTypeREST)
-	gmux := runtime.NewServeMux()
+	gmux := runtime.NewServeMux(runtime.WithMarshalerOption(runtime.MIMEWildcard, &runtime.JSONPb{OrigName: true, EmitDefaults: true}))
 	opts := []grpc.DialOption{grpc.WithInsecure()}
 	err := pb.RegisterVPNServiceHandlerFromEndpoint(ctx, gmux, endPoint, opts)
 	if err != nil {
@@ -68,11 +69,11 @@ func NewRESTServer(grpcPort string) (http.Handler, context.CancelFunc, error) {
 		Path:     "auth",
 	}, mware)
 	mux.Handle("/", mware)
-	return mux, cancel, nil
+
+	return allowCORS(mux), cancel, nil
 }
 
 func specsHandler(w http.ResponseWriter, r *http.Request) {
-
 	w.Header().Set("Content-Type", "application/json")
 	switch r.URL.Path {
 	case "/specs/user.swagger.json":
@@ -102,3 +103,25 @@ func specsHandler(w http.ResponseWriter, r *http.Request) {
 		w.Write(vpnData)
 	}
 }
+
+func preflightHandler(w http.ResponseWriter, r *http.Request) {
+	headers := []string{"Content-Type", "Accept", "Authorization"}
+	w.Header().Set("Access-Control-Allow-Headers", strings.Join(headers, ","))
+	methods := []string{"GET", "HEAD", "POST", "PUT", "DELETE"}
+	w.Header().Set("Access-Control-Allow-Methods", strings.Join(methods, ","))
+	logrus.Debugf("rest: preflight request for %s", r.URL.Path)
+	return
+}
+
+func allowCORS(h http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if origin := r.Header.Get("Origin"); origin != "" {
+			w.Header().Set("Access-Control-Allow-Origin", origin)
+			if r.Method == "OPTIONS" && r.Header.Get("Access-Control-Request-Method") != "" {
+				preflightHandler(w, r)
+				return
+			}
+		}
+		h.ServeHTTP(w, r)
+	})
+}

template/auth.swagger.json

@@ -113,10 +113,6 @@
     "pbAuthStatusResponse": {
       "type": "object",
       "properties": {
-        "is_authenticated": {
-          "type": "boolean",
-          "format": "boolean"
-        },
         "user": {
           "$ref": "#/definitions/UserResponseUser"
         }