#include <string.h>
#include <errno.h>
#include <stdio.h>
-#include <inttypes.h>
#include <stdlib.h>
-#include <limits.h>
#include <sys/stat.h>
#include <pulse/util.h>
#define O_BINARY 0
#endif
-/* Load an euthorization cookie from file fn and store it in data. If
+/* Load an authorization cookie from file fn and store it in data. If
* the cookie file doesn't exist, create it */
-static int load(const char *fn, void *data, size_t length) {
+static int load(const char *fn, bool create, void *data, size_t length) {
int fd = -1;
int writable = 1;
int unlock = 0, ret = -1;
pa_assert(data);
pa_assert(length > 0);
- if ((fd = pa_open_cloexec(fn, O_RDWR|O_CREAT|O_BINARY, S_IRUSR|S_IWUSR)) < 0) {
+ if (create)
+ pa_make_secure_parent_dir(fn, pa_in_system_mode() ? 0755U : 0700U, -1, -1, false);
- if (errno != EACCES || (fd = open(fn, O_RDONLY|O_BINARY)) < 0) {
+ if ((fd = pa_open_cloexec(fn, (create ? O_RDWR|O_CREAT : O_RDONLY)|O_BINARY, S_IRUSR|S_IWUSR)) < 0) {
+
+ if (!create || errno != EACCES || (fd = open(fn, O_RDONLY|O_BINARY)) < 0) {
pa_log_warn("Failed to open cookie file '%s': %s", fn, pa_cstrerror(errno));
goto finish;
} else
}
/* Load a cookie from a cookie file. If the file doesn't exist, create it. */
-int pa_authkey_load(const char *path, void *data, size_t length) {
+int pa_authkey_load(const char *path, bool create, void *data, size_t length) {
int ret;
pa_assert(path);
pa_assert(data);
pa_assert(length > 0);
- if ((ret = load(path, data, length)) < 0)
+ if ((ret = load(path, create, data, length)) < 0)
pa_log_warn("Failed to load authorization key '%s': %s", path, (ret < 0) ? pa_cstrerror(errno) : "File corrupt");
return ret;
/* Load a cookie from a file in the home directory. If the specified
* path starts with /, use it as absolute path instead. */
-int pa_authkey_load_auto(const char *fn, void *data, size_t length) {
+int pa_authkey_load_auto(const char *fn, bool create, void *data, size_t length) {
char *p;
int ret;
if (!(p = normalize_path(fn)))
return -2;
- ret = pa_authkey_load(p, data, length);
+ ret = pa_authkey_load(p, create, data, length);
pa_xfree(p);
return ret;