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.

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

Fix #5515 #5524

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
5 changes: 5 additions & 0 deletions .changeset/lazy-brooms-explain.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@neo4j/graphql": patch
---

Fix authorization filtering in delete operations
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,9 @@ export class DeleteOperation extends MutationOperation {
): OperationTranspileResult {
this.validateSelection(selection);
const filterSubqueries = wrapSubqueriesInCypherCalls(context, this.filters, [context.target]);
const authBeforeSubqueries = this.getAuthFilterSubqueries(context);
const authBeforeSubqueries = this.getAuthFilterSubqueries(context).map((c) => {
return new Cypher.Call(c).importWith(context.target);
});
const predicate = this.getPredicate(context);
const extraSelections = this.getExtraSelections(context);

Expand All @@ -105,7 +107,10 @@ export class DeleteOperation extends MutationOperation {
throw new Error("Transpile error: No relationship found!");
}
const filterSubqueries = wrapSubqueriesInCypherCalls(context, this.filters, [context.target]);
const authBeforeSubqueries = this.getAuthFilterSubqueries(context);

const authBeforeSubqueries = this.getAuthFilterSubqueries(context).map((c) => {
return new Cypher.Call(c).importWith(context.target);
});
const predicate = this.getPredicate(context);
const extraSelections = this.getExtraSelections(context);
const collect = Cypher.collect(context.target).distinct();
Expand Down
117 changes: 117 additions & 0 deletions packages/graphql/tests/integration/issues/5515.int.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
/*
* Copyright (c) "Neo4j"
* Neo4j Sweden AB [http://neo4j.com]
*
* This file is part of Neo4j.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

import { createBearerToken } from "../../utils/create-bearer-token";
import type { UniqueType } from "../../utils/graphql-types";
import { TestHelper } from "../../utils/tests-helper";

describe("https://github.com/neo4j/graphql/issues/5515", () => {
const testHelper = new TestHelper();

const secret = "dontpanic";

let User: UniqueType;
let Cabinet: UniqueType;
let Category: UniqueType;
let File: UniqueType;

beforeAll(async () => {
User = testHelper.createUniqueType("User");
Cabinet = testHelper.createUniqueType("Cabinet");
Category = testHelper.createUniqueType("Category");
File = testHelper.createUniqueType("File");

const typeDefs = /* GraphQL */ `
type JWT @jwt {
roles: [String!]!
}

type ${User}
@authorization(
validate: [
{ operations: [CREATE, DELETE], where: { jwt: { roles_INCLUDES: "admin" } } }
{ operations: [READ, UPDATE], where: { node: { id: "$jwt.sub" } } }
]
filter: [{ where: { node: { id: "$jwt.sub" } } }]
) {
id: ID!
cabinets: [${Cabinet}!]! @relationship(type: "HAS_CABINET", direction: OUT)
}

type ${Cabinet} @authorization(filter: [{ where: { node: { user: { id: "$jwt.sub" } } } }]) {
id: ID! @id
categories: [${Category}!]! @relationship(type: "HAS_CATEGORY", direction: OUT)
user: ${User}! @relationship(type: "HAS_CABINET", direction: IN)
}

type ${Category} @authorization(filter: [{ where: { node: { cabinet: { user: { id: "$jwt.sub" } } } } }]) {
id: ID! @id
files: [${File}!]! @relationship(type: "HAS_FILE", direction: OUT)
cabinet: ${Cabinet}! @relationship(type: "HAS_CATEGORY", direction: IN)
}

type ${File} {
id: ID! @unique
category: ${Category} @relationship(type: "HAS_FILE", direction: IN)
}
`;
await testHelper.initNeo4jGraphQL({
typeDefs,
features: {
authorization: {
key: secret,
},
},
});
});

afterAll(async () => {
await testHelper.close();
});

