From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Phil Hagelberg Newsgroups: gmane.emacs.devel Subject: [PATCH] Improved SSH host support for pcomplete/eshell Date: Wed, 29 Dec 2010 12:10:35 -0800 Message-ID: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Trace: dough.gmane.org 1293654671 8836 80.91.229.12 (29 Dec 2010 20:31:11 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 29 Dec 2010 20:31:11 +0000 (UTC) To: Emacs discussions Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Dec 29 21:31:07 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1PY2fq-0006Ij-IV for ged-emacs-devel@m.gmane.org; Wed, 29 Dec 2010 21:31:06 +0100 Original-Received: from localhost ([127.0.0.1]:60322 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PY2MR-0001jV-Aw for ged-emacs-devel@m.gmane.org; Wed, 29 Dec 2010 15:11:03 -0500 Original-Received: from [140.186.70.92] (port=50314 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PY2M9-0001JV-F1 for emacs-devel@gnu.org; Wed, 29 Dec 2010 15:11:00 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PY2M1-0008VV-MN for emacs-devel@gnu.org; Wed, 29 Dec 2010 15:10:39 -0500 Original-Received: from mail-yw0-f41.google.com ([209.85.213.41]:64712) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PY2M1-0008VJ-Jv for emacs-devel@gnu.org; Wed, 29 Dec 2010 15:10:37 -0500 Original-Received: by ywj3 with SMTP id 3so4966353ywj.0 for ; Wed, 29 Dec 2010 12:10:37 -0800 (PST) Original-Received: by 10.100.153.4 with SMTP id a4mr8445205ane.228.1293653435318; Wed, 29 Dec 2010 12:10:35 -0800 (PST) Original-Received: by 10.100.57.18 with HTTP; Wed, 29 Dec 2010 12:10:35 -0800 (PST) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:134039 Archived-At: I've added support to pcmpl-ssh-hosts for it to parse ~/.ssh/config as well instead of just ~/.ssh/known_hosts. Changelog entry: 2010-12-29 Phil Hagelberg * pcmpl-unix.el (pcmpl-ssh-config-file): New defcustom. (pcmpl-ssh-hosts): Parse pcmpl-ssh-config-file in addition to pcmpl-ssh-known-hosts-file. (pcmpl-ssh-known-hosts, pcmpl-ssh-config-hosts): New functions. I have already submitted copyright paperwork for a previous patch. Comments? -Phil diff --git a/lisp/pcmpl-unix.el b/lisp/pcmpl-unix.el index f2c19ca..f6b37b8 100644 --- a/lisp/pcmpl-unix.el +++ b/lisp/pcmpl-unix.el @@ -40,14 +40,21 @@ (defcustom pcmpl-ssh-known-hosts-file "~/.ssh/known_hosts" "If non-nil, a string naming your SSH \"known_hosts\" file. -This allows completion of SSH host names. Note that newer -versions of ssh hash the hosts by default to prevent +This allows one method of completion of SSH host names. Note +that newer versions of ssh hash the hosts by default to prevent Island-hopping SSH attacks. This can be disabled, at some risk, with the SSH option \"HashKnownHosts no\"." :type '(choice file (const nil)) :group 'pcmpl-unix :version "23.1") +(defcustom pcmpl-ssh-config-file "~/.ssh/config" + "If non-nil, a string naming your SSH \"config\" file. +This allows one method of completion of SSH host names." + :type '(choice file (const nil)) + :group 'pcmpl-unix + :version "24.1") + ;; Functions: ;;;###autoload @@ -138,7 +145,7 @@ documentation), this function returns nil." ;; ssh support by Phil Hagelberg. ;; http://www.emacswiki.org/cgi-bin/wiki/pcmpl-ssh.el -(defun pcmpl-ssh-hosts () +(defun pcmpl-ssh-known-hosts () "Return a list of hosts found in `pcmpl-ssh-known-hosts-file'." (when (and pcmpl-ssh-known-hosts-file (file-readable-p pcmpl-ssh-known-hosts-file)) @@ -153,6 +160,27 @@ documentation), this function returns nil." (add-to-list 'ssh-hosts-list (match-string 1)))) ssh-hosts-list)))) +(defun pcmpl-ssh-config-hosts () + "Return a list of hosts found in `pcmpl-ssh-config-file'." + (when (and pcmpl-ssh-config-file + (file-readable-p pcmpl-ssh-config-file)) + (with-temp-buffer + (insert-file-contents-literally pcmpl-ssh-config-file) + (let (ssh-hosts-list + (case-fold-search t)) + (while (re-search-forward "^ *host\\(name\\)? +\\([-.[:alnum:]]+\\)" + nil t) + (add-to-list 'ssh-hosts-list (match-string 2))) + ssh-hosts-list)))) + +(defun pcmpl-ssh-hosts () + "Return a list of known SSH hosts. +Uses both `pcmpl-ssh-config-file' and `pcmpl-ssh-known-hosts-file'." + (let ((hosts (pcmpl-ssh-known-hosts))) + (dolist (h (pcmpl-ssh-config-hosts)) + (add-to-list 'hosts h)) + hosts)) + ;;;###autoload (defun pcomplete/ssh () "Completion rules for the `ssh' command."