Skip to content

Commit 1bd70c6

Browse files
committed
Ensure that unsafe: is always used when the encodeJS modifier is used.
1 parent 16fc2e0 commit 1bd70c6

12 files changed

Lines changed: 18 additions & 18 deletions

com.woltlab.wcf/templates/accountManagement.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@
107107
new PasswordStrength(elById('newPassword'), {
108108
relatedInputs: relatedInputs,
109109
staticDictionary: [
110-
'{$__wcf->user->username|encodeJS}',
111-
'{$__wcf->user->email|encodeJS}',
110+
'{unsafe:$__wcf->user->username|encodeJS}',
111+
'{unsafe:$__wcf->user->email|encodeJS}',
112112
]
113113
});
114114
})

com.woltlab.wcf/templates/articleAdd.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
i18n: {
111111
defaultLanguageId: {$defaultLanguageID},
112112
isI18n: {if $article->isMultilingual}true{else}false{/if},
113-
languages: { {implode from=$languages item=language glue=', '}{$language->languageID}: '{$language|encodeJS}'{/implode} }
113+
languages: { {implode from=$languages item=language glue=', '}{$language->languageID}: '{unsafe:$language|encodeJS}'{/implode} }
114114
},
115115
redirectUrl: '{link controller='ArticleList'}{/link}'
116116
});

com.woltlab.wcf/templates/headIncludeJavaScript.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,9 @@ window.addEventListener('pageshow', function(event) {
102102
],
103103
{/if}
104104
styleChanger: {if $__wcf->getStyleHandler()->showStyleChanger()}true{else}false{/if},
105-
{if $__wcf->user->userID && !$__wcf->getMessageQuoteManager()->getRemoveQuoteIDs()|empty}removeQuotes: [{implode from=$__wcf->getMessageQuoteManager()->getRemoveQuoteIDs() item=uuid}'{$uuid|encodeJS}'{/implode}],{/if}
105+
{if $__wcf->user->userID && !$__wcf->getMessageQuoteManager()->getRemoveQuoteIDs()|empty}removeQuotes: [{implode from=$__wcf->getMessageQuoteManager()->getRemoveQuoteIDs() item=uuid}'{unsafe:$uuid|encodeJS}'{/implode}],{/if}
106106
{if $__wcf->user->userID && !$__wcf->getMessageQuoteManager()->getUsedQuotes()|empty}usedQuotes: new Map([
107-
{foreach from=$__wcf->getMessageQuoteManager()->getUsedQuotes() key=editorID item=uuids}['{$editorID|encodeJS}', [{implode from=$uuids item=uuid}'{$uuid|encodeJS}'{/implode}]]{/foreach}
107+
{foreach from=$__wcf->getMessageQuoteManager()->getUsedQuotes() key=editorID item=uuids}['{unsafe:$editorID|encodeJS}', [{implode from=$uuids item=uuid}'{unsafe:$uuid|encodeJS}'{/implode}]]{/foreach}
108108
]),
109109
{/if}
110110
});

com.woltlab.wcf/templates/shared_uploadFieldComponent.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
imagePreview: {if !$uploadField->supportMultipleFiles() && $uploadField->isImageOnly()}true{else}false{/if},
5353
{if $uploadField->getAcceptableFiles()}
5454
acceptableFiles: [
55-
{implode from=$uploadField->getAcceptableFiles() item=accept}'{$accept|encodeJS}'{/implode}
55+
{implode from=$uploadField->getAcceptableFiles() item=accept}'{unsafe:$accept|encodeJS}'{/implode}
5656
],
5757
{/if}
5858
});

com.woltlab.wcf/templates/shared_wysiwyg.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@
4343
4444
{include file='mediaJavaScript'}
4545
46-
const element = document.getElementById('{$wysiwygSelector|encodeJS}');
46+
const element = document.getElementById('{unsafe:$wysiwygSelector|encodeJS}');
4747
if (element === null) {
48-
throw new Error("Unable to find the source element '{$wysiwygSelector|encodeJS}' for the editor.")
48+
throw new Error("Unable to find the source element '{unsafe:$wysiwygSelector|encodeJS}' for the editor.")
4949
}
5050
5151
let enableAttachments = element.dataset.disableAttachments !== "true";

com.woltlab.wcf/templates/shared_wysiwygCmsToolbar.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
{jsphrase name='wcf.page.search.name'}
2222
{jsphrase name='wcf.page.search.results'}
2323
24-
const element = document.getElementById('{$wysiwygSelector|encodeJS}');
24+
const element = document.getElementById('{unsafe:$wysiwygSelector|encodeJS}');
2525
setupArticle(element);
2626
setupPage(element);
2727
});

com.woltlab.wcf/templates/userException.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
{$stacktrace}
3131
-->
3232
<script>
33-
console.debug('{$name|encodeJS} thrown in {$file|encodeJS} ({$line})');
33+
console.debug('{unsafe:$name|encodeJS} thrown in {unsafe:$file|encodeJS} ({$line})');
3434
console.debug('Stacktrace:\n{unsafe:$stacktrace|encodeJS}');
3535
</script>
3636
{/if}

wcfsetup/install/files/acp/templates/__devtoolsProjectInstructionsFormField.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@
250250
],
251251
pip: '{$instruction[pip]}',
252252
runStandalone: {$instruction[runStandalone]|intval},
253-
value: '{$instruction[value]|encodeJS}'
253+
value: '{unsafe:$instruction[value]|encodeJS}'
254254
}
255255
{/implode}
256256
{/if}

wcfsetup/install/files/acp/templates/articleAdd.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
i18n: {
112112
defaultLanguageId: {$defaultLanguageID},
113113
isI18n: {if $article->isMultilingual}true{else}false{/if},
114-
languages: { {implode from=$languages item=language glue=', '}{$language->languageID}: '{$language|encodeJS}'{/implode} }
114+
languages: { {implode from=$languages item=language glue=', '}{$language->languageID}: '{unsafe:$language|encodeJS}'{/implode} }
115115
},
116116
redirectUrl: '{link controller='ArticleList'}{/link}'
117117
});

wcfsetup/install/files/acp/templates/userAdd.tpl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -261,11 +261,11 @@
261261
new PasswordStrength(elById('password'), {
262262
relatedInputs: relatedInputs,
263263
staticDictionary: [
264-
'{$__wcf->user->username|encodeJS}',
265-
'{$__wcf->user->email|encodeJS}',
264+
'{unsafe:$__wcf->user->username|encodeJS}',
265+
'{unsafe:$__wcf->user->email|encodeJS}',
266266
{if $user|isset}
267-
'{$user->username|encodeJS}',
268-
'{$user->email|encodeJS}',
267+
'{unsafe:$user->username|encodeJS}',
268+
'{unsafe:$user->email|encodeJS}',
269269
{/if}
270270
]
271271
});

0 commit comments

Comments
 (0)