freebsd-skq/lib/libfetch/ftp.c

807 lines
19 KiB
C
Raw Normal View History

/*-
* Copyright (c) 1998 Dag-Erling Co<EFBFBD>dan Sm<EFBFBD>rgrav
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer
* in this position and unchanged.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
1999-08-28 00:22:10 +00:00
* $FreeBSD$
*/
/*
* Portions of this code were taken from or based on ftpio.c:
*
* ----------------------------------------------------------------------------
* "THE BEER-WARE LICENSE" (Revision 42):
* <phk@login.dknet.dk> wrote this file. As long as you retain this notice you
* can do whatever you want with this stuff. If we meet some day, and you think
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
* ----------------------------------------------------------------------------
*
* Major Changelog:
*
* Dag-Erling Co<EFBFBD>dan Sm<EFBFBD>rgrav
* 9 Jun 1998
*
* Incorporated into libfetch
*
* Jordan K. Hubbard
* 17 Jan 1996
*
* Turned inside out. Now returns xfers as new file ids, not as a special
* `state' of FTP_t
*
* $ftpioId: ftpio.c,v 1.30 1998/04/11 07:28:53 phk Exp $
*
*/
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/uio.h>
#include <netinet/in.h>
#include <ctype.h>
#include <errno.h>
#include <netdb.h>
1998-07-11 21:29:08 +00:00
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <time.h>
#include <unistd.h>
#include "fetch.h"
#include "common.h"
#include "ftperr.h"
#define FTP_ANONYMOUS_USER "ftp"
#define FTP_ANONYMOUS_PASSWORD "ftp"
1998-07-11 21:29:08 +00:00
#define FTP_DEFAULT_PORT 21
#define FTP_OPEN_DATA_CONNECTION 150
#define FTP_OK 200
#define FTP_FILE_STATUS 213
#define FTP_SERVICE_READY 220
1998-07-11 21:29:08 +00:00
#define FTP_PASSIVE_MODE 227
2000-05-20 18:23:51 +00:00
#define FTP_LPASSIVE_MODE 228
#define FTP_EPASSIVE_MODE 229
1998-07-11 21:29:08 +00:00
#define FTP_LOGGED_IN 230
#define FTP_FILE_ACTION_OK 250
#define FTP_NEED_PASSWORD 331
#define FTP_NEED_ACCOUNT 332
#define FTP_FILE_OK 350
#define FTP_SYNTAX_ERROR 500
static char ENDL[2] = "\r\n";
Second of a series of cleanups to libfetch. This commit introduces the following features: a) the fetchStat*() functions, which return meta-information for a document, such as size, modification time, etc. b) the use of the com_err(3) facilities to report errors. It also fixes a bunch of style bugs and a few logic bugs and somewhat improves the man page. Changed files, in alphabetical order: Makefile: Don't generate macros in {ftp,http}err.c. Generate category fields for the error message lists. Compile the error table. Install fetch_err.h along with fetch.h. common.c: Remove the _netdb_errstring() macro, and add FETCH_ERR_NETDB to the error code in the _netdb_seterr() macro. Add categories to the _netdb_errlist table. Report errors through the Common Error library. common.h: Add the DEBUG macros. Add prototype for fetchConnect(). Remove the prototype for _fetch_errstring(), which is local to common.c Add a categroy field to struct fetcherr, and define constants for error categories. Define macros for _{url,netdb,ftp,http}_seterr(). errors.et: (new file) List error categories. fetch.3: Document the fetchStat*() functions. Move the "unimplemented functionality" comments from NOTES to BUGS. Document that applications which use libfetch must also use libcom_err, and list existing error codes. Undocument fetchLastErr{Code,String}. Remove the (empty) DIAGNOSTICS section. Mention Eugene Skepner in the AUTHORS section. fetch.c: Move the DEBUG macros to common.c Add fetchStat() and fetchStatURL(). Generate error messages for URL parser errors, and fix a minor bug in the parser. Use 'struct url' instead of 'url_t'. Remove fetchLastErr{Code,String}. fetch.h: Use 'struct url' instead of 'url_t', and remove the typedef. Define struct url_stat (used by fetchStat()). Add prototypes for fetchStat*(). Remove the declarations for fetchLastErr{Code,String}. Include fetch_err.h. fetch_err.et: (new file) Error table for libfetch. file.c: Add fetchStatFile(). Use 'struct url' instead of 'url_t'. ftp.c: Add fetchStatFTP(). Use 'struct url' instead of 'url_t'. Don't use fetchLastErrCode. ftp.errors: Add categories to all error messages. http.c: Add fetchStatHTTP(). Use 'struct url' instead of 'url_t'. Don't use fetchLastErr{Code,Text}. http.errors: Add categories to all error messages. Prompted by: jkh and Eugene Skepner Numerous sugestions from: Garett Wollman and Eugene Skepner
1998-11-06 22:14:08 +00:00
static struct url cached_host;
static int cached_socket;
static char *last_reply;
static size_t lr_size, lr_length;
static int last_code;
#define isftpreply(foo) (isdigit(foo[0]) && isdigit(foo[1]) \
&& isdigit(foo[2]) \
&& (foo[3] == ' ' || foo[3] == '\0'))
#define isftpinfo(foo) (isdigit(foo[0]) && isdigit(foo[1]) \
&& isdigit(foo[2]) && foo[3] == '-')
2000-05-20 18:23:51 +00:00
/* translate IPv4 mapped IPv6 address to IPv4 address */
static void
unmappedaddr(struct sockaddr_in6 *sin6)
{
struct sockaddr_in *sin4;
u_int32_t addr;
int port;
if (sin6->sin6_family != AF_INET6 ||
!IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr))
return;
sin4 = (struct sockaddr_in *)sin6;
addr = *(u_int32_t *)&sin6->sin6_addr.s6_addr[12];
port = sin6->sin6_port;
memset(sin4, 0, sizeof(struct sockaddr_in));
sin4->sin_addr.s_addr = addr;
sin4->sin_port = port;
sin4->sin_family = AF_INET;
sin4->sin_len = sizeof(struct sockaddr_in);
}
/*
* Get server response
*/
static int
_ftp_chkerr(int cd)
{
if (_fetch_getln(cd, &last_reply, &lr_size, &lr_length) == -1) {
_fetch_syserr();
return -1;
}
1998-07-11 21:29:08 +00:00
#ifndef NDEBUG
_fetch_info("got reply '%.*s'", lr_length - 2, last_reply);
1998-07-11 21:29:08 +00:00
#endif
if (isftpinfo(last_reply)) {
while (!isftpreply(last_reply)) {
if (_fetch_getln(cd, &last_reply, &lr_size, &lr_length) == -1) {
_fetch_syserr();
return -1;
}
#ifndef NDEBUG
_fetch_info("got reply '%.*s'", lr_length - 2, last_reply);
#endif
}
}
while (lr_length && isspace(last_reply[lr_length-1]))
lr_length--;
last_reply[lr_length] = 0;
if (!isftpreply(last_reply)) {
_ftp_seterr(999);
return -1;
}
last_code = (last_reply[0] - '0') * 100
+ (last_reply[1] - '0') * 10
+ (last_reply[2] - '0');
return last_code;
}
/*
1998-07-11 21:29:08 +00:00
* Send a command and check reply
*/
static int
_ftp_cmd(int cd, char *fmt, ...)
{
1998-07-11 21:29:08 +00:00
va_list ap;
struct iovec iov[2];
char *msg;
int r;
1998-07-11 21:29:08 +00:00
va_start(ap, fmt);
vasprintf(&msg, fmt, ap);
va_end(ap);
if (msg == NULL) {
errno = ENOMEM;
_fetch_syserr();
return -1;
}
1998-07-11 21:29:08 +00:00
#ifndef NDEBUG
_fetch_info("sending '%s'", msg);
1998-07-11 21:29:08 +00:00
#endif
iov[0].iov_base = msg;
iov[0].iov_len = strlen(msg);
iov[1].iov_base = ENDL;
iov[1].iov_len = sizeof ENDL;
r = writev(cd, iov, 2);
free(msg);
if (r == -1) {
_fetch_syserr();
return -1;
}
return _ftp_chkerr(cd);
}
/*
* Transfer file
*/
static FILE *
_ftp_transfer(int cd, char *oper, char *file,
char *mode, off_t offset, char *flags)
{
2000-05-20 18:23:51 +00:00
struct sockaddr_storage sin;
struct sockaddr_in6 *sin6;
struct sockaddr_in *sin4;
int pasv, high, verbose;
int e, sd = -1;
socklen_t l;
1998-07-11 21:29:08 +00:00
char *s;
FILE *df;
/* check flags */
pasv = (flags && strchr(flags, 'p'));
high = (flags && strchr(flags, 'h'));
verbose = (flags && strchr(flags, 'v'));
/* passive mode */
if (!pasv && (s = getenv("FTP_PASSIVE_MODE")) != NULL)
pasv = (strncasecmp(s, "no", 2) != 0);
/* change directory */
1998-07-11 21:29:08 +00:00
if (((s = strrchr(file, '/')) != NULL) && (s != file)) {
*s = 0;
if (verbose)
_fetch_info("changing directory to %s", file);
if ((e = _ftp_cmd(cd, "CWD %s", file)) != FTP_FILE_ACTION_OK) {
1998-07-11 21:29:08 +00:00
*s = '/';
if (e != -1)
_ftp_seterr(e);
return NULL;
}
1998-07-11 21:29:08 +00:00
*s++ = '/';
} else {
if (verbose)
_fetch_info("changing directory to /");
if ((e = _ftp_cmd(cd, "CWD /")) != FTP_FILE_ACTION_OK) {
if (e != -1)
_ftp_seterr(e);
return NULL;
}
}
1998-07-11 21:29:08 +00:00
/* s now points to file name */
2000-05-20 18:23:51 +00:00
/* find our own address, bind, and listen */
l = sizeof sin;
if (getsockname(cd, (struct sockaddr *)&sin, &l) == -1)
goto sysouch;
if (sin.ss_family == AF_INET6)
unmappedaddr((struct sockaddr_in6 *)&sin);
1998-07-11 21:29:08 +00:00
/* open data socket */
2000-05-20 18:23:51 +00:00
if ((sd = socket(sin.ss_family, SOCK_STREAM, IPPROTO_TCP)) == -1) {
_fetch_syserr();
1998-07-11 21:29:08 +00:00
return NULL;
}
if (pasv) {
2000-05-20 18:23:51 +00:00
u_char addr[64];
1998-07-11 21:29:08 +00:00
char *ln, *p;
int i;
2000-05-20 18:23:51 +00:00
int port;
1998-07-11 21:29:08 +00:00
/* send PASV command */
if (verbose)
_fetch_info("setting passive mode");
2000-05-20 18:23:51 +00:00
switch (sin.ss_family) {
case AF_INET:
if ((e = _ftp_cmd(cd, "PASV")) != FTP_PASSIVE_MODE)
goto ouch;
break;
case AF_INET6:
if ((e = _ftp_cmd(cd, "EPSV")) != FTP_EPASSIVE_MODE) {
if (e == -1)
goto ouch;
if ((e = _ftp_cmd(cd, "LPSV")) != FTP_LPASSIVE_MODE)
goto ouch;
}
break;
default:
e = 999; /* XXX: error code should be prepared */
1998-07-11 21:29:08 +00:00
goto ouch;
2000-05-20 18:23:51 +00:00
}
1998-07-11 21:29:08 +00:00
/*
* Find address and port number. The reply to the PASV command
* is IMHO the one and only weak point in the FTP protocol.
*/
ln = last_reply;
2000-05-20 18:23:51 +00:00
for (p = ln + 3; *p && *p != '('; p++)
1998-07-11 21:29:08 +00:00
/* nothing */ ;
2000-05-20 18:23:51 +00:00
if (!*p) {
e = 999;
goto ouch;
1998-07-11 21:29:08 +00:00
}
2000-05-20 18:23:51 +00:00
p++;
switch (e) {
case FTP_PASSIVE_MODE:
case FTP_LPASSIVE_MODE:
l = (e == FTP_PASSIVE_MODE ? 6 : 21);
for (i = 0; *p && i < l; i++, p++)
addr[i] = strtol(p, &p, 10);
if (i < l) {
e = 999;
goto ouch;
}
break;
case FTP_EPASSIVE_MODE:
if (sscanf(p, "%c%c%c%d%c", &addr[0], &addr[1], &addr[2],
&port, &addr[3]) != 5 ||
addr[0] != addr[1] ||
addr[0] != addr[2] || addr[0] != addr[3]) {
e = 999;
goto ouch;
}
break;
}
1998-07-11 21:29:08 +00:00
/* seek to required offset */
if (offset)
if (_ftp_cmd(cd, "REST %lu", (u_long)offset) != FTP_FILE_OK)
goto sysouch;
1998-07-11 21:29:08 +00:00
/* construct sockaddr for data socket */
l = sizeof sin;
if (getpeername(cd, (struct sockaddr *)&sin, &l) == -1)
1998-07-11 21:29:08 +00:00
goto sysouch;
2000-05-20 18:23:51 +00:00
if (sin.ss_family == AF_INET6)
unmappedaddr((struct sockaddr_in6 *)&sin);
switch (sin.ss_family) {
case AF_INET6:
sin6 = (struct sockaddr_in6 *)&sin;
if (e == FTP_EPASSIVE_MODE)
sin6->sin6_port = htons(port);
else {
bcopy(addr + 2, (char *)&sin6->sin6_addr, 16);
bcopy(addr + 19, (char *)&sin6->sin6_port, 2);
}
break;
case AF_INET:
sin4 = (struct sockaddr_in *)&sin;
if (e == FTP_EPASSIVE_MODE)
sin4->sin_port = htons(port);
else {
bcopy(addr, (char *)&sin4->sin_addr, 4);
bcopy(addr + 4, (char *)&sin4->sin_port, 2);
}
break;
default:
e = 999; /* XXX: error code should be prepared */
break;
}
1998-07-11 21:29:08 +00:00
/* connect to data port */
if (verbose)
_fetch_info("opening data connection");
2000-05-20 18:23:51 +00:00
if (connect(sd, (struct sockaddr *)&sin, sin.ss_len) == -1)
1998-07-11 21:29:08 +00:00
goto sysouch;
1998-07-11 21:29:08 +00:00
/* make the server initiate the transfer */
if (verbose)
_fetch_info("initiating transfer");
e = _ftp_cmd(cd, "%s %s", oper, s);
if (e != FTP_OPEN_DATA_CONNECTION)
1998-07-11 21:29:08 +00:00
goto ouch;
} else {
u_int32_t a;
u_short p;
int arg, d;
2000-05-20 18:23:51 +00:00
char *ap;
char hname[INET6_ADDRSTRLEN];
1998-07-11 21:29:08 +00:00
2000-05-20 18:23:51 +00:00
switch (sin.ss_family) {
case AF_INET6:
((struct sockaddr_in6 *)&sin)->sin6_port = 0;
#ifdef IPV6_PORTRANGE
arg = high ? IPV6_PORTRANGE_HIGH : IPV6_PORTRANGE_DEFAULT;
if (setsockopt(sd, IPPROTO_IPV6, IPV6_PORTRANGE,
(char *)&arg, sizeof(arg)) == -1)
goto sysouch;
#endif
break;
case AF_INET:
((struct sockaddr_in *)&sin)->sin_port = 0;
arg = high ? IP_PORTRANGE_HIGH : IP_PORTRANGE_DEFAULT;
if (setsockopt(sd, IPPROTO_IP, IP_PORTRANGE,
(char *)&arg, sizeof arg) == -1)
goto sysouch;
break;
}
if (verbose)
_fetch_info("binding data socket");
2000-05-20 18:23:51 +00:00
if (bind(sd, (struct sockaddr *)&sin, sin.ss_len) == -1)
1998-07-11 21:29:08 +00:00
goto sysouch;
if (listen(sd, 1) == -1)
1998-07-11 21:29:08 +00:00
goto sysouch;
/* find what port we're on and tell the server */
if (getsockname(sd, (struct sockaddr *)&sin, &l) == -1)
1998-07-11 21:29:08 +00:00
goto sysouch;
2000-05-20 18:23:51 +00:00
switch (sin.ss_family) {
case AF_INET:
sin4 = (struct sockaddr_in *)&sin;
a = ntohl(sin4->sin_addr.s_addr);
p = ntohs(sin4->sin_port);
e = _ftp_cmd(cd, "PORT %d,%d,%d,%d,%d,%d",
(a >> 24) & 0xff, (a >> 16) & 0xff,
(a >> 8) & 0xff, a & 0xff,
(p >> 8) & 0xff, p & 0xff);
break;
case AF_INET6:
#define UC(b) (((int)b)&0xff)
e = -1;
sin6 = (struct sockaddr_in6 *)&sin;
if (getnameinfo((struct sockaddr *)&sin, sin.ss_len,
hname, sizeof(hname),
NULL, 0, NI_NUMERICHOST) == 0) {
e = _ftp_cmd(cd, "EPRT |%d|%s|%d|", 2, hname,
htons(sin6->sin6_port));
if (e == -1)
goto ouch;
}
if (e != FTP_OK) {
ap = (char *)&sin6->sin6_addr;
e = _ftp_cmd(cd,
"LPRT %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d",
6, 16,
UC(ap[0]), UC(ap[1]), UC(ap[2]), UC(ap[3]),
UC(ap[4]), UC(ap[5]), UC(ap[6]), UC(ap[7]),
UC(ap[8]), UC(ap[9]), UC(ap[10]), UC(ap[11]),
UC(ap[12]), UC(ap[13]), UC(ap[14]), UC(ap[15]),
2,
(ntohs(sin6->sin6_port) >> 8) & 0xff,
ntohs(sin6->sin6_port) & 0xff);
}
break;
default:
e = 999; /* XXX: error code should be prepared */
goto ouch;
}
if (e != FTP_OK)
1998-07-11 21:29:08 +00:00
goto ouch;
/* make the server initiate the transfer */
if (verbose)
_fetch_info("initiating transfer");
e = _ftp_cmd(cd, "%s %s", oper, s);
if (e != FTP_OPEN_DATA_CONNECTION)
1998-07-11 21:29:08 +00:00
goto ouch;
/* accept the incoming connection and go to town */
if ((d = accept(sd, NULL, NULL)) == -1)
1998-07-11 21:29:08 +00:00
goto sysouch;
close(sd);
sd = d;
}
if ((df = fdopen(sd, mode)) == NULL)
1998-07-11 21:29:08 +00:00
goto sysouch;
return df;
sysouch:
_fetch_syserr();
2000-05-20 18:23:51 +00:00
if (sd >= 0)
close(sd);
return NULL;
1998-07-11 21:29:08 +00:00
ouch:
if (e != -1)
_ftp_seterr(e);
2000-05-20 18:23:51 +00:00
if (sd >= 0)
close(sd);
return NULL;
}
/*
* Log on to FTP server
*/
static int
_ftp_connect(char *host, int port, char *user, char *pwd, char *flags)
{
int cd, e, pp = 0, direct, verbose;
2000-05-20 18:23:51 +00:00
#ifdef INET6
int af = AF_UNSPEC;
#else
int af = AF_INET;
#endif
char *p, *q;
const char *logname;
char localhost[MAXHOSTNAMELEN];
char pbuf[MAXHOSTNAMELEN + MAXLOGNAME + 1];
direct = (flags && strchr(flags, 'd'));
verbose = (flags && strchr(flags, 'v'));
2000-05-20 18:23:51 +00:00
if ((flags && strchr(flags, '4')))
af = AF_INET;
else if ((flags && strchr(flags, '6')))
af = AF_INET6;
/* check for proxy */
if (!direct && (p = getenv("FTP_PROXY")) != NULL) {
2000-05-20 18:23:51 +00:00
char c = 0;
#ifdef INET6
if (*p != '[' || (q = strchr(p + 1, ']')) == NULL ||
(*++q != '\0' && *q != ':'))
#endif
q = strchr(p, ':');
if (q != NULL && *q == ':') {
if (strspn(q+1, "0123456789") != strlen(q+1) || strlen(q+1) > 5) {
/* XXX we should emit some kind of warning */
}
pp = atoi(q+1);
if (pp < 1 || pp > 65535) {
/* XXX we should emit some kind of warning */
}
}
if (!pp) {
struct servent *se;
if ((se = getservbyname("ftp", "tcp")) != NULL)
pp = ntohs(se->s_port);
else
pp = FTP_DEFAULT_PORT;
}
2000-05-20 18:23:51 +00:00
if (q) {
#ifdef INET6
if (q > p && *p == '[' && *(q - 1) == ']') {
p++;
q--;
}
#endif
c = *q;
*q = 0;
2000-05-20 18:23:51 +00:00
}
cd = _fetch_connect(p, pp, af, verbose);
if (q)
2000-05-20 18:23:51 +00:00
*q = c;
} else {
/* no proxy, go straight to target */
2000-05-20 18:23:51 +00:00
cd = _fetch_connect(host, port, af, verbose);
p = NULL;
}
/* check connection */
if (cd == -1) {
_fetch_syserr();
return NULL;
}
/* expect welcome message */
if ((e = _ftp_chkerr(cd)) != FTP_SERVICE_READY)
goto fouch;
/* send user name and password */
if (!user || !*user)
user = FTP_ANONYMOUS_USER;
e = p ? _ftp_cmd(cd, "USER %s@%s@%d", user, host, port)
: _ftp_cmd(cd, "USER %s", user);
/* did the server request a password? */
if (e == FTP_NEED_PASSWORD) {
if (!pwd || !*pwd)
pwd = getenv("FTP_PASSWORD");
if (!pwd || !*pwd) {
if ((logname = getlogin()) == 0)
logname = FTP_ANONYMOUS_PASSWORD;
gethostname(localhost, sizeof localhost);
snprintf(pbuf, sizeof pbuf, "%s@%s", logname, localhost);
pwd = pbuf;
}
e = _ftp_cmd(cd, "PASS %s", pwd);
}
/* did the server request an account? */
if (e == FTP_NEED_ACCOUNT)
goto fouch;
/* we should be done by now */
if (e != FTP_LOGGED_IN)
goto fouch;
/* might as well select mode and type at once */
#ifdef FTP_FORCE_STREAM_MODE
if ((e = _ftp_cmd(cd, "MODE S")) != FTP_OK) /* default is S */
goto fouch;
#endif
if ((e = _ftp_cmd(cd, "TYPE I")) != FTP_OK) /* default is A */
goto fouch;
/* done */
return cd;
fouch:
if (e != -1)
_ftp_seterr(e);
close(cd);
return NULL;
}
/*
* Disconnect from server
*/
static void
_ftp_disconnect(int cd)
{
(void)_ftp_cmd(cd, "QUIT");
close(cd);
}
/*
* Check if we're already connected
*/
static int
Second of a series of cleanups to libfetch. This commit introduces the following features: a) the fetchStat*() functions, which return meta-information for a document, such as size, modification time, etc. b) the use of the com_err(3) facilities to report errors. It also fixes a bunch of style bugs and a few logic bugs and somewhat improves the man page. Changed files, in alphabetical order: Makefile: Don't generate macros in {ftp,http}err.c. Generate category fields for the error message lists. Compile the error table. Install fetch_err.h along with fetch.h. common.c: Remove the _netdb_errstring() macro, and add FETCH_ERR_NETDB to the error code in the _netdb_seterr() macro. Add categories to the _netdb_errlist table. Report errors through the Common Error library. common.h: Add the DEBUG macros. Add prototype for fetchConnect(). Remove the prototype for _fetch_errstring(), which is local to common.c Add a categroy field to struct fetcherr, and define constants for error categories. Define macros for _{url,netdb,ftp,http}_seterr(). errors.et: (new file) List error categories. fetch.3: Document the fetchStat*() functions. Move the "unimplemented functionality" comments from NOTES to BUGS. Document that applications which use libfetch must also use libcom_err, and list existing error codes. Undocument fetchLastErr{Code,String}. Remove the (empty) DIAGNOSTICS section. Mention Eugene Skepner in the AUTHORS section. fetch.c: Move the DEBUG macros to common.c Add fetchStat() and fetchStatURL(). Generate error messages for URL parser errors, and fix a minor bug in the parser. Use 'struct url' instead of 'url_t'. Remove fetchLastErr{Code,String}. fetch.h: Use 'struct url' instead of 'url_t', and remove the typedef. Define struct url_stat (used by fetchStat()). Add prototypes for fetchStat*(). Remove the declarations for fetchLastErr{Code,String}. Include fetch_err.h. fetch_err.et: (new file) Error table for libfetch. file.c: Add fetchStatFile(). Use 'struct url' instead of 'url_t'. ftp.c: Add fetchStatFTP(). Use 'struct url' instead of 'url_t'. Don't use fetchLastErrCode. ftp.errors: Add categories to all error messages. http.c: Add fetchStatHTTP(). Use 'struct url' instead of 'url_t'. Don't use fetchLastErr{Code,Text}. http.errors: Add categories to all error messages. Prompted by: jkh and Eugene Skepner Numerous sugestions from: Garett Wollman and Eugene Skepner
1998-11-06 22:14:08 +00:00
_ftp_isconnected(struct url *url)
{
return (cached_socket
&& (strcmp(url->host, cached_host.host) == 0)
&& (strcmp(url->user, cached_host.user) == 0)
&& (strcmp(url->pwd, cached_host.pwd) == 0)
&& (url->port == cached_host.port));
}
/*
* Check the cache, reconnect if no luck
*/
static int
_ftp_cached_connect(struct url *url, char *flags)
{
int e, cd;
cd = -1;
/* set default port */
if (!url->port) {
struct servent *se;
if ((se = getservbyname("ftp", "tcp")) != NULL)
url->port = ntohs(se->s_port);
else
url->port = FTP_DEFAULT_PORT;
}
/* try to use previously cached connection */
if (_ftp_isconnected(url)) {
e = _ftp_cmd(cached_socket, "NOOP");
if (e == FTP_OK || e == FTP_SYNTAX_ERROR)
cd = cached_socket;
}
/* connect to server */
if (cd == -1) {
cd = _ftp_connect(url->host, url->port, url->user, url->pwd, flags);
if (cd == -1)
return -1;
if (cached_socket)
_ftp_disconnect(cached_socket);
cached_socket = cd;
memcpy(&cached_host, url, sizeof *url);
}
return cd;
}
/*
* Get file
*/
FILE *
Second of a series of cleanups to libfetch. This commit introduces the following features: a) the fetchStat*() functions, which return meta-information for a document, such as size, modification time, etc. b) the use of the com_err(3) facilities to report errors. It also fixes a bunch of style bugs and a few logic bugs and somewhat improves the man page. Changed files, in alphabetical order: Makefile: Don't generate macros in {ftp,http}err.c. Generate category fields for the error message lists. Compile the error table. Install fetch_err.h along with fetch.h. common.c: Remove the _netdb_errstring() macro, and add FETCH_ERR_NETDB to the error code in the _netdb_seterr() macro. Add categories to the _netdb_errlist table. Report errors through the Common Error library. common.h: Add the DEBUG macros. Add prototype for fetchConnect(). Remove the prototype for _fetch_errstring(), which is local to common.c Add a categroy field to struct fetcherr, and define constants for error categories. Define macros for _{url,netdb,ftp,http}_seterr(). errors.et: (new file) List error categories. fetch.3: Document the fetchStat*() functions. Move the "unimplemented functionality" comments from NOTES to BUGS. Document that applications which use libfetch must also use libcom_err, and list existing error codes. Undocument fetchLastErr{Code,String}. Remove the (empty) DIAGNOSTICS section. Mention Eugene Skepner in the AUTHORS section. fetch.c: Move the DEBUG macros to common.c Add fetchStat() and fetchStatURL(). Generate error messages for URL parser errors, and fix a minor bug in the parser. Use 'struct url' instead of 'url_t'. Remove fetchLastErr{Code,String}. fetch.h: Use 'struct url' instead of 'url_t', and remove the typedef. Define struct url_stat (used by fetchStat()). Add prototypes for fetchStat*(). Remove the declarations for fetchLastErr{Code,String}. Include fetch_err.h. fetch_err.et: (new file) Error table for libfetch. file.c: Add fetchStatFile(). Use 'struct url' instead of 'url_t'. ftp.c: Add fetchStatFTP(). Use 'struct url' instead of 'url_t'. Don't use fetchLastErrCode. ftp.errors: Add categories to all error messages. http.c: Add fetchStatHTTP(). Use 'struct url' instead of 'url_t'. Don't use fetchLastErr{Code,Text}. http.errors: Add categories to all error messages. Prompted by: jkh and Eugene Skepner Numerous sugestions from: Garett Wollman and Eugene Skepner
1998-11-06 22:14:08 +00:00
fetchGetFTP(struct url *url, char *flags)
{
int cd;
/* connect to server */
if ((cd = _ftp_cached_connect(url, flags)) == NULL)
return NULL;
/* initiate the transfer */
return _ftp_transfer(cd, "RETR", url->doc, "r", url->offset, flags);
}
/*
* Put file
*/
FILE *
Second of a series of cleanups to libfetch. This commit introduces the following features: a) the fetchStat*() functions, which return meta-information for a document, such as size, modification time, etc. b) the use of the com_err(3) facilities to report errors. It also fixes a bunch of style bugs and a few logic bugs and somewhat improves the man page. Changed files, in alphabetical order: Makefile: Don't generate macros in {ftp,http}err.c. Generate category fields for the error message lists. Compile the error table. Install fetch_err.h along with fetch.h. common.c: Remove the _netdb_errstring() macro, and add FETCH_ERR_NETDB to the error code in the _netdb_seterr() macro. Add categories to the _netdb_errlist table. Report errors through the Common Error library. common.h: Add the DEBUG macros. Add prototype for fetchConnect(). Remove the prototype for _fetch_errstring(), which is local to common.c Add a categroy field to struct fetcherr, and define constants for error categories. Define macros for _{url,netdb,ftp,http}_seterr(). errors.et: (new file) List error categories. fetch.3: Document the fetchStat*() functions. Move the "unimplemented functionality" comments from NOTES to BUGS. Document that applications which use libfetch must also use libcom_err, and list existing error codes. Undocument fetchLastErr{Code,String}. Remove the (empty) DIAGNOSTICS section. Mention Eugene Skepner in the AUTHORS section. fetch.c: Move the DEBUG macros to common.c Add fetchStat() and fetchStatURL(). Generate error messages for URL parser errors, and fix a minor bug in the parser. Use 'struct url' instead of 'url_t'. Remove fetchLastErr{Code,String}. fetch.h: Use 'struct url' instead of 'url_t', and remove the typedef. Define struct url_stat (used by fetchStat()). Add prototypes for fetchStat*(). Remove the declarations for fetchLastErr{Code,String}. Include fetch_err.h. fetch_err.et: (new file) Error table for libfetch. file.c: Add fetchStatFile(). Use 'struct url' instead of 'url_t'. ftp.c: Add fetchStatFTP(). Use 'struct url' instead of 'url_t'. Don't use fetchLastErrCode. ftp.errors: Add categories to all error messages. http.c: Add fetchStatHTTP(). Use 'struct url' instead of 'url_t'. Don't use fetchLastErr{Code,Text}. http.errors: Add categories to all error messages. Prompted by: jkh and Eugene Skepner Numerous sugestions from: Garett Wollman and Eugene Skepner
1998-11-06 22:14:08 +00:00
fetchPutFTP(struct url *url, char *flags)
{
int cd;
/* connect to server */
if ((cd = _ftp_cached_connect(url, flags)) == NULL)
return NULL;
/* initiate the transfer */
return _ftp_transfer(cd, (flags && strchr(flags, 'a')) ? "APPE" : "STOR",
url->doc, "w", url->offset, flags);
}
Second of a series of cleanups to libfetch. This commit introduces the following features: a) the fetchStat*() functions, which return meta-information for a document, such as size, modification time, etc. b) the use of the com_err(3) facilities to report errors. It also fixes a bunch of style bugs and a few logic bugs and somewhat improves the man page. Changed files, in alphabetical order: Makefile: Don't generate macros in {ftp,http}err.c. Generate category fields for the error message lists. Compile the error table. Install fetch_err.h along with fetch.h. common.c: Remove the _netdb_errstring() macro, and add FETCH_ERR_NETDB to the error code in the _netdb_seterr() macro. Add categories to the _netdb_errlist table. Report errors through the Common Error library. common.h: Add the DEBUG macros. Add prototype for fetchConnect(). Remove the prototype for _fetch_errstring(), which is local to common.c Add a categroy field to struct fetcherr, and define constants for error categories. Define macros for _{url,netdb,ftp,http}_seterr(). errors.et: (new file) List error categories. fetch.3: Document the fetchStat*() functions. Move the "unimplemented functionality" comments from NOTES to BUGS. Document that applications which use libfetch must also use libcom_err, and list existing error codes. Undocument fetchLastErr{Code,String}. Remove the (empty) DIAGNOSTICS section. Mention Eugene Skepner in the AUTHORS section. fetch.c: Move the DEBUG macros to common.c Add fetchStat() and fetchStatURL(). Generate error messages for URL parser errors, and fix a minor bug in the parser. Use 'struct url' instead of 'url_t'. Remove fetchLastErr{Code,String}. fetch.h: Use 'struct url' instead of 'url_t', and remove the typedef. Define struct url_stat (used by fetchStat()). Add prototypes for fetchStat*(). Remove the declarations for fetchLastErr{Code,String}. Include fetch_err.h. fetch_err.et: (new file) Error table for libfetch. file.c: Add fetchStatFile(). Use 'struct url' instead of 'url_t'. ftp.c: Add fetchStatFTP(). Use 'struct url' instead of 'url_t'. Don't use fetchLastErrCode. ftp.errors: Add categories to all error messages. http.c: Add fetchStatHTTP(). Use 'struct url' instead of 'url_t'. Don't use fetchLastErr{Code,Text}. http.errors: Add categories to all error messages. Prompted by: jkh and Eugene Skepner Numerous sugestions from: Garett Wollman and Eugene Skepner
1998-11-06 22:14:08 +00:00
/*
* Get file stats
*/
Second of a series of cleanups to libfetch. This commit introduces the following features: a) the fetchStat*() functions, which return meta-information for a document, such as size, modification time, etc. b) the use of the com_err(3) facilities to report errors. It also fixes a bunch of style bugs and a few logic bugs and somewhat improves the man page. Changed files, in alphabetical order: Makefile: Don't generate macros in {ftp,http}err.c. Generate category fields for the error message lists. Compile the error table. Install fetch_err.h along with fetch.h. common.c: Remove the _netdb_errstring() macro, and add FETCH_ERR_NETDB to the error code in the _netdb_seterr() macro. Add categories to the _netdb_errlist table. Report errors through the Common Error library. common.h: Add the DEBUG macros. Add prototype for fetchConnect(). Remove the prototype for _fetch_errstring(), which is local to common.c Add a categroy field to struct fetcherr, and define constants for error categories. Define macros for _{url,netdb,ftp,http}_seterr(). errors.et: (new file) List error categories. fetch.3: Document the fetchStat*() functions. Move the "unimplemented functionality" comments from NOTES to BUGS. Document that applications which use libfetch must also use libcom_err, and list existing error codes. Undocument fetchLastErr{Code,String}. Remove the (empty) DIAGNOSTICS section. Mention Eugene Skepner in the AUTHORS section. fetch.c: Move the DEBUG macros to common.c Add fetchStat() and fetchStatURL(). Generate error messages for URL parser errors, and fix a minor bug in the parser. Use 'struct url' instead of 'url_t'. Remove fetchLastErr{Code,String}. fetch.h: Use 'struct url' instead of 'url_t', and remove the typedef. Define struct url_stat (used by fetchStat()). Add prototypes for fetchStat*(). Remove the declarations for fetchLastErr{Code,String}. Include fetch_err.h. fetch_err.et: (new file) Error table for libfetch. file.c: Add fetchStatFile(). Use 'struct url' instead of 'url_t'. ftp.c: Add fetchStatFTP(). Use 'struct url' instead of 'url_t'. Don't use fetchLastErrCode. ftp.errors: Add categories to all error messages. http.c: Add fetchStatHTTP(). Use 'struct url' instead of 'url_t'. Don't use fetchLastErr{Code,Text}. http.errors: Add categories to all error messages. Prompted by: jkh and Eugene Skepner Numerous sugestions from: Garett Wollman and Eugene Skepner
1998-11-06 22:14:08 +00:00
int
fetchStatFTP(struct url *url, struct url_stat *us, char *flags)
{
char *ln, *s;
struct tm tm;
time_t t;
int e, cd;
us->size = -1;
us->atime = us->mtime = 0;
/* connect to server */
if ((cd = _ftp_cached_connect(url, flags)) == NULL)
return -1;
/* change directory */
if (((s = strrchr(url->doc, '/')) != NULL) && (s != url->doc)) {
*s = 0;
if ((e = _ftp_cmd(cd, "CWD %s", url->doc)) != FTP_FILE_ACTION_OK) {
*s = '/';
goto ouch;
}
*s++ = '/';
} else {
if ((e = _ftp_cmd(cd, "CWD /")) != FTP_FILE_ACTION_OK)
goto ouch;
}
/* s now points to file name */
if (_ftp_cmd(cd, "SIZE %s", s) != FTP_FILE_STATUS)
goto ouch;
for (ln = last_reply + 4; *ln && isspace(*ln); ln++)
/* nothing */ ;
for (us->size = 0; *ln && isdigit(*ln); ln++)
us->size = us->size * 10 + *ln - '0';
if (*ln && !isspace(*ln)) {
_ftp_seterr(999);
return -1;
}
DEBUG(fprintf(stderr, "size: [\033[1m%lld\033[m]\n", us->size));
if ((e = _ftp_cmd(cd, "MDTM %s", s)) != FTP_FILE_STATUS)
goto ouch;
for (ln = last_reply + 4; *ln && isspace(*ln); ln++)
/* nothing */ ;
e = 999;
switch (strspn(ln, "0123456789")) {
case 14:
break;
case 15:
ln++;
ln[0] = '2';
ln[1] = '0';
break;
default:
goto ouch;
}
if (sscanf(ln, "%04d%02d%02d%02d%02d%02d",
&tm.tm_year, &tm.tm_mon, &tm.tm_mday,
&tm.tm_hour, &tm.tm_min, &tm.tm_sec) != 6)
goto ouch;
tm.tm_mon--;
tm.tm_year -= 1900;
tm.tm_isdst = -1;
t = timegm(&tm);
if (t == (time_t)-1)
t = time(NULL);
us->mtime = t;
us->atime = t;
DEBUG(fprintf(stderr, "last modified: [\033[1m%04d-%02d-%02d "
"%02d:%02d:%02d\033[m]\n",
tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday,
tm.tm_hour, tm.tm_min, tm.tm_sec));
return 0;
ouch:
if (e != -1)
_ftp_seterr(e);
Second of a series of cleanups to libfetch. This commit introduces the following features: a) the fetchStat*() functions, which return meta-information for a document, such as size, modification time, etc. b) the use of the com_err(3) facilities to report errors. It also fixes a bunch of style bugs and a few logic bugs and somewhat improves the man page. Changed files, in alphabetical order: Makefile: Don't generate macros in {ftp,http}err.c. Generate category fields for the error message lists. Compile the error table. Install fetch_err.h along with fetch.h. common.c: Remove the _netdb_errstring() macro, and add FETCH_ERR_NETDB to the error code in the _netdb_seterr() macro. Add categories to the _netdb_errlist table. Report errors through the Common Error library. common.h: Add the DEBUG macros. Add prototype for fetchConnect(). Remove the prototype for _fetch_errstring(), which is local to common.c Add a categroy field to struct fetcherr, and define constants for error categories. Define macros for _{url,netdb,ftp,http}_seterr(). errors.et: (new file) List error categories. fetch.3: Document the fetchStat*() functions. Move the "unimplemented functionality" comments from NOTES to BUGS. Document that applications which use libfetch must also use libcom_err, and list existing error codes. Undocument fetchLastErr{Code,String}. Remove the (empty) DIAGNOSTICS section. Mention Eugene Skepner in the AUTHORS section. fetch.c: Move the DEBUG macros to common.c Add fetchStat() and fetchStatURL(). Generate error messages for URL parser errors, and fix a minor bug in the parser. Use 'struct url' instead of 'url_t'. Remove fetchLastErr{Code,String}. fetch.h: Use 'struct url' instead of 'url_t', and remove the typedef. Define struct url_stat (used by fetchStat()). Add prototypes for fetchStat*(). Remove the declarations for fetchLastErr{Code,String}. Include fetch_err.h. fetch_err.et: (new file) Error table for libfetch. file.c: Add fetchStatFile(). Use 'struct url' instead of 'url_t'. ftp.c: Add fetchStatFTP(). Use 'struct url' instead of 'url_t'. Don't use fetchLastErrCode. ftp.errors: Add categories to all error messages. http.c: Add fetchStatHTTP(). Use 'struct url' instead of 'url_t'. Don't use fetchLastErr{Code,Text}. http.errors: Add categories to all error messages. Prompted by: jkh and Eugene Skepner Numerous sugestions from: Garett Wollman and Eugene Skepner
1998-11-06 22:14:08 +00:00
return -1;
}
/*
* List a directory
*/
extern void warnx(char *, ...);
struct url_ent *
fetchListFTP(struct url *url, char *flags)
{
warnx("fetchListFTP(): not implemented");
return NULL;
}