Mirrors/sshj
1
0
Fork 0
mirror of https://github.com/hierynomus/sshj.git synced 2025-12-06 23:30:55 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improving logging for KeyExchanger (#458)

Browse Source
This commit is contained in:
Andremoniy
2018-10-23 10:47:34 +02:00
committed by Jeroen van Erp
parent 17c368f9c2
commit 813469646e
4 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/net/schmizz/sshj/transport/verification/FingerprintVerifier.java
View File

@@ -26,7 +26,6 @@ import net.schmizz.sshj.common.Base64;
import net.schmizz.sshj.common.Buffer; import net.schmizz.sshj.common.Buffer;
import net.schmizz.sshj.common.SSHRuntimeException; import net.schmizz.sshj.common.SSHRuntimeException;
import net.schmizz.sshj.common.SecurityUtils; import net.schmizz.sshj.common.SecurityUtils;
import net.schmizz.sshj.transport.verification.HostKeyVerifier;
public class FingerprintVerifier implements HostKeyVerifier { public class FingerprintVerifier implements HostKeyVerifier {
private static final Pattern MD5_FINGERPRINT_PATTERN = Pattern.compile("[0-9a-f]{2}+(:[0-9a-f]{2}+){15}+"); private static final Pattern MD5_FINGERPRINT_PATTERN = Pattern.compile("[0-9a-f]{2}+(:[0-9a-f]{2}+){15}+");
@@ -121,4 +120,8 @@ public class FingerprintVerifier implements HostKeyVerifier {
return Arrays.equals(fingerprintData, digestData); return Arrays.equals(fingerprintData, digestData);
} }
@Override
public String toString() {
return "FingerprintVerifier{digestAlgorithm='" + digestAlgorithm + "'}";
}
} }

6
src/main/java/net/schmizz/sshj/transport/verification/OpenSSHKnownHosts.java
View File

@@ -440,4 +440,10 @@ public class OpenSSHKnownHosts
return null; return null;
} }
} }
@Override
public String toString() {
return "OpenSSHKnownHosts{khFile='" + khFile + "'}";
}
} }

12
src/test/groovy/com/hierynomus/sshj/transport/verification/OpenSSHKnownHostsSpec.groovy
View File

@@ -132,6 +132,18 @@ host1 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBL
h << ["schmizz.net", "69.163.155.180"] h << ["schmizz.net", "69.163.155.180"]
} }
def "should produce meaningful toString()"() {
given:
def f = knownHosts("schmizz.net,69.163.155.180 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6P9Hlwdahh250jGZYKg2snRq2j2lFJVdKSHyxqbJiVy9VX9gTkN3K2MD48qyrYLYOyGs3vTttyUk+cK++JMzURWsrP4piby7LpeOT+3Iq8CQNj4gXZdcH9w15Vuk2qS11at6IsQPVHpKD9HGg9//EFUccI/4w06k4XXLm/IxOGUwj6I2AeWmEOL3aDi+fe07TTosSdLUD6INtR0cyKsg0zC7Da24ixoShT8Oy3x2MpR7CY3PQ1pUVmvPkr79VeA+4qV9F1JM09WdboAMZgWQZ+XrbtuBlGsyhpUHSCQOya+kOJ+bYryS+U7A+6nmTW3C9FX4FgFqTF89UHOC7V0zZQ==")
when:
def knownhosts = new OpenSSHKnownHosts(f)
def toStringValue = knownhosts.toString()
then:
toStringValue == "OpenSSHKnownHosts{khFile='" + f + "'}"
}
def knownHosts(String s) { def knownHosts(String s) {
def f = temp.newFile("known_hosts") def f = temp.newFile("known_hosts")
f.write(s) f.write(s)

10
src/test/groovy/net/schmizz/sshj/transport/verification/FingerprintVerifierSpec.groovy
View File

@@ -49,6 +49,16 @@ class FingerprintVerifierSpec extends Specification {
} }
def "should produce meaningful toString()"() {
given:
def verifier = FingerprintVerifier.getInstance("SHA1:2Fo8c/96zv32xc8GZWbOGYOlRak")
when:
def toStringValue = verifier.toString()
then:
toStringValue == "FingerprintVerifier{digestAlgorithm='SHA-1'}"
}
def getPublicKey() { def getPublicKey() {
def lines = new File("src/test/resources/keytypes/test_ed25519.pub").readLines() def lines = new File("src/test/resources/keytypes/test_ed25519.pub").readLines()