From c3303d94a4cc0a1f7a97b65332fa03a6830d5ff3 Mon Sep 17 00:00:00 2001
From: varvara dvortsova <vvdvortsova@edu.hse.ru>
Date: Sun, 9 May 2021 20:40:08 +0300
Subject: [PATCH] embed: Added a check for an nil value of the request in
 ServeHTTP method. Fixed #12821

---
 server/embed/serve.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/server/embed/serve.go b/server/embed/serve.go
index 6100ebd0b..23e115d6a 100644
--- a/server/embed/serve.go
+++ b/server/embed/serve.go
@@ -303,8 +303,12 @@ type accessController struct {
 }
 
 func (ac *accessController) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
+	if req == nil {
+		http.Error(rw, "Request is nil", http.StatusBadRequest)
+		return
+	}
 	// redirect for backward compatibilities
-	if req != nil && req.URL != nil && strings.HasPrefix(req.URL.Path, "/v3beta/") {
+	if req.URL != nil && strings.HasPrefix(req.URL.Path, "/v3beta/") {
 		req.URL.Path = strings.Replace(req.URL.Path, "/v3beta/", "/v3/", 1)
 	}