mirror of
https://github.com/netbirdio/netbird.git
synced 2026-10-23 22:09:09 +02:00
Fix client ssh file
This commit is contained in:
@@ -451,19 +451,11 @@ func (m *Manager) UpdatePeerHostKeys(peerKeys []PeerHostKey) error {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create updated known_hosts content
|
// Create updated known_hosts content - NetBird file should only contain NetBird entries
|
||||||
var updatedContent strings.Builder
|
var updatedContent strings.Builder
|
||||||
updatedContent.WriteString("# NetBird SSH known hosts\n")
|
updatedContent.WriteString("# NetBird SSH known hosts\n")
|
||||||
updatedContent.WriteString("# Generated automatically - do not edit manually\n\n")
|
updatedContent.WriteString("# Generated automatically - do not edit manually\n\n")
|
||||||
|
|
||||||
// Add existing non-NetBird entries
|
|
||||||
for _, entry := range existingEntries {
|
|
||||||
if !m.isNetBirdEntry(entry) {
|
|
||||||
updatedContent.WriteString(entry)
|
|
||||||
updatedContent.WriteString("\n")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Add new NetBird entries
|
// Add new NetBird entries
|
||||||
for _, entry := range newEntries {
|
for _, entry := range newEntries {
|
||||||
updatedContent.WriteString(entry)
|
updatedContent.WriteString(entry)
|
||||||
@@ -539,14 +531,6 @@ func (m *Manager) getHostnameVariants(peerKey PeerHostKey) []string {
|
|||||||
return hostnames
|
return hostnames
|
||||||
}
|
}
|
||||||
|
|
||||||
// isNetBirdEntry checks if a known_hosts entry appears to be NetBird-managed
|
|
||||||
func (m *Manager) isNetBirdEntry(entry string) bool {
|
|
||||||
// Check if entry contains NetBird IP ranges or domains
|
|
||||||
return strings.Contains(entry, "100.125.") ||
|
|
||||||
strings.Contains(entry, ".nb.internal") ||
|
|
||||||
strings.Contains(entry, "netbird")
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetKnownHostsPath returns the path to the NetBird known_hosts file
|
// GetKnownHostsPath returns the path to the NetBird known_hosts file
|
||||||
func (m *Manager) GetKnownHostsPath() (string, error) {
|
func (m *Manager) GetKnownHostsPath() (string, error) {
|
||||||
return m.setupKnownHostsFile()
|
return m.setupKnownHostsFile()
|
||||||
|
|||||||
Reference in New Issue
Block a user