Add apikey subcommand

_meta/beat.yml

@@ -157,6 +157,11 @@ apm-server:
 
       #protocol: "http"
 
+      # Username and password are only needed for the apm-server apikey sub-command, and they are ignored otherwise
+      # See `apm-server apikey --help` for details.
+      #username: "elastic"
+      #password: "changeme"
+
       # Optional HTTP Path.
       #path: ""
 

apm-server.docker.yml

@@ -157,6 +157,11 @@ apm-server:
 
       #protocol: "http"
 
+      # Username and password are only needed for the apm-server apikey sub-command, and they are ignored otherwise
+      # See `apm-server apikey --help` for details.
+      #username: "elastic"
+      #password: "changeme"
+
       # Optional HTTP Path.
       #path: ""
 

apm-server.yml

@@ -157,6 +157,11 @@ apm-server:
 
       #protocol: "http"
 
+      # Username and password are only needed for the apm-server apikey sub-command, and they are ignored otherwise
+      # See `apm-server apikey --help` for details.
+      #username: "elastic"
+      #password: "changeme"
+
       # Optional HTTP Path.
       #path: ""
 

beater/api/mux.go

@@ -83,7 +83,7 @@ func NewMux(beaterConfig *config.Config, report publish.Reporter) (*http.ServeMu
 	mux := http.NewServeMux()
 	logger := logp.NewLogger(logs.Handler)
 
-	auth, err := authorization.NewBuilder(beaterConfig)
+	auth, err := authorization.NewBuilder(*beaterConfig)
 	if err != nil {
 		return nil, err
 	}
@@ -125,7 +125,7 @@ func NewMux(beaterConfig *config.Config, report publish.Reporter) (*http.ServeMu
 
 func profileHandler(cfg *config.Config, builder *authorization.Builder, reporter publish.Reporter) (request.Handler, error) {
 	h := profile.Handler(systemMetadataDecoder(cfg, emptyDecoder), transform.Config{}, reporter)
-	authHandler := builder.ForPrivilege(authorization.PrivilegeEventWrite)
+	authHandler := builder.ForPrivilege(authorization.PrivilegeEventWrite.Action)
 	return middleware.Wrap(h, backendMiddleware(cfg, authHandler, profile.MonitoringMap)...)
 }
 
@@ -137,7 +137,7 @@ func backendIntakeHandler(cfg *config.Config, builder *authorization.Builder, re
 			MaxEventSize: cfg.MaxEventSize,
 		},
 		reporter)
-	authHandler := builder.ForPrivilege(authorization.PrivilegeEventWrite)
+	authHandler := builder.ForPrivilege(authorization.PrivilegeEventWrite.Action)
 	return middleware.Wrap(h, backendMiddleware(cfg, authHandler, intake.MonitoringMap)...)
 }
 
@@ -162,12 +162,12 @@ func sourcemapHandler(cfg *config.Config, builder *authorization.Builder, report
 		return nil, err
 	}
 	h := sourcemap.Handler(systemMetadataDecoder(cfg, decoder.DecodeSourcemapFormData), psourcemap.Processor, *tcfg, reporter)
-	authHandler := builder.ForPrivilege(authorization.PrivilegeSourcemapWrite)
+	authHandler := builder.ForPrivilege(authorization.PrivilegeSourcemapWrite.Action)
 	return middleware.Wrap(h, sourcemapMiddleware(cfg, authHandler)...)
 }
 
 func backendAgentConfigHandler(cfg *config.Config, builder *authorization.Builder, _ publish.Reporter) (request.Handler, error) {
-	authHandler := builder.ForPrivilege(authorization.PrivilegeAgentConfigRead)
+	authHandler := builder.ForPrivilege(authorization.PrivilegeAgentConfigRead.Action)
 	return agentConfigHandler(cfg, authHandler, backendMiddleware)
 }
 
