External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

nss: Don't stop parsing on unexpected key

Browse Source 
Due to latest rewrite of NSS module, we are doing yajl parsing
ourselves. This means, we had to introduce couple of callback
that yajl calls. According to its documentation, a callback can
cancel parsing if it returns a zero value. Well, we do just that
in the string callback (findLeasesParserString()). If the JSON
file we are parsing contains a key that we are not interested in,
zero is returned meaning stop all parsing. This is not correct,
because the JSON file can contain some other keys which are not
harmful for our address translation (e.g. 'client-id').

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Michal Privoznik 2019-08-09 10:25:22 +02:00
parent 0848af78ae
commit 8be0ab638d
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/nssdata/virbr1.status
View File

@ -20,6 +20,7 @@
{ {
"ip-address": "192.168.122.3", "ip-address": "192.168.122.3",
"mac-address": "52:54:00:aa:bb:cc", "mac-address": "52:54:00:aa:bb:cc",
"client-id": "01:52:54:00:aa:bb:cc",
"expiry-time": 2000000000 "expiry-time": 2000000000
} }
] ]

2
tools/nss/libvirt_nss_leases.c
View File

@ -201,7 +201,7 @@ findLeasesParserString(void *ctx,
if (!(parser->entry.hostname = strndup((char *)stringVal, stringLen))) if (!(parser->entry.hostname = strndup((char *)stringVal, stringLen)))
return 0; return 0;
} else { } else {
return 0; return 1;
} }
} else { } else {
return 0; return 0;

4
tools/nss/libvirt_nss_macs.c
View File

@ -68,7 +68,7 @@ findMACsParserString(void *ctx,
if (parser->state == FIND_MACS_STATE_ENTRY) { if (parser->state == FIND_MACS_STATE_ENTRY) {
if (strcmp(parser->key, "domain")) if (strcmp(parser->key, "domain"))
return 0; return 1;
free(parser->entry.name); free(parser->entry.name);
if (!(parser->entry.name = strndup((char *)stringVal, stringLen))) if (!(parser->entry.name = strndup((char *)stringVal, stringLen)))
@ -76,7 +76,7 @@ findMACsParserString(void *ctx,
} else if (parser->state == FIND_MACS_STATE_ENTRY_MACS) { } else if (parser->state == FIND_MACS_STATE_ENTRY_MACS) {
char **macs; char **macs;
if (strcmp(parser->key, "macs")) if (strcmp(parser->key, "macs"))
return 0; return 1;
if (!(macs = realloc(parser->entry.macs, if (!(macs = realloc(parser->entry.macs,
sizeof(char *) * (parser->entry.nmacs + 1)))) sizeof(char *) * (parser->entry.nmacs + 1))))