From 9441fe833fd422171364f247043f138b8d6160fa Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sun, 5 Apr 2020 13:23:12 -0400
Subject: [PATCH] satisfy cpplint
---
src/zm_user.cpp | 183 +++++++++++++++++++++++++-----------------------
1 file changed, 97 insertions(+), 86 deletions(-)
diff --git a/src/zm_user.cpp b/src/zm_user.cpp
index 0ad9f0672..2d4a20851 100644
--- a/src/zm_user.cpp
+++ b/src/zm_user.cpp
@@ -1,21 +1,21 @@
/*
* ZoneMinder regular expression class implementation, $Date$, $Revision$
* Copyright (C) 2001-2008 Philip Coombes
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+*/
#include "zm.h"
#include "zm_db.h"
@@ -26,6 +26,7 @@
#include <stdlib.h>
#include <string.h>
#include <time.h>
+#include <utility>
#if HAVE_GNUTLS_GNUTLS_H
#include <gnutls/gnutls.h>
@@ -35,7 +36,7 @@
#include <gcrypt.h>
#elif HAVE_LIBCRYPTO
#include <openssl/md5.h>
-#endif // HAVE_L || HAVE_LIBCRYPTO
+#endif // HAVE_GCRYPT_H || HAVE_LIBCRYPTO
#include "zm_utils.h"
#include "zm_crypt.h"
@@ -52,7 +53,7 @@ User::User(const MYSQL_ROW &dbrow) {
id = atoi(dbrow[index++]);
strncpy(username, dbrow[index++], sizeof(username)-1);
strncpy(password, dbrow[index++], sizeof(password)-1);
- enabled = (bool)atoi(dbrow[index++]);
+ enabled = static_cast<bool>atoi(dbrow[index++]);
stream = (Permission)atoi(dbrow[index++]);
events = (Permission)atoi(dbrow[index++]);
control = (Permission)atoi(dbrow[index++]);
@@ -61,7 +62,7 @@ User::User(const MYSQL_ROW &dbrow) {
char *monitor_ids_str = dbrow[index++];
if ( monitor_ids_str && *monitor_ids_str ) {
StringVector ids = split(monitor_ids_str, ",");
- for( StringVector::iterator i = ids.begin(); i < ids.end(); ++i ) {
+ for ( StringVector::iterator i = ids.begin(); i < ids.end(); ++i ) {
monitor_ids.push_back(atoi((*i).c_str()));
}
}
@@ -72,7 +73,7 @@ User::~User() {
}
void User::Copy(const User &u) {
- id=u.id;
+ id = u.id;
strncpy(username, u.username, sizeof(username)-1);
strncpy(password, u.password, sizeof(password)-1);
enabled = u.enabled;
@@ -87,8 +88,9 @@ void User::Copy(const User &u) {
bool User::canAccess(int monitor_id) {
if ( monitor_ids.empty() )
return true;
-
- for ( std::vector<int>::iterator i = monitor_ids.begin(); i != monitor_ids.end(); ++i ) {
+
+ for ( std::vector<int>::iterator i = monitor_ids.begin();
+ i != monitor_ids.end(); ++i ) {
if ( *i == monitor_id ) {
return true;
}
@@ -103,16 +105,20 @@ User *zmLoadUser(const char *username, const char *password) {
int username_length = strlen(username);
char *safer_username = new char[(username_length * 2) + 1];
- // According to docs, size of safer_whatever must be 2*length+1 due to unicode conversions + null terminator.
+ // According to docs, size of safer_whatever must be 2*length+1
+ // due to unicode conversions + null terminator.
mysql_real_escape_string(&dbconn, safer_username, username, username_length);
snprintf(sql, sizeof(sql),
- "SELECT `Id`, `Username`, `Password`, `Enabled`, `Stream`+0, `Events`+0, `Control`+0, `Monitors`+0, `System`+0, `MonitorIds`"
- " FROM `Users` WHERE `Username` = '%s' AND `Enabled` = 1", safer_username);
+ "SELECT `Id`, `Username`, `Password`, `Enabled`,"
+ " `Stream`+0, `Events`+0, `Control`+0, `Monitors`+0, `System`+0,"
+ " `MonitorIds`"
+ " FROM `Users` WHERE `Username` = '%s' AND `Enabled` = 1",
+ safer_username);
if ( mysql_query(&dbconn, sql) ) {
Error("Can't run query: %s", mysql_error(&dbconn));
- exit(mysql_errno(&dbconn));
+ exit(mysql_errno(&dbconn));
}
delete safer_username;
@@ -136,45 +142,48 @@ User *zmLoadUser(const char *username, const char *password) {
// relay type must be none
return user;
}
-
+
if ( verifyPassword(username, password, user->getPassword()) ) {
Info("Authenticated user '%s'", user->getUsername());
return user;
- }
+ }
Warning("Unable to authenticate user %s", username);
return NULL;
}
-User *zmLoadTokenUser (std::string jwt_token_str, bool use_remote_addr ) {
+User *zmLoadTokenUser(std::string jwt_token_str, bool use_remote_addr) {
std::string key = config.auth_hash_secret;
std::string remote_addr = "";
-
- if (use_remote_addr) {
- remote_addr = std::string(getenv( "REMOTE_ADDR" ));
+
+ if ( use_remote_addr ) {
+ remote_addr = std::string(getenv("REMOTE_ADDR"));
if ( remote_addr == "" ) {
- Warning( "Can't determine remote address, using null" );
+ Warning("Can't determine remote address, using null");
remote_addr = "";
}
key += remote_addr;
}
- Debug (1,"Inside zmLoadTokenUser, formed key=%s", key.c_str());
+ Debug(1, "Inside zmLoadTokenUser, formed key=%s", key.c_str());
std::pair<std::string, unsigned int> ans = verifyToken(jwt_token_str, key);
std::string username = ans.first;
unsigned int iat = ans.second;
- Debug (1,"retrieved user '%s' from token", username.c_str());
+ Debug(1, "retrieved user '%s' from token", username.c_str());
- if (username != "") {
+ if ( username != "" ) {
char sql[ZM_SQL_MED_BUFSIZ] = "";
snprintf(sql, sizeof(sql),
- "SELECT `Id`, `Username`, `Password`, `Enabled`, `Stream`+0, `Events`+0, `Control`+0, `Monitors`+0, `System`+0, `MonitorIds`, `TokenMinExpiry`"
- " FROM `Users` WHERE `Username` = '%s' AND `Enabled` = 1", username.c_str() );
+ "SELECT `Id`, `Username`, `Password`, `Enabled`,"
+ " `Stream`+0, `Events`+0, `Control`+0, `Monitors`+0, `System`+0,"
+ " `MonitorIds`, `TokenMinExpiry`"
+ " FROM `Users` WHERE `Username` = '%s' AND `Enabled` = 1",
+ username.c_str());
if ( mysql_query(&dbconn, sql) ) {
Error("Can't run query: %s", mysql_error(&dbconn));
- exit(mysql_errno(&dbconn));
+ exit(mysql_errno(&dbconn));
}
MYSQL_RES *result = mysql_store_result(&dbconn);
@@ -192,70 +201,71 @@ User *zmLoadTokenUser (std::string jwt_token_str, bool use_remote_addr ) {
MYSQL_ROW dbrow = mysql_fetch_row(result);
User *user = new User(dbrow);
- unsigned int stored_iat = strtoul(dbrow[10], NULL,0 );
+ unsigned int stored_iat = strtoul(dbrow[10], NULL, 0);
- if (stored_iat > iat ) { // admin revoked tokens
+ if ( stored_iat > iat ) { // admin revoked tokens
mysql_free_result(result);
Error("Token was revoked for '%s'", username.c_str());
return NULL;
}
- Debug (1,"Got last token revoke time of: %u",stored_iat);
- Debug (1,"Authenticated user '%s' via token", username.c_str());
+ Debug(1, "Authenticated user '%s' via token with last revoke time: %u",
+ username.c_str(), stored_iat);
mysql_free_result(result);
return user;
- }
- else {
+ } else {
return NULL;
}
+} // end User *zmLoadTokenUser(std::string jwt_token_str, bool use_remote_addr)
-}
-
// Function to validate an authentication string
-User *zmLoadAuthUser( const char *auth, bool use_remote_addr ) {
+User *zmLoadAuthUser(const char *auth, bool use_remote_addr) {
#if HAVE_DECL_MD5 || HAVE_DECL_GNUTLS_FINGERPRINT
#ifdef HAVE_GCRYPT_H
// Special initialisation for libgcrypt
- if ( !gcry_check_version( GCRYPT_VERSION ) ) {
- Fatal( "Unable to initialise libgcrypt" );
+ if ( !gcry_check_version(GCRYPT_VERSION) ) {
+ Fatal("Unable to initialise libgcrypt");
}
- gcry_control( GCRYCTL_DISABLE_SECMEM, 0 );
- gcry_control( GCRYCTL_INITIALIZATION_FINISHED, 0 );
-#endif // HAVE_GCRYPT_H
+ gcry_control(GCRYCTL_DISABLE_SECMEM, 0);
+ gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
+#endif // HAVE_GCRYPT_H
const char *remote_addr = "";
if ( use_remote_addr ) {
- remote_addr = getenv( "REMOTE_ADDR" );
+ remote_addr = getenv("REMOTE_ADDR");
if ( !remote_addr ) {
- Warning( "Can't determine remote address, using null" );
+ Warning("Can't determine remote address, using null");
remote_addr = "";
}
}
- Debug( 1, "Attempting to authenticate user from auth string '%s'", auth );
+ Debug(1, "Attempting to authenticate user from auth string '%s'", auth);
char sql[ZM_SQL_SML_BUFSIZ] = "";
- snprintf( sql, sizeof(sql), "SELECT `Id`, `Username`, `Password`, `Enabled`, `Stream`+0, `Events`+0, `Control`+0, `Monitors`+0, `System`+0, `MonitorIds` FROM `Users` WHERE `Enabled` = 1" );
+ snprintf(sql, sizeof(sql),
+ "SELECT `Id`, `Username`, `Password`, `Enabled`,"
+ " `Stream`+0, `Events`+0, `Control`+0, `Monitors`+0, `System`+0,"
+ " `MonitorIds` FROM `Users` WHERE `Enabled` = 1");
- if ( mysql_query( &dbconn, sql ) ) {
- Error( "Can't run query: %s", mysql_error( &dbconn ) );
- exit( mysql_errno( &dbconn ) );
+ if ( mysql_query(&dbconn, sql) ) {
+ Error("Can't run query: %s", mysql_error(&dbconn));
+ exit(mysql_errno(&dbconn));
}
- MYSQL_RES *result = mysql_store_result( &dbconn );
+ MYSQL_RES *result = mysql_store_result(&dbconn);
if ( !result ) {
- Error( "Can't use query result: %s", mysql_error( &dbconn ) );
- exit( mysql_errno( &dbconn ) );
+ Error("Can't use query result: %s", mysql_error(&dbconn));
+ exit(mysql_errno(&dbconn));
}
- int n_users = mysql_num_rows( result );
+ int n_users = mysql_num_rows(result);
if ( n_users < 1 ) {
- mysql_free_result( result );
- Warning( "Unable to authenticate user" );
- return( 0 );
+ mysql_free_result(result);
+ Warning("Unable to authenticate user");
+ return 0;
}
- while( MYSQL_ROW dbrow = mysql_fetch_row( result ) ) {
+ while ( MYSQL_ROW dbrow = mysql_fetch_row(result) ) {
const char *user = dbrow[1];
const char *pass = dbrow[2];
@@ -264,20 +274,20 @@ User *zmLoadAuthUser( const char *auth, bool use_remote_addr ) {
size_t md5len = 16;
unsigned char md5sum[md5len];
- time_t now = time( 0 );
+ time_t now = time(0);
unsigned int hours = config.auth_hash_ttl;
- if ( ! hours ) {
+ if ( !hours ) {
Warning("No value set for ZM_AUTH_HASH_TTL. Defaulting to 2.");
hours = 2;
} else {
- Debug( 1, "AUTH_HASH_TTL is %d", hours );
+ Debug(1, "AUTH_HASH_TTL is %d", hours);
}
for ( unsigned int i = 0; i < hours; i++, now -= 3600 ) {
- struct tm *now_tm = localtime( &now );
+ struct tm *now_tm = localtime(&now);
- snprintf( auth_key, sizeof(auth_key), "%s%s%s%s%d%d%d%d",
+ snprintf(auth_key, sizeof(auth_key), "%s%s%s%s%d%d%d%d",
config.auth_hash_secret,
user,
pass,
@@ -285,51 +295,52 @@ User *zmLoadAuthUser( const char *auth, bool use_remote_addr ) {
now_tm->tm_hour,
now_tm->tm_mday,
now_tm->tm_mon,
- now_tm->tm_year
- );
+ now_tm->tm_year);
#if HAVE_DECL_MD5
- MD5( (unsigned char *)auth_key, strlen(auth_key), md5sum );
+ MD5((unsigned char *)auth_key, strlen(auth_key), md5sum);
#elif HAVE_DECL_GNUTLS_FINGERPRINT
gnutls_datum_t md5data = { (unsigned char *)auth_key, strlen(auth_key) };
- gnutls_fingerprint( GNUTLS_DIG_MD5, &md5data, md5sum, &md5len );
+ gnutls_fingerprint(GNUTLS_DIG_MD5, &md5data, md5sum, &md5len);
#endif
auth_md5[0] = '\0';
for ( unsigned int j = 0; j < md5len; j++ ) {
- sprintf( &auth_md5[2*j], "%02x", md5sum[j] );
+ sprintf(&auth_md5[2*j], "%02x", md5sum[j]);
}
- Debug( 1, "Checking auth_key '%s' -> auth_md5 '%s' == '%s'", auth_key, auth_md5, auth );
+ Debug(1, "Checking auth_key '%s' -> auth_md5 '%s' == '%s'",
+ auth_key, auth_md5, auth);
- if ( !strcmp( auth, auth_md5 ) ) {
+ if ( !strcmp(auth, auth_md5) ) {
// We have a match
- User *user = new User( dbrow );
- Debug(1, "Authenticated user '%s'", user->getUsername() );
- mysql_free_result( result );
- return( user );
+ User *user = new User(dbrow);
+ Debug(1, "Authenticated user '%s'", user->getUsername());
+ mysql_free_result(result);
+ return user;
} else {
- Debug(1, "No match for %s", auth );
+ Debug(1, "No match for %s", auth);
}
- }
- }
- mysql_free_result( result );
-#else // HAVE_DECL_MD5
- Error( "You need to build with gnutls or openssl installed to use hash based authentication" );
-#endif // HAVE_DECL_MD5
- Debug(1, "No user found for auth_key %s", auth );
+ } // end foreach hour
+ } // end foreach user
+ mysql_free_result(result);
+#else // HAVE_DECL_MD5 || HAVE_DECL_GNUTLS_FINGERPRINT
+ Error("You need to build with gnutls or openssl to use hash based auth");
+#endif // HAVE_DECL_MD5 || HAVE_DECL_GNUTLS_FINGERPRINT
+ Debug(1, "No user found for auth_key %s", auth);
return 0;
-}
+} // end User *zmLoadAuthUser( const char *auth, bool use_remote_addr )
-//Function to check Username length
-bool checkUser ( const char *username) {
- if ( ! username )
+// Function to check Username length
+bool checkUser(const char *username) {
+ if ( !username )
return false;
if ( strlen(username) > 32 )
return false;
return true;
}
-//Function to check password length
-bool checkPass (const char *password) {
+
+// Function to check password length
+bool checkPass(const char *password) {
if ( !password )
return false;
if ( strlen(password) > 64 )