upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-11 09:41:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Log pathname arguments to ftp commands as the user specified them;

Browse source 
add the working directory pathname to the log message if any of
such arguments isn't absolute.  This has advantage over the old
way of logging that an admin can see what users are actually trying
to do, and where.  The old code was also not too robust when it
came to a chrooted session and an absolute pathname.

Pointed out by: Nick Leuta
MFC after:      2 weeks
This commit is contained in:
Yaroslav Tykhiy 2004-11-18 10:02:28 +00:00
parent ac4f2391be
commit 6b2dee6ba1
1 changed files with 55 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
libexec/ftpd/ftpd.c
View file

@ -215,25 +215,9 @@ char *LastArgv = NULL; /* end of argv */
char proctitle[LINE_MAX]; /* initial part of title */
#endif /* SETPROCTITLE */
#define LOGCMD(cmd, file) \
if (logging > 1) \
syslog(LOG_INFO,"%s %s%s", cmd, \
*(file) == '/' ? "" : curdir(), file);
#define LOGCMD2(cmd, file1, file2) \
if (logging > 1) \
syslog(LOG_INFO,"%s %s%s %s%s", cmd, \
*(file1) == '/' ? "" : curdir(), file1, \
*(file2) == '/' ? "" : curdir(), file2);
#define LOGBYTES(cmd, file, cnt) \
if (logging > 1) { \
if (cnt == -1) \
syslog(LOG_INFO,"%s %s%s", cmd, \
*(file) == '/' ? "" : curdir(), file); \
else \
syslog(LOG_INFO, "%s %s%s = %jd bytes", \
cmd, (*(file) == '/') ? "" : curdir(), file, \
(intmax_t)cnt); \
}
#define LOGCMD(cmd, file) logcmd((cmd), (file), NULL, -1)
#define LOGCMD2(cmd, file1, file2) logcmd((cmd), (file1), (file2), -1)
#define LOGBYTES(cmd, file, cnt) logcmd((cmd), (file), NULL, (cnt))
#ifdef VIRTUAL_HOSTING
static void inithosts(void);
@ -245,7 +229,6 @@ static void myoob(void);
static int checkuser(char *, char *, int, char **);
static FILE *dataconn(char *, off_t, char *);
static void dolog(struct sockaddr *);
static char *curdir(void);
static void end_login(void);
static FILE *getdatasock(char *);
static int guniquefd(char *, char **);
@ -257,23 +240,12 @@ static struct passwd *
sgetpwnam(char *);
static char *sgetsave(char *);
static void reapchild(int);
static void appendf(char **, char *, ...);
static void logcmd(char *, char *, char *, off_t);
static void logxfer(char *, off_t, time_t);
static char *doublequote(char *);
static int *socksetup(int, char *, const char *);
static char *
curdir(void)
{
static char path[MAXPATHLEN+1+1]; /* path + '/' + '\0' */
if (getcwd(path, sizeof(path)-2) == NULL)
return ("");
if (path[1] != '\0') /* special case for root dir. */
strcat(path, "/");
/* For guest account, skip / since it's chrooted */
return (guest ? path+1 : path);
}
int
main(int argc, char *argv[], char **envp)
{
@ -3168,6 +3140,56 @@ setproctitle(const char *fmt, ...)
}
#endif /* OLD_SETPROCTITLE */
static void
appendf(char **strp, char *fmt, ...)
{
va_list ap;
char *ostr, *p;
va_start(ap, fmt);
vasprintf(&p, fmt, ap);
va_end(ap);
if (p == NULL)
fatalerror("Ran out of memory.");
if (*strp == NULL)
*strp = p;
else {
ostr = *strp;
asprintf(strp, "%s%s", ostr, p);
if (*strp == NULL)
fatalerror("Ran out of memory.");
free(ostr);
}
}
static void
logcmd(char *cmd, char *file1, char *file2, off_t cnt)
{
char *msg = NULL;
char wd[MAXPATHLEN + 1];
if (logging <= 1)
return;
/* If either filename isn't absolute, get current dir for log message. */
if ((file1 && file1[0] != '/') || (file2 && file2[0] != '/')) {
if (getcwd(wd, sizeof(wd) - 1) == NULL)
strcpy(wd, strerror(errno));
} else
wd[0] = '\0';
appendf(&msg, "%s", cmd);
if (file1)
appendf(&msg, " %s", file1);
if (file2)
appendf(&msg, " %s", file2);
if (cnt >= 0)
appendf(&msg, " = %jd bytes", (intmax_t)cnt);
if (wd[0])
appendf(&msg, " (wd: %s)", wd);
syslog(LOG_INFO, "%s", msg);
free(msg);
}
static void
logxfer(char *name, off_t size, time_t start)
{