Mirrors/sshj
1
0
Fork 0
mirror of https://github.com/hierynomus/sshj.git synced 2025-12-08 16:18:05 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add Reader constructor to OpenSSHKnownHosts (Fixes #626)

Browse Source
This commit is contained in:
Jeroen van Erp
2020-08-17 10:23:37 +02:00
parent 0e0d730bbf
commit 73d7560e6e
1 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,6 +41,11 @@ public class OpenSSHKnownHosts
protected final File khFile; protected final File khFile;
protected final List<KnownHostEntry> entries = new ArrayList<KnownHostEntry>(); protected final List<KnownHostEntry> entries = new ArrayList<KnownHostEntry>();
public OpenSSHKnownHosts(Reader reader) throws IOException {
this(reader, LoggerFactory.DEFAULT);
}
public OpenSSHKnownHosts(File khFile) public OpenSSHKnownHosts(File khFile)
throws IOException { throws IOException {
this(khFile, LoggerFactory.DEFAULT); this(khFile, LoggerFactory.DEFAULT);
@@ -51,29 +56,40 @@ public class OpenSSHKnownHosts
this.khFile = khFile; this.khFile = khFile;
log = loggerFactory.getLogger(getClass()); log = loggerFactory.getLogger(getClass());
if (khFile.exists()) { if (khFile.exists()) {
final EntryFactory entryFactory = new EntryFactory();
final BufferedReader br = new BufferedReader(new FileReader(khFile)); final BufferedReader br = new BufferedReader(new FileReader(khFile));
try { try {
// Read in the file, storing each line as an entry readEntries(br);
String line;
while ((line = br.readLine()) != null) {
try {
KnownHostEntry entry = entryFactory.parseEntry(line);
if (entry != null) {
entries.add(entry);
}
} catch (SSHException ignore) {
log.debug("Bad line ({}): {} ", ignore.toString(), line);
} catch (SSHRuntimeException ignore) {
log.debug("Failed to process line ({}): {} ", ignore.toString(), line);
}
}
} finally { } finally {
IOUtils.closeQuietly(br); IOUtils.closeQuietly(br);
} }
} }
} }
public OpenSSHKnownHosts(Reader reader, LoggerFactory loggerFactory) throws IOException {
this.khFile = null;
log = loggerFactory.getLogger(getClass());
BufferedReader br = new BufferedReader(reader);
readEntries(br);
}
private void readEntries(BufferedReader br) throws IOException {
final EntryFactory entryFactory = new EntryFactory();
String line;
while ((line = br.readLine()) != null) {
try {
KnownHostEntry entry = entryFactory.parseEntry(line);
if (entry != null) {
entries.add(entry);
}
} catch (SSHException ignore) {
log.debug("Bad line ({}): {} ", ignore.toString(), line);
} catch (SSHRuntimeException ignore) {
log.debug("Failed to process line ({}): {} ", ignore.toString(), line);
}
}
}
public File getFile() { public File getFile() {
return khFile; return khFile;
} }