From 42b3bb6a53e7ec778e5aac8545219f9a7211d441 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 4 Feb 2020 16:40:52 -0500 Subject: [PATCH 1/4] increase width of google sitekey and secret key inputs to 100% --- web/skins/classic/css/base/views/options.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/web/skins/classic/css/base/views/options.css b/web/skins/classic/css/base/views/options.css index f7123086c..a60d98001 100644 --- a/web/skins/classic/css/base/views/options.css +++ b/web/skins/classic/css/base/views/options.css @@ -21,3 +21,8 @@ input.large { #contentTable.userTable .colMonitor, #contentTable.userTable .colUsername { text-align: left; } + +input[name="newConfig[ZM_OPT_GOOG_RECAPTCHA_SITEKEY]"], +input[name="newConfig[ZM_OPT_GOOG_RECAPTCHA_SECRETKEY]"] { + width: 100%; +} From 1c2f2657d2c551add2f18b1c2c9ce26766466348 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 4 Feb 2020 16:41:19 -0500 Subject: [PATCH 2/4] We don't do automatic login when recaptcha is enabled, so add the login calls on successful recaptcha --- web/includes/actions/login.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/web/includes/actions/login.php b/web/includes/actions/login.php index 6c8312b2f..68ca4e604 100644 --- a/web/includes/actions/login.php +++ b/web/includes/actions/login.php @@ -49,14 +49,23 @@ if ( ('login' == $action) && isset($_REQUEST['username']) && ( ZM_AUTH_TYPE == ' // as it produces the same error as when you don't answer a recaptcha if ( isset($responseData['error-codes']) && is_array($responseData['error-codes']) ) { if ( !in_array('invalid-input-secret', $responseData['error-codes']) ) { - Error('reCaptcha authentication failed'); + ZM\Error('reCaptcha authentication failed. response was: ' . print_r($responseData['error-codes'],true)); unset($user); // unset should be ok here because we aren't in a function return; } else { - Error('Invalid recaptcha secret detected'); + ZM\Error('Invalid recaptcha secret detected'); } } } // end if success==false + if ( ! (empty($_REQUEST['username']) or empty($_REQUEST['password'])) ) { + $ret = validateUser($_REQUEST['username'], $_REQUEST['password']); + if ( !$ret[0] ) { + ZM\Error($ret[1]); + unset($user); // unset should be ok here because we aren't in a function + } else { + $user = $ret[0]; + } + } # end if have username and password } // end if using reCaptcha // if captcha existed, it was passed From af6b51f0d38b1167a55e0868ac60ffc5d169bffa Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 4 Feb 2020 16:47:33 -0500 Subject: [PATCH 3/4] release 1.34.2 --- db/zm_update-1.34.2.sql | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 db/zm_update-1.34.2.sql diff --git a/db/zm_update-1.34.2.sql b/db/zm_update-1.34.2.sql new file mode 100644 index 000000000..1fcc882d2 --- /dev/null +++ b/db/zm_update-1.34.2.sql @@ -0,0 +1,5 @@ +-- +-- This updates a 1.34.1 database to 1.34.2 +-- +-- No changes required +-- From b7ad7ab1fc25dfaf626f12c97d3403ff0aab1b2e Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 4 Feb 2020 16:47:39 -0500 Subject: [PATCH 4/4] release 1.34.2 --- distros/redhat/zoneminder.spec | 5 ++++- version | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec index 0638c6e49..3724c3aad 100644 --- a/distros/redhat/zoneminder.spec +++ b/distros/redhat/zoneminder.spec @@ -28,7 +28,7 @@ %global _hardened_build 1 Name: zoneminder -Version: 1.34.1 +Version: 1.34.2 Release: 1%{?dist} Summary: A camera monitoring and analysis tool Group: System Environment/Daemons @@ -416,6 +416,9 @@ EOF %dir %attr(755,nginx,nginx) %{_localstatedir}/spool/zoneminder-upload %changelog +* Tue Feb 04 2020 Isaac Connor - 1.34.2-1 +- 1.34.2 Release + * Fri Jan 31 2020 Andrew Bauer - 1.34.1-1 - 1.34.1 Release diff --git a/version b/version index a95a46d9f..00e952d04 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.34.1 +1.34.2