Skip to content
Permalink
Browse files Browse the repository at this point in the history
Prevent ACME output from being interpreted as HTML. Fixes #9888
  • Loading branch information
jim-p committed Nov 8, 2019
1 parent a14b802 commit a6f443c
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions security/pfSense-pkg-acme/Makefile
Expand Up @@ -2,6 +2,7 @@

PORTNAME= pfSense-pkg-acme
PORTVERSION= 0.6.3
PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= # empty
DISTFILES= # empty
Expand Down
Expand Up @@ -62,7 +62,7 @@ class acme_sh {
private function execacmesh($command, $envvariables = null) {
$command = "/usr/local/pkg/acme/acme.sh " . $command;
if ($this->debug) {
echo "<br/>\n".$command."<br/>\n";
echo "\n{$command}\n";
}
// add to cron environment path: /usr/local/bin/
$env = array();
Expand Down
Expand Up @@ -132,7 +132,7 @@
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
<span aria-hidden="true">×</span>
</button>
<div id="renewoutput" class="pull-left">
<div id="renewoutput" class="pull-left" style="white-space: pre-wrap">
</div>
</div>

Expand Down Expand Up @@ -219,7 +219,7 @@ function set_content(elementid, image) {

function js_callbackrenew(data) {
$('#renewoutputbox').removeClass("hidden");
$('#renewoutput').html(data);
$('#renewoutput').text(data);
}

function js_callback(req_content) {
Expand Down
Expand Up @@ -156,7 +156,7 @@
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
<span aria-hidden="true">×</span>
</button>
<div id="renewoutput" class="pull-left">
<div id="renewoutput" class="pull-left" style="white-space: pre-wrap">
</div>
</div>

Expand Down Expand Up @@ -326,7 +326,7 @@ function set_content(elementid, image) {

function js_callbackrenew(data) {
$('#renewoutputbox').removeClass("hidden");
$('#renewoutput').html(data.replace(/(?:\r\n|\r|\n)/g, '<br />'));
$('#renewoutput').text(data);
}

function js_callback(req_content) {
Expand Down

0 comments on commit a6f443c

Please sign in to comment.