d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a file descriptor in struct url for netrc

Browse Source 
When using libfetch in an application that drops privileges when fetching
like pkg(8) then user complain because the application does not read anymore
${HOME}/.netrc. Now a caller can prepare a fd to the said file and manually
assign it to the structure.

It is also a first step to allow to capsicumize libfetch applications

Reviewed by:	allanjude, des
Approved by:	des
Differential Revision:	https://reviews.freebsd.org/D9678
This commit is contained in:
Baptiste Daroussin 2017-02-20 00:14:31 +00:00
parent d893c36a35
commit d8713bf361
3 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/libfetch/common.c
View File

@ -1339,16 +1339,11 @@ fetch_read_word(FILE *f)
return (word);
}
/*
* Get authentication data for a URL from .netrc
*/
int
fetch_netrc_auth(struct url *url)
static int
fetch_netrc_open(void)
{
const char *p;
char fn[PATH_MAX];
const char *word;
char *p;
FILE *f;
if ((p = getenv("NETRC")) != NULL) {
if (snprintf(fn, sizeof(fn), "%s", p) >= (int)sizeof(fn)) {
@ -1368,8 +1363,25 @@ fetch_netrc_auth(struct url *url)
return (-1);
}
if ((f = fopen(fn, "r")) == NULL)
return (open(fn, O_RDONLY));
}
/*
* Get authentication data for a URL from .netrc
*/
int
fetch_netrc_auth(struct url *url)
{
const char *word;
FILE *f;
if (url->netrcfd == -2)
url->netrcfd = fetch_netrc_open();
if (url->netrcfd < 0)
return (-1);
if ((f = fdopen(url->netrcfd, "r")) == NULL)
return (-1);
rewind(f);
while ((word = fetch_read_word(f)) != NULL) {
if (strcmp(word, "default") == 0) {
DEBUG(fetch_info("Using default .netrc settings"));

1
lib/libfetch/fetch.c
View File

@ -284,6 +284,7 @@ fetchMakeURL(const char *scheme, const char *host, int port, const char *doc,
seturl(pwd);
#undef seturl
u->port = port;
u->netrcfd = -2;
return (u);
}

1
lib/libfetch/fetch.h
View File

@ -47,6 +47,7 @@ struct url {
off_t offset;
size_t length;
time_t ims_time;
int netrcfd;
};
struct url_stat {