test("should delete categories with auth filters", async () => {
await testHelper.executeCypher(`
CREATE (:${User} {id: "1234"})-[:HAS_CABINET]->(:${Cabinet})-[:HAS_CATEGORY]->(:${Category} {id: "category-video"})
CREATE (:${User} {id: "another"})-[:HAS_CABINET]->(:${Cabinet})-[:HAS_CATEGORY]->(:${Category} {id: "category-video"})
`);

const query = /* GraphQL */ `
mutation {
${Category.operations.delete}(where: { id: "category-video" }) {
__typename
nodesDeleted
relationshipsDeleted
}
}
`;

const token = createBearerToken(secret, { sub: "1234" });

const response = await testHelper.executeGraphQLWithToken(query, token);

expect(response.errors).toBeFalsy();
expect(response.data).toEqual({
[Category.operations.delete]: {
__typename: "DeleteInfo",
nodesDeleted: 1,
relationshipsDeleted: 1,
},
});
});
});
105 changes: 105 additions & 0 deletions packages/graphql/tests/tck/issues/5515.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
/*
* Copyright (c) "Neo4j"
* Neo4j Sweden AB [http://neo4j.com]
*
* This file is part of Neo4j.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

import { Neo4jGraphQL } from "../../../src";
import { formatCypher, formatParams, translateQuery } from "../utils/tck-test-utils";

describe("https://github.com/neo4j/graphql/issues/5515", () => {
let typeDefs: string;
let neoSchema: Neo4jGraphQL;

beforeAll(() => {
typeDefs = /* GraphQL */ `
type JWT @jwt {
roles: [String!]!
}

type User
@authorization(
validate: [
{ operations: [CREATE, DELETE], where: { jwt: { roles_INCLUDES: "admin" } } }
{ operations: [READ, UPDATE], where: { node: { id: "$jwt.sub" } } }
]
filter: [{ where: { node: { id: "$jwt.sub" } } }]
) {
id: ID!
cabinets: [Cabinet!]! @relationship(type: "HAS_CABINET", direction: OUT)
}

type Cabinet @authorization(filter: [{ where: { node: { user: { id: "$jwt.sub" } } } }]) {
id: ID! @id
categories: [Category!]! @relationship(type: "HAS_CATEGORY", direction: OUT)
user: User! @relationship(type: "HAS_CABINET", direction: IN)
}

type Category @authorization(filter: [{ where: { node: { cabinet: { user: { id: "$jwt.sub" } } } } }]) {
id: ID! @id
files: [File!]! @relationship(type: "HAS_FILE", direction: OUT)
cabinet: Cabinet! @relationship(type: "HAS_CATEGORY", direction: IN)
}

type File {
id: ID! @unique
category: Category @relationship(type: "HAS_FILE", direction: IN)
}
`;

neoSchema = new Neo4jGraphQL({
typeDefs,
});
});

test("should delete categories with auth filters", async () => {
const query = /* GraphQL */ `
mutation {
deleteCategories(where: { id: "category-video" }) {
__typename
nodesDeleted
relationshipsDeleted
}
}
`;

const result = await translateQuery(neoSchema, query);

expect(formatCypher(result.cypher)).toMatchInlineSnapshot(`
"MATCH (this:Category)
CALL {
WITH this
MATCH (this)<-[:HAS_CATEGORY]-(this0:Cabinet)
OPTIONAL MATCH (this0)<-[:HAS_CABINET]-(this1:User)
WITH *, count(this1) AS userCount
WITH *
WHERE (userCount <> 0 AND ($jwt.sub IS NOT NULL AND this1.id = $jwt.sub))
RETURN count(this0) = 1 AS var2
}
WITH *
WHERE (this.id = $param1 AND ($isAuthenticated = true AND var2 = true))
DETACH DELETE this"
`);

expect(formatParams(result.params)).toMatchInlineSnapshot(`
"{
\\"jwt\\": {},
\\"param1\\": \\"category-video\\",
\\"isAuthenticated\\": false
}"
`);
});
});
Loading