Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 13:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1399392 - Don't hardcode .config, use XDG_* environment vars. r=jld

Browse Source 
MozReview-Commit-ID: 30j9VbHUjFn

--HG--
extra : rebase_source : f36d5ff8d54215899862621908d48b57ffa78af3
This commit is contained in:
Gian-Carlo Pascutto 2017-09-13 15:55:07 +02:00
parent bb7bbfa321
commit 38ecd4cad0
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp
View File

@ -130,10 +130,20 @@ SandboxBrokerPolicyFactory::SandboxBrokerPolicyFactory()
}
#endif
// Configuration dirs in the homedir that we want to allow read
// Allow access to XDG_CONFIG_PATH and XDG_CONFIG_DIRS
if (const auto xdgConfigPath = PR_GetEnv("XDG_CONFIG_PATH")) {
policy->AddDir(rdonly, xdgConfigPath);
}
nsAutoCString xdgConfigDirs(PR_GetEnv("XDG_CONFIG_DIRS"));
for (const auto& path : xdgConfigDirs.Split(':')) {
policy->AddDir(rdonly, PromiseFlatCString(path).get());
}
// Extra configuration dirs in the homedir that we want to allow read
// access to.
mozilla::Array<const char*, 3> confDirs = {
".config",
mozilla::Array<const char*, 3> extraConfDirs = {
".config", // Fallback if XDG_CONFIG_PATH isn't set
".themes",
".fonts",
};
@ -143,7 +153,7 @@ SandboxBrokerPolicyFactory::SandboxBrokerPolicyFactory()
if (NS_SUCCEEDED(rv)) {
nsCOMPtr<nsIFile> confDir;
for (auto dir : confDirs) {
for (const auto& dir : extraConfDirs) {
rv = homeDir->Clone(getter_AddRefs(confDir));
if (NS_SUCCEEDED(rv)) {
rv = confDir->AppendNative(nsDependentCString(dir));