mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1361220 - Remove browser.formfill.saveHttpsForms support. r=MattN 

MozReview-Commit-ID: 3c1oDYnz3KC

--HG--
extra : rebase_source : c7149bea93fa55824a0a944fa749c8110d20b977
This commit is contained in:
Jonathan Guillotte-Blouin 2017-05-10 13:48:33 -07:00
Родитель 75759ac516
Коммит 1c665e5690
4 изменённых файлов: 15 добавлений и 70 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
modules/libpref/init/all.js
Просмотреть файл

@ -4449,7 +4449,6 @@ pref("signon.masterPasswordReprompt.timeout_ms", 900000); // 15 Minutes
pref("browser.formfill.debug", false);
pref("browser.formfill.enable", true);
pref("browser.formfill.expire_days", 180);
pref("browser.formfill.saveHttpsForms", true);
pref("browser.formfill.agedWeight", 2);
pref("browser.formfill.bucketSize", 1);
pref("browser.formfill.maxTimeGroupings", 25);

9
toolkit/components/satchel/formSubmitListener.js
Просмотреть файл

@ -20,7 +20,6 @@ var satchelFormListener = {
debug: true,
enabled: true,
saveHttpsForms: true,
init() {
Services.obs.addObserver(this, "earlyformsubmit");
@ -32,7 +31,6 @@ var satchelFormListener = {
updatePrefs() {
this.debug = Services.prefs.getBoolPref("browser.formfill.debug");
this.enabled = Services.prefs.getBoolPref("browser.formfill.enable");
this.saveHttpsForms = Services.prefs.getBoolPref("browser.formfill.saveHttpsForms");
},
// Implements the Luhn checksum algorithm as described at
@ -95,13 +93,6 @@ var satchelFormListener = {
this.log("Form submit observer notified.");
if (!this.saveHttpsForms) {
if (actionURI.schemeIs("https"))
return;
if (form.ownerDocument.documentURIObject.schemeIs("https"))
return;
}
if (form.hasAttribute("autocomplete") &&
form.getAttribute("autocomplete").toLowerCase() == "off")
return;

10
toolkit/components/satchel/test/subtst_form_submission_1.html
Просмотреть файл

@ -6,11 +6,6 @@
<body>
<form id="subform1" onsubmit="return checkSubmit(21)">
<input id="subtest1" type="text" name="subtest1">
<button type="submit">Submit</button>
</form>
<form id="subform2" onsubmit="return checkSubmit(100)">
<input id="subtest2" type="text" name="subtest2">
<button type="submit">Submit</button>
@ -22,14 +17,11 @@
}
function clickButton(num) {
if (num == 21)
if (num == 100)
document.querySelectorAll("button")[0].click();
else if (num == 100)
document.querySelectorAll("button")[1].click();
}
// set the input's value (can't use a default value, as satchel will ignore it)
document.getElementById("subtest1").value = "subtestValue";
document.getElementById("subtest2").value = "subtestValue";
</script>

65
toolkit/components/satchel/test/test_form_submission.html
Просмотреть файл

@ -142,29 +142,21 @@
<button type="submit">Submit</button>
</form>
<!-- form data submitted through HTTPS, when browser.formfill.saveHttpsForms is false -->
<form id="form20" action="https://www.example.com/" onsubmit="return checkSubmit(20)">
<input type="text" name="test1">
<button type="submit">Submit</button>
</form>
<!-- Form 21 is submitted into an iframe, not declared here. -->
<!-- Don't save values if the form is invalid. -->
<form id="form22" onsubmit="return checkSubmit(22);">
<input type='email' name='test1' oninvalid="return checkSubmit(22);">
<form id="form20" onsubmit="return checkSubmit(20);">
<input type='email' name='test1' oninvalid="return checkSubmit(20);">
<button type='submit'>Submit</button>
</form>
<!-- Don't save values if the form is invalid. -->
<form id="form23" onsubmit="return checkSubmit(23);">
<input type='email' value='foo' oninvalid="return checkSubmit(23);">
<form id="form21" onsubmit="return checkSubmit(21);">
<input type='email' value='foo' oninvalid="return checkSubmit(21);">
<input type='text' name='test1'>
<button type='submit'>Submit</button>
</form>
<!-- Don't save values if the input name is 'searchbar-history' -->
<form id="form24" onsubmit="return checkSubmit(24);">
<form id="form22" onsubmit="return checkSubmit(22);">
<input type='text' name='searchbar-history'>
<button type='submit'>Submit</button>
</form>
@ -246,12 +238,6 @@
<button type="submit">Submit</button>
</form>
<!-- regular form data, when browser.formfill.saveHttpsForms is false -->
<form id="form110" onsubmit="return checkSubmit(110)">
<input type="text" name="test10">
<button type="submit">Submit</button>
</form>
</div>
<pre id="test">
<script class="testbody" type="text/javascript">
@ -333,9 +319,8 @@ function startTest() {
$_(18, "test1").value = "0000-0000-0080-4609";
$_(19, "test1").value = "0000 0000 0222 331";
$_(20, "test1").value = "dontSaveThis";
$_(22, "test1").value = "dontSaveThis";
$_(23, "test1").value = "dontSaveThis";
$_(24, "searchbar-history").value = "dontSaveThis";
$_(21, "test1").value = "dontSaveThis";
$_(22, "searchbar-history").value = "dontSaveThis";
$_(101, "test1").value = "savedValue";
$_(102, "test2").value = "savedValue";
@ -355,7 +340,6 @@ function startTest() {
}
$_(109, "test9").value = "savedValue";
$_(110, "test10").value = "savedValue";
// submit the first form.
var button = getFormSubmitButton(1);
@ -394,8 +378,6 @@ function checkSubmit(formNum) {
case 20:
case 21:
case 22:
case 23:
case 24:
countEntries(null, null,
function(num) {
ok(!num, "checking for empty storage");
@ -436,9 +418,6 @@ function checkSubmit(formNum) {
case 109:
checkForSave("test9", "savedValue", "checking saved value");
break;
case 110:
checkForSave("test10", "savedValue", "checking saved value");
break;
default:
ok(false, "Unexpected form submission");
break;
@ -448,17 +427,10 @@ function checkSubmit(formNum) {
}
function submitForm(formNum) {
// Forms 20 and 21 requires browser.formfill.saveHttpsForms to be false
if (formNum == 19)
SpecialPowers.setBoolPref("browser.formfill.saveHttpsForms", false);
// Reset preference now that 20 and 21 are over
if (formNum == 21)
SpecialPowers.clearUserPref("browser.formfill.saveHttpsForms");
// End the test now on SeaMonkey.
if (formNum == 21 && navigator.userAgent.match(/ SeaMonkey\//)) {
if (formNum == 20 && navigator.userAgent.match(/ SeaMonkey\//)) {
checkObserver.uninit();
is(numSubmittedForms, 21, "Ensuring all forms were submitted.");
is(numSubmittedForms, 20, "Ensuring all forms were submitted.");
todo(false, "Skipping remaining checks on SeaMonkey ftb. (Bug 589471)");
// finish(), yet let the test actually end first, to be safe.
@ -467,20 +439,11 @@ function submitForm(formNum) {
return false; // return false to cancel current form submission
}
// Form 109 requires browser.formfill.save_https_forms to be true;
// Form 110 requires it to be false.
if (formNum == 108)
SpecialPowers.setBoolPref("browser.formfill.saveHttpsForms", true);
if (formNum == 109)
SpecialPowers.setBoolPref("browser.formfill.saveHttpsForms", false);
if (formNum == 110)
SpecialPowers.clearUserPref("browser.formfill.saveHttpsForms");
// End the test at the last form.
if (formNum == 110) {
is(numSubmittedForms, 35, "Ensuring all forms were submitted.");
if (formNum == 109) {
is(numSubmittedForms, 32, "Ensuring all forms were submitted.");
checkObserver.uninit();
SimpleTest.finish();
SimpleTest.executeSoon(SimpleTest.finish);
return false; // return false to cancel current form submission
}
@ -494,11 +457,11 @@ function submitForm(formNum) {
//
setTimeout(function() {
checkObserver.waitForChecks(function() {
var nextFormNum = formNum == 24 ? 100 : (formNum + 1);
var nextFormNum = formNum == 22 ? 100 : (formNum + 1);
// Submit the next form. Special cases are Forms 21 and 100, which happen
// from an HTTPS domain in an iframe.
if (nextFormNum == 21 || nextFormNum == 100) {
if (nextFormNum == 100) {
ok(true, "submitting iframe test " + nextFormNum);
SpecialPowers.wrap(document.getElementById("iframe").contentWindow).wrappedJSObject.clickButton(nextFormNum);
} else {