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-16332 Send error message if root authorization fails #10998

Merged
merged 1 commit into from
Apr 10, 2018
Merged

HPCC-16332 Send error message if root authorization fails #10998

merged 1 commit into from
Apr 10, 2018

Conversation

wangkx
Copy link
Member

@wangkx wangkx commented Apr 2, 2018

If a user logins to ECLWatch with valid credential without SMC
Root access, the existing ECLWatch is redirected to the login
window as if a bad password is entered. In this fix, the
redirect is replaced by sending an error message.

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-16332
Jira updated

@wangkx
Copy link
Member Author

wangkx commented Apr 2, 2018

@RussWhitehead please review.

RussWhitehead
RussWhitehead reviewed Apr 2, 2018
View reviewed changes
Copy link
Member

@RussWhitehead RussWhitehead left a comment

Choose a reason for hiding this comment

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

A couple very minor comments

esp/bindings/http/platform/httpbinding.cpp
if (user->getAuthenticateStatus() == AS_PASSWORD_EXPIRED || user->getAuthenticateStatus() == AS_PASSWORD_VALID_BUT_EXPIRED)
ctx->AuditMessage(AUDIT_TYPE_ACCESS_FAILURE, "Authentication", "ESP password is expired");
desc = "ESP password is expired";
Copy link
Member

Choose a reason for hiding this comment

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

Should be able to call ctx->setRespMsg() and no need for "desc" pointer

Copy link
Member Author

Choose a reason for hiding this comment

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

The "desc" is also used by the AuditMessage().

esp/bindings/http/platform/httpservice.cpp Outdated
}
else
{
resp.setf("<LoginResponse><Error>");
Copy link
Member

Choose a reason for hiding this comment

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

Why setf() ?

Copy link
Member Author

Choose a reason for hiding this comment

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

I should change it to set().

esp/bindings/http/platform/httpservice.cpp
else
resp.appendf("\"Error\": \"%s\"", errMsg);
resp.append(" }");
resp.append(" }");
Copy link
Member

Choose a reason for hiding this comment

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

Would it make sense to combine some of these appends ?

Copy link
Member Author

Choose a reason for hiding this comment

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

It shows the JSON layers better to keep those appends.

@wangkx
Copy link
Member Author

wangkx commented Apr 2, 2018

@RussWhitehead please review again.

@RussWhitehead
Copy link
Member

Looks good

HPCC-16332 Send error message if root authorization fails
1c09389 
If a user logins to ECLWatch with valid credential without SMC
Root access, the existing ECLWatch is redirected to the login
window as if a bad password is entered. In this fix, the
redirect is replaced by sending an error message.

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

Automated Smoketest: ✅
OS: centos 7.2.1511 (Linux 3.10.0-327.28.3.el7.x86_64)
Sha: 1c09389
Build: success
Install hpccsystems-platform-community_6.5.0-trunk0.el7.x86_64.rpm
HPCC Start: OK

Unit tests result:

Test total passed failed errors timeout
unittest 83 83 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) 759 759 0
test (thor) 686 686 0
test (roxie) 799 799 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) 182 sec (00:03:02) 55 sec (00:00:55) 6 sec (00:00:06) 21 sec (00:00:21) 1109 sec (00:18:29) 15 sec (00:00:15) 1413 sec (00:23:33)

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

@RussWhitehead RussWhitehead RussWhitehead left review comments

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

Successfully merging this pull request may close these issues.
5 participants
@wangkx @hpcc-jirabot @RussWhitehead @HPCCSmoketest @richardkchapman