Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(Webhook Node): Binary data handling #7804

Merged
merged 12 commits into from
Dec 6, 2023
Merged

fix(Webhook Node): Binary data handling #7804

merged 12 commits into from
Dec 6, 2023

Conversation

michael-radency
Copy link
Contributor

@michael-radency michael-radency commented Nov 24, 2023 •
edited by netroy
Loading

@michael-radency michael-radency added node/improvement New feature or request n8n team Authored by the n8n team node/issue Issue with a node labels Nov 24, 2023
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 6, 2023

⚠️ Some Cypress E2E specs are failing, please fix them before merging

@cypress Cypress
Copy link

cypress bot commented Dec 6, 2023 •
edited
Loading

Passing run #3219 ↗︎

0 297 5 0 Flakiness 0

Details:

🌳 🖥️ browsers:node18.12.0-chrome107 🤖 michael-radency 🗃️ e2e/*
Project: n8n Commit: 1fc5568562
Status: Passed Duration: 06:29 💡
Started: Dec 6, 2023 3:37 PM Ended: Dec 6, 2023 3:44 PM

Review all test suite changes for PR #7804 ↗︎

@michael-radency
Merge branch 'master' of https://github.com/n8n-io/n8n into node-807-…
dbe95c0 
…webhook-trigger-not-always-returning-data
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 6, 2023

⚠️ Some Cypress E2E specs are failing, please fix them before merging

3 similar comments
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 6, 2023

⚠️ Some Cypress E2E specs are failing, please fix them before merging

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 6, 2023

⚠️ Some Cypress E2E specs are failing, please fix them before merging

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 6, 2023

⚠️ Some Cypress E2E specs are failing, please fix them before merging

maspio
maspio previously approved these changes Dec 6, 2023
View reviewed changes
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 6, 2023

⚠️ Some Cypress E2E specs are failing, please fix them before merging

1 similar comment
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 6, 2023

⚠️ Some Cypress E2E specs are failing, please fix them before merging

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 6, 2023

✅ All Cypress E2E specs passed

@michael-radency michael-radency merged commit 565b409 into master Dec 6, 2023
19 checks passed
@michael-radency michael-radency deleted the node-807-webhook-trigger-not-always-returning-data branch December 6, 2023 15:46
netroy
netroy reviewed Dec 11, 2023
View reviewed changes
packages/nodes-base/nodes/Webhook/Webhook.node.ts
Comment on lines +129 to +133
if (nodeVersion > 1 && !req.body && !options.rawBody) {
try {
return await this.handleBinaryData(context);
} catch (error) {}
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change means that now every single GET webhook gets a .binary object set, even though there is not binary data present.
This causes errors here.
We need to

  1. improve the checks here to create .binary if there actually any data (or maybe just check if the method is POST, PATCH, or `PUT).
  2. update the workflowExecuteAfter hook to make sure that restoreBinaryDataId does not fail.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

improve the checks here to create .binary if there actually any data

it's checked in handleBinaryData, agree that we could add check for httpMethod type as generally only those methods would have binaries

			const binaryPropertyName = (options.binaryPropertyName || 'data') as string;
			const fileName = req.contentDisposition?.filename ?? uuid();
			const binaryData = await context.nodeHelpers.copyBinaryFile(
				binaryFile.path,
				fileName,
				req.contentType ?? 'application/octet-stream',
			);

			if (!binaryData.data) {
				return { workflowData: [[returnItem]] };
			}

			returnItem.binary![binaryPropertyName] = binaryData;

This was referenced Dec 13, 2023
Closed
Merged
ivov added a commit that referenced this pull request Dec 13, 2023
@github-actions @ivov
🚀 Release 1.21.0 (#8019)
1516c84 
#
[1.21.0](https://github.com/n8n-io/n8n/compare/n8n@1.20.0...n8n@1.21.0)
(2023-12-13)


### Bug Fixes

* **core:** Ensure inviter and invitee are set correctly in invite link
([#7943](#7943))
([386bd61](386bd61))
* **core:** Fix user comparison in same-user subworkflow caller policy
([#7913](#7913))
([92bab72](92bab72))
* **core:** Perform multi-main leader check against key ID
([#7964](#7964))
([1a87f70](1a87f70))
* **core:** Ensure external hooks post workflow execute run in queue
mode ([#7947](#7947))
([3ba7deb](3ba7deb))
* **core:** Fix issue preventing secrets from loading if the path
contains - or / ([#7988](#7988))
([0ac9594](0ac9594))
* **core:** Restrict updating/deleting of shared but not owned
credentials ([#7950](#7950))
([42e828d](42e828d))
* **core:** Prevent workflow history saving error from happening
([#7812](#7812))
([e5581ce](e5581ce))
* **editor:** Add missing string for worker in log streaming
([#7971](#7971))
([148bc1d](148bc1d))
* **editor:** Allow SSH protocol in git repository URL for environments
([#7944](#7944))
([bc1c72f](bc1c72f))
* **editor:** Fix bug with node names with certain characters
([#8013](#8013))
([26f0d57](26f0d57))
* **editor:** Fix Webhook URL expansion icon
([#8011](#8011))
([b00b905](b00b905))
* **editor:** Prevent opening NDV search if `/` is typed in a
contenteditable element
([#7968](#7968))
([e8a493f](e8a493f))
* **editor:** Return early in ws message handler if no 'command' keyword
is found ([#7946](#7946))
([5b2defc](5b2defc))
* **FileMaker Node:** Prevent erroring on zero fields loaded
([#7955](#7955))
([10ad386](10ad386))
* **Google Sheets Node:** Prevent erroring on zero sheet search results
([#7957](#7957))
([9b877a9](9b877a9))
* **Google Sheets Node:** Prevent erroring when fetching mapping columns
([#7972](#7972))
([29a1066](29a1066))
* **Postgres Node:** Do not include id column in upsert fields selection
if it's not unique ([#7975](#7975))
([435392c](435392c))
* **Postgres Trigger Node:** Increase manual trigger timeout from 30 to
60 seconds ([#8015](#8015))
([09a5729](09a5729))
* **Webhook Node:** Binary data handling
([#7804](#7804))
([565b409](565b409))
* **Webhook Node:** Do not create binary data when there is no data in
the request ([#8000](#8000))
([70f0755](70f0755))


### Features

* **core:** Add config option for external secret update interval
([#7995](#7995))
([b6c1c04](b6c1c04))
* AI nodes usability fixes + Summarization Chain V2
([#7949](#7949))
([dcf1286](dcf1286))
* **editor:** Data transformation nodes and actions in Nodes Panel
([#7760](#7760))
([675ec21](675ec21))
* **editor:** Add AppCues tracking for onboarding event
([#7945](#7945))
([04cabaf](04cabaf))
* **editor:** Add option to disable NDV in workflow previews
([#7990](#7990))
([393afef](393afef))
* **editor:** Filter component + implement in If node
([#7490](#7490))
([8a53434](8a53434))
* **editor:** Show template credential setup based on feature flag
([#7989](#7989))
([08ee307](08ee307))
* **editor:** Introduce advanced permissions
([#7844](#7844))
([dbd62a4](dbd62a4))
* **Google Ads Node:** Update to support v15
([#7962](#7962))
([7f01269](7f01269))
* **Local File Trigger Node:** Add polling option typically good to
watch network files/folders
([#7942](#7942))
([2fbdfec](2fbdfec))
* **n8n Form Trigger Node:** Improvements
([#7571](#7571))
([953a58f](953a58f))

Co-authored-by: ivov <ivov@users.noreply.github.com>
@janober
Copy link
Member

janober commented Dec 13, 2023

Got released with n8n@1.21.0

@netroy netroy mentioned this pull request Dec 19, 2023
Closed
3 tasks
@Joffcom Joffcom mentioned this pull request Jan 18, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@netroy netroy netroy left review comments

@maspio maspio maspio approved these changes

Assignees
No one assigned
Labels
n8n team Authored by the n8n team node/improvement New feature or request node/issue Issue with a node Released
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@michael-radency @janober @netroy @maspio