Skip to content
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

[OSQuery Plugin] Migrate usage og authc.getCurrentUser to coreContext.security #187014

Merged
merged 2 commits into from
Jun 28, 2024
Merged

[OSQuery Plugin] Migrate usage og authc.getCurrentUser to coreContext.security #187014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13634bb
[OSQuery Plugin] Migrate routes consuming authc.getCurrentUser to cor…
tsullivan Jun 26, 2024
a38b956
Merge branch 'main' into security-in-core/osquery-server-plugin-server
tsullivan Jun 26, 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
7 changes: 4 additions & 3 deletions x-pack/plugins/osquery/server/routes/asset/update_assets_route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,10 @@ export const updateAssetsRoute = (router: IRouter, osqueryContext: OsqueryAppCon
},
},
},
async (context, request, response) => {
const savedObjectsClient = (await context.core).savedObjects.client;
const currentUser = await osqueryContext.security.authc.getCurrentUser(request)?.username;
async (context, _request, response) => {
const coreContext = await context.core;
const savedObjectsClient = coreContext.savedObjects.client;
const currentUser = coreContext.security.authc.getCurrentUser()?.username;

let installation;

Expand Down
5 changes: 3 additions & 2 deletions x-pack/plugins/osquery/server/routes/live_query/create_live_query_route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ export const createLiveQueryRoute = (router: IRouter, osqueryContext: OsqueryApp
},
async (context, request, response) => {
const [coreStartServices] = await osqueryContext.getStartServices();
const soClient = (await context.core).savedObjects.client;
const coreContext = await context.core;
const soClient = coreContext.savedObjects.client;

const {
osquery: { writeLiveQueries, runSavedQueries },
Expand Down Expand Up @@ -106,7 +107,7 @@ export const createLiveQueryRoute = (router: IRouter, osqueryContext: OsqueryApp
}

try {
const currentUser = await osqueryContext.security.authc.getCurrentUser(request)?.username;
const currentUser = coreContext.security.authc.getCurrentUser()?.username;
const { response: osqueryAction, fleetActionsCount } = await createActionHandler(
osqueryContext,
request.body,
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/osquery/server/routes/pack/create_pack_route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export const createPackRoute = (router: IRouter, osqueryContext: OsqueryAppConte
const agentPolicyService = osqueryContext.service.getAgentPolicyService();

const packagePolicyService = osqueryContext.service.getPackagePolicyService();
const currentUser = await osqueryContext.security.authc.getCurrentUser(request)?.username;
const currentUser = coreContext.security.authc.getCurrentUser()?.username;

// eslint-disable-next-line @typescript-eslint/naming-convention
const { name, description, queries, enabled, policy_ids, shards = {} } = request.body;
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/osquery/server/routes/pack/update_pack_route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export const updatePackRoute = (router: IRouter, osqueryContext: OsqueryAppConte
);
const agentPolicyService = osqueryContext.service.getAgentPolicyService();
const packagePolicyService = osqueryContext.service.getPackagePolicyService();
const currentUser = await osqueryContext.security.authc.getCurrentUser(request)?.username;
const currentUser = coreContext.security.authc.getCurrentUser()?.username;

// eslint-disable-next-line @typescript-eslint/naming-convention
const { name, description, queries, enabled, policy_ids, shards = {} } = request.body;
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/osquery/server/routes/saved_query/create_saved_query_route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export const createSavedQueryRoute = (router: IRouter, osqueryContext: OsqueryAp
ecs_mapping,
} = request.body;

const currentUser = await osqueryContext.security.authc.getCurrentUser(request)?.username;
const currentUser = coreContext.security.authc.getCurrentUser()?.username;

const conflictingEntries = await savedObjectsClient.find<SavedQuerySavedObject>({
type: savedQuerySavedObjectType,
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/osquery/server/routes/saved_query/update_saved_query_route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export const updateSavedQueryRoute = (router: IRouter, osqueryContext: OsqueryAp
async (context, request, response) => {
const coreContext = await context.core;
const savedObjectsClient = coreContext.savedObjects.client;
const currentUser = await osqueryContext.security.authc.getCurrentUser(request)?.username;
const currentUser = coreContext.security.authc.getCurrentUser()?.username;

const {
id,
Expand Down