From 7176e6d8dabbdd577e99c18fccb99fc9a09e1760 Mon Sep 17 00:00:00 2001
From: dklawren <dklawren@users.noreply.github.com>
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
---
 .../en/default/hook/attachment/edit-view.html.tmpl      | 17 +++++++++++++++++
 .../en/default/hook/global/user-error-errors.html.tmpl  |  3 +++
 2 files changed, 20 insertions(+)
 create mode 100644 extensions/PhabBugz/template/en/default/hook/attachment/edit-view.html.tmpl

(limited to 'extensions/PhabBugz/template/en')

diff --git a/extensions/PhabBugz/template/en/default/hook/attachment/edit-view.html.tmpl b/extensions/PhabBugz/template/en/default/hook/attachment/edit-view.html.tmpl
new file mode 100644
index 000000000..17db585f8
--- /dev/null
+++ b/extensions/PhabBugz/template/en/default/hook/attachment/edit-view.html.tmpl
@@ -0,0 +1,17 @@
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+  # License, v. 2.0. If a copy of the MPL was not distributed with this
+  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  #
+  # This Source Code Form is "Incompatible With Secondary Licenses", as
+  # defined by the Mozilla Public License, v. 2.0.
+  #%]
+
+[%
+  IF attachment.mimetype == "text/x-phabricator-request" && attachment.external_redirect;
+  custom_attachment_viewer = 1;
+  url = attachment.data;
+%]
+  <h3>
+    <a href="[% url FILTER html %]" title="[% url FILTER html %]">Show review on Phabricator</a><br>
+  </h3>
+[% END %]
diff --git a/extensions/PhabBugz/template/en/default/hook/global/user-error-errors.html.tmpl b/extensions/PhabBugz/template/en/default/hook/global/user-error-errors.html.tmpl
index 6959c759d..60cd08923 100644
--- a/extensions/PhabBugz/template/en/default/hook/global/user-error-errors.html.tmpl
+++ b/extensions/PhabBugz/template/en/default/hook/global/user-error-errors.html.tmpl
@@ -18,5 +18,8 @@
   [% title = "Invalid Phabricator Sync Groups" %]
   You must provide a comma delimited list of security groups
   to sync with Phabricator.
+[% ELSIF error == "invalid_phabricator_revision_id" %]
+  [% title = "Invalid Phabricator Revision ID" %]
+  You must provide a valid Phabricator revision ID.
 
 [% END %]
-- 
cgit v1.2.3-24-g4f1b