Skip to content

Handle virtual packages in dpkginfo probe #2255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Handle virtual packages in dpkginfo probe #2255

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 31 additions & 8 deletions src/OVAL/probes/unix/linux/dpkginfo-helper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ static int version(struct dpkginfo_reply_t *reply)
struct dpkginfo_reply_t* dpkginfo_get_by_name(const char *name, int *err)
{
FILE *f;
char buf[DPKG_STATUS_BUFFER_SIZE], path[PATH_MAX], *root, *key, *value;
char buf[DPKG_STATUS_BUFFER_SIZE], path[PATH_MAX], *root, *key, *value, *p;
struct dpkginfo_reply_t *reply;

*err = 0;
Expand All @@ -93,8 +93,14 @@ struct dpkginfo_reply_t* dpkginfo_get_by_name(const char *name, int *err)
if (buf[0] == '\n') {
// New package entry.
if (reply != NULL) {
// Package found.
goto out;
if (reply->name != NULL) {
// Package found.
goto out;
} else {
// Package not found yet.
dpkginfo_free_reply(reply);
reply = NULL;
}
}
continue;
}
Expand All @@ -113,12 +119,12 @@ struct dpkginfo_reply_t* dpkginfo_get_by_name(const char *name, int *err)
value = trimleft(value);
// Package should be the first line.
if (strcmp(key, "Package") == 0) {
if (reply != NULL)
continue;
reply = calloc(1, sizeof(*reply));
if (reply == NULL)
goto err;
if (strcmp(value, name) == 0) {
if (reply != NULL)
continue;
reply = calloc(1, sizeof(*reply));
if (reply == NULL)
goto err;
reply->name = strdup(value);
if (reply->name == NULL)
goto err;
Expand All @@ -142,6 +148,23 @@ struct dpkginfo_reply_t* dpkginfo_get_by_name(const char *name, int *err)
goto err;
if (version(reply) < 0)
goto err;
} else if (strcmp(key, "Provides") == 0) {
// Handle virtual packages.
char *s = strtok(value, ",");
while (s != NULL) {
s = trimleft(s);
// Ignore version.
p = strchr(s, ' ');
if (p != NULL)
*p++ = '\0';
if (strcmp(s, name) == 0) {
reply->name = strdup(value);
if (reply->name == NULL)
goto err;
break;
}
s = strtok(NULL, ",");
}
}
}
}
Expand Down
Loading