diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 4dc8dad1e5..6a4a4dc198 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.752-210302 +Version: 7.0NG.752-210304 Architecture: all Priority: optional Section: admin diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh index 249df9263e..2990cb5a3f 100644 --- a/pandora_agents/unix/DEBIAN/make_deb_package.sh +++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="7.0NG.752-210302" +pandora_version="7.0NG.752-210304" echo "Test if you has the tools for to make the packages." whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent index 98e279ccf7..1cdd231861 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1016,7 +1016,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.752'; -use constant AGENT_BUILD => '210302'; +use constant AGENT_BUILD => '210304'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index 7d8692835f..0629182cd7 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 7.0NG.752 -%define release 210302 +%define release 210304 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index 08fdf4c9db..ecf9b558d4 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 7.0NG.752 -%define release 210302 +%define release 210304 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index d50fc39144..25435c6c2d 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.752" -PI_BUILD="210302" +PI_BUILD="210304" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index b1c95d80f0..c0171698cf 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{210302} +{210304} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 58e799a8c6..7ef00c586a 100644 --- a/pandora_agents/win32/pandora.cc +++ b/pandora_agents/win32/pandora.cc @@ -30,7 +30,7 @@ using namespace Pandora; using namespace Pandora_Strutils; #define PATH_SIZE _MAX_PATH+1 -#define PANDORA_VERSION ("7.0NG.752(Build 210302)") +#define PANDORA_VERSION ("7.0NG.752(Build 210304)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index aefb20d901..db55fbfdcf 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Artica ST" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(7.0NG.752(Build 210302))" + VALUE "ProductVersion", "(7.0NG.752(Build 210304))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index dfa34dc0bf..2874b6e3a6 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.752-210302 +Version: 7.0NG.752-210304 Architecture: all Priority: optional Section: admin diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh index 48410ff59c..1c4d4a4832 100644 --- a/pandora_console/DEBIAN/make_deb_package.sh +++ b/pandora_console/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="7.0NG.752-210302" +pandora_version="7.0NG.752-210304" package_pear=0 package_pandora=1 diff --git a/pandora_console/godmode/groups/group_list.php b/pandora_console/godmode/groups/group_list.php index ad6eb27adf..55f38b3e35 100644 --- a/pandora_console/godmode/groups/group_list.php +++ b/pandora_console/godmode/groups/group_list.php @@ -251,7 +251,16 @@ if (is_ajax()) { $tab = (string) get_parameter('tab', 'groups'); -if ($tab != 'credbox' && ! check_acl($config['id_user'], 0, 'PM')) { +if ($tab != 'credbox' && ! check_acl( + $config['id_user'], + 0, + 'PM' +) && ! check_acl( + $config['id_user'], + 0, + 'AW' +) +) { db_pandora_audit( 'ACL Violation', 'Trying to access Group Management' diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php index e960a33d6e..6213048e19 100644 --- a/pandora_console/godmode/users/configure_user.php +++ b/pandora_console/godmode/users/configure_user.php @@ -1176,7 +1176,11 @@ if ($config['double_auth_enabled'] && check_acl($config['id_user'], 0, 'PM')) { || ($config['double_auth_enabled'] == '' && $double_auth_enabled) || check_acl($config['id_user'], 0, 'PM') ) { - $double_authentication .= html_print_checkbox_switch('double_auth', 1, $double_auth_enabled, true); + if ($new_user === false) { + $double_authentication .= html_print_checkbox_switch('double_auth', 1, $double_auth_enabled, true); + } else { + $double_authentication .= ui_print_help_tip(__('User must be created before activating double authentication.'), true); + } } // Dialog. @@ -1582,6 +1586,7 @@ console.log(userID); data: { page: 'include/ajax/double_auth.ajax', id_user: userID, + id_user_auth: userID, get_double_auth_data_page: 1, FA_forced: 1, containerID: $dialogContainer.prop('id') @@ -1638,6 +1643,8 @@ function show_double_auth_activation () { var $loadingSpinner = $("/images/spinner.gif\" />"); var $dialogContainer = $("div#dialog-double_auth-container"); + // Uncheck until completed successfully. + $("input#checkbox-double_auth").prop( "checked", false ); $dialogContainer.html($loadingSpinner); @@ -1649,6 +1656,7 @@ function show_double_auth_activation () { data: { page: 'include/ajax/double_auth.ajax', id_user: userID, + id_user_auth: userID, FA_forced: 1, get_double_auth_info_page: 1, containerID: $dialogContainer.prop('id') @@ -1691,8 +1699,6 @@ function show_double_auth_activation () { request.abort(); // Remove the contained html $dialogContainer.empty(); - - document.location.reload(); } }) .show(); @@ -1706,6 +1712,9 @@ function show_double_auth_deactivation () { var message = "
'.__('The double authentication will be deactivated'); ?>
"; var $button = $("\" />"); + // Prevent switch deactivaction until proceess is done + $("input#checkbox-double_auth").prop( "checked", true ); + $dialogContainer .empty() @@ -1740,6 +1749,7 @@ function show_double_auth_deactivation () { } else if (data) { $dialogContainer.html("