mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2025-04-06 17:49:11 +03:00
libshare/nfs: escape mount points when needed
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz> Closes #13165 Closes #13153
This commit is contained in:
parent
a31fcd4bad
commit
9b06aa634a
@ -24,6 +24,7 @@
|
|||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#include <sys/file.h>
|
#include <sys/file.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
#include <ctype.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <libshare.h>
|
#include <libshare.h>
|
||||||
@ -143,6 +144,34 @@ nfs_fini_tmpfile(const char *exports, struct tmpfile *tmpf)
|
|||||||
return (SA_OK);
|
return (SA_OK);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
nfs_escape_mountpoint(const char *mp, char **out, boolean_t *need_free)
|
||||||
|
{
|
||||||
|
if (strpbrk(mp, "\t\n\v\f\r \\") == NULL) {
|
||||||
|
*out = (char *)mp;
|
||||||
|
*need_free = B_FALSE;
|
||||||
|
return (SA_OK);
|
||||||
|
} else {
|
||||||
|
size_t len = strlen(mp);
|
||||||
|
*out = malloc(len * 4 + 1);
|
||||||
|
if (!*out)
|
||||||
|
return (SA_NO_MEMORY);
|
||||||
|
*need_free = B_TRUE;
|
||||||
|
|
||||||
|
char *oc = *out;
|
||||||
|
for (const char *c = mp; c < mp + len; ++c)
|
||||||
|
if (memchr("\t\n\v\f\r \\", *c,
|
||||||
|
strlen("\t\n\v\f\r \\"))) {
|
||||||
|
sprintf(oc, "\\%03hho", *c);
|
||||||
|
oc += 4;
|
||||||
|
} else
|
||||||
|
*oc++ = *c;
|
||||||
|
*oc = '\0';
|
||||||
|
}
|
||||||
|
|
||||||
|
return (SA_OK);
|
||||||
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
nfs_process_exports(const char *exports, const char *mountpoint,
|
nfs_process_exports(const char *exports, const char *mountpoint,
|
||||||
boolean_t (*cbk)(void *userdata, char *line, boolean_t found_mountpoint),
|
boolean_t (*cbk)(void *userdata, char *line, boolean_t found_mountpoint),
|
||||||
@ -153,8 +182,16 @@ nfs_process_exports(const char *exports, const char *mountpoint,
|
|||||||
|
|
||||||
FILE *oldfp = fopen(exports, "re");
|
FILE *oldfp = fopen(exports, "re");
|
||||||
if (oldfp != NULL) {
|
if (oldfp != NULL) {
|
||||||
|
boolean_t need_mp_free;
|
||||||
|
char *mp;
|
||||||
|
if ((error = nfs_escape_mountpoint(mountpoint,
|
||||||
|
&mp, &need_mp_free)) != SA_OK) {
|
||||||
|
(void) fclose(oldfp);
|
||||||
|
return (error);
|
||||||
|
}
|
||||||
|
|
||||||
char *buf = NULL, *sep;
|
char *buf = NULL, *sep;
|
||||||
size_t buflen = 0, mplen = strlen(mountpoint);
|
size_t buflen = 0, mplen = strlen(mp);
|
||||||
|
|
||||||
while (cont && getline(&buf, &buflen, oldfp) != -1) {
|
while (cont && getline(&buf, &buflen, oldfp) != -1) {
|
||||||
if (buf[0] == '\n' || buf[0] == '#')
|
if (buf[0] == '\n' || buf[0] == '#')
|
||||||
@ -163,9 +200,11 @@ nfs_process_exports(const char *exports, const char *mountpoint,
|
|||||||
cont = cbk(userdata, buf,
|
cont = cbk(userdata, buf,
|
||||||
(sep = strpbrk(buf, "\t \n")) != NULL &&
|
(sep = strpbrk(buf, "\t \n")) != NULL &&
|
||||||
sep - buf == mplen &&
|
sep - buf == mplen &&
|
||||||
strncmp(buf, mountpoint, mplen) == 0);
|
strncmp(buf, mp, mplen) == 0);
|
||||||
}
|
}
|
||||||
free(buf);
|
free(buf);
|
||||||
|
if (need_mp_free)
|
||||||
|
free(mp);
|
||||||
|
|
||||||
if (ferror(oldfp) != 0)
|
if (ferror(oldfp) != 0)
|
||||||
error = ferror(oldfp);
|
error = ferror(oldfp);
|
||||||
|
@ -28,6 +28,7 @@
|
|||||||
|
|
||||||
#define FILE_HEADER "# !!! DO NOT EDIT THIS FILE MANUALLY !!!\n\n"
|
#define FILE_HEADER "# !!! DO NOT EDIT THIS FILE MANUALLY !!!\n\n"
|
||||||
|
|
||||||
|
int nfs_escape_mountpoint(const char *mp, char **out, boolean_t *need_free);
|
||||||
boolean_t nfs_is_shared_impl(const char *exports, sa_share_impl_t impl_share);
|
boolean_t nfs_is_shared_impl(const char *exports, sa_share_impl_t impl_share);
|
||||||
int nfs_toggle_share(const char *lockfile, const char *exports,
|
int nfs_toggle_share(const char *lockfile, const char *exports,
|
||||||
const char *expdir, sa_share_impl_t impl_share,
|
const char *expdir, sa_share_impl_t impl_share,
|
||||||
|
@ -109,15 +109,24 @@ nfs_enable_share_impl(sa_share_impl_t impl_share, FILE *tmpfile)
|
|||||||
if (strcmp(shareopts, "on") == 0)
|
if (strcmp(shareopts, "on") == 0)
|
||||||
shareopts = "";
|
shareopts = "";
|
||||||
|
|
||||||
if (fputs(impl_share->sa_mountpoint, tmpfile) == EOF ||
|
boolean_t need_free;
|
||||||
|
char *mp;
|
||||||
|
int rc = nfs_escape_mountpoint(impl_share->sa_mountpoint, &mp,
|
||||||
|
&need_free);
|
||||||
|
if (rc != SA_OK)
|
||||||
|
return (rc);
|
||||||
|
|
||||||
|
if (fputs(mp, tmpfile) == EOF ||
|
||||||
fputc('\t', tmpfile) == EOF ||
|
fputc('\t', tmpfile) == EOF ||
|
||||||
translate_opts(shareopts, tmpfile) == EOF ||
|
translate_opts(shareopts, tmpfile) == EOF ||
|
||||||
fputc('\n', tmpfile) == EOF) {
|
fputc('\n', tmpfile) == EOF) {
|
||||||
fprintf(stderr, "failed to write to temporary file\n");
|
fprintf(stderr, "failed to write to temporary file\n");
|
||||||
return (SA_SYSTEM_ERR);
|
rc = SA_SYSTEM_ERR;
|
||||||
}
|
}
|
||||||
|
|
||||||
return (SA_OK);
|
if (need_free)
|
||||||
|
free(mp);
|
||||||
|
return (rc);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
|
@ -387,14 +387,21 @@ nfs_add_entry(FILE *tmpfile, const char *sharepath,
|
|||||||
if (linux_opts == NULL)
|
if (linux_opts == NULL)
|
||||||
linux_opts = "";
|
linux_opts = "";
|
||||||
|
|
||||||
if (fprintf(tmpfile, "%s %s(sec=%s,%s,%s)\n", sharepath,
|
boolean_t need_free;
|
||||||
|
char *mp;
|
||||||
|
int rc = nfs_escape_mountpoint(sharepath, &mp, &need_free);
|
||||||
|
if (rc != SA_OK)
|
||||||
|
return (rc);
|
||||||
|
if (fprintf(tmpfile, "%s %s(sec=%s,%s,%s)\n", mp,
|
||||||
get_linux_hostspec(host), security, access_opts,
|
get_linux_hostspec(host), security, access_opts,
|
||||||
linux_opts) < 0) {
|
linux_opts) < 0) {
|
||||||
fprintf(stderr, "failed to write to temporary file\n");
|
fprintf(stderr, "failed to write to temporary file\n");
|
||||||
return (SA_SYSTEM_ERR);
|
rc = SA_SYSTEM_ERR;
|
||||||
}
|
}
|
||||||
|
|
||||||
return (SA_OK);
|
if (need_free)
|
||||||
|
free(mp);
|
||||||
|
return (rc);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
Loading…
Reference in New Issue
Block a user