fix(fusion_helpdesk_central): close magic-link race + cron savepoint + avg pivot
Findings from the post-feature code review on commit 396170b4. Addresses
the two CRITICAL + one HIGH + two MEDIUM issues; rest are deferred.
CRITICAL #1 — magic-link token race:
Two near-simultaneous POSTs on the same /engagement/<token>/approve
could both SELECT state='pending' under READ COMMITTED, both post
chatter, and let the last writer flip the outcome. Now the POST path
does an atomic UPDATE helpdesk_ticket SET token=NULL WHERE token=%s
AND state='pending' RETURNING id — the loser gets no row back and
renders the friendly invalid-link page. Verified live: 2 concurrent
POSTs → 1 wins, 1 loses, exactly 1 chatter row.
CRITICAL #2 — reminder cron without per-row savepoint:
Per CLAUDE.md rule #14, a DB failure mid-loop aborts the whole
transaction and silently kills the rest of the batch. Wrap each row's
send_mail+write in `with self.env.cr.savepoint()`. Also corrected the
success-count log (was len(stale), now actual sent count).
HIGH #3 — turnaround pivot summed instead of averaged:
fields.Float defaults to SUM aggregator; meaningless for per-ticket
decision delays. Added aggregator='avg' so the pivot reads "avg
turnaround per ticket" not "summed wait time".
HIGH #4 — added test_concurrent_claim_only_one_wins regression test
that fires two real HTTP POSTs against the same token and asserts
exactly one wins + exactly one approval chatter row exists.
MEDIUM #6 — cron nextcall pinned to 09:00 tomorrow so reminders land
in business hours regardless of when the module was last upgraded.
MEDIUM #10 — escalate failed owner-partner-create from WARNING to
ERROR (via _logger.exception) since silent attribution to the bot
account is a real audit-trail confusion.
Deferred (follow-up commits): #5, #7 (executor cleanup), #8, #9,
#11–#14 — none are bugs, all spec-drift or hardening.
This commit is contained in:
@@ -25,7 +25,7 @@ class FusionHelpdeskEngagementController(http.Controller):
|
||||
# ------------------------------------------------------------------
|
||||
# Token resolution — single source of truth for the GET + POST handlers.
|
||||
# ------------------------------------------------------------------
|
||||
def _resolve(self, token, decision):
|
||||
def _resolve(self, token, decision, claim=False):
|
||||
"""Return (ticket, decision_state) or (None, None) on any problem.
|
||||
|
||||
The "no problem" cases:
|
||||
@@ -33,14 +33,41 @@ class FusionHelpdeskEngagementController(http.Controller):
|
||||
- decision is one of {'approve', 'reject'}
|
||||
- a single ticket matches the token AND is in state='pending'
|
||||
|
||||
Anything else -> (None, None), caller renders the friendly
|
||||
"link no longer valid" page.
|
||||
When `claim=True` (POST path), atomically clear the token via
|
||||
UPDATE ... RETURNING so two near-simultaneous clicks can't both
|
||||
succeed — the second SELECT-then-write would otherwise double-post
|
||||
the decision chatter and let the last writer flip the outcome.
|
||||
The atomic UPDATE makes single-use a property of the SQL, not of
|
||||
the application logic.
|
||||
|
||||
When `claim=False` (GET path), we just look — no token rotation
|
||||
— so re-loading the confirm page before clicking still works.
|
||||
"""
|
||||
if not token or not isinstance(token, str):
|
||||
return (None, None)
|
||||
if decision not in ('approve', 'reject'):
|
||||
return (None, None)
|
||||
decision_state = 'approved' if decision == 'approve' else 'rejected'
|
||||
if claim:
|
||||
# Atomic claim: clear the token only if it's still pending. The
|
||||
# WHERE clause re-checks state so a re-engagement (which
|
||||
# rotates the token) between GET and POST won't be claimed.
|
||||
request.env.cr.execute(
|
||||
"UPDATE helpdesk_ticket "
|
||||
"SET x_fc_engagement_token = NULL "
|
||||
"WHERE x_fc_engagement_token = %s "
|
||||
" AND x_fc_engagement_state = 'pending' "
|
||||
"RETURNING id",
|
||||
(token,),
|
||||
)
|
||||
row = request.env.cr.fetchone()
|
||||
if not row:
|
||||
return (None, None) # lost the race or token rotated
|
||||
ticket = request.env['helpdesk.ticket'].sudo().browse(row[0])
|
||||
# Invalidate the ORM cache for the field we just changed via raw SQL.
|
||||
ticket.invalidate_recordset(['x_fc_engagement_token'])
|
||||
return (ticket, decision_state)
|
||||
# GET path — just look, don't claim.
|
||||
ticket = request.env['helpdesk.ticket'].sudo().search(
|
||||
[('x_fc_engagement_token', '=', token),
|
||||
('x_fc_engagement_state', '=', 'pending')],
|
||||
@@ -81,9 +108,11 @@ class FusionHelpdeskEngagementController(http.Controller):
|
||||
type='http', auth='public', methods=['POST'], csrf=False, sitemap=False,
|
||||
)
|
||||
def engagement_submit(self, token, decision, **post):
|
||||
ticket, decision_state = self._resolve(token, decision)
|
||||
# claim=True does an atomic UPDATE that clears the token only if
|
||||
# the row is still pending — wins the race against a second click.
|
||||
ticket, decision_state = self._resolve(token, decision, claim=True)
|
||||
if not ticket:
|
||||
# Could be a second click on the same link, or a token rotated
|
||||
# Could be a second click on the same link, a token rotated
|
||||
# by a re-engagement, or a typo. Same friendly page for all.
|
||||
return request.render(
|
||||
'fusion_helpdesk_central.engagement_invalid', {},
|
||||
@@ -139,9 +168,14 @@ class FusionHelpdeskEngagementController(http.Controller):
|
||||
'email': email,
|
||||
})
|
||||
except Exception:
|
||||
_logger.warning(
|
||||
# ERROR not WARNING: a failed owner partner-create means the
|
||||
# approval chatter line will say "Approved by support@nexasystems.ca"
|
||||
# (the bot) instead of the actual owner — a real audit-trail
|
||||
# confusion that someone needs to look at.
|
||||
_logger.exception(
|
||||
'fusion_helpdesk_central: could not create owner partner '
|
||||
'for %s on ticket %s; chatter will be attributed to the '
|
||||
'service account.', email, ticket.id,
|
||||
'for %s on ticket %s; chatter author will fall back to the '
|
||||
'service account. Body text still names the owner correctly '
|
||||
'via format_engagement_chatter.', email, ticket.id,
|
||||
)
|
||||
return None
|
||||
|
||||
Reference in New Issue
Block a user