Displays a browser window to clear captcha when saving attachments. (#3526)
- Currently enabled only for ScienceDirect. Can be enabled via a whitelist - Matches the HiddenBrowser loaded HTML page for a captcha element. If the captcha element class changes, this will break (but the alternative is potentially displaying a captcha clearing window when something else that is not a captcha guard is loaded). - Captcha clear timeout for 60s. - Doesn't automatically switch focus back to the browser which intiated the item save via the Connector. - Stores the cookies used to clear the captcha for future saves from the same domain. Discards Connector supplied User Agent, since CF bot detector checks UA header against actual UA behavior like TLS handshake and if the UA acts different to what it's supposed to, the bot challenge is not cleared. Other changes: - Adjusted the cookie sandbox to allow multiple cookie sandboxes to be active (and simplified some legacy code that was meant to cover a bug in old FX codebase). - HiddenBrowser API changed to be Object oriented, translator tester in the translate repo will need to be updated after a merge (have the change ready). - Improved Connector Server attachment progress handling
This commit is contained in:
parent
c9b4daf152
commit
8b77c96e97
16 changed files with 607 additions and 342 deletions
|
@ -41,7 +41,8 @@ describe("RemoteTranslate", function () {
|
|||
describe("#setHandler()", function () {
|
||||
it("should receive handler calls from the translator", async function () {
|
||||
let translate = new RemoteTranslate();
|
||||
let browser = await HiddenBrowser.create(getTestDataUrl('test.html'));
|
||||
let browser = new HiddenBrowser();
|
||||
await browser.load(getTestDataUrl('test.html'));
|
||||
await translate.setBrowser(browser);
|
||||
await translate.setTranslator(dummyTranslator);
|
||||
|
||||
|
@ -50,7 +51,7 @@ describe("RemoteTranslate", function () {
|
|||
await translate.detect();
|
||||
sinon.assert.calledWith(debug, translate, 'test string');
|
||||
|
||||
HiddenBrowser.destroy(browser);
|
||||
browser.destroy();
|
||||
translate.dispose();
|
||||
});
|
||||
});
|
||||
|
@ -58,14 +59,15 @@ describe("RemoteTranslate", function () {
|
|||
describe("#setTranslatorProvider()", function () {
|
||||
it("should cause the passed provider to be queried instead of Zotero.Translators", async function () {
|
||||
let translate = new RemoteTranslate();
|
||||
let browser = await HiddenBrowser.create(getTestDataUrl('test.html'));
|
||||
let browser = new HiddenBrowser();
|
||||
await browser.load(getTestDataUrl('test.html'));
|
||||
await translate.setBrowser(browser);
|
||||
translate.setTranslatorProvider(translatorProvider);
|
||||
|
||||
let detectedTranslators = await translate.detect();
|
||||
assert.deepEqual(detectedTranslators.map(t => t.translatorID), [dummyTranslator.translatorID]);
|
||||
|
||||
HiddenBrowser.destroy(browser);
|
||||
browser.destroy();
|
||||
translate.dispose();
|
||||
});
|
||||
});
|
||||
|
@ -73,7 +75,8 @@ describe("RemoteTranslate", function () {
|
|||
describe("#translate()", function () {
|
||||
it("should return items without saving when libraryID is false", async function () {
|
||||
let translate = new RemoteTranslate();
|
||||
let browser = await HiddenBrowser.create(getTestDataUrl('test.html'));
|
||||
let browser = new HiddenBrowser();
|
||||
await browser.load(getTestDataUrl('test.html'));
|
||||
await translate.setBrowser(browser);
|
||||
translate.setTranslatorProvider(translatorProvider);
|
||||
|
||||
|
@ -87,13 +90,14 @@ describe("RemoteTranslate", function () {
|
|||
sinon.assert.notCalled(itemDone); // No items should be saved
|
||||
assert.equal(items[0].title, 'Title');
|
||||
|
||||
HiddenBrowser.destroy(browser);
|
||||
browser.destroy();
|
||||
translate.dispose();
|
||||
});
|
||||
|
||||
it("should save items and call itemDone when libraryID is not false", async function () {
|
||||
let translate = new RemoteTranslate();
|
||||
let browser = await HiddenBrowser.create(getTestDataUrl('test.html'));
|
||||
let browser = new HiddenBrowser();
|
||||
await browser.load(getTestDataUrl('test.html'));
|
||||
await translate.setBrowser(browser);
|
||||
translate.setTranslator(dummyTranslator);
|
||||
|
||||
|
@ -111,13 +115,14 @@ describe("RemoteTranslate", function () {
|
|||
// Item should still be returned
|
||||
assert.equal(items[0].getField('title'), 'Title');
|
||||
|
||||
HiddenBrowser.destroy(browser);
|
||||
browser.destroy();
|
||||
translate.dispose();
|
||||
});
|
||||
|
||||
it("should call itemDone before done", async function () {
|
||||
let translate = new RemoteTranslate();
|
||||
let browser = await HiddenBrowser.create(getTestDataUrl('test.html'));
|
||||
let browser = new HiddenBrowser();
|
||||
await browser.load(getTestDataUrl('test.html'));
|
||||
await translate.setBrowser(browser);
|
||||
translate.setTranslator(dummyTranslator);
|
||||
|
||||
|
@ -131,7 +136,7 @@ describe("RemoteTranslate", function () {
|
|||
sinon.assert.calledOnce(done);
|
||||
assert.isTrue(itemDone.calledBefore(done));
|
||||
|
||||
HiddenBrowser.destroy(browser);
|
||||
browser.destroy();
|
||||
translate.dispose();
|
||||
});
|
||||
|
||||
|
@ -149,14 +154,15 @@ describe("RemoteTranslate", function () {
|
|||
`);
|
||||
|
||||
let translate = new RemoteTranslate();
|
||||
let browser = await HiddenBrowser.create(getTestDataUrl('test.html'));
|
||||
let browser = new HiddenBrowser();
|
||||
await browser.load(getTestDataUrl('test.html'));
|
||||
await translate.setBrowser(browser);
|
||||
translate.setTranslator(domParserDummy);
|
||||
|
||||
let items = await translate.translate({ libraryID: false });
|
||||
assert.equal(items[0].title, 'content');
|
||||
|
||||
HiddenBrowser.destroy(browser);
|
||||
browser.destroy();
|
||||
translate.dispose();
|
||||
});
|
||||
|
||||
|
@ -176,14 +182,15 @@ describe("RemoteTranslate", function () {
|
|||
Zotero.Prefs.set('translators.testPref', 'Test value');
|
||||
|
||||
let translate = new RemoteTranslate();
|
||||
let browser = await HiddenBrowser.create(getTestDataUrl('test.html'));
|
||||
let browser = new HiddenBrowser();
|
||||
await browser.load(getTestDataUrl('test.html'));
|
||||
await translate.setBrowser(browser);
|
||||
translate.setTranslator(domParserDummy);
|
||||
|
||||
let items = await translate.translate({ libraryID: false });
|
||||
assert.equal(items[0].title, 'Test value');
|
||||
|
||||
HiddenBrowser.destroy(browser);
|
||||
browser.destroy();
|
||||
translate.dispose();
|
||||
});
|
||||
});
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue