diff options
| author | Frédéric Buclin <LpSolit@gmail.com> | 2012-01-10 00:51:48 +0100 |
|---|---|---|
| committer | Frédéric Buclin <LpSolit@gmail.com> | 2012-01-10 00:51:48 +0100 |
| commit | e7fb5b6ba75cc488d5fa155593546244334dec23 (patch) | |
| tree | 347370d0a0321745debae7cfb05c142e248f6f10 | |
| parent | e50fc49676a9dfdc958b17b2c4d0bf3fa72e8b69 (diff) | |
| download | bugzilla-e7fb5b6ba75cc488d5fa155593546244334dec23.tar.gz bugzilla-e7fb5b6ba75cc488d5fa155593546244334dec23.tar.xz | |
Bug 716283: Clickjacking in the attachment "Details" page allows to bypass token checks
r=dkl a=LpSolit
| -rw-r--r-- | template/en/default/attachment/edit.html.tmpl | 10 | ||||
| -rw-r--r-- | template/en/default/global/textarea.html.tmpl | 3 |
2 files changed, 13 insertions, 0 deletions
diff --git a/template/en/default/attachment/edit.html.tmpl b/template/en/default/attachment/edit.html.tmpl index a078141a2..d637e37d1 100644 --- a/template/en/default/attachment/edit.html.tmpl +++ b/template/en/default/attachment/edit.html.tmpl @@ -195,6 +195,16 @@ [% END %] </a> </p> + [% ELSIF attachment.contenttype == "text/html" %] + [%# For security reasons (clickjacking, embedded scripts), we never + # render HTML pages from here. The source code is displayed instead. %] + [% INCLUDE global/textarea.html.tmpl + id = 'viewFrame' + minrows = 10 + cols = 80 + defaultcontent = attachment.data + readonly = 'readonly' + %] [% ELSE %] <iframe id="viewFrame" src="attachment.cgi?id=[% attachment.id %]"> <b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. diff --git a/template/en/default/global/textarea.html.tmpl b/template/en/default/global/textarea.html.tmpl index 84aacf2ee..4a493f928 100644 --- a/template/en/default/global/textarea.html.tmpl +++ b/template/en/default/global/textarea.html.tmpl @@ -21,6 +21,8 @@ # style: (optional) The "style"-attribute of the textarea. # classes: (optional) The "class"-attribute of the textarea. # wrap: (deprecated; optional) The "wrap"-attribute of the textarea. + # disabled: (optional) Disable the textarea. + # readonly: (optional) Prevent the textarea from being edited. # minrows: (required) Number of rows the textarea shall have initially # and when not having focus. # maxrows: (optional) Number of rows the textarea shall have if @@ -42,6 +44,7 @@ [% IF classes %] class="[% classes FILTER html %]"[% END %] [% IF wrap %] wrap="[% wrap FILTER html %]"[% END %] [% IF disabled %] disabled="disabled"[% END %] + [% IF readonly %] readonly="readonly"[% END %] [% IF defaultrows && user.settings.zoom_textareas.value == 'off' %] rows="[% defaultrows FILTER html %]" [% ELSE %] |