admin/cacti
1
0 Fork 0
mirror of https://github.com/Cacti/cacti.git synced 2026-11-08 21:16:17 +09:00
Code Issues Packages Projects Releases Wiki Activity

Updates after final QA of SNMP security_level feature

Browse Source
This commit is contained in:
cigamit committed 2018-01-14 16:28:36 -06:00
1 parent 39be1f395e
commit ebf8fb2ee8
5 files changed
+35 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

host.php
+3
View File
@@ -1099,6 +1099,9 @@ function device_javascript() {
}
$(function() {
// Need to set this for global snmpv3 functions to remain sane between edits
snmp_security_initialized = false;
if (typeof hostInfoHeight != 'undefined') {
if ($(window).scrollTop() == 0) {
$('.hostInfoHeader').css('height', '');
include/global_session.php
+1
View File
@@ -115,6 +115,7 @@ if (isset($_SESSION['refresh'])) {
var clipboardCopyFailed='<?php print __esc('Failed to find data to copy!');?>';
var clipboardUpdated='<?php print __esc('Clipboard has been updated');?>';
var clipboardNotUpdated='<?php print __esc('Sorry, your clipboard could not be updated at this time');?>';
var defaultSNMPSecurityLevel='<?php print read_config_option('snmp_security_level');?>';
var defaultSNMPAuthProtocol='<?php print read_config_option('snmp_auth_protocol');?>';
var defaultSNMPPrivProtocol='<?php print read_config_option('snmp_priv_protocol');?>';
</script>
include/layout.js
+25 -12
View File
@@ -2489,6 +2489,7 @@ var snmp_password = '';
var snmp_auth_protocol = '';
var snmp_priv_protocol = '';
var snmp_priv_passphrase = '';
var snmp_security_initialized = false;
function storeSNMPSecurity() {
if ($('#snmp_version').val() == '3') {
@@ -2507,20 +2508,27 @@ function storeSNMPSecurity() {
snmp_priv_protocol = '';
snmp_priv_passphrase = '';
}
} else {
$('#snmp_security_level').val(defaultSNMPSecurityLevel);
}
}
function setSNMPSecurity() {
if ($('#snmp_version').val() == '3') {
if ($('#snmp_auth_protocol').val() == '[None]') {
if ($('#snmp_priv_protocol').val() == '[None]') {
$('#snmp_security_level').val('noAuthNoPriv');
if (!snmp_security_initialized) {
if ($('#snmp_auth_protocol').val() == '[None]') {
if ($('#snmp_priv_protocol').val() == '[None]') {
$('#snmp_security_level').val('noAuthNoPriv');
} else {
$('#snmp_security_level').val('authNoPriv');
}
} else {
$('#snmp_security_level').val('authNoPriv');
$('#snmp_security_level').val('authPriv');
}
} else {
$('#snmp_security_level').val('authPriv');
$('#snmp_security_level').selectmenu('refresh');
}
snmp_security_initialized = true;
}
}
@@ -2536,22 +2544,25 @@ function setSNMP() {
$('#row_snmp_username').hide();
$('#row_snmp_password').hide();
$('#row_snmp_community').show();
$('#row_snmp_security_level').hide();
$('#row_snmp_auth_password').hide();
$('#row_snmp_auth_protocol').hide();
$('#row_snmp_priv_password').hide();
$('#row_snmp_priv_passphrase').hide();
$('#row_snmp_priv_protocol').hide();
$('#row_snmp_engine_id').hide();
$('#row_snmp_context').hide();
$('#row_snmp_port').show();
$('#row_snmp_timeout').show();
break;
case '3': // SNMP v3
$('#row_snmp_username').show();
$('#row_snmp_password').show();
$('#row_snmp_community').hide();
$('#row_snmp_security_level').show();
$('#row_snmp_auth_password').show();
$('#row_snmp_auth_protocol').show();
$('#row_snmp_priv_password').show();
$('#row_snmp_priv_passphrase').show();
$('#row_snmp_priv_protocol').show();
$('#row_snmp_engine_id').show();
$('#row_snmp_context').show();
@@ -2573,8 +2584,11 @@ function setSNMP() {
$('#snmp_priv_protocol').val('[None]');
$('#row_snmp_auth_protocol').hide();
$('#row_snmp_priv_protocol').hide();
$('#row_snmp_password').hide();
$('#row_snmp_priv_passphrase').hide();
if (typeof $('#snmp_security_level').selectmenu() === 'object') {
$('#snmp_security_level').selectmenu('refresh');
$('#snmp_auth_protocol').selectmenu('refresh');
$('#snmp_priv_protocol').selectmenu('refresh');
}
@@ -2592,6 +2606,7 @@ function setSNMP() {
$('#snmp_priv_protocol').val('[None]');
$('#row_snmp_priv_protocol').hide();
$('#row_snmp_priv_passphrase').hide();
if (typeof $('#snmp_security_level').selectmenu() === 'object') {
$('#snmp_priv_protocol').selectmenu('refresh');
@@ -2617,9 +2632,7 @@ function setSNMP() {
$('#snmp_priv_passphrase').val('');
}
break;
break;
}
setSNMPSecurity();
}
managers.php
+3
View File
@@ -350,6 +350,9 @@ function manager_edit() {
?>
<script type='text/javascript'>
// Need to set this for global snmpv3 functions to remain sane between edits
snmp_security_initialized = false;
$(function() {
setSNMP();
});
settings.php
+3
View File
@@ -430,6 +430,9 @@ default:
}
if ($('#row_snmp_ver')) {
// Need to set this for global snmpv3 functions to remain sane between edits
snmp_security_initialized = false;
setSNMP();
$('#snmp_ver, #snmp_auth_protocol, #snmp_priv_protocol, #snmp_security_level').change(function() {
setSNMP();