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-20557 Return special error for wrong esp session request #11721

Merged
merged 1 commit into from Sep 19, 2018
Merged

HPCC-20557 Return special error for wrong esp session request #11721

merged 1 commit into from Sep 19, 2018

Conversation

wangkx
Copy link
Member

@wangkx wangkx commented Sep 18, 2018

If a session enabled ESP was used and some web page is still open,
the session timer may trig a session lock request to ESP even if
the ESP has been switched to a session disabled ESP. In this fix,
ESP will detect the problem and return an 'Action not support:...'
error to the session timer. Also clear session cookies from ESP
side.

Signed-off-by: wangkx kevin.wang@lexisnexis.com

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
    • 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

Testing:

@hpcc-jirabot
Copy link

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

@wangkx
Copy link
Member Author

wangkx commented Sep 18, 2018

@RussWhitehead please review.

RussWhitehead
RussWhitehead requested changes Sep 18, 2018
View reviewed changes
esp/bindings/http/platform/httpservice.cpp Outdated
{
if (strieq(method, "lock") || strieq(method, "unlock"))
{
VStringBuffer errMsg("Action not support: %s", method);
Copy link
Member

Choose a reason for hiding this comment

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

Is this displayed to a user? If so it should read "Action not supported:"

@wangkx
Copy link
Member Author

wangkx commented Sep 18, 2018

@RussWhitehead Please review my changes.

@RussWhitehead
Copy link
Member

@wangkx Looks good

HPCC-20557 Return special error for wrong esp session request
8644f5e 
If a session enabled ESP was used and some web page is still open,
the session timer may trig a session lock request to ESP even if
the ESP has been switched to a session disabled ESP. In this fix,
ESP will detect the problem and return an 'Action not supported:...'
error to the session timer. Also clear session cookies from ESP
side.

Signed-off-by: wangkx <kevin.wang@lexisnexis.com>
@HPCCSmoketest
Copy link
Contributor

Automated Smoketest: ✅
OS: centos 7.4.1708 (Linux 3.10.0-327.28.3.el7.x86_64)
Sha: 8644f5e
Build: success
Install hpccsystems-platform-community_7.0.0-rc2.el7.x86_64.rpm
HPCC Start: OK

Unit tests result:

Test total passed failed errors timeout
unittest 94 94 0 0 0
wutoolTest(Dali) 19 19 0 0 0
wutoolTest(Cassandra) 19 19 0 0 0

Regression test result:

phase total pass fail
setup (hthor) 11 11 0
setup (thor) 11 11 0
setup (roxie) 11 11 0
test (hthor) 806 806 0
test (thor) 730 730 0
test (roxie) 879 879 0

HPCC Stop: OK
HPCC Uninstall: OK
Time stats:

Prep time Build time Package time Install time Start time Test time Stop time Summary
25 sec (00:00:25) 190 sec (00:03:10) 94 sec (00:01:34) 21 sec (00:00:21) 44 sec (00:00:44) 1556 sec (00:25:56) 19 sec (00:00:19) 1949 sec (00:32:29)

@wangkx
Copy link
Member Author

wangkx commented Sep 18, 2018

@richardkchapman this PR is ready to be merged.

@richardkchapman richardkchapman merged commit b1962e4 into hpcc-systems:master Sep 19, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RussWhitehead RussWhitehead RussWhitehead requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
5 participants
@wangkx @hpcc-jirabot @RussWhitehead @HPCCSmoketest @richardkchapman