michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 08:40:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webmin/webmin

Browse Source
This commit is contained in:
Jamie Cameron
2021-04-03 13:07:24 -07:00
parent ae64743265 4cb4177ae6
commit a946e958f9
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
web-lib-funcs.pl
View File

@@ -957,10 +957,19 @@ if ($gconfig{'extra_headers'}) {
if (!$gconfig{'no_frame_options'}) {
print "X-Frame-Options: SAMEORIGIN\n";
}
if (!$gconfig{'no_content_security_policy'}) {
print "Content-Security-Policy: script-src 'self' 'unsafe-inline' 'unsafe-eval'; frame-src 'self'; child-src 'self'\n";
if (!$gconfig{'no_content_security_policy'} &&
$gconfig{'extra_headers'} !~ /Content-Security-Policy:/) {
if ($tconfig{'csp_headers'}) {
print "Content-Security-Policy: $tconfig{'csp_headers'}\n";
}
else {
print "Content-Security-Policy: script-src 'self' 'unsafe-inline' 'unsafe-eval'; frame-src 'self'; child-src 'self'\n";
}
}
print "X-Content-Type-Options: nosniff\n";
if ($tconfig{'nolinks'}) {
print "X-no-links: 1\n";
}
if (defined($cs)) {
print "Content-type: $mt; Charset=$cs\n\n";
}

11
webmin/edit_advanced.cgi
View File

@@ -73,6 +73,11 @@ if (&has_command("chattr")) {
&ui_yesno_radio("chattr", $gconfig{'chattr'}));
}
# Network buffer size
print &ui_table_row($text{'advanced_bufsize'},
&ui_opt_textbox("bufsize", $miniserv{'bufsize'}, 6,
$text{'default'}." (32768)"));
# Nice level for cron jobs
if (&foreign_check("proc")) {
&foreign_require("proc", "proc-lib.pl");
@@ -107,12 +112,6 @@ print &ui_table_row($text{'advanced_headers'},
print &ui_table_row($text{'advanced_sortconfigs'},
&ui_yesno_radio("sortconfigs", $gconfig{'sortconfigs'}));
# Network buffer size
print &ui_table_row($text{'advanced_bufsize'},
&ui_opt_textbox("bufsize", $miniserv{'bufsize'}, 6,
$text{'default'}." (32768)"));
print &ui_table_end();
print &ui_form_end([ [ "save", $text{'save'} ] ]);