Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Harden putpwent, putgrent, putspent, putspent against injection [BZ #…
…18724] This prevents injection of ':' and '\n' into output functions which use the NSS files database syntax. Critical fields (user/group names and file system paths) are checked strictly. For backwards compatibility, the GECOS field is rewritten instead. The getent program is adjusted to use the put*ent functions in libc, instead of local copies. This changes the behavior of getent if user names start with '-' or '+'.
- Loading branch information
Florian Weimer
committed
Oct 2, 2015
1 parent
b0f8163
commit 676599b
Showing
22 changed files
with
1,018 additions
and
109 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,167 @@ | ||
/* Test for processing of invalid group entries. [BZ #18724] | ||
Copyright (C) 2015 Free Software Foundation, Inc. | ||
This file is part of the GNU C Library. | ||
The GNU C Library is free software; you can redistribute it and/or | ||
modify it under the terms of the GNU Lesser General Public | ||
License as published by the Free Software Foundation; either | ||
version 2.1 of the License, or (at your option) any later version. | ||
The GNU C Library 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 | ||
Lesser General Public License for more details. | ||
You should have received a copy of the GNU Lesser General Public | ||
License along with the GNU C Library; if not, see | ||
<http://www.gnu.org/licenses/>. */ | ||
|
||
#include <errno.h> | ||
#include <grp.h> | ||
#include <stdbool.h> | ||
#include <stdio.h> | ||
#include <stdlib.h> | ||
#include <string.h> | ||
|
||
static bool errors; | ||
|
||
static void | ||
check (struct group e, const char *expected) | ||
{ | ||
char *buf; | ||
size_t buf_size; | ||
FILE *f = open_memstream (&buf, &buf_size); | ||
|
||
if (f == NULL) | ||
{ | ||
printf ("open_memstream: %m\n"); | ||
errors = true; | ||
return; | ||
} | ||
|
||
int ret = putgrent (&e, f); | ||
|
||
if (expected == NULL) | ||
{ | ||
if (ret == -1) | ||
{ | ||
if (errno != EINVAL) | ||
{ | ||
printf ("putgrent: unexpected error code: %m\n"); | ||
errors = true; | ||
} | ||
} | ||
else | ||
{ | ||
printf ("putgrent: unexpected success (\"%s\", \"%s\")\n", | ||
e.gr_name, e.gr_passwd); | ||
errors = true; | ||
} | ||
} | ||
else | ||
{ | ||
/* Expect success. */ | ||
size_t expected_length = strlen (expected); | ||
if (ret == 0) | ||
{ | ||
long written = ftell (f); | ||
|
||
if (written <= 0 || fflush (f) < 0) | ||
{ | ||
printf ("stream error: %m\n"); | ||
errors = true; | ||
} | ||
else if (buf[written - 1] != '\n') | ||
{ | ||
printf ("FAILED: \"%s\" without newline\n", expected); | ||
errors = true; | ||
} | ||
else if (strncmp (buf, expected, written - 1) != 0 | ||
|| written - 1 != expected_length) | ||
{ | ||
buf[written - 1] = '\0'; | ||
printf ("FAILED: \"%s\" (%ld), expected \"%s\" (%zu)\n", | ||
buf, written - 1, expected, expected_length); | ||
errors = true; | ||
} | ||
} | ||
else | ||
{ | ||
printf ("FAILED: putgrent (expected \"%s\"): %m\n", expected); | ||
errors = true; | ||
} | ||
} | ||
|
||
fclose (f); | ||
free (buf); | ||
} | ||
|
||
static int | ||
do_test (void) | ||
{ | ||
check ((struct group) { | ||
.gr_name = (char *) "root", | ||
}, | ||
"root::0:"); | ||
check ((struct group) { | ||
.gr_name = (char *) "root", | ||
.gr_passwd = (char *) "password", | ||
.gr_gid = 1234, | ||
.gr_mem = (char *[2]) {(char *) "member1", NULL} | ||
}, | ||
"root:password:1234:member1"); | ||
check ((struct group) { | ||
.gr_name = (char *) "root", | ||
.gr_passwd = (char *) "password", | ||
.gr_gid = 1234, | ||
.gr_mem = (char *[3]) {(char *) "member1", (char *) "member2", NULL} | ||
}, | ||
"root:password:1234:member1,member2"); | ||
|
||
/* Bad values. */ | ||
{ | ||
static const char *const bad_strings[] = { | ||
":", | ||
"\n", | ||
":bad", | ||
"\nbad", | ||
"b:ad", | ||
"b\nad", | ||
"bad:", | ||
"bad\n", | ||
"b:a\nd" | ||
",", | ||
"\n,", | ||
":,", | ||
",bad", | ||
"b,ad", | ||
"bad,", | ||
NULL | ||
}; | ||
for (const char *const *bad = bad_strings; *bad != NULL; ++bad) | ||
{ | ||
char *members[] | ||
= {(char *) "first", (char *) *bad, (char *) "last", NULL}; | ||
if (strpbrk (*bad, ":\n") != NULL) | ||
{ | ||
check ((struct group) { | ||
.gr_name = (char *) *bad, | ||
}, NULL); | ||
check ((struct group) { | ||
.gr_name = (char *) "root", | ||
.gr_passwd = (char *) *bad, | ||
}, NULL); | ||
} | ||
check ((struct group) { | ||
.gr_name = (char *) "root", | ||
.gr_passwd = (char *) "password", | ||
.gr_mem = members, | ||
}, NULL); | ||
} | ||
} | ||
|
||
return errors; | ||
} | ||
|
||
#define TEST_FUNCTION do_test () | ||
#include "../test-skeleton.c" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.