From 9ef93d0f3f417c09d2c24e9cceaf600eeb8ff44a Mon Sep 17 00:00:00 2001 From: Henrique Nakashima Date: Wed, 3 Oct 2018 18:41:03 +0000 Subject: Reland "Make potentially dangerous Actions require a user click." This is a reland of 9d784c291714b703b16185e69860a3797de85b6c https://chromium-review.googlesource.com/c/chromium/src/+/1244367 was submitted changing the test that broke with this CL to not depend on PDF OpenActions anymore. Original change's description: > Make potentially dangerous Actions require a user click. > > URI and SubmitForm actions are only handled if the event was > ButtonUp or ButtonDown. > > Bug: 851821 > Change-Id: If6eb0ff44f6d62ac6df50b552c0bdc582885ab5d > Reviewed-on: https://pdfium-review.googlesource.com/42731 > Commit-Queue: Henrique Nakashima > Reviewed-by: Tom Sepez > Reviewed-by: Ryan Harrison Bug: 851821 Change-Id: Iaf9c399059590f0f1a050ac450e08ee60a8d5a38 Reviewed-on: https://pdfium-review.googlesource.com/43410 Commit-Queue: Henrique Nakashima Reviewed-by: Tom Sepez Reviewed-by: Ryan Harrison --- fpdfsdk/cpdfsdk_actionhandler.cpp | 31 +++++++++++++++++++------------ fpdfsdk/cpdfsdk_actionhandler.h | 4 ++++ fpdfsdk/cpdfsdk_widget.cpp | 1 + fpdfsdk/fpdf_formfill_embeddertest.cpp | 19 +++++++++++++++++++ 4 files changed, 43 insertions(+), 12 deletions(-) (limited to 'fpdfsdk') diff --git a/fpdfsdk/cpdfsdk_actionhandler.cpp b/fpdfsdk/cpdfsdk_actionhandler.cpp index f951bfb9fe..f98585f2a1 100644 --- a/fpdfsdk/cpdfsdk_actionhandler.cpp +++ b/fpdfsdk/cpdfsdk_actionhandler.cpp @@ -82,7 +82,7 @@ bool CPDFSDK_ActionHandler::DoAction_BookMark( CPDF_AAction::AActionType type, CPDFSDK_FormFillEnvironment* pFormFillEnv) { std::set visited; - return ExecuteBookMark(action, pFormFillEnv, pBookMark, &visited); + return ExecuteBookMark(action, type, pFormFillEnv, pBookMark, &visited); } bool CPDFSDK_ActionHandler::DoAction_Screen( @@ -96,9 +96,10 @@ bool CPDFSDK_ActionHandler::DoAction_Screen( bool CPDFSDK_ActionHandler::DoAction_Link( const CPDF_Action& action, + CPDF_AAction::AActionType type, CPDFSDK_FormFillEnvironment* pFormFillEnv) { std::set visited; - return ExecuteLinkAction(action, pFormFillEnv, &visited); + return ExecuteLinkAction(action, type, pFormFillEnv, &visited); } bool CPDFSDK_ActionHandler::DoAction_Field( @@ -130,7 +131,8 @@ bool CPDFSDK_ActionHandler::ExecuteDocumentOpenAction( RunDocumentOpenJavaScript(pFormFillEnv, L"", swJS); } } else { - DoAction_NoJs(action, pFormFillEnv); + DoAction_NoJs(action, CPDF_AAction::AActionType::DocumentOpen, + pFormFillEnv); } for (int32_t i = 0, sz = action.GetSubActionsCount(); i < sz; i++) { @@ -144,6 +146,7 @@ bool CPDFSDK_ActionHandler::ExecuteDocumentOpenAction( bool CPDFSDK_ActionHandler::ExecuteLinkAction( const CPDF_Action& action, + CPDF_AAction::AActionType eType, CPDFSDK_FormFillEnvironment* pFormFillEnv, std::set* visited) { const CPDF_Dictionary* pDict = action.GetDict(); @@ -159,12 +162,12 @@ bool CPDFSDK_ActionHandler::ExecuteLinkAction( context->OnLink_MouseUp(pFormFillEnv); }); } else { - DoAction_NoJs(action, pFormFillEnv); + DoAction_NoJs(action, eType, pFormFillEnv); } for (int32_t i = 0, sz = action.GetSubActionsCount(); i < sz; i++) { CPDF_Action subaction = action.GetSubAction(i); - if (!ExecuteLinkAction(subaction, pFormFillEnv, visited)) + if (!ExecuteLinkAction(subaction, eType, pFormFillEnv, visited)) return false; } @@ -190,7 +193,7 @@ bool CPDFSDK_ActionHandler::ExecuteDocumentPageAction( RunDocumentPageJavaScript(pFormFillEnv, type, swJS); } } else { - DoAction_NoJs(action, pFormFillEnv); + DoAction_NoJs(action, type, pFormFillEnv); } ASSERT(pFormFillEnv); @@ -238,7 +241,7 @@ bool CPDFSDK_ActionHandler::ExecuteFieldAction( } } } else { - DoAction_NoJs(action, pFormFillEnv); + DoAction_NoJs(action, type, pFormFillEnv); } for (int32_t i = 0, sz = action.GetSubActionsCount(); i < sz; i++) { @@ -267,7 +270,7 @@ bool CPDFSDK_ActionHandler::ExecuteScreenAction( if (action.GetType() == CPDF_Action::JavaScript) RunScriptForAction(action, pFormFillEnv, [](IJS_EventContext*) {}); else - DoAction_NoJs(action, pFormFillEnv); + DoAction_NoJs(action, type, pFormFillEnv); for (int32_t i = 0, sz = action.GetSubActionsCount(); i < sz; i++) { CPDF_Action subaction = action.GetSubAction(i); @@ -280,6 +283,7 @@ bool CPDFSDK_ActionHandler::ExecuteScreenAction( bool CPDFSDK_ActionHandler::ExecuteBookMark( const CPDF_Action& action, + CPDF_AAction::AActionType type, CPDFSDK_FormFillEnvironment* pFormFillEnv, CPDF_Bookmark* pBookmark, std::set* visited) { @@ -296,12 +300,12 @@ bool CPDFSDK_ActionHandler::ExecuteBookMark( context->OnBookmark_MouseUp(pBookmark); }); } else { - DoAction_NoJs(action, pFormFillEnv); + DoAction_NoJs(action, type, pFormFillEnv); } for (int32_t i = 0, sz = action.GetSubActionsCount(); i < sz; i++) { CPDF_Action subaction = action.GetSubAction(i); - if (!ExecuteBookMark(subaction, pFormFillEnv, pBookmark, visited)) + if (!ExecuteBookMark(subaction, type, pFormFillEnv, pBookmark, visited)) return false; } @@ -310,6 +314,7 @@ bool CPDFSDK_ActionHandler::ExecuteBookMark( void CPDFSDK_ActionHandler::DoAction_NoJs( const CPDF_Action& action, + CPDF_AAction::AActionType type, CPDFSDK_FormFillEnvironment* pFormFillEnv) { ASSERT(pFormFillEnv); @@ -318,7 +323,8 @@ void CPDFSDK_ActionHandler::DoAction_NoJs( DoAction_GoTo(pFormFillEnv, action); break; case CPDF_Action::URI: - DoAction_URI(pFormFillEnv, action); + if (CPDF_AAction::IsUserClick(type)) + DoAction_URI(pFormFillEnv, action); break; case CPDF_Action::Hide: DoAction_Hide(action, pFormFillEnv); @@ -327,7 +333,8 @@ void CPDFSDK_ActionHandler::DoAction_NoJs( DoAction_Named(pFormFillEnv, action); break; case CPDF_Action::SubmitForm: - DoAction_SubmitForm(action, pFormFillEnv); + if (CPDF_AAction::IsUserClick(type)) + DoAction_SubmitForm(action, pFormFillEnv); break; case CPDF_Action::ResetForm: DoAction_ResetForm(action, pFormFillEnv); diff --git a/fpdfsdk/cpdfsdk_actionhandler.h b/fpdfsdk/cpdfsdk_actionhandler.h index 14cbc9c5c5..94b347f630 100644 --- a/fpdfsdk/cpdfsdk_actionhandler.h +++ b/fpdfsdk/cpdfsdk_actionhandler.h @@ -44,6 +44,7 @@ class CPDFSDK_ActionHandler { CPDFSDK_FormFillEnvironment* pFormFillEnv, CPDFSDK_Annot* pScreen); bool DoAction_Link(const CPDF_Action& action, + CPDF_AAction::AActionType type, CPDFSDK_FormFillEnvironment* pFormFillEnv); bool DoAction_Field(const CPDF_Action& action, CPDF_AAction::AActionType type, @@ -85,14 +86,17 @@ class CPDFSDK_ActionHandler { CPDFSDK_Annot* pScreen, std::set* visited); bool ExecuteBookMark(const CPDF_Action& action, + CPDF_AAction::AActionType type, CPDFSDK_FormFillEnvironment* pFormFillEnv, CPDF_Bookmark* pBookmark, std::set* visited); bool ExecuteLinkAction(const CPDF_Action& action, + CPDF_AAction::AActionType type, CPDFSDK_FormFillEnvironment* pFormFillEnv, std::set* visited); void DoAction_NoJs(const CPDF_Action& action, + CPDF_AAction::AActionType type, CPDFSDK_FormFillEnvironment* pFormFillEnv); void RunDocumentPageJavaScript(CPDFSDK_FormFillEnvironment* pFormFillEnv, CPDF_AAction::AActionType type, diff --git a/fpdfsdk/cpdfsdk_widget.cpp b/fpdfsdk/cpdfsdk_widget.cpp index 8bd1f10177..82776e3298 100644 --- a/fpdfsdk/cpdfsdk_widget.cpp +++ b/fpdfsdk/cpdfsdk_widget.cpp @@ -174,6 +174,7 @@ static XFA_EVENTTYPE GetXFAEventType(CPDF_AAction::AActionType eAAT, case CPDF_AAction::PrintDocument: case CPDF_AAction::DocumentPrinted: break; + case CPDF_AAction::DocumentOpen: case CPDF_AAction::NumberOfActions: NOTREACHED(); break; diff --git a/fpdfsdk/fpdf_formfill_embeddertest.cpp b/fpdfsdk/fpdf_formfill_embeddertest.cpp index 8ff3a84291..3e53753b48 100644 --- a/fpdfsdk/fpdf_formfill_embeddertest.cpp +++ b/fpdfsdk/fpdf_formfill_embeddertest.cpp @@ -379,6 +379,25 @@ TEST_F(FPDFFormFillEmbeddertest, BUG_514690) { UnloadPage(page); } +class DoURIActionBlockedDelegate final : public EmbedderTest::Delegate { + public: + void DoURIAction(FPDF_BYTESTRING uri) override { + FAIL() << "Navigated to " << uri; + } +}; + +TEST_F(FPDFFormFillEmbeddertest, BUG_851821) { + DoURIActionBlockedDelegate delegate; + SetDelegate(&delegate); + + EXPECT_TRUE(OpenDocument("redirect.pdf")); + FPDF_PAGE page = LoadPage(0); + EXPECT_TRUE(page); + DoOpenActions(); + + UnloadPage(page); +} + #ifdef PDF_ENABLE_V8 TEST_F(FPDFFormFillEmbeddertest, DisableJavaScript) { // Test that timers and intervals can't fire without JS. -- cgit v1.2.3