Skip to content

Make known_hosts hostname matching more lenient #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
scop wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make known_hosts hostname matching more lenient #36

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 16 additions & 21 deletions ssh-config-mode.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,17 @@ We permit underscores.")
ssh-known-hosts-regex-hostname
"\\)"))

(defvar ssh-known-hosts-regex-hostname-pattern
(concat
"\\(?:"
ssh-known-hosts-regex-hostname
"\\|"
ssh-known-hosts-regex-ip
"\\|"
;; [host-or-ip]:222
"\\(?:\\[" ssh-known-hosts-regex-host "\\]:" ssh-known-hosts-regex-port "\\)"
"\\)"))

;; NOTE: font-lock-studio might be of help when making changes.
(defvar ssh-known-hosts-font-lock-keywords
;; We want to match lines like the following:
Expand All @@ -320,27 +331,11 @@ We permit underscores.")
ssh-known-hosts-regex-hashed
"\\|"

;; hostname-only
ssh-known-hosts-regex-hostname
"\\|"

;; ip-only
ssh-known-hosts-regex-ip
"\\|"

;; hostname "," ip
"\\(?:" ssh-known-hosts-regex-hostname "," ssh-known-hosts-regex-ip "\\)"
"\\|"

;; [host-or-ip]:222
"\\(?:\\[" ssh-known-hosts-regex-host "\\]:" ssh-known-hosts-regex-port "\\)"
"\\|"

;; We arent matching ports, but they should be the same.
;; [ssh.github.com]:443,[192.1.2.3]:443
"\\(?:"
"\\[" ssh-known-hosts-regex-hostname "\\]:" ssh-known-hosts-regex-port ","
"\\[" ssh-known-hosts-regex-ip "\\]:" ssh-known-hosts-regex-port "\\)"
;; list of comma separated hostname patterns
ssh-known-hosts-regex-hostname-pattern
"\\(?:,"
ssh-known-hosts-regex-hostname-pattern
"\\)*"

"\\)"
"[ \t]+"
Expand Down