Auth: Should redirect to login when anonymous enabled and URL with different org…

Auth: Should redirect to login when anonymous enabled and URL with different org than anonymous specified  (#28158)

If anonymous access is enabled for an org and there are multiple
orgs. When requesting a page that requires user to be logged in
and orgId query string is set in the request url to an org not
equal the anonymous org, if the user is not logged in should
be redirected to the login page.

Fixes #26120

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>

pkg/middleware/auth.go

@@ -94,6 +94,14 @@ func Auth(options *AuthOptions) macaron.Handler {
 			if err == nil {
 				forceLogin = forceLoginParam
 			}
+
+			if !forceLogin {
+				orgIDValue := c.Req.URL.Query().Get("orgId")
+				orgID, err := strconv.ParseInt(orgIDValue, 10, 64)
+				if err == nil && orgID > 0 && orgID != c.OrgId {
+					forceLogin = true
+				}
+			}
 		}
 		requireLogin := !c.AllowAnonymous || forceLogin
 		if !c.IsSignedIn && options.ReqSignedIn && requireLogin {

pkg/middleware/auth_test.go

@@ -3,6 +3,8 @@ package middleware
 import (
 	"testing"
 
+	"github.com/grafana/grafana/pkg/bus"
+	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/setting"
 
 	. "github.com/smartystreets/goconvey/convey"
@@ -32,6 +34,60 @@ func TestMiddlewareAuth(t *testing.T) {
 			})
 		})
 
+		Convey("Anonymous auth enabled", func() {
+			origEnabled := setting.AnonymousEnabled
+			t.Cleanup(func() {
+				setting.AnonymousEnabled = origEnabled
+			})
+			origName := setting.AnonymousOrgName
+			t.Cleanup(func() {
+				setting.AnonymousOrgName = origName
+			})
+			setting.AnonymousEnabled = true
+			setting.AnonymousOrgName = "test"
+
+			bus.AddHandler("test", func(query *models.GetOrgByNameQuery) error {
+				query.Result = &models.Org{Id: 1, Name: "test"}
+				return nil
+			})
+
+			middlewareScenario(t, "ReqSignIn true and request with forceLogin in query string", func(sc *scenarioContext) {
+				sc.m.Get("/secure", reqSignIn, sc.defaultHandler)
+
+				sc.fakeReq("GET", "/secure?forceLogin=true").exec()
+
+				Convey("Should redirect to login", func() {
+					So(sc.resp.Code, ShouldEqual, 302)
+					location, ok := sc.resp.Header()["Location"]
+					So(ok, ShouldBeTrue)
+					So(location[0], ShouldEqual, "/login")
+				})
+			})
+
+			middlewareScenario(t, "ReqSignIn true and request with same org provided in query string", func(sc *scenarioContext) {
+				sc.m.Get("/secure", reqSignIn, sc.defaultHandler)
+
+				sc.fakeReq("GET", "/secure?orgId=1").exec()
+
+				Convey("Should not redirect to login", func() {
+					So(sc.resp.Code, ShouldEqual, 200)
+				})
+			})
+
+			middlewareScenario(t, "ReqSignIn true and request with different org provided in query string", func(sc *scenarioContext) {
+				sc.m.Get("/secure", reqSignIn, sc.defaultHandler)
+
+				sc.fakeReq("GET", "/secure?orgId=2").exec()
+
+				Convey("Should redirect to login", func() {
+					So(sc.resp.Code, ShouldEqual, 302)
+					location, ok := sc.resp.Header()["Location"]
+					So(ok, ShouldBeTrue)
+					So(location[0], ShouldEqual, "/login")
+				})
+			})
+		})
+
 		Convey("snapshot public mode or signed in", func() {
 			middlewareScenario(t, "Snapshot public mode disabled and unauthenticated request should return 401", func(sc *scenarioContext) {
 				sc.m.Get("/api/snapshot", SnapshotPublicModeOrSignedIn(), sc.defaultHandler)

pkg/middleware/org_redirect.go

@@ -17,7 +17,7 @@ import (
 func OrgRedirect() macaron.Handler {
 	return func(res http.ResponseWriter, req *http.Request, c *macaron.Context) {
 		orgIdValue := req.URL.Query().Get("orgId")
-		orgId, err := strconv.ParseInt(orgIdValue, 10, 32)
+		orgId, err := strconv.ParseInt(orgIdValue, 10, 64)
 
 		if err != nil || orgId == 0 {
 			return