3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-06-11 07:11:41 +02:00
Code Issues Projects Releases Packages Wiki Activity

change user/group of config file

Browse source
This commit is contained in:
badaix 2017-10-03 21:42:56 +02:00
parent 52b64e9f0c
commit 3e0e6f33d8
3 changed files with 44 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

30
common/utils/file_utils.h
View file

@ -31,22 +31,40 @@ namespace utils
namespace file namespace file
{ {
static bool exists(const std::string& filename)
{
std::ifstream infile(filename.c_str());
return infile.good();
}
static void do_chown(const std::string& file_path, const std::string& user_name, const std::string& group_name) static void do_chown(const std::string& file_path, const std::string& user_name, const std::string& group_name)
{ {
uid_t uid; if (user_name.empty() && group_name.empty())
gid_t gid; return;
struct passwd *pwd;
struct group *grp;
pwd = getpwnam(user_name.c_str()); if (!exists(file_path))
return;
uid_t uid = -1;
gid_t gid = -1;
if (!user_name.empty())
{
struct passwd *pwd = getpwnam(user_name.c_str());
if (pwd == NULL) if (pwd == NULL)
throw std::runtime_error("Failed to get uid"); throw std::runtime_error("Failed to get uid");
uid = pwd->pw_uid; uid = pwd->pw_uid;
}
grp = getgrnam(group_name.c_str()); if (!group_name.empty())
{
struct group *grp = getgrnam(group_name.c_str());
if (grp == NULL) if (grp == NULL)
throw std::runtime_error("Failed to get gid"); throw std::runtime_error("Failed to get gid");
gid = grp->gr_gid; gid = grp->gr_gid;
}
if (chown(file_path.c_str(), uid, gid) == -1) if (chown(file_path.c_str(), uid, gid) == -1)
throw std::runtime_error("chown failed"); throw std::runtime_error("chown failed");

26
server/config.cpp
View file

@ -64,19 +64,6 @@ void Config::init(const std::string& root_directory, const std::string& user, co
filename_ = dir + "server.json"; filename_ = dir + "server.json";
SLOG(NOTICE) << "Settings file: \"" << filename_ << "\"\n"; SLOG(NOTICE) << "Settings file: \"" << filename_ << "\"\n";
if (!user.empty() && !group.empty())
{
try
{
utils::file::do_chown(dir, user, group);
utils::file::do_chown(filename_, user, group);
}
catch(const std::exception& e)
{
LOG(ERROR) << "Exception in chown: " << e.what() << "\n";
}
}
int fd; int fd;
if ((fd = open(filename_.c_str(), O_RDWR | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)) == -1) if ((fd = open(filename_.c_str(), O_RDWR | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)) == -1)
{ {
@ -87,6 +74,19 @@ void Config::init(const std::string& root_directory, const std::string& user, co
} }
close(fd); close(fd);
if (!user.empty() && !group.empty())
{
try
{
utils::file::do_chown(dir, user, group);
utils::file::do_chown(filename_, user, group);
}
catch(const std::exception& e)
{
SLOG(ERROR) << "Exception in chown: " << e.what() << "\n";
}
}
try try
{ {
ifstream ifs(filename_, std::ifstream::in); ifstream ifs(filename_, std::ifstream::in);

2
server/snapServer.cpp
View file

@ -162,7 +162,7 @@ int main(int argc, char* argv[])
group = user_group[1]; group = user_group[1];
} }
Config::instance().init("/var/lib/snapserver"); Config::instance().init("/var/lib/snapserver", user, group);
daemon.reset(new Daemon(user, group, "/var/run/snapserver/pid")); daemon.reset(new Daemon(user, group, "/var/run/snapserver/pid"));
daemon->daemonize(); daemon->daemonize();
if (processPriority < -20) if (processPriority < -20)