lgoldstein commented on a change in pull request #119: Add support for openssh host key certificates URL: https://github.com/apache/mina-sshd/pull/119#discussion_r409641226
########## File path: sshd-common/src/main/java/org/apache/sshd/common/config/keys/impl/OpenSSHCertificateDecoder.java ########## @@ -0,0 +1,115 @@ +/* + * 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.sshd.common.config.keys.impl; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.security.GeneralSecurityException; +import java.security.KeyFactory; +import java.security.KeyPairGenerator; +import java.util.Arrays; +import java.util.Collections; +import java.util.Map; +import java.util.Objects; + +import org.apache.sshd.common.config.keys.OpenSshCertificate; +import org.apache.sshd.common.keyprovider.KeyPairProvider; +import org.apache.sshd.common.session.SessionContext; +import org.apache.sshd.common.util.buffer.ByteArrayBuffer; +import org.apache.sshd.common.util.buffer.keys.OpenSSHCertPublicKeyParser; +import org.apache.sshd.common.util.io.IoUtils; + +/** + * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> + */ +public class OpenSSHCertificateDecoder extends AbstractPublicKeyEntryDecoder<OpenSshCertificate, OpenSshCertificate> { + public static final OpenSSHCertificateDecoder INSTANCE = new OpenSSHCertificateDecoder(); + + public OpenSSHCertificateDecoder() { + super(OpenSshCertificate.class, OpenSshCertificate.class, + Collections.unmodifiableList(Arrays.asList( + KeyPairProvider.SSH_RSA_CERT, + KeyPairProvider.SSH_DSS_CERT, + KeyPairProvider.SSH_ED25519_CERT, + KeyPairProvider.SSH_ECDSA_SHA2_NISTP256_CERT, + KeyPairProvider.SSH_ECDSA_SHA2_NISTP384_CERT, + KeyPairProvider.SSH_ECDSA_SHA2_NISTP521_CERT + ))); + } + + @Override + public OpenSshCertificate decodePublicKey( + SessionContext session, String keyType, InputStream keyData, Map<String, String> headers) + throws IOException, GeneralSecurityException { + + byte[] bytes = IoUtils.toByteArray(keyData); + + ByteArrayBuffer buffer = new ByteArrayBuffer(bytes); + + OpenSshCertificate cert = (OpenSshCertificate) OpenSSHCertPublicKeyParser.INSTANCE.getRawPublicKey(keyType, buffer); + + if (cert.getType() != OpenSshCertificate.SSH_CERT_TYPE_HOST) { + throw new GeneralSecurityException("The provided certificate is not a Host certificate."); + } + + return cert; + } + + @Override + public String encodePublicKey(OutputStream s, OpenSshCertificate key) throws IOException { + Objects.requireNonNull(key, "No public key provided"); + + ByteArrayBuffer buffer = new ByteArrayBuffer(); + buffer.putRawPublicKeyBytes(key); + s.write(buffer.getCompactData()); + + return key.getKeyType(); + } + + @Override + public OpenSshCertificate clonePublicKey(OpenSshCertificate key) throws GeneralSecurityException { + try { + ByteArrayOutputStream outStream = new ByteArrayOutputStream(); + String keyType = encodePublicKey(outStream, key); + InputStream inStream = new ByteArrayInputStream(outStream.toByteArray()); + return decodePublicKey(null, keyType, inStream, null); + } catch (IOException e) { + throw new GeneralSecurityException("Unable to clone key.", e); + } + } Review comment: Even though we are dealing with byte-array streams that do no require closing, as a matter of coding style I prefer to have them in try-with-resource blocks: ```java try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) { ... try (InputStream inStream = new ByteArrayInputStream(outStream.toByteArray())) { ... return ....; } } ``` ---------------------------------------------------------------- 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: [email protected] With regards, Apache Git Services --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
