Authn: move namespace id type (#86853)

* Use RoleType from org package

* Move to identity package and re-export from authn

* Replace usage of top level functions for identity

Co-authored-by: Misi <mgyongyosi@users.noreply.github.com>

pkg/services/auth/identity/error.go

@@ -0,0 +1,13 @@
+package identity
+
+import (
+	"errors"
+
+	"github.com/grafana/grafana/pkg/util/errutil"
+)
+
+var (
+	ErrInvalidNamespaceID       = errutil.BadRequest("auth.identity.invalid-namespace-id")
+	ErrNotIntIdentifier         = errors.New("identifier is not an int64")
+	ErrIdentifierNotInitialized = errors.New("identifier is not initialized")
+)

pkg/services/auth/identity/namespace.go

@@ -0,0 +1,113 @@
+package identity
+
+import (
+	"fmt"
+	"strconv"
+	"strings"
+)
+
+const (
+	NamespaceUser           = "user"
+	NamespaceAPIKey         = "api-key"
+	NamespaceServiceAccount = "service-account"
+	NamespaceAnonymous      = "anonymous"
+	NamespaceRenderService  = "render"
+	NamespaceAccessPolicy   = "access-policy"
+)
+
+var AnonymousNamespaceID = MustNewNamespaceID(NamespaceAnonymous, 0)
+
+var namespaceLookup = map[string]struct{}{
+	NamespaceUser:           {},
+	NamespaceAPIKey:         {},
+	NamespaceServiceAccount: {},
+	NamespaceAnonymous:      {},
+	NamespaceRenderService:  {},
+	NamespaceAccessPolicy:   {},
+}
+
+func ParseNamespaceID(str string) (NamespaceID, error) {
+	var namespaceID NamespaceID
+
+	parts := strings.Split(str, ":")
+	if len(parts) != 2 {
+		return namespaceID, ErrInvalidNamespaceID.Errorf("expected namespace id to have 2 parts")
+	}
+
+	namespace, id := parts[0], parts[1]
+
+	if _, ok := namespaceLookup[namespace]; !ok {
+		return namespaceID, ErrInvalidNamespaceID.Errorf("got invalid namespace %s", namespace)
+	}
+
+	namespaceID.id = id
+	namespaceID.namespace = namespace
+
+	return namespaceID, nil
+}
+
+// MustParseNamespaceID parses namespace id, it will panic if it fails to do so.
+// Suitable to use in tests or when we can guarantee that we pass a correct format.
+func MustParseNamespaceID(str string) NamespaceID {
+	namespaceID, err := ParseNamespaceID(str)
+	if err != nil {
+		panic(err)
+	}
+	return namespaceID
+}
+
+// NewNamespaceID creates a new NamespaceID, will fail for invalid namespace.
+func NewNamespaceID(namespace string, id int64) (NamespaceID, error) {
+	var namespaceID NamespaceID
+	if _, ok := namespaceLookup[namespace]; !ok {
+		return namespaceID, ErrInvalidNamespaceID.Errorf("got invalid namespace %s", namespace)
+	}
+	namespaceID.id = strconv.FormatInt(id, 10)
+	namespaceID.namespace = namespace
+	return namespaceID, nil
+}
+
+// MustNewNamespaceID creates a new NamespaceID, will panic for invalid namespace.
+// Suitable to use in tests or when we can guarantee that we pass a correct format.
+func MustNewNamespaceID(namespace string, id int64) NamespaceID {
+	namespaceID, err := NewNamespaceID(namespace, id)
+	if err != nil {
+		panic(err)
+	}
+	return namespaceID
+}
+
+// NewNamespaceIDUnchecked creates a new NamespaceID without checking if namespace is valid.
+// It us up to the caller to ensure that namespace is valid.
+func NewNamespaceIDUnchecked(namespace string, id int64) NamespaceID {
+	return NamespaceID{
+		id:        strconv.FormatInt(id, 10),
+		namespace: namespace,
+	}
+}
+
+// FIXME: use this instead of encoded string through the codebase
+type NamespaceID struct {
+	id        string
+	namespace string
+}
+
+func (ni NamespaceID) ID() string {
+	return ni.id
+}
+
+func (ni NamespaceID) ParseInt() (int64, error) {
+	return strconv.ParseInt(ni.id, 10, 64)
+}
+
+func (ni NamespaceID) Namespace() string {
+	return ni.namespace
+}
+
+func (ni NamespaceID) IsNamespace(expected ...string) bool {
+	return IsNamespace(ni.namespace, expected...)
+}
+
+func (ni NamespaceID) String() string {
+	return fmt.Sprintf("%s:%s", ni.namespace, ni.id)
+}

pkg/services/auth/identity/requester.go

@@ -1,25 +1,12 @@
 package identity
 
 import (
-	"errors"
 	"fmt"
 	"strconv"
 
 	"github.com/grafana/grafana/pkg/models/roletype"
 )
 
-const (
-	NamespaceUser           = "user"
-	NamespaceAPIKey         = "api-key"
-	NamespaceServiceAccount = "service-account"
-	NamespaceAnonymous      = "anonymous"
-	NamespaceRenderService  = "render"
-	NamespaceAccessPolicy   = "access-policy"
-)
-
-var ErrNotIntIdentifier = errors.New("identifier is not an int64")
-var ErrIdentifierNotInitialized = errors.New("identifier is not initialized")
-
 type Requester interface {
 	// GetID returns namespaced id for the entity
 	GetID() string