ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Introducing a new ZM_DB_SSL_VERIFY_SERVER_CERT configuration option t…"

pull/3818/head
Isaac Connor 2024-02-07 09:58:49 -05:00 committed by GitHub
parent 3f0076bf49
commit caccc6def0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmakecacheimport.sh
View File

@ -58,7 +58,6 @@ echo "Database password : Not shown"
echo "Database SSL CA Cert : $ZM_DB_SSL_CA_CERT"
echo "Database SSL Client Key : $ZM_DB_SSL_CLIENT_KEY"
echo "Database SSL Client Cert : $ZM_DB_SSL_CLIENT_CERT"
echo "Verify database SSL Cert : $ZM_DB_SSL_VERIFY_SERVER_CERT"
CMPATH="CACHE PATH \"Imported by cmakecacheimport.sh\" FORCE"
@ -79,7 +78,6 @@ echo "set(ZM_DB_PASS \"$ZM_DB_PASS\" $CMSTRING)">>zm_conf.cmake
echo "set(ZM_DB_SSL_CA_CERT \"$ZM_DB_SSL_CA_CERT\" $CMSTRING)">>zm_conf.cmake
echo "set(ZM_DB_SSL_CLIENT_KEY \"$ZM_DB_SSL_CLIENT_KEY\" $CMSTRING)">>zm_conf.cmake
echo "set(ZM_DB_SSL_CLIENT_CERT \"$ZM_DB_SSL_CLIENT_CERT\" $CMSTRING)">>zm_conf.cmake
echo "set(ZM_DB_SSL_VERIFY_SERVER_CERT \"$ZM_DB_SSL_VERIFY_SERVER_CERT\" $CMSTRING)">>zm_conf.cmake
echo ""
echo "Wrote zm_conf.cmake"

3
scripts/ZoneMinder/lib/ZoneMinder/Database.pm
View File

@ -102,8 +102,7 @@ sub zmDbConnect {
'mysql_ssl=1',
'mysql_ssl_ca_file='.$ZoneMinder::Config::Config{ZM_DB_SSL_CA_CERT},
'mysql_ssl_client_key='.$ZoneMinder::Config::Config{ZM_DB_SSL_CLIENT_KEY},
'mysql_ssl_client_cert='.$ZoneMinder::Config::Config{ZM_DB_SSL_CLIENT_CERT},
'mysql_ssl_verify_server_cert='.$ZoneMinder::Config::Config{ZM_DB_SSL_VERIFY_SERVER_CERT}
'mysql_ssl_client_cert='.$ZoneMinder::Config::Config{ZM_DB_SSL_CLIENT_CERT}
);
}

2
src/zm_config.cpp
View File

@ -170,8 +170,6 @@ void process_configfile(char const *configFile) {
staticConfig.DB_SSL_CLIENT_KEY = std::string(val_ptr);
else if ( strcasecmp(name_ptr, "ZM_DB_SSL_CLIENT_CERT") == 0 )
staticConfig.DB_SSL_CLIENT_CERT = std::string(val_ptr);
else if ( strcasecmp(name_ptr, "ZM_DB_SSL_VERIFY_SERVER_CERT") == 0 )
staticConfig.DB_SSL_VERIFY_SERVER_CERT = std::string(val_ptr);
else if ( strcasecmp(name_ptr, "ZM_PATH_WEB") == 0 )
staticConfig.PATH_WEB = std::string(val_ptr);
else if ( strcasecmp(name_ptr, "ZM_SERVER_HOST") == 0 )

1
src/zm_config.h
View File

@ -53,7 +53,6 @@ struct StaticConfig {
std::string DB_SSL_CA_CERT;
std::string DB_SSL_CLIENT_KEY;
std::string DB_SSL_CLIENT_CERT;
std::string DB_SSL_VERIFY_SERVER_CERT;
std::string PATH_WEB;
std::string SERVER_NAME;
unsigned int SERVER_ID;

1
src/zm_db.cpp
View File

@ -46,7 +46,6 @@ bool zmDbConnect() {
mysql_options(&dbconn, MYSQL_OPT_SSL_KEY, staticConfig.DB_SSL_CLIENT_KEY.c_str());
mysql_options(&dbconn, MYSQL_OPT_SSL_CERT, staticConfig.DB_SSL_CLIENT_CERT.c_str());
mysql_options(&dbconn, MYSQL_OPT_SSL_CA, staticConfig.DB_SSL_CA_CERT.c_str());
mysql_options(&dbconn, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, staticConfig.DB_SSL_VERIFY_SERVER_CERT.c_str());
}
std::string::size_type colonIndex = staticConfig.DB_HOST.find(":");

1
web/api/app/Config/database.php.default
View File

@ -73,7 +73,6 @@ class DATABASE_CONFIG {
'ssl_ca' => ZM_DB_SSL_CA_CERT,
'ssl_key' => ZM_DB_SSL_CLIENT_KEY,
'ssl_cert' => ZM_DB_SSL_CLIENT_CERT,
'ssl_verify_server_cert' => ZM_DB_SSL_VERIFY_SERVER_CERT,
'prefix' => '',
'encoding' => 'utf8',
);

1
web/includes/database.php
View File

@ -55,7 +55,6 @@ function dbConnect() {
PDO::MYSQL_ATTR_SSL_CA => ZM_DB_SSL_CA_CERT,
PDO::MYSQL_ATTR_SSL_KEY => ZM_DB_SSL_CLIENT_KEY,
PDO::MYSQL_ATTR_SSL_CERT => ZM_DB_SSL_CLIENT_CERT,
PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT => ZM_DB_SSL_VERIFY_SERVER_CERT,
);
$dbConn = new PDO($dsn, ZM_DB_USER, ZM_DB_PASS, $dbOptions);
} else {

3
zm.conf.in
View File

@ -59,9 +59,6 @@ ZM_DB_SSL_CLIENT_KEY=@ZM_DB_SSL_CLIENT_KEY@
# SSL client cert for ZoneMinder database
ZM_DB_SSL_CLIENT_CERT=@ZM_DB_SSL_CLIENT_CERT@
# Verify database SSL Cert
ZM_DB_SSL_VERIFY_SERVER_CERT=@ZM_DB_SSL_VERIFY_SERVER_CERT@
# Do NOT set ZM_SERVER_HOST if you are not using Multi-Server
# You have been warned
#