From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Leon Vack Newsgroups: gmane.emacs.bugs Subject: bug#45340: erc-services.el: Auth-source support for passwords Date: Mon, 11 Jan 2021 14:38:02 GMT Message-ID: <87wnwjk08m.fsf@sol.hw.lgcl.de> References: <87v9cw7np1.fsf@sol.hw.lgcl.de> <874kk5jwqr.fsf@gnu.org> <87h7o5vx3b.fsf@sol.hw.lgcl.de> <87eeitvwnu.fsf@gnus.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="8776"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 45340@debbugs.gnu.org, Amin Bandali To: Lars Ingebrigtsen Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Jan 11 15:39:16 2021 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 1kyyLj-00028P-6D for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 11 Jan 2021 15:39:15 +0100 Original-Received: from localhost ([::1]:41178 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kyyLi-0003Y4-2N for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 11 Jan 2021 09:39:14 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:39028) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kyyLW-0003Xs-6h for bug-gnu-emacs@gnu.org; Mon, 11 Jan 2021 09:39:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:44675) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kyyLW-0006hZ-07 for bug-gnu-emacs@gnu.org; Mon, 11 Jan 2021 09:39:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kyyLV-0003am-Tm for bug-gnu-emacs@gnu.org; Mon, 11 Jan 2021 09:39:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Leon Vack Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 11 Jan 2021 14:39:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45340 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 45340-submit@debbugs.gnu.org id=B45340.161037588913741 (code B ref 45340); Mon, 11 Jan 2021 14:39:01 +0000 Original-Received: (at 45340) by debbugs.gnu.org; 11 Jan 2021 14:38:09 +0000 Original-Received: from localhost ([127.0.0.1]:56219 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kyyKe-0003ZZ-UU for submit@debbugs.gnu.org; Mon, 11 Jan 2021 09:38:09 -0500 Original-Received: from out0.migadu.com ([94.23.1.103]:38068) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kyyKa-0003ZJ-RQ for 45340@debbugs.gnu.org; Mon, 11 Jan 2021 09:38:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lgcl.de; s=key1; t=1610375882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=t3rTRn423+UsnO6lz3yjSNd5TRvuOIf5qu486q4Qp+s=; b=WLqEZnduvE4turI5UTvVgur6r+t5mr8zAiKPNuOqSaxhJyeB0ZPXeMkKXJaN8kKDyW4jq8 dZ/jFaoh2r/qPY9qYkDXE37XNUz6ivbYmQgFfdBIsg4C2/+EaIz15puGg/Vw0RWA9ExOHD r/KGHfl/lt3grG6Qg1zfaILcp0YbFXV6TIXEWt56DmI+CVCdJIRdsgq8ALrWW1TbVppNvb IL7YLN1oDxPZfhH01OfdYlzDQFmY1pjAvt70As3nMCHOavjaJ+baaJhJVc5zGf78Gh2sLb PqLZ+F2DjwGaDx0jhLXSCO3NlYxuO1fTaNWEH4zUGeKWq4MDxdabDHCG8bSEjg== X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. In-reply-to: <87eeitvwnu.fsf@gnus.org> X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: dev@lgcl.de 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:197699 Archived-At: --=-=-= Content-Type: text/plain Lars Ingebrigtsen writes: > Leon Vack writes: > >> Thanks for the pointers. I attached a new patch with all of them addressed. > > This leads to the following warning: > > In erc-nickserv-call-identify-function: > erc/erc-services.el:454:11: Warning: reference to free variable `password' > > And the code in that function doesn't look correct to me... Yes, that is a mistake on my part, it must have slipped through from an earlier implementation I wrote and used. Sorry about that. I have fixed that in the attached patch and done some testing (without changing anything after it this time). --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-Support-using-auth-source-for-NickServ-passwords-in-.patch >From 02d6ddfe3b07a793855dd87ea0d9ba4daee8af3f Mon Sep 17 00:00:00 2001 From: Leon Vack Date: Sun, 20 Dec 2020 10:53:33 +0100 Subject: [PATCH] Support using auth-source for NickServ passwords in ERC * lisp/etc/erc-services.el (erc-nickserv-passwords): Document that the passwords are only used when erc-prompt-for-nickserv-password is nil. * (erc-use-auth-source-for-nickserv-password): New customizable variable to enable checking auth-source for NickServ passwords. * (etc-nickserv-get-password): New function to handle the lookup of the NickServ password from both auth-source and the erc-nickserv-passwords variable. * (erc-nickserv-call-identify-function): Use new erc-nickserv-get-password function to lookup NickServ passwords. * (erc-nickserv-identify-autodetect, erc-nickserv-identify-on-connect, erc-nickserv-identify-on-nick-change): Call erc-nickserv-call-identify-function when erc-use-auth-source-for-nickserv-password is set. * etc/NEWS: Document change. --- etc/NEWS | 9 ++++++ lisp/erc/erc-services.el | 59 ++++++++++++++++++++++++++++++++-------- 2 files changed, 56 insertions(+), 12 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index 4a8e70e6a6..d722592fd3 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1283,6 +1283,15 @@ https://www.w3.org/TR/xml/#charsets). Now it rejects such strings. ** erc +*** erc-services.el now supports NickServ passwords from auth-source. +The 'erc-use-auth-source-for-nickserv-password' enables querying +auth-source for NickServ passwords. To enable this, add the following +to your init file: + + (setq erc-prompt-for-nickserv-password nil + erc-use-auth-source-for-nickserv-password t) + + --- *** The '/ignore' command will now ask for a timeout to stop ignoring the user. Allowed inputs are seconds or ISO8601-like periods like "1h" or "4h30m". diff --git a/lisp/erc/erc-services.el b/lisp/erc/erc-services.el index c0011f9808..60c7852edf 100644 --- a/lisp/erc/erc-services.el +++ b/lisp/erc/erc-services.el @@ -168,9 +168,23 @@ erc-prompt-for-nickserv-password :group 'erc-services :type 'boolean) +(defcustom erc-use-auth-source-for-nickserv-password nil + "Query auth-source for a password when identifiying to NickServ. + + +This option has an no effect if `erc-prompt-for-nickserv-password' +is not nil, and passwords from `erc-nickserv-passwords' take +precedence." + :version "28.1" + :group 'erc-services + :type 'boolean) + (defcustom erc-nickserv-passwords nil "Passwords used when identifying to NickServ automatically. +`erc-prompt-for-nickserv-password' must be nil for these +passwords to be used. + Example of use: (setq erc-nickserv-passwords \\='((freenode ((\"nick-one\" . \"password\") @@ -375,7 +389,8 @@ erc-nickserv-identify-autodetect If `erc-prompt-for-nickserv-password' is non-nil, prompt the user for the password for this nickname, otherwise try to send it automatically." (unless (and (null erc-nickserv-passwords) - (null erc-prompt-for-nickserv-password)) + (null erc-prompt-for-nickserv-password) + (null erc-use-auth-source-for-nickserv-password)) (let* ((network (erc-network)) (sender (erc-nickserv-alist-sender network)) (identify-regex (erc-nickserv-alist-regexp network)) @@ -394,30 +409,49 @@ erc-nickserv-identify-autodetect (defun erc-nickserv-identify-on-connect (_server nick) "Identify to Nickserv after the connection to the server is established." (unless (or (and (null erc-nickserv-passwords) - (null erc-prompt-for-nickserv-password)) - (and (eq erc-nickserv-identify-mode 'both) - (erc-nickserv-alist-regexp (erc-network)))) + (null erc-prompt-for-nickserv-password) + (null erc-use-auth-source-for-nickserv-password)) + (and (eq erc-nickserv-identify-mode 'both) + (erc-nickserv-alist-regexp (erc-network)))) (erc-nickserv-call-identify-function nick))) (defun erc-nickserv-identify-on-nick-change (nick _old-nick) "Identify to Nickserv whenever your nick changes." (unless (or (and (null erc-nickserv-passwords) - (null erc-prompt-for-nickserv-password)) - (and (eq erc-nickserv-identify-mode 'both) - (erc-nickserv-alist-regexp (erc-network)))) + (null erc-prompt-for-nickserv-password) + (null erc-use-auth-source-for-nickserv-password)) + (and (eq erc-nickserv-identify-mode 'both) + (erc-nickserv-alist-regexp (erc-network)))) (erc-nickserv-call-identify-function nick))) +(defun erc-nickserv-get-password (nickname) + "Return the password for NICKNAME from configured sources. + +It uses `erc-nickserv-passwords' and additionally auth-source +when `erc-use-auth-source-for-nickserv-password' is not nil." + (or + (when erc-nickserv-passwords + (cdr (assoc nickname + (nth 1 (assoc (erc-network) + erc-nickserv-passwords))))) + (when erc-use-auth-source-for-nickserv-password + (let* ((secret (nth 0 (auth-source-search + :max 1 :require '(:secret) + :host (erc-with-server-buffer erc-session-server) + :port (format ; ensure we have a string + "%s" (erc-with-server-buffer erc-session-port)) + :user nickname)))) + (when secret + (let ((passwd (plist-get secret :secret))) + (if (functionp passwd) (funcall passwd) passwd))))))) + (defun erc-nickserv-call-identify-function (nickname) "Call `erc-nickserv-identify'. Either call it interactively or run it with NICKNAME's password, depending on the value of `erc-prompt-for-nickserv-password'." (if erc-prompt-for-nickserv-password (call-interactively 'erc-nickserv-identify) - (when erc-nickserv-passwords - (erc-nickserv-identify - (cdr (assoc nickname - (nth 1 (assoc (erc-network) - erc-nickserv-passwords)))))))) + (erc-nickserv-identify (erc-nickserv-get-password nickname)))) (defvar erc-auto-discard-away) @@ -451,6 +485,7 @@ erc-nickserv-identify (provide 'erc-services) + ;;; erc-services.el ends here ;; ;; Local Variables: -- 2.28.0 --=-=-=--