Mirrors/lgogdownloader
2
0
Fork 0
mirror of https://github.com/Sude-/lgogdownloader.git synced 2024-11-20 11:49:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'respect-umask' of https://github.com/chewi/lgogdownloader

Browse Source
This commit is contained in:
Sude 2016-11-03 20:53:27 +02:00
commit 3baefaa96f
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/config.h
View File

@ -48,6 +48,7 @@ class Config
bool bShowWishlist;
bool bAutomaticXMLCreation;
bool bSaveChangelogs;
bool bRespectUmask;
std::string sGameRegex;
std::string sDirectory;
std::string sCacheDirectory;

14
main.cpp
View File

@ -144,6 +144,7 @@ int main(int argc, char *argv[])
("login-api", bpo::value<bool>(&config.bLoginAPI)->zero_tokens()->default_value(false), "Login (API only)")
("login-website", bpo::value<bool>(&config.bLoginHTTP)->zero_tokens()->default_value(false), "Login (website only)")
("cacert", bpo::value<std::string>(&config.sCACertPath)->default_value(""), "Path to CA certificate bundle in PEM format")
("respect-umask", bpo::value<bool>(&config.bRespectUmask)->zero_tokens()->default_value(false), "Do not adjust permissions of sensitive files")
;
// Commandline options (config file)
options_cli_cfg.add_options()
@ -462,8 +463,11 @@ int main(int argc, char *argv[])
}
// Make sure that config file and cookie file are only readable/writable by owner
Util::setFilePermissions(config.sConfigFilePath, boost::filesystem::owner_read | boost::filesystem::owner_write);
Util::setFilePermissions(config.sCookiePath, boost::filesystem::owner_read | boost::filesystem::owner_write);
if (!config.bRespectUmask)
{
Util::setFilePermissions(config.sConfigFilePath, boost::filesystem::owner_read | boost::filesystem::owner_write);
Util::setFilePermissions(config.sCookiePath, boost::filesystem::owner_read | boost::filesystem::owner_write);
}
if (config.bSaveConfig || iLoginResult == 1)
{
@ -520,7 +524,8 @@ int main(int argc, char *argv[])
}
}
ofs.close();
Util::setFilePermissions(config.sConfigFilePath, boost::filesystem::owner_read | boost::filesystem::owner_write);
if (!config.bRespectUmask)
Util::setFilePermissions(config.sConfigFilePath, boost::filesystem::owner_read | boost::filesystem::owner_write);
if (config.bSaveConfig)
return 0;
}
@ -541,7 +546,8 @@ int main(int argc, char *argv[])
ofs << "secret = " << config.sSecret << std::endl;
}
ofs.close();
Util::setFilePermissions(config.sConfigFilePath, boost::filesystem::owner_read | boost::filesystem::owner_write);
if (!config.bRespectUmask)
Util::setFilePermissions(config.sConfigFilePath, boost::filesystem::owner_read | boost::filesystem::owner_write);
return 0;
}
else

3
src/downloader.cpp
View File

@ -55,7 +55,8 @@ Downloader::~Downloader()
curl_global_cleanup();
ssl_thread_cleanup();
// Make sure that cookie file is only readable/writable by owner
Util::setFilePermissions(config.sCookiePath, boost::filesystem::owner_read | boost::filesystem::owner_write);
if (!config.bRespectUmask)
Util::setFilePermissions(config.sCookiePath, boost::filesystem::owner_read | boost::filesystem::owner_write);
}