bastion/nginx-proxy-manager
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix #1950 attempt to encode hdomain values before render

Browse Source
This commit is contained in:
Jamie Curnow 2022-03-25 08:31:28 +10:00
parent eb148eb8f0
commit feaafdc559
6 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/js/app/nginx/dead/delete.ejs
View File

@ -7,7 +7,7 @@
<form> <form>
<div class="row"> <div class="row">
<div class="col-sm-12 col-md-12"> <div class="col-sm-12 col-md-12">
<%= i18n('dead-hosts', 'delete-confirm', {domains: domain_names.join(', ')}) %> <%= i18n('dead-hosts', 'delete-confirm', {domains: domain_names.join(', ').toHtmlEntities()}) %>
<% if (certificate_id) { %> <% if (certificate_id) { %>
<br><br> <br><br>
<%- i18n('ssl', 'delete-ssl') %> <%- i18n('ssl', 'delete-ssl') %>

2
frontend/js/app/nginx/proxy/delete.ejs
View File

@ -7,7 +7,7 @@
<form> <form>
<div class="row"> <div class="row">
<div class="col-sm-12 col-md-12"> <div class="col-sm-12 col-md-12">
<%= i18n('proxy-hosts', 'delete-confirm', {domains: domain_names.join(', ')}) %> <%= i18n('proxy-hosts', 'delete-confirm', {domains: domain_names.join(', ').toHtmlEntities()}) %>
<% if (certificate_id) { %> <% if (certificate_id) { %>
<br><br> <br><br>
<%- i18n('ssl', 'delete-ssl') %> <%- i18n('ssl', 'delete-ssl') %>

2
frontend/js/app/nginx/redirection/delete.ejs
View File

@ -7,7 +7,7 @@
<form> <form>
<div class="row"> <div class="row">
<div class="col-sm-12 col-md-12"> <div class="col-sm-12 col-md-12">
<%= i18n('redirection-hosts', 'delete-confirm', {domains: domain_names.join(', ')}) %> <%= i18n('redirection-hosts', 'delete-confirm', {domains: domain_names.join(', ').toHtmlEntities()}) %>
<% if (certificate_id) { %> <% if (certificate_id) { %>
<br><br> <br><br>
<%- i18n('ssl', 'delete-ssl') %> <%- i18n('ssl', 'delete-ssl') %>

2
frontend/js/app/user/delete.ejs
View File

@ -7,7 +7,7 @@
<form> <form>
<div class="row"> <div class="row">
<div class="col-sm-12 col-md-12"> <div class="col-sm-12 col-md-12">
<%= i18n('users', 'delete-confirm', {name: name}) %> <%= i18n('users', 'delete-confirm', {name: name.toHtmlEntities()}) %>
</div> </div>
</div> </div>
</form> </form>

7
frontend/js/index.js
View File

@ -103,6 +103,13 @@ window.tabler = {
} }
}; };
String.prototype.toHtmlEntities = function() {
return this.replace(/./gm, function(s) {
// return "&#" + s.charCodeAt(0) + ";";
return (s.match(/[a-z0-9\s]+/i)) ? s : "&#" + s.charCodeAt(0) + ";";
});
};
require('tabler-core'); require('tabler-core');
const App = require('./app/main'); const App = require('./app/main');

22
frontend/webpack.config.js
View File

@ -92,17 +92,17 @@ module.exports = {
] ]
}, },
{ {
test: /source-sans-pro.*\.(woff(2)?)(\?v=\d+\.\d+\.\d+)?$/, test: /source-sans-pro.*\.(woff(2)?)(\?v=\d+\.\d+\.\d+)?$/,
use: [ use: [
{ {
loader: 'file-loader', loader: 'file-loader',
options: { options: {
name: '[name].[ext]', name: '[name].[ext]',
outputPath: 'assets/' outputPath: 'assets/'
} }
} }
] ]
} }
] ]
}, },
plugins: [ plugins: [