@@ -193,7 +193,7 @@ func agentConfigHandler(cfg *config.Config, authHandler *authorization.Handler,
 
 func rootHandler(cfg *config.Config, builder *authorization.Builder, _ publish.Reporter) (request.Handler, error) {
 	return middleware.Wrap(root.Handler(),
-		rootMiddleware(cfg, builder.ForAnyOfPrivileges(authorization.PrivilegesAll))...)
+		rootMiddleware(cfg, builder.ForAnyOfPrivileges(authorization.ActionAny))...)
 }
 
 func apmMiddleware(m map[request.ResultID]*monitoring.Int) []middleware.Middleware {

beater/api/mux_test.go

@@ -56,7 +56,7 @@ func requestToMuxer(cfg *config.Config, r *http.Request) (*httptest.ResponseReco
 
 func testHandler(t *testing.T, fn func(*config.Config, *authorization.Builder, publish.Reporter) (request.Handler, error)) request.Handler {
 	cfg := config.DefaultConfig(beatertest.MockBeatVersion())
-	builder, err := authorization.NewBuilder(cfg)
+	builder, err := authorization.NewBuilder(*cfg)
 	require.NoError(t, err)
 	h, err := fn(cfg, builder, beatertest.NilReporter)
 	require.NoError(t, err)

beater/api/root/handler_test.go

@@ -62,7 +62,7 @@ func TestRootHandler(t *testing.T) {
 
 	t.Run("authorized", func(t *testing.T) {
 		c, w := beatertest.ContextWithResponseRecorder(http.MethodGet, "/")
-		builder, err := authorization.NewBuilder(&config.Config{SecretToken: "abc"})
+		builder, err := authorization.NewBuilder(config.Config{SecretToken: "abc"})
 		require.NoError(t, err)
 		c.Authorization = builder.ForPrivilege("").AuthorizationFor("Bearer", "abc")
 		Handler()(c)

beater/authorization/allow.go

@@ -17,11 +17,13 @@
 
 package authorization
 
+import "github.com/elastic/apm-server/elasticsearch"
+
 // AllowAuth implements the Authorization interface. It allows all authorization requests.
 type AllowAuth struct{}
 
 // AuthorizedFor always returns true
-func (AllowAuth) AuthorizedFor(_ string) (bool, error) {
+func (AllowAuth) AuthorizedFor(_ elasticsearch.Resource) (bool, error) {
 	return true, nil
 }
 

beater/authorization/apikey.go

@@ -18,43 +18,39 @@
 package authorization
 
 import (
-	"encoding/json"
-	"net/http"
-	"strings"
+	"fmt"
 	"time"
 
 	"github.com/pkg/errors"
 
-	"github.com/elastic/apm-server/beater/headers"
-	"github.com/elastic/apm-server/elasticsearch"
+	es "github.com/elastic/apm-server/elasticsearch"
 )
 
-const (
-	//DefaultResource for apm backend enabled API Keys
-	DefaultResource = "-"
+const cleanupInterval = 60 * time.Second
 
-	application = "apm"
-	sep         = `","`
-
-	cleanupInterval = 60 * time.Second
+var (
+	// Application is a constant mapped to the "application" field for the Elasticsearch security API
+	// This identifies privileges and keys created for APM
+	Application = es.AppName("apm")
+	// ResourceInternal is only valid for first authorization of a request.
+	// The API Key needs to grant privileges to additional resources for successful processing of requests.
+	ResourceInternal = es.Resource("-")
+	ResourceAny      = es.Resource("*")
 )
 
 type apikeyBuilder struct {
-	esClient        elasticsearch.Client
+	esClient        es.Client
 	cache           *privilegesCache
-	anyOfPrivileges []string
+	anyOfPrivileges []es.PrivilegeAction
 }
 
 type apikeyAuth struct {
 	*apikeyBuilder
+	// key is base64(id:apiKey)
 	key string
 }
 
-type hasPrivilegesResponse struct {
-	Applications map[string]map[string]privileges `json:"application"`
-}
-
-func newApikeyBuilder(client elasticsearch.Client, cache *privilegesCache, anyOfPrivileges []string) *apikeyBuilder {
+func newApikeyBuilder(client es.Client, cache *privilegesCache, anyOfPrivileges []es.PrivilegeAction) *apikeyBuilder {
 	return &apikeyBuilder{client, cache, anyOfPrivileges}
 }
 
@@ -69,12 +65,8 @@ func (a *apikeyAuth) IsAuthorizationConfigured() bool {
 
 // AuthorizedFor checks if the configured api key is authorized.
 // An api key is considered to be authorized when the api key has the configured privileges for the requested resource.
-// Privileges are fetched from Elasticsearch and then cached in a global cache.
-func (a *apikeyAuth) AuthorizedFor(resource string) (bool, error) {
-	if resource == "" {
-		resource = DefaultResource
-	}
-
+// Permissions are fetched from Elasticsearch and then cached in a global cache.
+func (a *apikeyAuth) AuthorizedFor(resource es.Resource) (bool, error) {
 	//fetch from cache
 	if allowed, found := a.fromCache(resource); found {
 		return allowed, nil
@@ -98,7 +90,7 @@ func (a *apikeyAuth) AuthorizedFor(resource string) (bool, error) {
 	return allowed, nil
 }
 
-func (a *apikeyAuth) fromCache(resource string) (allowed bool, found bool) {
+func (a *apikeyAuth) fromCache(resource es.Resource) (allowed bool, found bool) {
 	privileges := a.cache.get(id(a.key, resource))
 	if privileges == nil {
 		return
@@ -114,43 +106,30 @@ func (a *apikeyAuth) fromCache(resource string) (allowed bool, found bool) {
 	return
 }
 
-func (a *apikeyAuth) queryES(resource string) (privileges, error) {
-	query := buildQuery(PrivilegesAll, resource)
-	statusCode, body, err := a.esClient.SecurityHasPrivilegesRequest(strings.NewReader(query),
-		http.Header{headers.Authorization: []string{headers.APIKey + " " + a.key}})
-	if err != nil {
-		return nil, err
-	}
-	defer body.Close()
-	if statusCode != http.StatusOK {
-		// return nil privileges for queried apps to ensure they are cached
-		return privileges{}, nil
+func (a *apikeyAuth) queryES(resource es.Resource) (es.Permissions, error) {
+	request := es.HasPrivilegesRequest{
+		Applications: []es.Application{
+			{
+				Name: Application,
+				// it is important to query all privilege actions because they are cached by api key+resources
+				// querying a.anyOfPrivileges would result in an incomplete cache entry
+				Privileges: ActionsAll(),
+				Resources:  []es.Resource{resource},
+			},
+		},
 	}
-
-	var decodedResponse hasPrivilegesResponse
-	if err := json.NewDecoder(body).Decode(&decodedResponse); err != nil {
+	info, err := es.HasPrivileges(a.esClient, request, a.key)
+	if err != nil {
 		return nil, err
 	}
-	if resources, ok := decodedResponse.Applications[application]; ok {
-		if privileges, ok := resources[resource]; ok {
-			return privileges, nil
+	if resources, ok := info.Application[Application]; ok {
+		if permissions, ok := resources[resource]; ok {
+			return permissions, nil
 		}
 	}
-	return privileges{}, nil
-}
-
-func buildQuery(privileges []string, resource string) string {
-	var b strings.Builder
-	b.WriteString(`{"application":[{"application":"`)
-	b.WriteString(application)
-	b.WriteString(`","privileges":["`)
-	b.WriteString(strings.Join(privileges, sep))
-	b.WriteString(`"],"resources":"`)
-	b.WriteString(resource)
-	b.WriteString(`"}]}`)
-	return b.String()
+	return es.Permissions{}, nil
 }
 
-func id(apiKey, resource string) string {
-	return apiKey + "_" + resource
+func id(apiKey string, resource es.Resource) string {
+	return apiKey + "_" + fmt.Sprintf("%v", resource)
 }

beater/authorization/apikey_test.go

@@ -41,11 +41,11 @@ func TestApikeyBuilder(t *testing.T) {
 	handler2 := tc.builder.forKey(key)
 
 	// add existing privileges to shared cache
-	privilegesValid := privileges{}
+	privilegesValid := elasticsearch.Permissions{}
 	for _, p := range PrivilegesAll {
-		privilegesValid[p] = true
+		privilegesValid[p.Action] = true
 	}
-	resource := "service-go"
+	resource := elasticsearch.Resource("service-go")
 	tc.cache.add(id(key, resource), privilegesValid)
 
 	// check that cache is actually shared between apiKeyHandlers
@@ -85,12 +85,12 @@ func TestAPIKey_AuthorizedFor(t *testing.T) {
 		tc.setup(t)
 		key := ""
 		handler := tc.builder.forKey(key)
-		resourceValid := "foo"
-		resourceInvalid := "bar"
-		resourceMissing := "missing"
+		resourceValid := elasticsearch.Resource("foo")
+		resourceInvalid := elasticsearch.Resource("bar")
+		resourceMissing := elasticsearch.Resource("missing")
 
-		tc.cache.add(id(key, resourceValid), privileges{tc.anyOfPrivileges[0]: true})
-		tc.cache.add(id(key, resourceInvalid), privileges{tc.anyOfPrivileges[0]: false})
+		tc.cache.add(id(key, resourceValid), elasticsearch.Permissions{tc.anyOfPrivileges[0]: true})
+		tc.cache.add(id(key, resourceInvalid), elasticsearch.Permissions{tc.anyOfPrivileges[0]: false})
 
 		valid, err := handler.AuthorizedFor(resourceValid)
 		require.NoError(t, err)
@@ -143,9 +143,9 @@ func TestAPIKey_AuthorizedFor(t *testing.T) {
 		handler := tc.builder.forKey("12a3")
 
 		valid, err := handler.AuthorizedFor("xyz")
-		require.NoError(t, err)
+		require.Error(t, err)
 		assert.False(t, valid)
-		assert.Equal(t, 1, tc.cache.cache.ItemCount())
+		assert.Equal(t, 0, tc.cache.cache.ItemCount())
 	})
 
 	t.Run("decode error from ES", func(t *testing.T) {
@@ -163,7 +163,7 @@ type apikeyTestcase struct {
 	transport       *estest.Transport
 	client          elasticsearch.Client
 	cache           *privilegesCache
-	anyOfPrivileges []string
+	anyOfPrivileges []elasticsearch.PrivilegeAction
 
 	builder *apikeyBuilder
 }
@@ -174,19 +174,19 @@ func (tc *apikeyTestcase) setup(t *testing.T) {
 		if tc.transport == nil {
 			tc.transport = estest.NewTransport(t, http.StatusOK, map[string]interface{}{
 				"application": map[string]interface{}{
-					application: map[string]privileges{
-						"foo": {PrivilegeAgentConfigRead: true, PrivilegeEventWrite: true, PrivilegeSourcemapWrite: false},
-						"bar": {PrivilegeAgentConfigRead: true, PrivilegeEventWrite: false},
+					"apm": map[string]map[string]interface{}{
+						"foo": {"config_agent:read": true, "event:write": true, "sourcemap:write": false},
+						"bar": {"config_agent:read": true, "event:write": false},
 					}}})
 		}
 		tc.client, err = estest.NewElasticsearchClient(tc.transport)
 		require.NoError(t, err)
 	}
 	if tc.cache == nil {
-		tc.cache = newPrivilegesCache(time.Millisecond, 5)
+		tc.cache = newPrivilegesCache(time.Minute, 5)
 	}
 	if tc.anyOfPrivileges == nil {
-		tc.anyOfPrivileges = []string{PrivilegeEventWrite, PrivilegeSourcemapWrite}
+		tc.anyOfPrivileges = []elasticsearch.PrivilegeAction{PrivilegeEventWrite.Action, PrivilegeSourcemapWrite.Action}
 	}
 	tc.builder = newApikeyBuilder(tc.client, tc.cache, tc.anyOfPrivileges)
 }

beater/authorization/bearer.go

@@ -19,6 +19,8 @@ package authorization
 
 import (
 	"crypto/subtle"
+
+	"github.com/elastic/apm-server/elasticsearch"
 )
 
 type bearerBuilder struct {
@@ -39,7 +41,7 @@ func (b bearerBuilder) forToken(token string) *bearerAuth {
 		configured: true}
 }
 
-func (b *bearerAuth) AuthorizedFor(_ string) (bool, error) {
+func (b *bearerAuth) AuthorizedFor(_ elasticsearch.Resource) (bool, error) {
 	return b.authorized, nil
 }