Require admin MFA for get/list tokens. (#38645)

gravitational · Feb 26, 2024 · e39808c · e39808c
1 parent 7008bef
commit e39808c
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 0 deletions.
diff --git a/lib/auth/auth_with_roles.go b/lib/auth/auth_with_roles.go
@@ -2024,6 +2024,11 @@ func (a *ServerWithRoles) GetTokens(ctx context.Context) ([]types.ProvisionToken
 	if err := a.action(apidefaults.Namespace, types.KindToken, types.VerbList, types.VerbRead); err != nil {
 		return nil, trace.Wrap(err)
 	}
+
+	if err := a.context.AuthorizeAdminAction(); err != nil {
+		return nil, trace.Wrap(err)
+	}
+
 	return a.authServer.GetTokens(ctx)
 }
 
@@ -2035,6 +2040,11 @@ func (a *ServerWithRoles) GetToken(ctx context.Context, token string) (types.Pro
 			return nil, trace.Wrap(err)
 		}
 	}
+
+	if err := a.context.AuthorizeAdminAction(); err != nil {
+		return nil, trace.Wrap(err)
+	}
+
 	return a.authServer.GetToken(ctx, token)
 }
 

diff --git a/tool/tctl/common/admin_action_test.go b/tool/tctl/common/admin_action_test.go
@@ -372,6 +372,11 @@ func (s *adminActionTestSuite) testTokens(t *testing.T) {
 				cliCommand: &tctl.TokensCommand{},
 				setup:      createToken,
 				cleanup:    deleteToken,
+			}, {
+				command:    "tokens ls",
+				cliCommand: &tctl.TokensCommand{},
+				setup:      createToken,
+				cleanup:    deleteToken,
 			},
 		} {
 			t.Run(tc.command, func(t *testing.T) {
@@ -385,6 +390,7 @@ func (s *adminActionTestSuite) testTokens(t *testing.T) {
 			resource:        token,
 			resourceCreate:  createToken,
 			resourceCleanup: deleteToken,
+			testGetList:     true,
 		})
 	})
 
@@ -820,6 +826,10 @@ type resourceCommandTestCase struct {
 	resource        types.Resource
 	resourceCreate  func() error
 	resourceCleanup func() error
+
+	// Tests get/list resource, for privileged resources
+	// like tokens that should require MFA to be seen.
+	testGetList bool
 }
 
 func (s *adminActionTestSuite) testResourceCommand(t *testing.T, ctx context.Context, tc resourceCommandTestCase) {
@@ -854,6 +864,26 @@ func (s *adminActionTestSuite) testResourceCommand(t *testing.T, ctx context.Con
 			cleanup:    tc.resourceCleanup,
 		})
 	})
+
+	if tc.testGetList {
+		t.Run("tctl get", func(t *testing.T) {
+			s.testCommand(t, ctx, adminActionTestCase{
+				command:    fmt.Sprintf("get %v", getResourceRef(tc.resource)),
+				cliCommand: &tctl.ResourceCommand{},
+				setup:      tc.resourceCreate,
+				cleanup:    tc.resourceCleanup,
+			})
+		})
+
+		t.Run("tctl list", func(t *testing.T) {
+			s.testCommand(t, ctx, adminActionTestCase{
+				command:    fmt.Sprintf("get %v", tc.resource.GetKind()),
+				cliCommand: &tctl.ResourceCommand{},
+				setup:      tc.resourceCreate,
+				cleanup:    tc.resourceCleanup,
+			})
+		})
+	}
 }
 
 type editCommandTestCase struct {