From notifications-return-458-archive-asf-public=cust-asf.ponee.io@zookeeper.apache.org Tue Jun 25 17:53:50 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 30B8618062F for ; Tue, 25 Jun 2019 19:53:50 +0200 (CEST) Received: (qmail 97800 invoked by uid 500); 25 Jun 2019 17:53:49 -0000 Mailing-List: contact notifications-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@zookeeper.apache.org Delivered-To: mailing list notifications@zookeeper.apache.org Received: (qmail 97775 invoked by uid 99); 25 Jun 2019 17:53:49 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Jun 2019 17:53:49 +0000 From: GitBox To: notifications@zookeeper.apache.org Subject: [GitHub] [zookeeper] eolivelli commented on a change in pull request #1003: ZOOKEEPER-3443: Add support of PKCS12 trust/key stores Message-ID: <156148522956.21197.8326918296009747011.gitbox@gitbox.apache.org> Date: Tue, 25 Jun 2019 17:53:49 -0000 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit eolivelli commented on a change in pull request #1003: ZOOKEEPER-3443: Add support of PKCS12 trust/key stores URL: https://github.com/apache/zookeeper/pull/1003#discussion_r297314763 ########## File path: zookeeper-server/src/main/java/org/apache/zookeeper/common/StandardTypeFileKeyStoreLoader.java ########## @@ -0,0 +1,91 @@ +/** + * 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.zookeeper.common; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.security.GeneralSecurityException; +import java.security.KeyStore; +import java.security.KeyStoreException; + +/** + * Base class for instances of {@link KeyStoreLoader} which load the key/trust + * stores from files on a filesystem using standard {@link KeyStore} types like + * JKS or PKCS12. + */ +abstract class StandardTypeFileKeyStoreLoader extends FileKeyStoreLoader { + private static final Logger LOG = LoggerFactory.getLogger(StandardTypeFileKeyStoreLoader.class); + + private static final char[] EMPTY_CHAR_ARRAY = new char[0]; + + StandardTypeFileKeyStoreLoader(String keyStorePath, + String trustStorePath, + String keyStorePassword, + String trustStorePassword) { + super(keyStorePath, trustStorePath, keyStorePassword, trustStorePassword); + } + + @Override + public KeyStore loadKeyStore() throws IOException, GeneralSecurityException { + KeyStore ks = keyStoreInstance(); + InputStream inputStream = null; Review comment: We can use try-with-resources now. I know this is only a refactoring but we can take this opportunity to clean up code ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org With regards, Apache Git Services