diff options
| author | dklawren <dklawren@users.noreply.github.com> | 2017-06-30 19:34:14 +0200 |
|---|---|---|
| committer | Dylan William Hardison <dylan@hardison.net> | 2017-07-07 00:19:20 +0200 |
| commit | 7176e6d8dabbdd577e99c18fccb99fc9a09e1760 (patch) | |
| tree | d02ade16e1d19eefe9cb879856a9c996b3affa0e /extensions/UserProfile/lib | |
| parent | 4c9f9a8c49e9f25096ee3b6982b197e9efa6dd60 (diff) | |
| download | bugzilla-7176e6d8dabbdd577e99c18fccb99fc9a09e1760.tar.gz bugzilla-7176e6d8dabbdd577e99c18fccb99fc9a09e1760.tar.xz | |
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
Diffstat (limited to 'extensions/UserProfile/lib')
| -rw-r--r-- | extensions/UserProfile/lib/Util.pm | 12 |
1 files changed, 7 insertions, 5 deletions
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 |