Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions x-pack/plugins/fleet/server/routes/preconfiguration/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ export const registerRoutes = (router: FleetAuthzRouter) => {
{
path: PRECONFIGURATION_API_ROUTES.RESET_PATTERN,
validate: false,
options: {
access: 'internal',
},
fleetAuthz: {
fleet: { all: true },
},
Expand All @@ -27,6 +30,9 @@ export const registerRoutes = (router: FleetAuthzRouter) => {
{
path: PRECONFIGURATION_API_ROUTES.RESET_ONE_PATTERN,
validate: PostResetOnePreconfiguredAgentPoliciesSchema,
options: {
access: 'internal',
},
fleetAuthz: {
fleet: { all: true },
},
Expand Down
60 changes: 60 additions & 0 deletions x-pack/plugins/fleet/server/services/security/fleet_router.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -201,4 +201,64 @@ describe('FleetAuthzRouter', () => {
).toEqual('forbidden');
});
});

describe('default access', () => {
let fakeRouter: jest.Mocked<IRouter<FleetRequestHandlerContext>>;
beforeEach(() => {
fakeRouter = {
get: jest.fn(),
post: jest.fn(),
delete: jest.fn(),
put: jest.fn(),
patch: jest.fn(),
} as unknown as jest.Mocked<IRouter<FleetRequestHandlerContext>>;
});

const METHODS: Array<'get' | 'post' | 'delete' | 'put' | 'patch'> = [
'get',
'post',
'delete',
'put',
'patch',
];

for (const method of METHODS) {
describe(`${method}`, () => {
it('should set default access to public', () => {
const fleetAuthzRouter = makeRouterWithFleetAuthz(fakeRouter, mockLogger);
fleetAuthzRouter[method](
{
path: '/test',
validate: false,
},
(() => {}) as any
);
expect(fakeRouter[method]).toBeCalledWith(
expect.objectContaining({
options: { access: 'public' },
}),
expect.anything()
);
});

it('should not allow to define internal routes', () => {
const fleetAuthzRouter = makeRouterWithFleetAuthz(fakeRouter, mockLogger);
fleetAuthzRouter[method](
{
path: '/test',
validate: false,
options: { access: 'internal' },
},
(() => {}) as any
);
expect(fakeRouter[method]).toBeCalledWith(
expect.objectContaining({
options: { access: 'internal' },
}),
expect.anything()
);
});
});
}
});
});
31 changes: 26 additions & 5 deletions x-pack/plugins/fleet/server/services/security/fleet_router.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ import type {
Logger,
RequestHandler,
RouteMethod,
RouteConfig,
RouteConfigOptions,
} from '@kbn/core/server';

import type { FleetRequestHandlerContext } from '../..';
Expand All @@ -26,6 +28,25 @@ import {
doesNotHaveRequiredFleetAuthz,
} from './security';

function withDefaultPublicAccess<P, Q, B, Method extends RouteMethod>(
routeConfig: RouteConfig<P, Q, B, Method>
): RouteConfig<P, Q, B, Method> {
let newOptions: RouteConfigOptions<Method>;
if (routeConfig?.options) {
newOptions = { ...routeConfig?.options };
} else {
newOptions = {};
}

if (!newOptions.access) {
newOptions.access = 'public';
}
return {
...routeConfig,
options: newOptions,
};
}

export function makeRouterWithFleetAuthz<TContext extends FleetRequestHandlerContext>(
router: IRouter<TContext>,
logger: Logger
Expand Down Expand Up @@ -106,27 +127,27 @@ export function makeRouterWithFleetAuthz<TContext extends FleetRequestHandlerCon

const fleetAuthzRouter: FleetAuthzRouter<TContext> = {
get: ({ fleetAuthz: hasRequiredAuthz, ...options }, handler) => {
router.get(options, (context, request, response) =>
router.get(withDefaultPublicAccess(options), (context, request, response) =>
fleetHandlerWrapper({ context, request, response, handler, hasRequiredAuthz })
);
},
delete: ({ fleetAuthz: hasRequiredAuthz, ...options }, handler) => {
router.delete(options, (context, request, response) =>
router.delete(withDefaultPublicAccess(options), (context, request, response) =>
fleetHandlerWrapper({ context, request, response, handler, hasRequiredAuthz })
);
},
post: ({ fleetAuthz: hasRequiredAuthz, ...options }, handler) => {
router.post(options, (context, request, response) =>
router.post(withDefaultPublicAccess(options), (context, request, response) =>
fleetHandlerWrapper({ context, request, response, handler, hasRequiredAuthz })
);
},
put: ({ fleetAuthz: hasRequiredAuthz, ...options }, handler) => {
router.put(options, (context, request, response) =>
router.put(withDefaultPublicAccess(options), (context, request, response) =>
fleetHandlerWrapper({ context, request, response, handler, hasRequiredAuthz })
);
},
patch: ({ fleetAuthz: hasRequiredAuthz, ...options }, handler) => {
router.patch(options, (context, request, response) =>
router.patch(withDefaultPublicAccess(options), (context, request, response) =>
fleetHandlerWrapper({ context, request, response, handler, hasRequiredAuthz })
);
},
Expand Down