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.

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

FIO-7498 Changed the passing of a data field to decrypt hook #1694

Merged
merged 1 commit into from
Feb 1, 2024

Conversation

antonSoftensity
Copy link
Contributor

Link to Jira Ticket

https://formio.atlassian.net/browse/FIO-7498

Description

Changed the way to pass the data to decrypt hook, so that if decrypt fails it should display hashed value instead of buffer array

Dependencies

Use this section to list any dependent changes/PRs in other Form.io modules

How has this PR been tested?

Use this section to describe how you tested your changes; if you haven't included automated tests, justify your reasoning

Checklist:

  • I have completed the above PR template
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation (if applicable)
  • My changes generate no new warnings
  • My changes include tests that prove my fix is effective (or that my feature works as intended)
  • New and existing unit/integration tests pass locally with my changes
  • Any dependent changes have corresponding PRs that are listed above

@@ -176,8 +176,8 @@ module.exports = (router) => {
);
}
else {
if (req.encryptedComponents && Object.keys(req.encryptedComponents).includes(key) && field.buffer) {
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm suspicious of this change only because other decrypt routines that we use contain a check for buffer-like properties before proceeding. Can you explain why this situation differs?

Copy link
Contributor Author

@antonSoftensity antonSoftensity Feb 1, 2024

Choose a reason for hiding this comment

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

the way I see it is we have 2 ways to pass data to decrypt function, just the regular data object, or the buffer field inside of it (i.e. formio-server encryptDecrypt passes a data object to decrypt function). In this case, I made this particular change so that if the server can't decrypt data (in case we don't have a secret or the project isn't loaded), the returned data would be in form of hashed value instead of the buffer array

@brendanbond brendanbond merged commit fd90cec into master Feb 1, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants