From owner-cvs-src@FreeBSD.ORG Fri Apr 27 16:26:19 2007 Return-Path: X-Original-To: cvs-src@freebsd.org Delivered-To: cvs-src@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id F25CC16A402; Fri, 27 Apr 2007 16:26:18 +0000 (UTC) (envelope-from yar@comp.chem.msu.su) Received: from comp.chem.msu.su (comp.chem.msu.su [158.250.32.97]) by mx1.freebsd.org (Postfix) with ESMTP id 2486313C4B8; Fri, 27 Apr 2007 16:26:17 +0000 (UTC) (envelope-from yar@comp.chem.msu.su) Received: from comp.chem.msu.su (localhost [127.0.0.1]) by comp.chem.msu.su (8.13.4/8.13.4) with ESMTP id l3RGQFvR005553; Fri, 27 Apr 2007 20:26:16 +0400 (MSD) (envelope-from yar@comp.chem.msu.su) Received: (from yar@localhost) by comp.chem.msu.su (8.13.4/8.13.4/Submit) id l3RGQFo3005552; Fri, 27 Apr 2007 20:26:15 +0400 (MSD) (envelope-from yar) Date: Fri, 27 Apr 2007 20:26:14 +0400 From: Yar Tikhiy To: Alexandr Kovalenko Message-ID: <20070427162614.GG3991@comp.chem.msu.su> References: <200704260639.l3Q6d1SH027885@repoman.freebsd.org> <20070426105458.GA98415@nevermind.kiev.ua> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20070426105458.GA98415@nevermind.kiev.ua> User-Agent: Mutt/1.5.9i Cc: cvs-src@freebsd.org, src-committers@freebsd.org, cvs-all@freebsd.org Subject: Re: cvs commit: src/lib/libpam/modules/pam_unix pam_unix.8 pam_unix.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Apr 2007 16:26:19 -0000 On Thu, Apr 26, 2007 at 01:54:59PM +0300, Alexandr Kovalenko wrote: > Hello, Yar Tikhiy! > > On Thu, Apr 26, 2007 at 06:39:01AM +0000, you wrote: > > > yar 2007-04-26 06:39:01 UTC > > > > FreeBSD src repository > > > > Modified files: (Branch: RELENG_6) > > lib/libpam/modules/pam_unix pam_unix.8 pam_unix.c > > Log: > > MFC: > > pam_unix.c 1.52 > > pam_unix.8 1.13 > > > > In account management, verify whether the account has been locked > > with `pw lock', so that it's impossible to log into a locked account > > using an alternative authentication mechanism, such as an ssh key. > > This change affects only accounts locked with pw(8), i.e., having a > > `*LOCKED*' prefix in their password hash field, so people still can > > use a different pattern to disable password authentication only. > > Using the very same logic you should also add checking for '*', and for > any other string, which cannot be in password hash of different > algorithms. By the way, what if some crypto algorithm, which will be > used for password hashing can produce hash, which contains substring > '*LOCKED*' ? Please don't over-generalize. My change adds a check for a *LOCKED* prefix only, which cannot appear in a password hash unless its current format is broken. Neither an old DES hash nor a new multi-algorithm hash can start with *LOCKED*. > But anyway, I think that it is not expected behavour of sshd/pam_unix. > > >From the pw manual page: > > USER LOCKING > The pw utility supports a simple _password_ locking mechanism for > users; it works by prepending the string `*LOCKED*' to the > beginning of the password field in master.passwd to prevent > successful authentication. > > Please note word _password_. There is nothing about locking _account_ > completely. I believe account locking was implied in the days pw(8) was written. > Please consider reviewing this PR and, hopefully, back out this commit. > At least for a lot of people - it is POLA violation. Just run adduser(8) and see how it implements account locking and password auth disabling. That's the system policy my change is in keeping with. > > Mention all account management criteria in the manpage. > > > > PR: bin/71147 http://www.FreeBSD.org/cgi/query-pr.cgi?pr=71147 > > > > Revision Changes Path > > 1.11.2.2 +16 -3 src/lib/libpam/modules/pam_unix/pam_unix.8 > > 1.51.2.1 +6 -0 src/lib/libpam/modules/pam_unix/pam_unix.c > > -- > NEVE-RIPE, will build world for food > Ukrainian FreeBSD User Group > http://uafug.org.ua/ -- Yar