зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1125289 - Restricted profiles: Disallow browsing about:addons. r=margaret
--HG-- extra : commitid : GQvyhHTw9QA
This commit is contained in:
Родитель
ce183223ef
Коммит
563cdc918b
|
@ -37,6 +37,8 @@ public class RestrictedProfiles {
|
||||||
add("wyciwyg");
|
add("wyciwyg");
|
||||||
}};
|
}};
|
||||||
|
|
||||||
|
private static final String ABOUT_ADDONS = "about:addons";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a hack to allow non-GeckoApp activities to safely call into
|
* This is a hack to allow non-GeckoApp activities to safely call into
|
||||||
* RestrictedProfiles without reworking this class or GeckoProfile.
|
* RestrictedProfiles without reworking this class or GeckoProfile.
|
||||||
|
@ -271,6 +273,13 @@ public class RestrictedProfiles {
|
||||||
return !GUEST_RESTRICTIONS.contains(restriction);
|
return !GUEST_RESTRICTIONS.contains(restriction);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Disallow browsing about:addons if 'disallow install extension' restriction is enforced
|
||||||
|
if (restriction == Restriction.DISALLOW_BROWSE_FILES
|
||||||
|
&& url.toLowerCase().startsWith(ABOUT_ADDONS)
|
||||||
|
&& !isAllowed(context, Restriction.DISALLOW_INSTALL_EXTENSION)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// NOTE: Restrictions hold the opposite intention, so we need to flip it.
|
// NOTE: Restrictions hold the opposite intention, so we need to flip it.
|
||||||
return !getRestriction(context, restriction);
|
return !getRestriction(context, restriction);
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче