Merge branch 'master' into auth-resolver

api/handler/rpc/stream.go

@@ -135,27 +135,38 @@ func serveWebsocket(ctx context.Context, w http.ResponseWriter, r *http.Request,
 
 	// receive from stream and send to client
 	for {
-		// read backend response body
-		buf, err := rsp.Read()
-		if err != nil {
-			if logger.V(logger.ErrorLevel, logger.DefaultLogger) {
-				logger.Error(err)
-			}
+		select {
+		case <-ctx.Done():
 			return
-		}
+		case <-stream.Context().Done():
+			return
+		default:
+			// read backend response body
+			buf, err := rsp.Read()
+			if err != nil {
+				// wants to avoid import  grpc/status.Status
+				if strings.Contains(err.Error(), "context canceled") {
+					return
+				}
+				if logger.V(logger.ErrorLevel, logger.DefaultLogger) {
+					logger.Error(err)
+				}
+				return
+			}
 
-		// write the response
-		if err := wsutil.WriteServerMessage(rw, op, buf); err != nil {
-			if logger.V(logger.ErrorLevel, logger.DefaultLogger) {
-				logger.Error(err)
+			// write the response
+			if err := wsutil.WriteServerMessage(rw, op, buf); err != nil {
+				if logger.V(logger.ErrorLevel, logger.DefaultLogger) {
+					logger.Error(err)
+				}
+				return
 			}
-			return
-		}
-		if err = rw.Flush(); err != nil {
-			if logger.V(logger.ErrorLevel, logger.DefaultLogger) {
-				logger.Error(err)
+			if err = rw.Flush(); err != nil {
+				if logger.V(logger.ErrorLevel, logger.DefaultLogger) {
+					logger.Error(err)
+				}
+				return
 			}
-			return
 		}
 	}
 }
@@ -166,30 +177,40 @@ func writeLoop(rw io.ReadWriter, stream client.Stream) {
 	defer stream.Close()
 
 	for {
-		buf, op, err := wsutil.ReadClientData(rw)
-		if err != nil {
-			if logger.V(logger.ErrorLevel, logger.DefaultLogger) {
-				logger.Error(err)
-			}
+		select {
+		case <-stream.Context().Done():
 			return
-		}
-		switch op {
 		default:
-			// not relevant
-			continue
-		case ws.OpText, ws.OpBinary:
-			break
-		}
-		// send to backend
-		// default to trying json
-		// if the extracted payload isn't empty lets use it
-		request := &raw.Frame{Data: buf}
-
-		if err := stream.Send(request); err != nil {
-			if logger.V(logger.ErrorLevel, logger.DefaultLogger) {
-				logger.Error(err)
+			buf, op, err := wsutil.ReadClientData(rw)
+			if err != nil {
+				if wserr, ok := err.(wsutil.ClosedError); ok {
+					switch wserr.Code {
+					case ws.StatusNormalClosure, ws.StatusNoStatusRcvd:
+						return
+					}
+				}
+				if logger.V(logger.ErrorLevel, logger.DefaultLogger) {
+					logger.Error(err)
+				}
+				return
+			}
+			switch op {
+			default:
+				// not relevant
+				continue
+			case ws.OpText, ws.OpBinary:
+				break
+			}
+			// send to backend
+			// default to trying json
+			// if the extracted payload isn't empty lets use it
+			request := &raw.Frame{Data: buf}
+			if err := stream.Send(request); err != nil {
+				if logger.V(logger.ErrorLevel, logger.DefaultLogger) {
+					logger.Error(err)
+				}
+				return
 			}
-			return
 		}
 	}
 }

api/server/auth/auth.go

@@ -133,22 +133,19 @@ func (h authHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 
 func namespaceFromRequest(req *http.Request) (string, error) {
 	// determine the host, e.g. dev.micro.mu:8080
-	host := req.URL.Host
+	host := req.URL.Hostname()
 	if len(host) == 0 {
-		host = req.Host
+		// fallback to req.Host
+		host, _, _ = net.SplitHostPort(req.Host)
 	}
 
+	logger.Infof("Host is %v", host)
+
 	// check for an ip address
 	if net.ParseIP(host) != nil {
 		return auth.DefaultNamespace, nil
 	}
 
-	// split the host to remove the port
-	host, _, err := net.SplitHostPort(req.Host)
-	if err != nil {
-		return "", err
-	}
-
 	// check for dev enviroment
 	if host == "localhost" || host == "127.0.0.1" {
 		return auth.DefaultNamespace, nil