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

HPCC-30455 Fix a bug when trying to validate empty host #17912

Merged
merged 1 commit into from
Oct 24, 2023
Merged

HPCC-30455 Fix a bug when trying to validate empty host #17912

merged 1 commit into from
Oct 24, 2023

Conversation

wangkx
Copy link
Member

@wangkx wangkx commented Oct 17, 2023

When File Upload dialog box is displayed in a containerized environment, it sends a FileList request with an empty Netaddr to ESP FileSpray service. The service should not validate the Netaddr.

Type of change:

  • This change is a bug fix (non-breaking change which fixes an issue).
  • This change is a new feature (non-breaking change which adds functionality).
  • This change improves the code (refactor or other change that does not change the functionality)
  • This change fixes warnings (the fix does not alter the functionality or the generated code)
  • This change is a breaking change (fix or feature that will cause existing behavior to change).
  • This change alters the query API (existing queries will have to be recompiled)

Checklist:

  • My code follows the code style of this project.
    • My code does not create any new warnings from compiler, build system, or lint.
  • The commit message is properly formatted and free of typos.
    • The commit message title makes sense in a changelog, by itself.
    • The commit is signed.
  • My change requires a change to the documentation.
    • I have updated the documentation accordingly, or...
    • I have created a JIRA ticket to update the documentation.
    • Any new interfaces or exported functions are appropriately commented.
  • I have read the CONTRIBUTORS document.
  • The change has been fully tested:
    • I have added tests to cover my changes.
    • All new and existing tests passed.
    • I have checked that this change does not introduce memory leaks.
    • I have used Valgrind or similar tools to check for potential issues.
  • I have given due consideration to all of the following potential concerns:
    • Scalability
    • Performance
    • Security
    • Thread-safety
    • Cloud-compatibility
    • Premature optimization
    • Existing deployed queries will not be broken
    • This change fixes the problem, not just the symptom
    • The target branch of this pull request is appropriate for such a change.
  • There are no similar instances of the same problem that should be addressed
    • I have addressed them here
    • I have raised JIRA issues to address them separately
  • This is a user interface / front-end modification
    • I have tested my changes in multiple modern browsers
    • The component(s) render as expected

Smoketest:

  • Send notifications about my Pull Request position in Smoketest queue.
  • Test my draft Pull Request.

Testing:

HPCC-30455 Fix a bug when trying to validate empty host
9605b7f 
When File Upload dialog box is displayed in a containerized
environment, it sends a FileList request with an empty Netaddr
to ESP FileSpray service. The service should not validate the
Netaddr.

Signed-off-by: wangkx <[email protected]>
@wangkx wangkx requested a review from jakesmith October 17, 2023 21:08
@github-actions
Copy link

https://track.hpccsystems.com/browse/HPCC-30455
Jira updated

jakesmith
jakesmith approved these changes Oct 17, 2023
View reviewed changes
Copy link
Member

@jakesmith jakesmith left a comment

Choose a reason for hiding this comment

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

@wangkx - approved, but 1 question.

esp/smc/SMCLib/TpCommon.cpp
if (!isEmptyString(hostToCheck) && !isHostInPlane(dropZone, hostToCheck, isIPAddress(hostToCheck)))
throw makeStringExceptionV(ECLWATCH_INVALID_INPUT, "The host '%s' is not valid for dropzone %s.", host, dropZoneName);
if (!isEmptyString(pathToCheck) && !isPathInPlane(dropZone, pathToCheck))
throw makeStringExceptionV(ECLWATCH_INVALID_INPUT, "The path '%s' is not valid for dropzone %s.", path, dropZoneName);
Copy link
Member

Choose a reason for hiding this comment

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

looks ok, and improves the error reporting,

but using validateDropZone was problematic because hostToCheck was not null, but was empty?
If so, validateDropZone should probably be changed too, changing if (host) to if (!isEmptyString(host))

Copy link
Member Author

Choose a reason for hiding this comment

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

but using validateDropZone was problematic because hostToCheck was not null, but was empty?

Yes.

If so, validateDropZone should probably be changed too, changing if (host) to if (!isEmptyString(host))

I was wondering why the validateDropZone() uses 'if (host)' not 'if (!isEmptyString(host))'. I will create another JIRA to change it.

Copy link
Member Author

Choose a reason for hiding this comment

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

https://track.hpccsystems.com/browse/HPCC-30565

jakesmith
jakesmith approved these changes Oct 18, 2023
View reviewed changes
Copy link
Member

@jakesmith jakesmith left a comment

Choose a reason for hiding this comment

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

@wangkx looks good

@wangkx
Copy link
Member Author

wangkx commented Oct 19, 2023

@ghalliday please merge

@ghalliday ghalliday merged commit fbec473 into hpcc-systems:candidate-9.2.x Oct 24, 2023
50 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jakesmith jakesmith jakesmith approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@wangkx @jakesmith @ghalliday