hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-28 12:07:10 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

YAMF2.2: Allow @group entries in /etc/ftpusers & /etc/ftpchroot to deny

Browse Source 
and allow chroot access to entire groups.
This commit is contained in:
David Nugent 1997-04-27 08:29:21 +00:00
parent 524a1478c8
commit 31fea7b8f2
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=25187
2 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libexec/ftpd/ftpd.8
View File

@ -30,7 +30,7 @@
.\" SUCH DAMAGE. .\" SUCH DAMAGE.
.\" .\"
.\" @(#)ftpd.8 8.2 (Berkeley) 4/19/94 .\" @(#)ftpd.8 8.2 (Berkeley) 4/19/94
.\" $Id: ftpd.8,v 1.15 1997/04/23 04:56:39 davidn Exp $ .\" $Id: ftpd.8,v 1.16 1997/04/26 12:23:51 davidn Exp $
.\" .\"
.Dd April 19, 1994 .Dd April 19, 1994
.Dt FTPD 8 .Dt FTPD 8
@ -261,11 +261,20 @@ Bellcore.
The login name must not appear in the file The login name must not appear in the file
.Pa /etc/ftpusers . .Pa /etc/ftpusers .
.It .It
The login name must not be a member of a group specified in the file
.Pa /etc/ftpusers .
Entries in this file interpreted as group names are prefixed by an "at"
.Ql \&@
sign.
.It
The user must have a standard shell returned by The user must have a standard shell returned by
.Xr getusershell 3 . .Xr getusershell 3 .
.It .It
If the user name appears in the file If the user name appears in the file
.Pa /etc/ftpchroot .Pa /etc/ftpchroot ,
or the user is a member of a group with a group entry in this file,
i.e. one prefixed with
.Ql \&@ ,
the session's root will be changed to the user's login directory by the session's root will be changed to the user's login directory by
.Xr chroot 2 .Xr chroot 2
as for an as for an
@ -273,13 +282,13 @@ as for an
or or
.Dq ftp .Dq ftp
account (see next item). account (see next item).
This facility may also be used by using the boolean "ftp-chroot" This facility may also be triggered by enabling the boolean "ftp-chroot"
capability in capability in
.Xr login.conf 5 . .Xr login.conf 5 .
However, the user must still supply a password. However, the user must still supply a password.
This feature is intended as a compromise between a fully anonymous account This feature is intended as a compromise between a fully anonymous account
and a fully privileged account. The account should also be set up as for an and a fully privileged account.
anonymous account. The account should also be set up as for an anonymous account.
.It .It
If the user name is If the user name is
.Dq anonymous .Dq anonymous

26
libexec/ftpd/ftpd.c
View File

@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: ftpd.c,v 1.35 1997/04/23 04:56:39 davidn Exp $ * $Id: ftpd.c,v 1.36 1997/04/26 12:12:10 davidn Exp $
*/ */
#if 0 #if 0
@ -76,6 +76,7 @@ static char sccsid[] = "@(#)ftpd.c 8.4 (Berkeley) 4/16/94";
#include <limits.h> #include <limits.h>
#include <netdb.h> #include <netdb.h>
#include <pwd.h> #include <pwd.h>
#include <grp.h>
#include <setjmp.h> #include <setjmp.h>
#include <signal.h> #include <signal.h>
#include <stdio.h> #include <stdio.h>
@ -670,15 +671,30 @@ checkuser(fname, name)
char *p, line[BUFSIZ]; char *p, line[BUFSIZ];
if ((fd = fopen(fname, "r")) != NULL) { if ((fd = fopen(fname, "r")) != NULL) {
while (fgets(line, sizeof(line), fd) != NULL) while (!found && fgets(line, sizeof(line), fd) != NULL)
if ((p = strchr(line, '\n')) != NULL) { if ((p = strchr(line, '\n')) != NULL) {
*p = '\0'; *p = '\0';
if (line[0] == '#') if (line[0] == '#')
continue; continue;
if (strcmp(line, name) == 0) { /*
found = 1; * if first chr is '@', check group membership
break; */
if (line[0] == '@') {
int i = 0;
struct group *grp;
if ((grp = getgrnam(line+1)) == NULL)
continue;
while (!found && grp->gr_mem[i])
found = strcmp(name,
grp->gr_mem[i++])
== 0;
} }
/*
* Otherwise, just check for username match
*/
else
found = strcmp(line, name) == 0;
} }
(void) fclose(fd); (void) fclose(fd);
} }