From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Nick Gasson Newsgroups: gmane.emacs.bugs Subject: bug#43846: [PATCH] Match OpenBSD doas password prompt in comint Date: Wed, 7 Oct 2020 14:56:18 +0800 Message-ID: <20201007065618.43170-1-nick@nickg.me.uk> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="11011"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Nick Gasson To: 43846@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Oct 07 16:08:49 2020 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kQA7c-0002lM-31 for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 07 Oct 2020 16:08:48 +0200 Original-Received: from localhost ([::1]:42584 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kQA7b-0003dP-0O for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 07 Oct 2020 10:08:47 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:36672) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQA40-0001es-Qt for bug-gnu-emacs@gnu.org; Wed, 07 Oct 2020 10:05:06 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:46080) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kQA3y-0000qZ-Ph for bug-gnu-emacs@gnu.org; Wed, 07 Oct 2020 10:05:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kQA3y-0004S9-J7 for bug-gnu-emacs@gnu.org; Wed, 07 Oct 2020 10:05:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Nick Gasson Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 07 Oct 2020 14:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 43846 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.160207945817060 (code B ref -1); Wed, 07 Oct 2020 14:05:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 7 Oct 2020 14:04:18 +0000 Original-Received: from localhost ([127.0.0.1]:57626 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kQA3D-0004R4-TY for submit@debbugs.gnu.org; Wed, 07 Oct 2020 10:04:18 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:59086) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kQ3sH-0004Wi-N7 for submit@debbugs.gnu.org; Wed, 07 Oct 2020 03:28:34 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:33232) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQ3sH-00021R-A5 for bug-gnu-emacs@gnu.org; Wed, 07 Oct 2020 03:28:33 -0400 Original-Received: from outmail149043.authsmtp.co.uk ([62.13.149.43]:59152) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQ3sE-0001uO-Gg for bug-gnu-emacs@gnu.org; Wed, 07 Oct 2020 03:28:32 -0400 Original-Received: from mail-c233.authsmtp.com (mail-c233.authsmtp.com [62.13.128.233]) by punt18.authsmtp.com. (8.15.2/8.15.2) with ESMTP id 0976ugnL037526 for ; Wed, 7 Oct 2020 07:56:42 +0100 (BST) (envelope-from nick@nickg.me.uk) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nickg.me.uk; s=authsmtp; t=1602053802; bh=+PWnjWaYVAeyH/1K3ZNX/voMSiNDZ77bs9FpX2iSI5Y=; h=Date:From:To:Subject; b=PQy52GjdO1pLtbiBEAs/8IPT7DY8muiedzuNJRPzfP9Eh+MqG+gDZ/9eGzCuOQCFg qWeFQ1MqyAXne5LJTC5+Pq/OO4IUr6hYVix0uT1BbOTivp7ENr73vGy2d0y424UJJM F8hdOpXfZToKGnsVO4aNqHSa+bGcRVBpAopwci0E= Original-Received: from asterix.nickg.me.uk (asterix.nickg.me.uk [85.119.83.229]) (authenticated bits=0) by mail.authsmtp.com (8.15.2/8.15.2) with ESMTPA id 0976uetU011751 for ; Wed, 7 Oct 2020 07:56:41 +0100 (BST) (envelope-from nick@nickg.me.uk) Original-Received: from bertha.nickg.me.uk (unknown [120.204.58.13]) by asterix.nickg.me.uk (Postfix) with ESMTPSA id 906A5860B0; Wed, 7 Oct 2020 06:56:38 +0000 (UTC) Original-Received: from localhost (bertha.nickg.me.uk [local]) by bertha.nickg.me.uk (OpenSMTPD) with ESMTPA id 636a9857; Wed, 7 Oct 2020 14:56:34 +0800 (CST) X-Mailer: git-send-email 2.28.0 X-Server-Quench: 40bd05ae-086a-11eb-80b4-84349711df28 X-AuthReport-Spam: If SPAM / abuse - report it at: http://www.authsmtp.com/abuse X-AuthRoute: OCd0YgkXC1ZTTQ8Z IiUFByxPDwAoYABP FxUeIk5VJkdMWAFY OV1yIVxOdloGSkcB BHl0CBBLUl1zWXN1 bABUaw9ZYwRGWhtr UUFXSlFMFgdhHh4E GR5QUhB1cUATPBtw ZEdlW3EVXkBycQh5 QhwAFWhXMHpgYGZO TUFZIlFJeAMYegJN blN7XXQMYDFRZHIu LDcaAxsRCH16IThe QkkqNV8Ua30nVjI7 TgtKBTw0BlICXSl7 NwYhL0YAVEcXek41 NFonRTp/ X-Authentic-SMTP: 61633732313238.1021:7600 X-AuthFastPath: 0 (Was 255) X-AuthSMTP-Origin: 85.119.83.229/25 X-AuthVirus-Status: No virus detected - but ensure you scan with your own anti-virus system. Received-SPF: pass client-ip=62.13.149.43; envelope-from=nick@nickg.me.uk; helo=outmail149043.authsmtp.co.uk X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/07 02:56:42 X-ACL-Warn: Detected OS = ??? X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, UNPARSEABLE_RELAY=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Wed, 07 Oct 2020 10:04:14 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:190028 Archived-At: * lisp/comint.el (comint-password-prompt-regexp): match OpenBSD doas password prompt. OpenBSD 5.8 replaced sudo with doas in the base install. * test/lisp/comint-tests.el (comint-testsuite-password-strings): test that the doas password prompt is matched. --- lisp/comint.el | 3 ++- test/lisp/comint-tests.el | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lisp/comint.el b/lisp/comint.el index 6119476..944e1ae 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -362,6 +362,7 @@ This variable is buffer-local." ;; Some implementations of passwd use "Password (again)" as the 2nd prompt. ;; Something called "perforce" uses "Enter password:". ;; OpenVPN prints a prompt like: "Enter Auth Password:". +;; OpenBSD doas prints "doas (user@host) password:". ;; See ert test `comint-test-password-regexp'. (defcustom comint-password-prompt-regexp (concat @@ -370,7 +371,7 @@ This variable is buffer-local." '("Enter" "enter" "Enter same" "enter same" "Enter the" "enter the" "Enter Auth" "enter auth" "Old" "old" "New" "new" "'s" "login" "Kerberos" "CVS" "UNIX" " SMB" "LDAP" "PEM" "SUDO" - "[sudo]" "Repeat" "Bad" "Retype") + "[sudo]" "doas" "Repeat" "Bad" "Retype") t) ;; Allow for user name to precede password equivalent (Bug#31075). " +.*\\)" diff --git a/test/lisp/comint-tests.el b/test/lisp/comint-tests.el index 5b59340..923f588 100644 --- a/test/lisp/comint-tests.el +++ b/test/lisp/comint-tests.el @@ -39,6 +39,7 @@ "Passphrase for key root@GNU.ORG: " ; plink "[sudo] password for user:" ; Ubuntu sudo "[sudo] user 的密码：" ; localized + "doas (user@host) password:" ; OpenBSD doas "PIN for user:" ; Bug#35523 "Password (again):" "Enter password:" -- 2.28.0