Skip to content

[Fleet] Adjust privileges for GET output and GET download_source endpoints #194951

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
criamico merged 7 commits into from
Oct 8, 2024
Merged

[Fleet] Adjust privileges for GET output and GET download_source endpoints #194951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
47e3b6a
[Fleet] Adjust privileges for GET output and GET download_source endp…
criamico Oct 4, 2024
341fa47
Merge branch 'main' into 191266_rbac_endpoints
elasticmachine Oct 4, 2024
f677d01
Merge branch 'main' into 191266_rbac_endpoints
elasticmachine Oct 7, 2024
e3c01ef
Fix integration test
criamico Oct 7, 2024
b7c46b3
Merge branch 'main' into 191266_rbac_endpoints
elasticmachine Oct 7, 2024
87f61cd
Fix tests
criamico Oct 8, 2024
0fa1163
Merge branch 'main' into 191266_rbac_endpoints
elasticmachine Oct 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions x-pack/plugins/fleet/server/routes/download_source/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ export const registerRoutes = (router: FleetAuthzRouter) => {
router.versioned
.get({
path: DOWNLOAD_SOURCE_API_ROUTES.LIST_PATTERN,
fleetAuthz: {
fleet: { readSettings: true },
fleetAuthz: (authz) => {
return authz.fleet.readSettings || authz.fleet.readAgentPolicies;
},
description: `List agent binary download sources`,
options: {
Expand Down Expand Up @@ -65,8 +65,8 @@ export const registerRoutes = (router: FleetAuthzRouter) => {
router.versioned
.get({
path: DOWNLOAD_SOURCE_API_ROUTES.INFO_PATTERN,
fleetAuthz: {
fleet: { readSettings: true },
fleetAuthz: (authz) => {
return authz.fleet.readSettings || authz.fleet.readAgentPolicies;
},
description: `Get agent binary download source by ID`,
options: {
Expand Down
12 changes: 6 additions & 6 deletions x-pack/plugins/fleet/server/routes/output/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ export const registerRoutes = (router: FleetAuthzRouter) => {
router.versioned
.get({
path: OUTPUT_API_ROUTES.LIST_PATTERN,
fleetAuthz: {
fleet: { readSettings: true },
fleetAuthz: (authz) => {
return authz.fleet.readSettings || authz.fleet.readAgentPolicies;
},
description: 'List outputs',
options: {
Expand All @@ -68,8 +68,8 @@ export const registerRoutes = (router: FleetAuthzRouter) => {
router.versioned
.get({
path: OUTPUT_API_ROUTES.INFO_PATTERN,
fleetAuthz: {
fleet: { readSettings: true },
fleetAuthz: (authz) => {
return authz.fleet.readSettings || authz.fleet.readAgentPolicies;
},
description: 'Get output by ID',
options: {
Expand All @@ -96,8 +96,8 @@ export const registerRoutes = (router: FleetAuthzRouter) => {
router.versioned
.put({
path: OUTPUT_API_ROUTES.UPDATE_PATTERN,
fleetAuthz: {
fleet: { allSettings: true },
fleetAuthz: (authz) => {
return authz.fleet.allSettings || authz.fleet.allAgentPolicies;
},
description: 'Update output by ID',
options: {
Expand Down
51 changes: 47 additions & 4 deletions x-pack/test/fleet_api_integration/apis/fleet_settings_privileges.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,49 @@ const READ_SCENARIOS = [
statusCode: 403,
},
];
// Scenarios updated for download_source and outputs routes that are slightly different
const READ_SCENARIOS_2 = [
{
user: testUsers.fleet_all_only,
statusCode: 200,
},
{
user: testUsers.fleet_read_only,
statusCode: 200,
},
{
user: testUsers.fleet_settings_all_only,
statusCode: 200,
},
{
user: testUsers.fleet_settings_read_only,
statusCode: 200,
},
{
user: testUsers.fleet_agent_policies_read_only,
statusCode: 200,
},
{
user: testUsers.fleet_agent_policies_all_only,
statusCode: 200,
},
{
user: testUsers.fleet_agents_read_only,
statusCode: 403,
},
{
user: testUsers.fleet_no_access,
statusCode: 403,
},
{
user: testUsers.fleet_minimal_all_only,
statusCode: 403,
},
{
user: testUsers.fleet_minimal_read_only,
statusCode: 403,
},
];

const ALL_SCENARIOS = [
{
Expand Down Expand Up @@ -106,12 +149,12 @@ export default function (providerContext: FtrProviderContext) {
{
method: 'GET',
path: '/api/fleet/outputs',
scenarios: READ_SCENARIOS,
scenarios: READ_SCENARIOS_2,
},
{
method: 'GET',
path: '/api/fleet/outputs/test-privileges-output-1',
scenarios: READ_SCENARIOS,
scenarios: READ_SCENARIOS_2,
},
{
method: 'POST',
Expand Down Expand Up @@ -226,12 +269,12 @@ export default function (providerContext: FtrProviderContext) {
{
method: 'GET',
path: '/api/fleet/agent_download_sources',
scenarios: READ_SCENARIOS,
scenarios: READ_SCENARIOS_2,
},
{
method: 'GET',
path: '/api/fleet/agent_download_sources/test-privileges-download-source-1',
scenarios: READ_SCENARIOS,
scenarios: READ_SCENARIOS_2,
},
{
method: 'POST',
Expand Down