From 7176e6d8dabbdd577e99c18fccb99fc9a09e1760 Mon Sep 17 00:00:00 2001 From: dklawren Date: Fri, 30 Jun 2017 10:34:14 -0700 Subject: Bug 1367604 - BMO extension to apply security policies to Phabricator revisions as needed * - Updated based on dylans review - Fixed custom policy to instead allow projects and subscribers and then add BMO roles to the subscriber list - Some other bug fixes * fix lifetime of phabricator_url_re() Instead of passing the value (which depends on runtime configuration) pass in a reference. Also edit extensions/BMO/Extension.pm to allow %autodetect_attach_urls regex option to be a callback instead of just a plain regexp ref. * - Fixed regex in BMO extension to detect phabricator attachments - Use request_cache for useragent handle in Util.pm --- extensions/UserProfile/lib/Util.pm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'extensions/UserProfile/lib/Util.pm') diff --git a/extensions/UserProfile/lib/Util.pm b/extensions/UserProfile/lib/Util.pm index 509b131c1..e50260af2 100644 --- a/extensions/UserProfile/lib/Util.pm +++ b/extensions/UserProfile/lib/Util.pm @@ -74,9 +74,10 @@ EOF SELECT COUNT(*) FROM attachments WHERE submitter_id = ? - AND (ispatch = 1 - OR mimetype = 'text/x-github-pull-request' - OR mimetype = 'text/x-review-board-request') + AND (ispatch = 1 + OR mimetype IN ('text/x-github-pull-request', + 'text/x-review-board-request', + 'text/x-phabricator-request')) EOF # patches reviewed @@ -86,8 +87,9 @@ EOF INNER JOIN attachments ON attachments.attach_id = flags.attach_id WHERE setter_id = ? AND (attachments.ispatch = 1 - OR attachments.mimetype = 'text/x-github-pull-request' - OR attachments.mimetype = 'text/x-review-board-request') + OR mimetype IN ('text/x-github-pull-request', + 'text/x-review-board-request', + 'text/x-phabricator-request')) AND status IN ('+', '-') EOF -- cgit v1.2.3-24-g4f1b