Skip to content

ZEPPLIN-976 ] HotFix - zeppelin server does not restart when incorrect credentials data. #976

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

Closed
cloverhearts wants to merge 6 commits into from
Closed

ZEPPLIN-976 ] HotFix - zeppelin server does not restart when incorrect credentials data. #976

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1e5cd72
Credentials Json serialize backend bug.
cloverhearts Jun 8, 2016
4b9aba3
changed status code for CredentialsRestapi
cloverhearts Jun 8, 2016
e9a1e93
Merge branch 'master' into hotfix/CredentialsJsonBug
cloverhearts Jun 14, 2016
5079495
add test code for credentials backends about invalid request.
cloverhearts Jun 14, 2016
ef256c2
Merge branch 'master' into hotfix/CredentialsJsonBug
cloverhearts Jun 14, 2016
293ab08
Merge branch 'master' into hotfix/CredentialsJsonBug
cloverhearts Jun 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion zeppelin-server/src/main/java/org/apache/zeppelin/rest/CredentialRestApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,15 @@ public CredentialRestApi(Credentials credentials) {
@PUT
public Response putCredentials(String message) throws IOException {
Map<String, String> messageMap = gson.fromJson(message,
new TypeToken<Map<String, String>>(){}.getType());
new TypeToken<Map<String, String>>(){}.getType());
String entity = messageMap.get("entity");
String username = messageMap.get("username");
String password = messageMap.get("password");

if (entity == null || username == null || password == null) {

@bzz bzz Jun 9, 2016

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

And they could not be "", or is that case is ok?

@cloverhearts cloverhearts Jun 10, 2016

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

An empty string does not have a problem in Zeppelin server.
I only solve a serious trouble in this pr.

return new JsonResponse(Status.BAD_REQUEST, "", "").build();
}

String user = SecurityUtils.getPrincipal();
logger.info("Update credentials for user {} entity {}", user, entity);
UserCredentials uc = credentials.getUserCredentials(user);
Expand Down
4 changes: 4 additions & 0 deletions zeppelin-web/src/app/credential/credential.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ angular.module('zeppelinWebApp').controller('CredentialCtrl', function($scope, $
$http, baseUrlSrv) {
$scope._ = _;

$scope.credentialEntity = '';
$scope.credentialUsername = '';
$scope.credentialPassword = '';

$scope.updateCredentials = function() {
$http.put(baseUrlSrv.getRestApiBase() + '/credential',
{ 'entity': $scope.credentialEntity,
Expand Down