Stowage/clamav
2
0
Fork 0
mirror of https://github.com/Cisco-Talos/clamav.git synced 2025-10-19 10:23:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Freshclam: fix issue DatabaseCustomURL CVD prune issue

Browse source 
If using DatabaseCustomURL to download a CVD that Freshclam doesn't know
about, i.e. one that is not in the hardcoded standard or optional
database lists in freshclam.c, Freshclam will prune the database and
then re-download it.

This change makes it so we look for URL's with ".cvd" at the end and
then take those into consideration when checking which CVD's (or CLD's)
should be pruned.

Note that I didn't change the interface to
fc_prune_database_directory(). That would have been cleaner, but
would've changed the public API and I want to backport this fix.
This commit is contained in:
Micah Snyder 2024-04-12 13:52:19 -04:00 • committed by Micah Snyder
parent c72bb31c13
commit 296e7d1791
1 changed files with 46 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

47
freshclam/freshclam.c
View file

@ -1432,6 +1432,10 @@ fc_error_t perform_database_update(
uint32_t nUpdated = 0; uint32_t nUpdated = 0;
uint32_t nTotalUpdated = 0; uint32_t nTotalUpdated = 0;
uint32_t i;
char **doNotPruneDatabaseList = NULL;
uint32_t nDoNotPruneDatabases = 0;
STATBUF statbuf; STATBUF statbuf;
if (NULL == serverList) { if (NULL == serverList) {
@ -1452,7 +1456,38 @@ fc_error_t perform_database_update(
* Prune database directory of official databases * Prune database directory of official databases
* that are no longer available or no longer desired. * that are no longer available or no longer desired.
*/ */
(void)fc_prune_database_directory(databaseList, nDatabases);
// include the URL databases in the prune process
doNotPruneDatabaseList = (char **)malloc(sizeof(char *) * (nDatabases + nUrlDatabases));
if (NULL == doNotPruneDatabaseList) {
logg(LOGG_ERROR, "perform_database_update: Can't allocate memory for doNotPruneDatabaseList\n");
status = FC_EMEM;
goto done;
}
for (i = 0; i < nDatabases; i++) {
doNotPruneDatabaseList[i] = strdup(databaseList[i]);
if (doNotPruneDatabaseList[i] == NULL) {
logg(LOGG_ERROR, "perform_database_update: Can't allocate memory for database name in doNotPruneDatabaseList\n");
status = FC_EMEM;
goto done;
}
}
nDoNotPruneDatabases = nDatabases;
for (i = 0; i < nUrlDatabases; i++) {
// Only append the URL databases that end with '.cvd'
if (strlen(urlDatabaseList[i]) > 4 && 0 == strcasecmp(urlDatabaseList[i] + strlen(urlDatabaseList[i]) - 4, ".cvd")) {
const char *startOfFilename = strrchr(urlDatabaseList[i], '/') + 1;
if (NULL != startOfFilename) {
// Add the base database name to the do-not-prune list, excluding the '.cvd' extension.
doNotPruneDatabaseList[nDatabases + i] = CLI_STRNDUP(startOfFilename, strlen(startOfFilename) - strlen(".cvd"));
nDoNotPruneDatabases++;
}
}
}
(void)fc_prune_database_directory(doNotPruneDatabaseList, nDoNotPruneDatabases);
} }
/* /*
@ -1523,6 +1558,16 @@ fc_error_t perform_database_update(
done: done:
// Free up the database list
if (NULL != doNotPruneDatabaseList) {
for (i = 0; i < nDoNotPruneDatabases; i++) {
free(doNotPruneDatabaseList[i]);
doNotPruneDatabaseList[i] = NULL;
}
free(doNotPruneDatabaseList);
doNotPruneDatabaseList = NULL;
}
if (LSTAT(g_freshclamTempDirectory, &statbuf) != -1) { if (LSTAT(g_freshclamTempDirectory, &statbuf) != -1) {
/* Remove temp directory */ /* Remove temp directory */
if (*g_freshclamTempDirectory) { if (*g_freshclamTempDirectory) {