Repository: zeppelin Updated Branches: refs/heads/branch-0.6 a4f19148a -> c503f450c
ZEPPLIN-976 ] HotFix - zeppelin server does not restart when incorrect credentials data. ### What is this PR zeppelin server does not restart when incorrect credentials data. reproduce. 1. Click to zeppelin home for web ui. 2. Click to zeppelin Credentials. 3. 'Entity' information without writing, username and password only written to storage. 4. Click to zeppelin home for web ui. 5. Click to zeppelin Credentials. and zeppelin restart. ##### but, Zeppelin does not work. It creates the wrong json file. 'conf / credentials.json' according to the null. ### What type of PR is it? Hot Fix ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-976 ### How should this be tested? 1. Click to zeppelin home for web ui. 2. Click to zeppelin Credentials. 3. 'Entity' information without writing, username and password only written to storage. 4. Click to zeppelin home for web ui. 5. Click to zeppelin Credentials. and zeppelin restart. zeppelin does work! ### Reproduced Screenshots  ### Questions: * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: CloverHearts <[email protected]> Closes #976 from cloverhearts/hotfix/CredentialsJsonBug and squashes the following commits: 293ab08 [CloverHearts] Merge branch 'master' into hotfix/CredentialsJsonBug ef256c2 [CloverHearts] Merge branch 'master' into hotfix/CredentialsJsonBug 5079495 [CloverHearts] add test code for credentials backends about invalid request. e9a1e93 [CloverHearts] Merge branch 'master' into hotfix/CredentialsJsonBug 4b9aba3 [CloverHearts] changed status code for CredentialsRestapi 1e5cd72 [CloverHearts] Credentials Json serialize backend bug. Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/c503f450 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/c503f450 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/c503f450 Branch: refs/heads/branch-0.6 Commit: c503f450c78c55e2c1369ecc3e11f082e865b048 Parents: a4f1914 Author: CloverHearts <[email protected]> Authored: Wed Jun 15 14:01:28 2016 +0900 Committer: Alexander Bezzubov <[email protected]> Committed: Wed Jun 15 18:24:22 2016 +0900 ---------------------------------------------------------------------- .../apache/zeppelin/rest/CredentialRestApi.java | 7 +- .../zeppelin/rest/CredentialsRestApiTest.java | 76 ++++++++++++++++++++ .../src/app/credential/credential.controller.js | 4 ++ 3 files changed, 86 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c503f450/zeppelin-server/src/main/java/org/apache/zeppelin/rest/CredentialRestApi.java ---------------------------------------------------------------------- diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/rest/CredentialRestApi.java b/zeppelin-server/src/main/java/org/apache/zeppelin/rest/CredentialRestApi.java index b1a4d17..6904a32 100644 --- a/zeppelin-server/src/main/java/org/apache/zeppelin/rest/CredentialRestApi.java +++ b/zeppelin-server/src/main/java/org/apache/zeppelin/rest/CredentialRestApi.java @@ -63,10 +63,15 @@ public class CredentialRestApi { @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) { + 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); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c503f450/zeppelin-server/src/test/java/org/apache/zeppelin/rest/CredentialsRestApiTest.java ---------------------------------------------------------------------- diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/CredentialsRestApiTest.java b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/CredentialsRestApiTest.java new file mode 100644 index 0000000..674c47e --- /dev/null +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/CredentialsRestApiTest.java @@ -0,0 +1,76 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.zeppelin.rest; + +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import org.apache.commons.httpclient.methods.GetMethod; +import org.apache.commons.httpclient.methods.PutMethod; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + +import java.io.IOException; +import java.util.Map; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThat; + +public class CredentialsRestApiTest extends AbstractTestRestApi { + Gson gson = new Gson(); + + @BeforeClass + public static void init() throws Exception { + AbstractTestRestApi.startUp(); + } + + @AfterClass + public static void destroy() throws Exception { + AbstractTestRestApi.shutDown(); + } + + @Test + public void testInvalidRequest() throws IOException { + String jsonInvalidRequestEntityNull = "{\"entity\" : null, \"username\" : \"test\", \"password\" : \"testpass\"}"; + String jsonInvalidRequestNameNull = "{\"entity\" : \"test\", \"username\" : null, \"password\" : \"testpass\"}"; + String jsonInvalidRequestPasswordNull = "{\"entity\" : \"test\", \"username\" : \"test\", \"password\" : null}"; + String jsonInvalidRequestAllNull = "{\"entity\" : null, \"username\" : null, \"password\" : null}"; + + PutMethod entityNullPut = httpPut("/credential", jsonInvalidRequestEntityNull); + entityNullPut.addRequestHeader("Origin", "http://localhost";); + assertThat(entityNullPut, isBadRequest()); + entityNullPut.releaseConnection(); + + PutMethod nameNullPut = httpPut("/credential", jsonInvalidRequestNameNull); + nameNullPut.addRequestHeader("Origin", "http://localhost";); + assertThat(nameNullPut, isBadRequest()); + nameNullPut.releaseConnection(); + + PutMethod passwordNullPut = httpPut("/credential", jsonInvalidRequestPasswordNull); + passwordNullPut.addRequestHeader("Origin", "http://localhost";); + assertThat(passwordNullPut, isBadRequest()); + passwordNullPut.releaseConnection(); + + PutMethod allNullPut = httpPut("/credential", jsonInvalidRequestAllNull); + allNullPut.addRequestHeader("Origin", "http://localhost";); + assertThat(allNullPut, isBadRequest()); + allNullPut.releaseConnection(); + } + +} + http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c503f450/zeppelin-web/src/app/credential/credential.controller.js ---------------------------------------------------------------------- diff --git a/zeppelin-web/src/app/credential/credential.controller.js b/zeppelin-web/src/app/credential/credential.controller.js index 4bb89f0..11dff3e 100644 --- a/zeppelin-web/src/app/credential/credential.controller.js +++ b/zeppelin-web/src/app/credential/credential.controller.js @@ -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,
