Skip to content

[IMP] web: throw error when a domain is invalid #787

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

Closed
wants to merge 1 commit into from
Closed

[IMP] web: throw error when a domain is invalid #787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 16 additions & 6 deletions addons/web/static/src/core/domain.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import { toPyValue } from "./py_js/py_utils";
* @typedef {DomainListRepr | string | Domain} DomainRepr
*/

class InvalidDomainError extends Error {}

/**
* Javascript representation of an Odoo domain
*/
Expand Down Expand Up @@ -151,19 +153,27 @@ function normalizeDomainAST(domain, op = "&") {
if (domain.type !== 4 /* List */) {
throw new Error("Invalid domain AST");
}
let expected = -1;
if (domain.value.length === 0) {
return domain;
}
let expected = 1;
for (let child of domain.value) {
if (child.type === 1 /* String */ && (child.value === "&" || child.value === "|")) {
expected--;
} else if (child.type !== 1 /* String */ || child.value !== "!") {
expected++;
} else if (child.type !== 1 /* String */ || child.value !== "!") {
expected--;
}
}
let values = domain.value.slice();
while (expected > 0) {
expected--;
while (expected < 0) {
expected++;
values.unshift({ type: 1 /* String */, value: op });
}
if (expected > 0) {
throw new InvalidDomainError(
`invalid domain ${formatAST(domain)} (missing ${expected} segment(s))`
);
}
return { type: 4 /* List */, value: values };
}

Expand Down Expand Up @@ -212,7 +222,7 @@ function matchCondition(record, condition) {
if (fieldValue === false) {
return false;
}
return new RegExp(value.replace(/%/g, '.*')).test(fieldValue);
return new RegExp(value.replace(/%/g, ".*")).test(fieldValue);
case "ilike":
if (fieldValue === false) {
return false;
Expand Down
64 changes: 45 additions & 19 deletions addons/web/static/tests/core/domain_tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,25 +89,25 @@ QUnit.module("domain", {}, () => {
QUnit.test("like, =like, ilike and =ilike", function (assert) {
assert.expect(16);

assert.ok(new Domain([['a', 'like', 'value']]).contains({ a: 'value' }));
assert.ok(new Domain([['a', 'like', 'value']]).contains({ a: 'some value' }));
assert.notOk(new Domain([['a', 'like', 'value']]).contains({ a: 'Some Value' }));
assert.notOk(new Domain([['a', 'like', 'value']]).contains({ a: false }));

assert.ok(new Domain([['a', '=like', '%value']]).contains({ a: 'value' }));
assert.ok(new Domain([['a', '=like', '%value']]).contains({ a: 'some value' }));
assert.notOk(new Domain([['a', '=like', '%value']]).contains({ a: 'Some Value' }));
assert.notOk(new Domain([['a', '=like', '%value']]).contains({ a: false }));

assert.ok(new Domain([['a', 'ilike', 'value']]).contains({ a: 'value' }));
assert.ok(new Domain([['a', 'ilike', 'value']]).contains({ a: 'some value' }));
assert.ok(new Domain([['a', 'ilike', 'value']]).contains({ a: 'Some Value' }));
assert.notOk(new Domain([['a', 'ilike', 'value']]).contains({ a: false }));

assert.ok(new Domain([['a', '=ilike', '%value']]).contains({ a: 'value' }));
assert.ok(new Domain([['a', '=ilike', '%value']]).contains({ a: 'some value' }));
assert.ok(new Domain([['a', '=ilike', '%value']]).contains({ a: 'Some Value' }));
assert.notOk(new Domain([['a', '=ilike', '%value']]).contains({ a: false }));
assert.ok(new Domain([["a", "like", "value"]]).contains({ a: "value" }));
assert.ok(new Domain([["a", "like", "value"]]).contains({ a: "some value" }));
assert.notOk(new Domain([["a", "like", "value"]]).contains({ a: "Some Value" }));
assert.notOk(new Domain([["a", "like", "value"]]).contains({ a: false }));

assert.ok(new Domain([["a", "=like", "%value"]]).contains({ a: "value" }));
assert.ok(new Domain([["a", "=like", "%value"]]).contains({ a: "some value" }));
assert.notOk(new Domain([["a", "=like", "%value"]]).contains({ a: "Some Value" }));
assert.notOk(new Domain([["a", "=like", "%value"]]).contains({ a: false }));

assert.ok(new Domain([["a", "ilike", "value"]]).contains({ a: "value" }));
assert.ok(new Domain([["a", "ilike", "value"]]).contains({ a: "some value" }));
assert.ok(new Domain([["a", "ilike", "value"]]).contains({ a: "Some Value" }));
assert.notOk(new Domain([["a", "ilike", "value"]]).contains({ a: false }));

assert.ok(new Domain([["a", "=ilike", "%value"]]).contains({ a: "value" }));
assert.ok(new Domain([["a", "=ilike", "%value"]]).contains({ a: "some value" }));
assert.ok(new Domain([["a", "=ilike", "%value"]]).contains({ a: "Some Value" }));
assert.notOk(new Domain([["a", "=ilike", "%value"]]).contains({ a: false }));
});

QUnit.test("complex domain", function (assert) {
Expand Down Expand Up @@ -257,6 +257,32 @@ QUnit.module("domain", {}, () => {
assert.notOk(Domain.and([Domain.FALSE, new Domain([["a", "=", 3]])]).contains({ a: 3 }));
});

QUnit.test("invalid domains should not succeed", function (assert) {
assert.throws(
() => new Domain(["|", ["hr_presence_state", "=", "absent"]]),
/invalid domain .* \(missing 1 segment/
);
assert.throws(
() =>
new Domain([
"|",
"|",
["hr_presence_state", "=", "absent"],
["attendance_state", "=", "checked_in"],
]),
/invalid domain .* \(missing 1 segment/
);
assert.throws(
() => new Domain(["|", "|", ["hr_presence_state", "=", "absent"]]),
/invalid domain .* \(missing 2 segment\(s\)/
);
assert.throws(
() => new Domain(["&", ["composition_mode", "!=", "mass_post"]]),
/invalid domain .* \(missing 1 segment/
);
assert.throws(() => new Domain(["!"]), /invalid domain .* \(missing 1 segment/);
});

// ---------------------------------------------------------------------------
// Normalization
// ---------------------------------------------------------------------------
Expand Down