You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2014/06/22 12:59:36 UTC
git commit: CAMEL-7039: As SSHD-268 has been already resolved,
removed the patched version of
org.apache.sshd.common.keyprovider.FileKeyPairProvider being applied into the
camel-ssh codebase.
Repository: camel
Updated Branches:
refs/heads/master 12a2c0d29 -> d348ea9ec
CAMEL-7039: As SSHD-268 has been already resolved, removed the patched version of org.apache.sshd.common.keyprovider.FileKeyPairProvider being applied into the camel-ssh codebase.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d348ea9e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d348ea9e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d348ea9e
Branch: refs/heads/master
Commit: d348ea9ec89fcb72a0f9ae04a976a98648421705
Parents: 12a2c0d
Author: Babak Vahdat <bv...@apache.org>
Authored: Sun Jun 22 12:59:30 2014 +0200
Committer: Babak Vahdat <bv...@apache.org>
Committed: Sun Jun 22 12:59:30 2014 +0200
----------------------------------------------------------------------
.../file/remote/sftp/SftpServerTestSupport.java | 2 +-
.../component/jsch/ScpServerTestSupport.java | 3 +-
.../component/ssh/FileKeyPairProvider.java | 113 -------------------
.../component/ssh/SshComponentSecurityTest.java | 1 +
.../component/ssh/SshComponentTestSupport.java | 1 +
5 files changed, 4 insertions(+), 116 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d348ea9e/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpServerTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpServerTestSupport.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpServerTestSupport.java
index 0c56501..72d09f4 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpServerTestSupport.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpServerTestSupport.java
@@ -21,10 +21,10 @@ import java.security.PublicKey;
import java.util.Arrays;
import org.apache.camel.component.file.remote.BaseServerTestSupport;
-import org.apache.camel.component.ssh.FileKeyPairProvider;
import org.apache.camel.util.ObjectHelper;
import org.apache.sshd.SshServer;
import org.apache.sshd.common.NamedFactory;
+import org.apache.sshd.common.keyprovider.FileKeyPairProvider;
import org.apache.sshd.server.Command;
import org.apache.sshd.server.PublickeyAuthenticator;
import org.apache.sshd.server.command.ScpCommandFactory;
http://git-wip-us.apache.org/repos/asf/camel/blob/d348ea9e/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpServerTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpServerTestSupport.java b/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpServerTestSupport.java
index 1213e9d..2e93fad 100644
--- a/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpServerTestSupport.java
+++ b/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpServerTestSupport.java
@@ -29,13 +29,12 @@ import com.jcraft.jsch.JSchException;
import com.jcraft.jsch.Session;
import com.jcraft.jsch.UserInfo;
-import org.apache.camel.component.ssh.FileKeyPairProvider;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.camel.util.FileUtil;
import org.apache.sshd.SshServer;
import org.apache.sshd.common.NamedFactory;
-// import org.apache.sshd.common.keyprovider.FileKeyPairProvider;
+import org.apache.sshd.common.keyprovider.FileKeyPairProvider;
import org.apache.sshd.server.Command;
import org.apache.sshd.server.PasswordAuthenticator;
import org.apache.sshd.server.PublickeyAuthenticator;
http://git-wip-us.apache.org/repos/asf/camel/blob/d348ea9e/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/FileKeyPairProvider.java
----------------------------------------------------------------------
diff --git a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/FileKeyPairProvider.java b/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/FileKeyPairProvider.java
deleted file mode 100644
index 30df778..0000000
--- a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/FileKeyPairProvider.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/**
- * 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.camel.component.ssh;
-
-import java.io.FileInputStream;
-import java.io.InputStreamReader;
-import java.security.KeyPair;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.sshd.common.keyprovider.AbstractKeyPairProvider;
-import org.apache.sshd.common.util.SecurityUtils;
-import org.bouncycastle.openssl.PEMDecryptorProvider;
-import org.bouncycastle.openssl.PEMEncryptedKeyPair;
-import org.bouncycastle.openssl.PEMKeyPair;
-import org.bouncycastle.openssl.PEMParser;
-import org.bouncycastle.openssl.PasswordFinder;
-import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter;
-import org.bouncycastle.openssl.jcajce.JcePEMDecryptorProviderBuilder;
-
-/**
- * This host key provider loads private keys from the specified files.
- *
- * Note that this class has a direct dependency on BouncyCastle and won't work
- * unless it has been correctly registered as a security provider.
- *
- * @author <a href="mailto:dev@mina.apache.org">Apache MINA SSHD Project</a>
- */
-public class FileKeyPairProvider extends AbstractKeyPairProvider {
-
- private String[] files;
- private PasswordFinder passwordFinder;
-
- public FileKeyPairProvider() {
- }
-
- public FileKeyPairProvider(String[] files) {
- this.files = files;
- }
-
- public FileKeyPairProvider(String[] files, PasswordFinder passwordFinder) {
- this.files = files;
- this.passwordFinder = passwordFinder;
- }
-
- public String[] getFiles() {
- return files;
- }
-
- public void setFiles(String[] files) {
- this.files = files;
- }
-
- public PasswordFinder getPasswordFinder() {
- return passwordFinder;
- }
-
- public void setPasswordFinder(PasswordFinder passwordFinder) {
- this.passwordFinder = passwordFinder;
- }
-
- @Override
- public Iterable<KeyPair> loadKeys() {
- if (!SecurityUtils.isBouncyCastleRegistered()) {
- throw new IllegalStateException("BouncyCastle must be registered as a JCE provider");
- }
- List<KeyPair> keys = new ArrayList<KeyPair>();
- for (String file : files) {
- try {
- PEMParser r = new PEMParser(new InputStreamReader(new FileInputStream(file)));
- try {
- Object o = r.readObject();
-
- JcaPEMKeyConverter pemConverter = new JcaPEMKeyConverter();
- pemConverter.setProvider("BC");
- if (passwordFinder != null && o instanceof PEMEncryptedKeyPair) {
- JcePEMDecryptorProviderBuilder decryptorBuilder = new JcePEMDecryptorProviderBuilder();
- PEMDecryptorProvider pemDecryptor = decryptorBuilder.build(passwordFinder.getPassword());
- o = pemConverter.getKeyPair(((PEMEncryptedKeyPair) o).decryptKeyPair(pemDecryptor));
- }
-
- if (o instanceof PEMKeyPair) {
- o = pemConverter.getKeyPair((PEMKeyPair)o);
- keys.add((KeyPair) o);
- } else if (o instanceof KeyPair) {
- keys.add((KeyPair) o);
- }
-
- } finally {
- r.close();
- }
- } catch (Exception e) {
- log.warn("Unable to read key {}: {}", file, e);
- }
- }
- return keys;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/d348ea9e/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentSecurityTest.java
----------------------------------------------------------------------
diff --git a/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentSecurityTest.java b/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentSecurityTest.java
index 02220d6..cd5c2df 100644
--- a/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentSecurityTest.java
+++ b/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentSecurityTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.ssh;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.sshd.common.KeyPairProvider;
+import org.apache.sshd.common.keyprovider.FileKeyPairProvider;
import org.junit.Test;
public class SshComponentSecurityTest extends SshComponentTestSupport {
http://git-wip-us.apache.org/repos/asf/camel/blob/d348ea9e/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentTestSupport.java b/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentTestSupport.java
index b7e9ace..3a2eb1d 100644
--- a/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentTestSupport.java
+++ b/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentTestSupport.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.ssh;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.sshd.SshServer;
+import org.apache.sshd.common.keyprovider.FileKeyPairProvider;
public class SshComponentTestSupport extends CamelTestSupport {
protected SshServer sshd;