Skip to content

Commit d85aae8

Browse files
gonzalesedwin1123gonzalesedwin1123
committed
style(dci): fix CI pre-commit failures across DCI modules
- replace deprecated <odoo><data> wrappers in 5 data XML files - drop tests import from spp_dci_server_social __init__ (pylint E8130) - remove unused env param in security_warning.js systray item (eslint) - add nosemgrep suppressions for the 16 reviewed sudo() usages, with justification comments; restructure the search_service.py suppression that was misplaced and over-long (also fixes ruff E501)
1 parent 0f9e81b commit d85aae8

16 files changed

Lines changed: 479 additions & 489 deletions

File tree

‎spp_dci_client_sr/middleware/signature.py‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,8 @@ async def verify_sr_signature(
3636
"""
3737
try:
3838
# Check if unsigned requests are allowed (development mode)
39-
allow_unsigned = (
40-
env["ir.config_parameter"].sudo().get_param("dci.allow_unsigned_requests", "false").lower() == "true"
41-
)
39+
config = env["ir.config_parameter"].sudo() # nosemgrep: odoo-sudo-without-context
40+
allow_unsigned = config.get_param("dci.allow_unsigned_requests", "false").lower() == "true"
4241

4342
# Extract sender_id from header
4443
sender_id = envelope.header.sender_id
@@ -65,7 +64,9 @@ async def verify_sr_signature(
6564
)
6665

6766
# Look up SR sender in registry
68-
sr_sender = env["spp.dci.sr.sender"].sudo().search([("sender_id", "=", sender_id)], limit=1)
67+
# sudo: sender lookup happens before request authentication
68+
SRSender = env["spp.dci.sr.sender"].sudo() # nosemgrep: odoo-sudo-without-context
69+
sr_sender = SRSender.search([("sender_id", "=", sender_id)], limit=1)
6970

7071
if not sr_sender:
7172
_logger.warning("Unknown SR sender_id in callback: %s", sender_id)

‎spp_dci_client_sr/routers/callback.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ def _find_partner_by_identifier(env: Environment, id_type: str, id_value: str):
258258
"""
259259
# Search in spp.id records
260260
id_record = (
261-
env["spp.registry.id"]
261+
env["spp.registry.id"] # nosemgrep: odoo-sudo-without-context
262262
.sudo()
263263
.search(
264264
[
@@ -275,7 +275,7 @@ def _find_partner_by_identifier(env: Environment, id_type: str, id_value: str):
275275
# Also check with namespace URIs
276276
if not id_type.startswith("urn:"):
277277
id_record = (
278-
env["spp.registry.id"]
278+
env["spp.registry.id"] # nosemgrep: odoo-sudo-without-context
279279
.sudo()
280280
.search(
281281
[
@@ -305,7 +305,7 @@ def _update_sr_record(
305305
record: SR person record
306306
source_registry: Source registry ID
307307
"""
308-
SRRecord = env["spp.dci.sr.record"].sudo()
308+
SRRecord = env["spp.dci.sr.record"].sudo() # nosemgrep: odoo-sudo-without-context
309309

310310
# Find existing record
311311
existing = SRRecord.search(

‎spp_dci_client_sr/services/sr_service.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -370,15 +370,15 @@ def sync_person_to_local(
370370
if not person_data:
371371
raise UserError(f"Person with {identifier_type}:{identifier_value} not found in SR")
372372

373-
SRRecord = self.env["spp.dci.sr.record"].sudo()
373+
SRRecord = self.env["spp.dci.sr.record"].sudo() # nosemgrep: odoo-sudo-without-context
374374

375375
# Find or create partner if not provided
376376
if not partner_id:
377377
# Try to find by identifier. The model is spp.registry.id;
378378
# earlier code referenced a non-existent 'spp.id', which
379379
# raised KeyError on every lookup-by-identifier call.
380380
id_record = (
381-
self.env["spp.registry.id"]
381+
self.env["spp.registry.id"] # nosemgrep: odoo-sudo-without-context
382382
.sudo()
383383
.search(
384384
[

‎spp_dci_compliance/__init__.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,12 @@ def _post_init_hook(env):
1717
if public_user and registry_viewer_group:
1818
# Write to group's user_ids field (Odoo 19 field name)
1919
if public_user.id not in registry_viewer_group.user_ids.ids:
20-
registry_viewer_group.sudo().write({"user_ids": [(4, public_user.id)]})
20+
# sudo: install hook granting compliance-test access
21+
group_sudo = registry_viewer_group.sudo() # nosemgrep: odoo-sudo-without-context
22+
group_sudo.write({"user_ids": [(4, public_user.id)]})
2123

2224
# Set DCI config parameters for compliance testing
23-
config = env["ir.config_parameter"].sudo()
25+
config = env["ir.config_parameter"].sudo() # nosemgrep: odoo-sudo-without-context
2426

2527
# Allow unsigned requests for signature verification testing
2628
config.set_param("dci.allow_unsigned_requests", "true")

‎spp_dci_compliance/data/ir_cron.xml‎

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,14 @@
11
<?xml version="1.0" encoding="utf-8" ?>
2-
<odoo>
3-
<data noupdate="1">
4-
<!-- Automated cleanup of old DCI callback logs -->
5-
<record id="ir_cron_cleanup_dci_callback_logs" model="ir.cron">
6-
<field name="name">DCI: Cleanup Old Callback Logs</field>
7-
<field
8-
name="model_id"
9-
ref="spp_dci_compliance.model_spp_dci_callback_log"
10-
/>
11-
<field name="state">code</field>
12-
<field name="code">model.cleanup_old_logs(days=7)</field>
13-
<field name="user_id" ref="base.user_root" />
14-
<field name="interval_number">1</field>
15-
<field name="interval_type">days</field>
16-
<field name="priority">10</field>
17-
</record>
18-
</data>
2+
<odoo noupdate="1">
3+
<!-- Automated cleanup of old DCI callback logs -->
4+
<record id="ir_cron_cleanup_dci_callback_logs" model="ir.cron">
5+
<field name="name">DCI: Cleanup Old Callback Logs</field>
6+
<field name="model_id" ref="spp_dci_compliance.model_spp_dci_callback_log" />
7+
<field name="state">code</field>
8+
<field name="code">model.cleanup_old_logs(days=7)</field>
9+
<field name="user_id" ref="base.user_root" />
10+
<field name="interval_number">1</field>
11+
<field name="interval_type">days</field>
12+
<field name="priority">10</field>
13+
</record>
1914
</odoo>

‎spp_dci_compliance/data/test_identifiers.xml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
<?xml version="1.0" encoding="utf-8" ?>
2-
<odoo>
3-
<data noupdate="1">
4-
<!--
2+
<odoo noupdate="1">
3+
<!--
54
Test Identifier Type for DCI Compliance
65
References spp_dci.id_type_uin which defines urn:dci:id:uin
76
No need to create a duplicate - use the existing one from spp_dci module
87
-->
9-
</data>
108
</odoo>

‎spp_dci_compliance/data/test_individuals.xml‎

Lines changed: 85 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -1,98 +1,96 @@
11
<?xml version="1.0" encoding="utf-8" ?>
2-
<odoo>
3-
<data noupdate="1">
4-
<!-- Test Individual with UIN 847951632 (matching DR compliance tests) -->
5-
<record id="test_individual_847951632" model="res.partner">
6-
<field name="name">Test Individual 847951632</field>
7-
<field name="is_registrant" eval="True" />
8-
<field name="is_group" eval="False" />
9-
<field name="given_name">John</field>
10-
<field name="family_name">Doe</field>
11-
<field name="addl_name">Michael</field>
12-
<field name="birthdate">1994-06-15</field>
13-
<field name="phone">+1234567890</field>
14-
<field name="email">john.doe@example.com</field>
15-
<field name="street">123 Test Street</field>
16-
<field name="street2">Apt 4B</field>
17-
<field name="city">Test City</field>
18-
<field name="zip">12345</field>
19-
</record>
2+
<odoo noupdate="1">
3+
<!-- Test Individual with UIN 847951632 (matching DR compliance tests) -->
4+
<record id="test_individual_847951632" model="res.partner">
5+
<field name="name">Test Individual 847951632</field>
6+
<field name="is_registrant" eval="True" />
7+
<field name="is_group" eval="False" />
8+
<field name="given_name">John</field>
9+
<field name="family_name">Doe</field>
10+
<field name="addl_name">Michael</field>
11+
<field name="birthdate">1994-06-15</field>
12+
<field name="phone">+1234567890</field>
13+
<field name="email">john.doe@example.com</field>
14+
<field name="street">123 Test Street</field>
15+
<field name="street2">Apt 4B</field>
16+
<field name="city">Test City</field>
17+
<field name="zip">12345</field>
18+
</record>
2019

21-
<!-- Identifier for test individual matching compliance test value -->
22-
<record id="test_individual_847951632_identifier" model="spp.registry.id">
23-
<field name="partner_id" ref="test_individual_847951632" />
24-
<field name="id_type_id" ref="spp_dci.id_type_uin" />
25-
<field name="value">847951632</field>
26-
</record>
20+
<!-- Identifier for test individual matching compliance test value -->
21+
<record id="test_individual_847951632_identifier" model="spp.registry.id">
22+
<field name="partner_id" ref="test_individual_847951632" />
23+
<field name="id_type_id" ref="spp_dci.id_type_uin" />
24+
<field name="value">847951632</field>
25+
</record>
2726

28-
<!-- Test Individual with disability information -->
29-
<record id="test_individual_with_disability" model="res.partner">
30-
<field name="name">Test Individual with Disability</field>
31-
<field name="is_registrant" eval="True" />
32-
<field name="is_group" eval="False" />
33-
<field name="given_name">Jane</field>
34-
<field name="family_name">Smith</field>
35-
<field name="birthdate">1999-03-22</field>
36-
<field name="phone">+1234567891</field>
37-
<field name="email">jane.smith@example.com</field>
38-
</record>
27+
<!-- Test Individual with disability information -->
28+
<record id="test_individual_with_disability" model="res.partner">
29+
<field name="name">Test Individual with Disability</field>
30+
<field name="is_registrant" eval="True" />
31+
<field name="is_group" eval="False" />
32+
<field name="given_name">Jane</field>
33+
<field name="family_name">Smith</field>
34+
<field name="birthdate">1999-03-22</field>
35+
<field name="phone">+1234567891</field>
36+
<field name="email">jane.smith@example.com</field>
37+
</record>
3938

40-
<!-- Identifier for individual with disability -->
41-
<record id="test_individual_with_disability_identifier" model="spp.registry.id">
42-
<field name="partner_id" ref="test_individual_with_disability" />
43-
<field name="id_type_id" ref="spp_dci.id_type_uin" />
44-
<field name="value">987654321</field>
45-
</record>
39+
<!-- Identifier for individual with disability -->
40+
<record id="test_individual_with_disability_identifier" model="spp.registry.id">
41+
<field name="partner_id" ref="test_individual_with_disability" />
42+
<field name="id_type_id" ref="spp_dci.id_type_uin" />
43+
<field name="value">987654321</field>
44+
</record>
4645

47-
<!-- Test Household/Group -->
48-
<record id="test_household_group" model="res.partner">
49-
<field name="name">Test Household Group</field>
50-
<field name="is_registrant" eval="True" />
51-
<field name="is_group" eval="True" />
52-
<field name="street">456 Family Avenue</field>
53-
<field name="city">Test Town</field>
54-
<field name="zip">54321</field>
55-
</record>
46+
<!-- Test Household/Group -->
47+
<record id="test_household_group" model="res.partner">
48+
<field name="name">Test Household Group</field>
49+
<field name="is_registrant" eval="True" />
50+
<field name="is_group" eval="True" />
51+
<field name="street">456 Family Avenue</field>
52+
<field name="city">Test Town</field>
53+
<field name="zip">54321</field>
54+
</record>
5655

57-
<!-- Identifier for test household -->
58-
<record id="test_household_group_identifier" model="spp.registry.id">
59-
<field name="partner_id" ref="test_household_group" />
60-
<field name="id_type_id" ref="spp_dci.id_type_uin" />
61-
<field name="value">HH123456</field>
62-
</record>
56+
<!-- Identifier for test household -->
57+
<record id="test_household_group_identifier" model="spp.registry.id">
58+
<field name="partner_id" ref="test_household_group" />
59+
<field name="id_type_id" ref="spp_dci.id_type_uin" />
60+
<field name="value">HH123456</field>
61+
</record>
6362

64-
<!-- Test Individual - Member of Household -->
65-
<record id="test_household_member_1" model="res.partner">
66-
<field name="name">Test Household Member 1</field>
67-
<field name="is_registrant" eval="True" />
68-
<field name="is_group" eval="False" />
69-
<field name="given_name">Alice</field>
70-
<field name="family_name">Johnson</field>
71-
<field name="birthdate">1989-11-08</field>
72-
</record>
63+
<!-- Test Individual - Member of Household -->
64+
<record id="test_household_member_1" model="res.partner">
65+
<field name="name">Test Household Member 1</field>
66+
<field name="is_registrant" eval="True" />
67+
<field name="is_group" eval="False" />
68+
<field name="given_name">Alice</field>
69+
<field name="family_name">Johnson</field>
70+
<field name="birthdate">1989-11-08</field>
71+
</record>
7372

74-
<!-- Identifier for household member 1 -->
75-
<record id="test_household_member_1_identifier" model="spp.registry.id">
76-
<field name="partner_id" ref="test_household_member_1" />
77-
<field name="id_type_id" ref="spp_dci.id_type_uin" />
78-
<field name="value">111222333</field>
79-
</record>
73+
<!-- Identifier for household member 1 -->
74+
<record id="test_household_member_1_identifier" model="spp.registry.id">
75+
<field name="partner_id" ref="test_household_member_1" />
76+
<field name="id_type_id" ref="spp_dci.id_type_uin" />
77+
<field name="value">111222333</field>
78+
</record>
8079

81-
<!-- Test Individual - Member 2 of Household -->
82-
<record id="test_household_member_2" model="res.partner">
83-
<field name="name">Test Household Member 2</field>
84-
<field name="is_registrant" eval="True" />
85-
<field name="is_group" eval="False" />
86-
<field name="given_name">Bob</field>
87-
<field name="family_name">Johnson</field>
88-
<field name="birthdate">2014-07-20</field>
89-
</record>
80+
<!-- Test Individual - Member 2 of Household -->
81+
<record id="test_household_member_2" model="res.partner">
82+
<field name="name">Test Household Member 2</field>
83+
<field name="is_registrant" eval="True" />
84+
<field name="is_group" eval="False" />
85+
<field name="given_name">Bob</field>
86+
<field name="family_name">Johnson</field>
87+
<field name="birthdate">2014-07-20</field>
88+
</record>
9089

91-
<!-- Identifier for household member 2 -->
92-
<record id="test_household_member_2_identifier" model="spp.registry.id">
93-
<field name="partner_id" ref="test_household_member_2" />
94-
<field name="id_type_id" ref="spp_dci.id_type_uin" />
95-
<field name="value">444555666</field>
96-
</record>
97-
</data>
90+
<!-- Identifier for household member 2 -->
91+
<record id="test_household_member_2_identifier" model="spp.registry.id">
92+
<field name="partner_id" ref="test_household_member_2" />
93+
<field name="id_type_id" ref="spp_dci.id_type_uin" />
94+
<field name="value">444555666</field>
95+
</record>
9896
</odoo>

0 commit comments

Comments
 (0)