/*
- * "$Id: client.c 7950 2008-09-17 00:21:59Z mike $"
+ * "$Id$"
*
- * Client routines for the CUPS scheduler.
+ * Client routines for the CUPS scheduler.
*
- * Copyright 2007-2012 by Apple Inc.
- * Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ * Copyright 2007-2013 by Apple Inc.
+ * Copyright 1997-2007 by Easy Software Products, all rights reserved.
*
- * This file contains Kerberos support code, copyright 2006 by
- * Jelmer Vernooij.
+ * This file contains Kerberos support code, copyright 2006 by
+ * Jelmer Vernooij.
*
- * These coded instructions, statements, and computer programs are the
- * property of Apple Inc. and are protected by Federal copyright
- * law. Distribution and use rights are outlined in the file "LICENSE.txt"
- * which should have been included with this file. If this file is
- * file is missing or damaged, see the license at "http://www.cups.org/".
- *
- * Contents:
- *
- * cupsdAcceptClient() - Accept a new client.
- * cupsdCloseAllClients() - Close all remote clients immediately.
- * cupsdCloseClient() - Close a remote client.
- * cupsdFlushHeader() - Flush the header fields to the client.
- * cupsdReadClient() - Read data from a client.
- * cupsdSendCommand() - Send output from a command via HTTP.
- * cupsdSendError() - Send an error message via HTTP.
- * cupsdSendHeader() - Send an HTTP request.
- * cupsdUpdateCGI() - Read status messages from CGI scripts and
- * programs.
- * cupsdWriteClient() - Write data to a client as needed.
- * check_if_modified() - Decode an "If-Modified-Since" line.
- * compare_clients() - Compare two client connections.
- * data_ready() - Check whether data is available from a client.
- * get_file() - Get a filename and state info.
- * install_conf_file() - Install a configuration file.
- * is_cgi() - Is the resource a CGI script/program?
- * is_path_absolute() - Is a path absolute and free of relative elements
- * (i.e. "..").
- * pipe_command() - Pipe the output of a command to the remote
- * client.
- * valid_host() - Is the Host: field valid?
- * write_file() - Send a file via HTTP.
- * write_pipe() - Flag that data is available on the CGI pipe.
+ * These coded instructions, statements, and computer programs are the
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*/
/*
* Include necessary headers...
*/
+#define _CUPS_NO_DEPRECATED
+//#define _HTTP_NO_PRIVATE
#include "cupsd.h"
+#ifdef __APPLE__
+# include <libproc.h>
+#endif /* __APPLE__ */
#ifdef HAVE_TCPD_H
# include <tcpd.h>
#endif /* HAVE_TCPD_H */
* Local globals...
*/
-static const char * const http_states[] =
- { /* HTTP state strings */
- "HTTP_WAITING",
- "HTTP_OPTIONS",
- "HTTP_GET",
- "HTTP_GET_SEND",
- "HTTP_HEAD",
- "HTTP_POST",
- "HTTP_POST_RECV",
- "HTTP_POST_SEND",
- "HTTP_PUT",
- "HTTP_PUT_RECV",
- "HTTP_DELETE",
- "HTTP_TRACE",
- "HTTP_CLOSE",
- "HTTP_STATUS"
- };
static const char * const ipp_states[] =
{ /* IPP state strings */
"IPP_IDLE",
"IPP_HEADER",
"IPP_ATTRIBUTE",
- "IPP_DATA"
+ "IPP_STATE_DATA"
};
struct stat *filestats);
static int compare_clients(cupsd_client_t *a, cupsd_client_t *b,
void *data);
-static int data_ready(cupsd_client_t *con);
static char *get_file(cupsd_client_t *con, struct stat *filestats,
char *filename, int len);
-static http_status_t install_conf_file(cupsd_client_t *con);
+static http_status_t install_cupsd_conf(cupsd_client_t *con);
static int is_cgi(cupsd_client_t *con, const char *filename,
struct stat *filestats, mime_type_t *type);
static int is_path_absolute(const char *path);
void
cupsdAcceptClient(cupsd_listener_t *lis)/* I - Listener socket */
{
+ const char *hostname; /* Hostname of client */
+ char name[256]; /* Hostname of client */
int count; /* Count of connections on a host */
- int val; /* Parameter value */
cupsd_client_t *con, /* New client pointer */
*tempcon; /* Temporary client pointer */
- http_addrlist_t *addrlist, /* List of adddresses for host */
- *addr; /* Current address */
socklen_t addrlen; /* Length of address */
- char *hostname; /* Hostname for address */
http_addr_t temp; /* Temporary address variable */
static time_t last_dos = 0; /* Time of last DoS attack */
#ifdef HAVE_TCPD_H
return;
}
- con->file = -1;
- con->http.activity = time(NULL);
- con->http.hostaddr = &(con->clientaddr);
- con->http.wait_value = 10000;
-
/*
* Accept the client and get the remote address...
*/
- addrlen = sizeof(http_addr_t);
+ con->number = ++ LastClientNumber;
+ con->file = -1;
- if ((con->http.fd = accept(lis->fd, (struct sockaddr *)con->http.hostaddr,
- &addrlen)) < 0)
+ if ((con->http = httpAcceptConnection(lis->fd, 0)) == NULL)
{
if (errno == ENFILE || errno == EMFILE)
cupsdPauseListening();
}
/*
- * Save the connected port number...
+ * Save the connected address and port number...
*/
- _httpAddrSetPort(con->http.hostaddr, _httpAddrPort(&(lis->address)));
+ con->clientaddr = lis->address;
-#ifdef AF_INET6
+#if 0 /* ifdef AF_INET6 */
+ /* FIXME: I don't believe this is recommended any longer, and we specifically
+ * disable IPv4-over-IPv6 when we listen...
+ */
/*
* Convert IPv4 over IPv6 addresses (::ffff:n.n.n.n) to IPv4 forms we
* can more easily use...
*/
if (lis->address.addr.sa_family == AF_INET6 &&
- con->http.hostaddr->ipv6.sin6_addr.s6_addr32[0] == 0 &&
- con->http.hostaddr->ipv6.sin6_addr.s6_addr32[1] == 0 &&
- ntohl(con->http.hostaddr->ipv6.sin6_addr.s6_addr32[2]) == 0xffff)
- con->http.hostaddr->ipv6.sin6_addr.s6_addr32[2] = 0;
+ httpGetAddress(con->http)->ipv6.sin6_addr.s6_addr32[0] == 0 &&
+ httpGetAddress(con->http)->ipv6.sin6_addr.s6_addr32[1] == 0 &&
+ ntohl(httpGetAddress(con->http)->ipv6.sin6_addr.s6_addr32[2]) == 0xffff)
+ httpGetAddress(con->http)->ipv6.sin6_addr.s6_addr32[2] = 0;
#endif /* AF_INET6 */
/*
for (count = 0, tempcon = (cupsd_client_t *)cupsArrayFirst(Clients);
tempcon;
tempcon = (cupsd_client_t *)cupsArrayNext(Clients))
- if (httpAddrEqual(tempcon->http.hostaddr, con->http.hostaddr))
+ if (httpAddrEqual(httpGetAddress(tempcon->http), httpGetAddress(con->http)))
{
count ++;
if (count >= MaxClientsPerHost)
last_dos = time(NULL);
cupsdLogMessage(CUPSD_LOG_WARN,
"Possible DoS attack - more than %d clients connecting "
- "from %s!",
+ "from %s.",
MaxClientsPerHost,
- httpAddrString(con->http.hostaddr, con->http.hostname,
- sizeof(con->http.hostname)));
+ httpGetHostname(con->http, name, sizeof(name)));
}
-#ifdef WIN32
- closesocket(con->http.fd);
-#else
- close(con->http.fd);
-#endif /* WIN32 */
-
+ httpClose(con->http);
free(con);
return;
}
* Get the hostname or format the IP address as needed...
*/
- if (httpAddrLocalhost(con->http.hostaddr))
- {
- /*
- * Map accesses from the loopback interface to "localhost"...
- */
-
- strlcpy(con->http.hostname, "localhost", sizeof(con->http.hostname));
- hostname = con->http.hostname;
- }
+ if (HostNameLookups)
+ hostname = httpResolveHostname(con->http, NULL, 0);
else
- {
- /*
- * Map accesses from the same host to the server name.
- */
-
- if (HostNameLookups)
- hostname = httpAddrLookup(con->http.hostaddr, con->http.hostname,
- sizeof(con->http.hostname));
- else
- {
- hostname = NULL;
- httpAddrString(con->http.hostaddr, con->http.hostname,
- sizeof(con->http.hostname));
- }
- }
+ hostname = httpGetHostname(con->http, NULL, 0);
if (hostname == NULL && HostNameLookups == 2)
{
* Can't have an unresolved IP address with double-lookups enabled...
*/
-#ifdef WIN32
- closesocket(con->http.fd);
-#else
- close(con->http.fd);
-#endif /* WIN32 */
+ httpClose(con->http);
- cupsdLogMessage(CUPSD_LOG_WARN,
+ cupsdLogClient(con, CUPSD_LOG_WARN,
"Name lookup failed - connection from %s closed!",
- con->http.hostname);
+ httpGetHostname(con->http, NULL, 0));
free(con);
return;
* Do double lookups as needed...
*/
- if ((addrlist = httpAddrGetList(con->http.hostname, AF_UNSPEC, NULL))
- != NULL)
+ http_addrlist_t *addrlist, /* List of addresses */
+ *addr; /* Current address */
+
+ if ((addrlist = httpAddrGetList(hostname, AF_UNSPEC, NULL)) != NULL)
{
/*
* See if the hostname maps to the same IP address...
*/
for (addr = addrlist; addr; addr = addr->next)
- if (httpAddrEqual(con->http.hostaddr, &(addr->addr)))
+ if (httpAddrEqual(httpGetAddress(con->http), &(addr->addr)))
break;
}
else
* with double-lookups enabled...
*/
-#ifdef WIN32
- closesocket(con->http.fd);
-#else
- close(con->http.fd);
-#endif /* WIN32 */
+ httpClose(con->http);
- cupsdLogMessage(CUPSD_LOG_WARN,
+ cupsdLogClient(con, CUPSD_LOG_WARN,
"IP lookup failed - connection from %s closed!",
- con->http.hostname);
+ httpGetHostname(con->http, NULL, 0));
free(con);
return;
}
* See if the connection is denied by TCP wrappers...
*/
- request_init(&wrap_req, RQ_DAEMON, "cupsd", RQ_FILE, con->http.fd, NULL);
+ request_init(&wrap_req, RQ_DAEMON, "cupsd", RQ_FILE, httpGetFd(con->http),
+ NULL);
fromhost(&wrap_req);
if (!hosts_access(&wrap_req))
{
-#ifdef WIN32
- closesocket(con->http.fd);
-#else
- close(con->http.fd);
-#endif /* WIN32 */
+ httpClose(con->http);
- cupsdLogMessage(CUPSD_LOG_WARN,
+ cupsdLogClient(con, CUPSD_LOG_WARN,
"Connection from %s refused by /etc/hosts.allow and "
- "/etc/hosts.deny rules.", con->http.hostname);
+ "/etc/hosts.deny rules.", httpGetHostname(con->http, NULL, 0));
free(con);
return;
}
#endif /* HAVE_TCPD_H */
#ifdef AF_LOCAL
- if (con->http.hostaddr->addr.sa_family == AF_LOCAL)
- cupsdLogMessage(CUPSD_LOG_DEBUG, "[Client %d] Accepted from %s (Domain)",
- con->http.fd, con->http.hostname);
+ if (httpAddrFamily(httpGetAddress(con->http)) == AF_LOCAL)
+ {
+# ifdef __APPLE__
+ socklen_t peersize; /* Size of peer credentials */
+ pid_t peerpid; /* Peer process ID */
+ char peername[256]; /* Name of process */
+
+ peersize = sizeof(peerpid);
+ if (!getsockopt(con->number, SOL_LOCAL, LOCAL_PEERPID, &peerpid,
+ &peersize))
+ {
+ if (!proc_name(peerpid, peername, sizeof(peername)))
+ cupsdLogClient(con, CUPSD_LOG_DEBUG,
+ "Accepted from %s (Domain ???[%d])",
+ httpGetHostname(con->http, NULL, 0), (int)peerpid);
+ else
+ cupsdLogClient(con, CUPSD_LOG_DEBUG,
+ "Accepted from %s (Domain %s[%d])",
+ httpGetHostname(con->http, NULL, 0), name, (int)peerpid);
+ }
+ else
+# endif /* __APPLE__ */
+
+ cupsdLogClient(con, CUPSD_LOG_DEBUG, "Accepted from %s (Domain)",
+ httpGetHostname(con->http, NULL, 0));
+ }
else
#endif /* AF_LOCAL */
- cupsdLogMessage(CUPSD_LOG_DEBUG, "[Client %d] Accepted from %s:%d (IPv%d)",
- con->http.fd, con->http.hostname,
- _httpAddrPort(con->http.hostaddr),
- _httpAddrFamily(con->http.hostaddr) == AF_INET ? 4 : 6);
+ cupsdLogClient(con, CUPSD_LOG_DEBUG, "Accepted from %s:%d (IPv%d)",
+ httpGetHostname(con->http, NULL, 0),
+ httpAddrPort(httpGetAddress(con->http)),
+ httpAddrFamily(httpGetAddress(con->http)) == AF_INET ? 4 : 6);
/*
* Get the local address the client connected to...
*/
addrlen = sizeof(temp);
- if (getsockname(con->http.fd, (struct sockaddr *)&temp, &addrlen))
+ if (getsockname(httpGetFd(con->http), (struct sockaddr *)&temp, &addrlen))
{
- cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to get local address - %s",
- strerror(errno));
+ cupsdLogClient(con, CUPSD_LOG_ERROR, "Unable to get local address - %s",
+ strerror(errno));
strlcpy(con->servername, "localhost", sizeof(con->servername));
con->serverport = LocalPort;
}
#ifdef AF_LOCAL
- else if (_httpAddrFamily(&temp) == AF_LOCAL)
+ else if (httpAddrFamily(&temp) == AF_LOCAL)
{
strlcpy(con->servername, "localhost", sizeof(con->servername));
con->serverport = LocalPort;
{
if (httpAddrLocalhost(&temp))
strlcpy(con->servername, "localhost", sizeof(con->servername));
- else if (HostNameLookups || RemotePort)
+ else if (HostNameLookups)
httpAddrLookup(&temp, con->servername, sizeof(con->servername));
else
httpAddrString(&temp, con->servername, sizeof(con->servername));
- con->serverport = _httpAddrPort(&(lis->address));
+ con->serverport = httpAddrPort(&(lis->address));
}
/*
cupsArrayAdd(Clients, con);
- /*
- * Using TCP_NODELAY improves responsiveness, especially on systems with a slow
- * loopback interface. Since we write large buffers when sending print files
- * and requests there shouldn't be any performance penalty for this...
- */
-
- val = 1;
- setsockopt(con->http.fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof(val));
-
- /*
- * Close this file on all execs...
- */
-
- fcntl(con->http.fd, F_SETFD, fcntl(con->http.fd, F_GETFD) | FD_CLOEXEC);
-
/*
* Add the socket to the server select.
*/
- cupsdAddSelect(con->http.fd, (cupsd_selfunc_t)cupsdReadClient, NULL, con);
+ cupsdAddSelect(httpGetFd(con->http), (cupsd_selfunc_t)cupsdReadClient, NULL,
+ con);
+
+ cupsdLogClient(con, CUPSD_LOG_DEBUG, "Waiting for request.");
/*
* Temporarily suspend accept()'s until we lose a client...
* See if we are connecting on a secure port...
*/
- if (lis->encryption == HTTP_ENCRYPT_ALWAYS)
+ if (lis->encryption == HTTP_ENCRYPTION_ALWAYS)
{
/*
* https connection; go secure...
*/
- con->http.encryption = HTTP_ENCRYPT_ALWAYS;
-
if (!cupsdStartTLS(con))
cupsdCloseClient(con);
}
#endif /* HAVE_LIBSSL */
- cupsdLogMessage(CUPSD_LOG_DEBUG, "[Client %d] Closing connection.",
- con->http.fd);
+ cupsdLogClient(con, CUPSD_LOG_DEBUG, "Closing connection.");
/*
* Flush pending writes before closing...
*/
- httpFlushWrite(HTTP(con));
+ httpFlushWrite(con->http);
partial = 0;
-#ifdef HAVE_SSL
- /*
- * Shutdown encryption as needed...
- */
-
- if (con->http.tls)
- {
- partial = 1;
-
- cupsdEndTLS(con);
- }
-#endif /* HAVE_SSL */
-
if (con->pipe_pid != 0)
{
/*
* Close the socket and clear the file from the input set for select()...
*/
- if (con->http.fd >= 0)
+ if (httpGetFd(con->http) >= 0)
{
cupsArrayRemove(ActiveClients, con);
cupsdSetBusyState();
+#ifdef HAVE_SSL
+ /*
+ * Shutdown encryption as needed...
+ */
+
+ if (httpIsEncrypted(con->http))
+ partial = 1;
+#endif /* HAVE_SSL */
+
if (partial)
{
/*
* Only do a partial close so that the encrypted client gets everything.
*/
- shutdown(con->http.fd, 0);
- cupsdAddSelect(con->http.fd, (cupsd_selfunc_t)cupsdReadClient, NULL, con);
+ httpShutdown(con->http);
+ cupsdAddSelect(httpGetFd(con->http), (cupsd_selfunc_t)cupsdReadClient,
+ NULL, con);
+
+ cupsdLogClient(con, CUPSD_LOG_DEBUG, "Waiting for socket close.");
}
else
{
* Shut the socket down fully...
*/
- cupsdRemoveSelect(con->http.fd);
- close(con->http.fd);
- con->http.fd = -1;
+ cupsdRemoveSelect(httpGetFd(con->http));
+ httpClose(con->http);
+ con->http = NULL;
}
}
* Free memory...
*/
- if (con->http.input_set)
- free(con->http.input_set);
+ cupsdRemoveSelect(httpGetFd(con->http));
- httpClearCookie(HTTP(con));
- httpClearFields(HTTP(con));
+ httpClose(con->http);
cupsdClearString(&con->filename);
cupsdClearString(&con->command);
int /* I - Bytes written or -1 on error */
cupsdFlushHeader(cupsd_client_t *con) /* I - Client to flush to */
{
- int bytes = httpFlushWrite(HTTP(con));
+ int bytes = httpFlushWrite(con->http);
- con->http.data_encoding = HTTP_ENCODE_LENGTH;
+ // TODO: Need to use httpSendResponse
+ con->http->data_encoding = HTTP_ENCODING_LENGTH;
return (bytes);
}
static unsigned request_id = 0; /* Request ID for temp files */
- status = HTTP_CONTINUE;
-
- cupsdLogMessage(CUPSD_LOG_DEBUG2,
- "[Client %d] cupsdReadClient "
- "error=%d, "
- "used=%d, "
- "state=%s, "
- "data_encoding=HTTP_ENCODE_%s, "
- "data_remaining=" CUPS_LLFMT ", "
- "request=%p(%s), "
- "file=%d",
- con->http.fd, con->http.error, con->http.used,
- http_states[con->http.state],
- con->http.data_encoding == HTTP_ENCODE_CHUNKED ?
- "CHUNKED" : "LENGTH",
- CUPS_LLCAST con->http.data_remaining,
- con->request,
- con->request ? ipp_states[con->request->state] : "",
- con->file);
+ status = HTTP_STATUS_CONTINUE;
+
+ cupsdLogClient(con, CUPSD_LOG_DEBUG2,
+ "cupsdReadClient "
+ "error=%d, "
+ "used=%d, "
+ "state=%s, "
+ "data_encoding=HTTP_ENCODING_%s, "
+ "data_remaining=" CUPS_LLFMT ", "
+ "request=%p(%s), "
+ "file=%d",
+ httpError(con->http), (int)httpGetReady(con->http),
+ httpStateString(httpGetState(con->http)),
+ httpIsChunked(con->http) ? "CHUNKED" : "LENGTH",
+ CUPS_LLCAST httpGetRemaining(con->http),
+ con->request,
+ con->request ? ipp_states[con->request->state] : "",
+ con->file);
#ifdef HAVE_SSL
if (con->auto_ssl)
con->auto_ssl = 0;
- if (recv(con->http.fd, buf, 1, MSG_PEEK) == 1 &&
+ if (recv(httpGetFd(con->http), buf, 1, MSG_PEEK) == 1 &&
(!buf[0] || !strchr("DGHOPT", buf[0])))
{
/*
* Encrypt this connection...
*/
- cupsdLogMessage(CUPSD_LOG_DEBUG2,
- "[Client %d] Saw first byte %02X, auto-negotiating "
- "SSL/TLS session.", con->http.fd, buf[0] & 255);
+ cupsdLogClient(con, CUPSD_LOG_DEBUG2,
+ "Saw first byte %02X, auto-negotiating "
+ "SSL/TLS session.", buf[0] & 255);
if (!cupsdStartTLS(con))
cupsdCloseClient(con);
}
#endif /* HAVE_SSL */
- switch (con->http.state)
+ switch (httpGetState(con->http))
{
- case HTTP_WAITING :
+ case HTTP_STATE_WAITING :
/*
* See if we've received a request line...
*/
- if (httpGets(line, sizeof(line) - 1, HTTP(con)) == NULL)
+ if (httpGets(line, sizeof(line) - 1, con->http) == NULL)
{
- if (con->http.error && con->http.error != EPIPE)
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "[Client %d] HTTP_WAITING Closing for error %d "
- "(%s)", con->http.fd, con->http.error,
- strerror(con->http.error));
+ if (httpError(con->http) && httpError(con->http) != EPIPE)
+ cupsdLogClient(con, CUPSD_LOG_DEBUG,
+ "HTTP_STATE_WAITING Closing for error %d (%s)",
+ httpError(con->http), strerror(httpError(con->http)));
else
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "[Client %d] HTTP_WAITING Closing on EOF",
- con->http.fd);
+ cupsdLogClient(con, CUPSD_LOG_DEBUG,
+ "HTTP_STATE_WAITING Closing on EOF.");
cupsdCloseClient(con);
return;
* Clear other state variables...
*/
- httpClearFields(HTTP(con));
+ httpClearFields(con->http);
- con->http.activity = time(NULL);
- con->http.version = HTTP_1_0;
- con->http.keep_alive = HTTP_KEEPALIVE_OFF;
- con->http.data_encoding = HTTP_ENCODE_LENGTH;
- con->http.data_remaining = 0;
- con->http._data_remaining = 0;
- con->operation = HTTP_WAITING;
+ con->http->activity = time(NULL);
+ con->http->version = HTTP_VERSION_1_0;
+ httpSetKeepAlive(con->http, HTTP_KEEPALIVE_OFF);
+ con->http->data_encoding = HTTP_ENCODING_LENGTH;
+ con->http->data_remaining = 0;
+ con->http->_data_remaining = 0;
+ con->operation = HTTP_STATE_WAITING;
con->bytes = 0;
con->file = -1;
con->file_ready = 0;
case 1 :
if (line[0])
{
- cupsdLogMessage(CUPSD_LOG_ERROR,
- "[Client %d] Bad request line \"%s\" from %s.",
- con->http.fd,
- _httpEncodeURI(buf, line, sizeof(buf)),
- con->http.hostname);
- cupsdSendError(con, HTTP_BAD_REQUEST, CUPSD_AUTH_NONE);
+ cupsdLogClient(con, CUPSD_LOG_ERROR,
+ "Bad request line \"%s\" from %s.",
+ _httpEncodeURI(buf, line, sizeof(buf)),
+ httpGetHostname(con->http, NULL, 0));
+ cupsdSendError(con, HTTP_STATUS_BAD_REQUEST, CUPSD_AUTH_NONE);
cupsdCloseClient(con);
}
return;
case 2 :
- con->http.version = HTTP_0_9;
+ con->http->version = HTTP_VERSION_0_9;
break;
case 3 :
if (sscanf(version, "HTTP/%d.%d", &major, &minor) != 2)
{
- cupsdLogMessage(CUPSD_LOG_ERROR,
- "[Client %d] Bad request line \"%s\" from %s.",
- con->http.fd,
- _httpEncodeURI(buf, line, sizeof(buf)),
- con->http.hostname);
- cupsdSendError(con, HTTP_BAD_REQUEST, CUPSD_AUTH_NONE);
+ cupsdLogClient(con, CUPSD_LOG_ERROR,
+ "Bad request line \"%s\" from %s.",
+ _httpEncodeURI(buf, line, sizeof(buf)),
+ httpGetHostname(con->http, NULL, 0));
+ cupsdSendError(con, HTTP_STATUS_BAD_REQUEST, CUPSD_AUTH_NONE);
cupsdCloseClient(con);
return;
}
if (major < 2)
{
- con->http.version = (http_version_t)(major * 100 + minor);
- if (con->http.version == HTTP_1_1 && KeepAlive)
- con->http.keep_alive = HTTP_KEEPALIVE_ON;
+ con->http->version = (http_version_t)(major * 100 + minor);
+ if (con->http->version == HTTP_VERSION_1_1 && KeepAlive)
+ httpSetKeepAlive(con->http, HTTP_KEEPALIVE_ON);
else
- con->http.keep_alive = HTTP_KEEPALIVE_OFF;
+ httpSetKeepAlive(con->http, HTTP_KEEPALIVE_OFF);
}
else
{
- cupsdLogMessage(CUPSD_LOG_ERROR,
- "[Client %d] Unsupported request line \"%s\" "
- "from %s.", con->http.fd,
- _httpEncodeURI(buf, line, sizeof(buf)),
- con->http.hostname);
- cupsdSendError(con, HTTP_NOT_SUPPORTED, CUPSD_AUTH_NONE);
+ cupsdLogClient(con, CUPSD_LOG_ERROR,
+ "Unsupported request line \"%s\" from %s.",
+ _httpEncodeURI(buf, line, sizeof(buf)),
+ httpGetHostname(con->http, NULL, 0));
+ cupsdSendError(con, HTTP_STATUS_NOT_SUPPORTED, CUPSD_AUTH_NONE);
cupsdCloseClient(con);
return;
}
* Nope, we don't do proxies...
*/
- cupsdLogMessage(CUPSD_LOG_ERROR,
- "[Client %d] Bad URI \"%s\" in request.",
- con->http.fd, con->uri);
- cupsdSendError(con, HTTP_METHOD_NOT_ALLOWED, CUPSD_AUTH_NONE);
+ cupsdLogClient(con, CUPSD_LOG_ERROR, "Bad URI \"%s\" in request.",
+ con->uri);
+ cupsdSendError(con, HTTP_STATUS_METHOD_NOT_ALLOWED, CUPSD_AUTH_NONE);
cupsdCloseClient(con);
return;
}
*/
if (!strcmp(operation, "GET"))
- con->http.state = HTTP_GET;
+ con->http->state = HTTP_STATE_GET;
else if (!strcmp(operation, "PUT"))
- con->http.state = HTTP_PUT;
+ con->http->state = HTTP_STATE_PUT;
else if (!strcmp(operation, "POST"))
- con->http.state = HTTP_POST;
+ con->http->state = HTTP_STATE_POST;
else if (!strcmp(operation, "DELETE"))
- con->http.state = HTTP_DELETE;
+ con->http->state = HTTP_STATE_DELETE;
else if (!strcmp(operation, "TRACE"))
- con->http.state = HTTP_TRACE;
+ con->http->state = HTTP_STATE_TRACE;
else if (!strcmp(operation, "OPTIONS"))
- con->http.state = HTTP_OPTIONS;
+ con->http->state = HTTP_STATE_OPTIONS;
else if (!strcmp(operation, "HEAD"))
- con->http.state = HTTP_HEAD;
+ con->http->state = HTTP_STATE_HEAD;
else
{
- cupsdLogMessage(CUPSD_LOG_ERROR,
- "[Client %d] Bad operation \"%s\".", con->http.fd,
- operation);
- cupsdSendError(con, HTTP_BAD_REQUEST, CUPSD_AUTH_NONE);
+ cupsdLogClient(con, CUPSD_LOG_ERROR, "Bad operation \"%s\".",
+ operation);
+ cupsdSendError(con, HTTP_STATUS_BAD_REQUEST, CUPSD_AUTH_NONE);
cupsdCloseClient(con);
return;
}
gettimeofday(&(con->start), NULL);
- con->operation = con->http.state;
+ con->operation = httpGetState(con->http);
- cupsdLogMessage(CUPSD_LOG_DEBUG, "[Client %d] %s %s HTTP/%d.%d",
- con->http.fd, operation, con->uri,
- con->http.version / 100, con->http.version % 100);
+ cupsdLogClient(con, CUPSD_LOG_DEBUG, "%s %s HTTP/%d.%d",
+ operation, con->uri, con->http->version / 100,
+ con->http->version % 100);
- con->http.status = HTTP_OK;
+ con->http->status = HTTP_STATUS_OK;
if (!cupsArrayFind(ActiveClients, con))
{
cupsdSetBusyState();
}
- case HTTP_OPTIONS :
- case HTTP_DELETE :
- case HTTP_GET :
- case HTTP_HEAD :
- case HTTP_POST :
- case HTTP_PUT :
- case HTTP_TRACE :
+ case HTTP_STATE_OPTIONS :
+ case HTTP_STATE_DELETE :
+ case HTTP_STATE_GET :
+ case HTTP_STATE_HEAD :
+ case HTTP_STATE_POST :
+ case HTTP_STATE_PUT :
+ case HTTP_STATE_TRACE :
/*
* Parse incoming parameters until the status changes...
*/
- while ((status = httpUpdate(HTTP(con))) == HTTP_CONTINUE)
- if (!data_ready(con))
+ while ((status = httpUpdate(con->http)) == HTTP_STATUS_CONTINUE)
+ if (!httpGetReady(con->http))
break;
- if (status != HTTP_OK && status != HTTP_CONTINUE)
+ if (status != HTTP_STATUS_OK && status != HTTP_STATUS_CONTINUE)
{
- if (con->http.error && con->http.error != EPIPE)
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "[Client %d] Closing for error %d (%s) while "
- "reading headers.",
- con->http.fd, con->http.error,
- strerror(con->http.error));
+ if (httpError(con->http) && httpError(con->http) != EPIPE)
+ cupsdLogClient(con, CUPSD_LOG_DEBUG,
+ "Closing for error %d (%s) while reading headers.",
+ httpError(con->http), strerror(httpError(con->http)));
else
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "[Client %d] Closing on EOF while reading headers.",
- con->http.fd);
+ cupsdLogClient(con, CUPSD_LOG_DEBUG,
+ "Closing on EOF while reading headers.");
- cupsdSendError(con, HTTP_BAD_REQUEST, CUPSD_AUTH_NONE);
+ cupsdSendError(con, HTTP_STATUS_BAD_REQUEST, CUPSD_AUTH_NONE);
cupsdCloseClient(con);
return;
}
break;
default :
- if (!data_ready(con) && recv(con->http.fd, buf, 1, MSG_PEEK) < 1)
+ if (!httpGetReady(con->http) && recv(httpGetFd(con->http), buf, 1, MSG_PEEK) < 1)
{
/*
* Connection closed...
*/
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "[Client %d] Closing on EOF", con->http.fd);
+ cupsdLogClient(con, CUPSD_LOG_DEBUG, "Closing on EOF.");
cupsdCloseClient(con);
return;
}
* Handle new transfers...
*/
- if (status == HTTP_OK)
+ if (status == HTTP_STATUS_OK)
{
- if (con->http.fields[HTTP_FIELD_ACCEPT_LANGUAGE][0])
+ if (httpGetField(con->http, HTTP_FIELD_ACCEPT_LANGUAGE)[0])
{
/*
* Figure out the locale from the Accept-Language and Content-Type
* fields...
*/
- if ((ptr = strchr(con->http.fields[HTTP_FIELD_ACCEPT_LANGUAGE],
+ if ((ptr = strchr(httpGetField(con->http, HTTP_FIELD_ACCEPT_LANGUAGE),
',')) != NULL)
*ptr = '\0';
- if ((ptr = strchr(con->http.fields[HTTP_FIELD_ACCEPT_LANGUAGE],
+ if ((ptr = strchr(httpGetField(con->http, HTTP_FIELD_ACCEPT_LANGUAGE),
';')) != NULL)
*ptr = '\0';
- if ((ptr = strstr(con->http.fields[HTTP_FIELD_CONTENT_TYPE],
+ if ((ptr = strstr(httpGetField(con->http, HTTP_FIELD_CONTENT_TYPE),
"charset=")) != NULL)
{
/*
*/
snprintf(locale, sizeof(locale), "%s.%s",
- con->http.fields[HTTP_FIELD_ACCEPT_LANGUAGE], ptr + 8);
+ httpGetField(con->http, HTTP_FIELD_ACCEPT_LANGUAGE), ptr + 8);
if ((ptr = strchr(locale, ',')) != NULL)
*ptr = '\0';
}
else
snprintf(locale, sizeof(locale), "%s.UTF-8",
- con->http.fields[HTTP_FIELD_ACCEPT_LANGUAGE]);
+ httpGetField(con->http, HTTP_FIELD_ACCEPT_LANGUAGE));
con->language = cupsLangGet(locale);
}
cupsdAuthorize(con);
- if (!_cups_strncasecmp(con->http.fields[HTTP_FIELD_CONNECTION],
+ if (!_cups_strncasecmp(httpGetField(con->http, HTTP_FIELD_CONNECTION),
"Keep-Alive", 10) && KeepAlive)
- con->http.keep_alive = HTTP_KEEPALIVE_ON;
- else if (!_cups_strncasecmp(con->http.fields[HTTP_FIELD_CONNECTION],
+ httpSetKeepAlive(con->http, HTTP_KEEPALIVE_ON);
+ else if (!_cups_strncasecmp(httpGetField(con->http, HTTP_FIELD_CONNECTION),
"close", 5))
- con->http.keep_alive = HTTP_KEEPALIVE_OFF;
+ httpSetKeepAlive(con->http, HTTP_KEEPALIVE_OFF);
- if (!con->http.fields[HTTP_FIELD_HOST][0] &&
- con->http.version >= HTTP_1_1)
+ if (!httpGetField(con->http, HTTP_FIELD_HOST)[0] &&
+ httpGetVersion(con->http) >= HTTP_VERSION_1_1)
{
/*
* HTTP/1.1 and higher require the "Host:" field...
*/
- if (!cupsdSendError(con, HTTP_BAD_REQUEST, CUPSD_AUTH_NONE))
+ if (!cupsdSendError(con, HTTP_STATUS_BAD_REQUEST, CUPSD_AUTH_NONE))
{
- cupsdLogMessage(CUPSD_LOG_ERROR,
- "[Client %d] Missing Host: field in request.",
- con->http.fd);
+ cupsdLogClient(con, CUPSD_LOG_ERROR, "Missing Host: field in request.");
cupsdCloseClient(con);
return;
}
* or IPv6 values in the Host: field.
*/
- cupsdLogMessage(CUPSD_LOG_ERROR,
- "[Client %d] Request from \"%s\" using invalid Host: "
- "field \"%s\"", con->http.fd, con->http.hostname,
- con->http.fields[HTTP_FIELD_HOST]);
+ cupsdLogClient(con, CUPSD_LOG_ERROR,
+ "Request from \"%s\" using invalid Host: field \"%s\".",
+ httpGetHostname(con->http, NULL, 0), httpGetField(con->http, HTTP_FIELD_HOST));
- if (!cupsdSendError(con, HTTP_BAD_REQUEST, CUPSD_AUTH_NONE))
+ if (!cupsdSendError(con, HTTP_STATUS_BAD_REQUEST, CUPSD_AUTH_NONE))
{
cupsdCloseClient(con);
return;
}
}
- else if (con->operation == HTTP_OPTIONS)
+ else if (con->operation == HTTP_STATE_OPTIONS)
{
/*
* Do OPTIONS command...
if (con->best && con->best->type != CUPSD_AUTH_NONE)
{
- if (!cupsdSendHeader(con, HTTP_UNAUTHORIZED, NULL, CUPSD_AUTH_NONE))
+ if (!cupsdSendHeader(con, HTTP_STATUS_UNAUTHORIZED, NULL, CUPSD_AUTH_NONE))
{
cupsdCloseClient(con);
return;
}
}
- if (!_cups_strcasecmp(con->http.fields[HTTP_FIELD_CONNECTION], "Upgrade") &&
- con->http.tls == NULL)
+ if (!_cups_strcasecmp(httpGetField(con->http, HTTP_FIELD_CONNECTION), "Upgrade") &&
+ !httpIsEncrypted(con->http))
{
#ifdef HAVE_SSL
/*
* Do encryption stuff...
*/
- if (!cupsdSendHeader(con, HTTP_SWITCHING_PROTOCOLS, NULL, CUPSD_AUTH_NONE))
+ if (!cupsdSendHeader(con, HTTP_STATUS_SWITCHING_PROTOCOLS, NULL, CUPSD_AUTH_NONE))
{
cupsdCloseClient(con);
return;
}
- httpPrintf(HTTP(con), "Connection: Upgrade\r\n");
- httpPrintf(HTTP(con), "Upgrade: TLS/1.0,HTTP/1.1\r\n");
- httpPrintf(HTTP(con), "Content-Length: 0\r\n");
- httpPrintf(HTTP(con), "\r\n");
+ httpPrintf(con->http, "Connection: Upgrade\r\n");
+ httpPrintf(con->http, "Upgrade: TLS/1.2,TLS/1.1,TLS/1.0\r\n");
+ httpPrintf(con->http, "Content-Length: 0\r\n");
+ httpPrintf(con->http, "\r\n");
if (cupsdFlushHeader(con) < 0)
{
#endif /* HAVE_SSL */
}
- if (!cupsdSendHeader(con, HTTP_OK, NULL, CUPSD_AUTH_NONE))
+ if (!cupsdSendHeader(con, HTTP_STATUS_OK, NULL, CUPSD_AUTH_NONE))
{
cupsdCloseClient(con);
return;
}
- httpPrintf(HTTP(con), "Allow: GET, HEAD, OPTIONS, POST, PUT\r\n");
- httpPrintf(HTTP(con), "Content-Length: 0\r\n");
- httpPrintf(HTTP(con), "\r\n");
+ httpPrintf(con->http, "Allow: GET, HEAD, OPTIONS, POST, PUT\r\n");
+ httpPrintf(con->http, "Content-Length: 0\r\n");
+ httpPrintf(con->http, "\r\n");
if (cupsdFlushHeader(con) < 0)
{
* Protect against malicious users!
*/
- cupsdLogMessage(CUPSD_LOG_ERROR,
- "[Client %d] Request for non-absolute resource \"%s\".",
- con->http.fd, con->uri);
+ cupsdLogClient(con, CUPSD_LOG_ERROR,
+ "Request for non-absolute resource \"%s\".", con->uri);
- if (!cupsdSendError(con, HTTP_FORBIDDEN, CUPSD_AUTH_NONE))
+ if (!cupsdSendError(con, HTTP_STATUS_FORBIDDEN, CUPSD_AUTH_NONE))
{
cupsdCloseClient(con);
return;
}
else
{
- if (!_cups_strcasecmp(con->http.fields[HTTP_FIELD_CONNECTION],
- "Upgrade") && con->http.tls == NULL)
+ if (!_cups_strcasecmp(httpGetField(con->http, HTTP_FIELD_CONNECTION),
+ "Upgrade") && con->http->tls == NULL)
{
#ifdef HAVE_SSL
/*
* Do encryption stuff...
*/
- if (!cupsdSendHeader(con, HTTP_SWITCHING_PROTOCOLS, NULL,
+ if (!cupsdSendHeader(con, HTTP_STATUS_SWITCHING_PROTOCOLS, NULL,
CUPSD_AUTH_NONE))
{
cupsdCloseClient(con);
return;
}
- httpPrintf(HTTP(con), "Connection: Upgrade\r\n");
- httpPrintf(HTTP(con), "Upgrade: TLS/1.0,HTTP/1.1\r\n");
- httpPrintf(HTTP(con), "Content-Length: 0\r\n");
- httpPrintf(HTTP(con), "\r\n");
+ httpPrintf(con->http, "Connection: Upgrade\r\n");
+ httpPrintf(con->http, "Upgrade: TLS/1.2,TLS/1.1,TLS/1.0\r\n");
+ httpPrintf(con->http, "Content-Length: 0\r\n");
+ httpPrintf(con->http, "\r\n");
if (cupsdFlushHeader(con) < 0)
{
#endif /* HAVE_SSL */
}
- if ((status = cupsdIsAuthorized(con, NULL)) != HTTP_OK)
+ if ((status = cupsdIsAuthorized(con, NULL)) != HTTP_STATUS_OK)
{
cupsdSendError(con, status, CUPSD_AUTH_NONE);
cupsdCloseClient(con);
return;
}
- if (con->http.expect &&
- (con->operation == HTTP_POST || con->operation == HTTP_PUT))
+ if (con->http->expect &&
+ (con->operation == HTTP_STATE_POST || con->operation == HTTP_STATE_PUT))
{
- if (con->http.expect == HTTP_CONTINUE)
+ if (con->http->expect == HTTP_STATUS_CONTINUE)
{
/*
* Send 100-continue header...
*/
- if (!cupsdSendHeader(con, HTTP_CONTINUE, NULL, CUPSD_AUTH_NONE))
+ if (!cupsdSendHeader(con, HTTP_STATUS_CONTINUE, NULL, CUPSD_AUTH_NONE))
{
cupsdCloseClient(con);
return;
* Send 417-expectation-failed header...
*/
- if (!cupsdSendHeader(con, HTTP_EXPECTATION_FAILED, NULL,
+ if (!cupsdSendHeader(con, HTTP_STATUS_EXPECTATION_FAILED, NULL,
CUPSD_AUTH_NONE))
{
cupsdCloseClient(con);
return;
}
- httpPrintf(HTTP(con), "Content-Length: 0\r\n");
- httpPrintf(HTTP(con), "\r\n");
+ httpPrintf(con->http, "Content-Length: 0\r\n");
+ httpPrintf(con->http, "\r\n");
if (cupsdFlushHeader(con) < 0)
{
}
}
- switch (con->http.state)
+ switch (httpGetState(con->http))
{
- case HTTP_GET_SEND :
- if (!strncmp(con->uri, "/printers/", 10) &&
+ case HTTP_STATE_GET_SEND :
+ if ((!strncmp(con->uri, "/ppd/", 5) ||
+ !strncmp(con->uri, "/printers/", 10) ||
+ !strncmp(con->uri, "/classes/", 9)) &&
!strcmp(con->uri + strlen(con->uri) - 4, ".ppd"))
{
/*
con->uri[strlen(con->uri) - 4] = '\0'; /* Drop ".ppd" */
- if ((p = cupsdFindPrinter(con->uri + 10)) != NULL)
+ if (!strncmp(con->uri, "/ppd/", 5))
+ p = cupsdFindPrinter(con->uri + 5);
+ else if (!strncmp(con->uri, "/printers/", 10))
+ p = cupsdFindPrinter(con->uri + 10);
+ else
+ {
+ p = cupsdFindClass(con->uri + 9);
+
+ if (p)
+ {
+ int i; /* Looping var */
+
+ for (i = 0; i < p->num_printers; i ++)
+ {
+ if (!(p->printers[i]->type & CUPS_PRINTER_CLASS))
+ {
+ char ppdname[1024];/* PPD filename */
+
+ snprintf(ppdname, sizeof(ppdname), "%s/ppd/%s.ppd",
+ ServerRoot, p->printers[i]->name);
+ if (!access(ppdname, 0))
+ {
+ p = p->printers[i];
+ break;
+ }
+ }
+ }
+
+ if (i >= p->num_printers)
+ p = NULL;
+ }
+ }
+
+ if (p)
+ {
snprintf(con->uri, sizeof(con->uri), "/ppd/%s.ppd", p->name);
+ }
else
{
- if (!cupsdSendError(con, HTTP_NOT_FOUND, CUPSD_AUTH_NONE))
+ if (!cupsdSendError(con, HTTP_STATUS_NOT_FOUND, CUPSD_AUTH_NONE))
{
cupsdCloseClient(con);
return;
break;
}
}
- else if ((!strncmp(con->uri, "/printers/", 10) ||
+ else if ((!strncmp(con->uri, "/icons/", 7) ||
+ !strncmp(con->uri, "/printers/", 10) ||
!strncmp(con->uri, "/classes/", 9)) &&
!strcmp(con->uri + strlen(con->uri) - 4, ".png"))
{
con->uri[strlen(con->uri) - 4] = '\0'; /* Drop ".png" */
- if (!strncmp(con->uri, "/printers/", 10))
+ if (!strncmp(con->uri, "/icons/", 7))
+ p = cupsdFindPrinter(con->uri + 7);
+ else if (!strncmp(con->uri, "/printers/", 10))
p = cupsdFindPrinter(con->uri + 10);
else
- p = cupsdFindClass(con->uri + 9);
+ {
+ p = cupsdFindClass(con->uri + 9);
+
+ if (p)
+ {
+ int i; /* Looping var */
+
+ for (i = 0; i < p->num_printers; i ++)
+ {
+ if (!(p->printers[i]->type & CUPS_PRINTER_CLASS))
+ {
+ char ppdname[1024];/* PPD filename */
+
+ snprintf(ppdname, sizeof(ppdname), "%s/ppd/%s.ppd",
+ ServerRoot, p->printers[i]->name);
+ if (!access(ppdname, 0))
+ {
+ p = p->printers[i];
+ break;
+ }
+ }
+ }
+
+ if (i >= p->num_printers)
+ p = NULL;
+ }
+ }
if (p)
snprintf(con->uri, sizeof(con->uri), "/icons/%s.png", p->name);
else
{
- if (!cupsdSendError(con, HTTP_NOT_FOUND, CUPSD_AUTH_NONE))
+ if (!cupsdSendError(con, HTTP_STATUS_NOT_FOUND, CUPSD_AUTH_NONE))
{
cupsdCloseClient(con);
return;
* Web interface is disabled. Show an appropriate message...
*/
- if (!cupsdSendError(con, HTTP_WEBIF_DISABLED, CUPSD_AUTH_NONE))
+ if (!cupsdSendError(con, HTTP_STATUS_CUPS_WEBIF_DISABLED, CUPSD_AUTH_NONE))
{
cupsdCloseClient(con);
return;
if (!cupsdSendCommand(con, con->command, con->options, 0))
{
- if (!cupsdSendError(con, HTTP_NOT_FOUND, CUPSD_AUTH_NONE))
+ if (!cupsdSendError(con, HTTP_STATUS_NOT_FOUND, CUPSD_AUTH_NONE))
{
cupsdCloseClient(con);
return;
}
}
else
- cupsdLogRequest(con, HTTP_OK);
+ cupsdLogRequest(con, HTTP_STATUS_OK);
- if (con->http.version <= HTTP_1_0)
- con->http.keep_alive = HTTP_KEEPALIVE_OFF;
+ if (con->http->version <= HTTP_VERSION_1_0)
+ httpSetKeepAlive(con->http, HTTP_KEEPALIVE_OFF);
}
else if ((!strncmp(con->uri, "/admin/conf/", 12) &&
(strchr(con->uri + 12, '/') ||
* /admin/conf...
*/
- cupsdLogMessage(CUPSD_LOG_ERROR,
+ cupsdLogClient(con, CUPSD_LOG_ERROR,
"Request for subdirectory \"%s\"!", con->uri);
- if (!cupsdSendError(con, HTTP_FORBIDDEN, CUPSD_AUTH_NONE))
+ if (!cupsdSendError(con, HTTP_STATUS_FORBIDDEN, CUPSD_AUTH_NONE))
{
cupsdCloseClient(con);
return;
if ((filename = get_file(con, &filestats, buf,
sizeof(buf))) == NULL)
{
- if (!cupsdSendError(con, HTTP_NOT_FOUND, CUPSD_AUTH_NONE))
+ if (!cupsdSendError(con, HTTP_STATUS_NOT_FOUND, CUPSD_AUTH_NONE))
{
cupsdCloseClient(con);
return;
if (!cupsdSendCommand(con, con->command, con->options, 0))
{
- if (!cupsdSendError(con, HTTP_NOT_FOUND, CUPSD_AUTH_NONE))
+ if (!cupsdSendError(con, HTTP_STATUS_NOT_FOUND, CUPSD_AUTH_NONE))
{
cupsdCloseClient(con);
return;
}
}
else
- cupsdLogRequest(con, HTTP_OK);
+ cupsdLogRequest(con, HTTP_STATUS_OK);
- if (con->http.version <= HTTP_1_0)
- con->http.keep_alive = HTTP_KEEPALIVE_OFF;
+ if (con->http->version <= HTTP_VERSION_1_0)
+ httpSetKeepAlive(con->http, HTTP_KEEPALIVE_OFF);
break;
}
if (!check_if_modified(con, &filestats))
{
- if (!cupsdSendError(con, HTTP_NOT_MODIFIED, CUPSD_AUTH_NONE))
+ if (!cupsdSendError(con, HTTP_STATUS_NOT_MODIFIED, CUPSD_AUTH_NONE))
{
cupsdCloseClient(con);
return;
else
snprintf(line, sizeof(line), "%s/%s", type->super, type->type);
- if (!write_file(con, HTTP_OK, filename, line, &filestats))
+ if (!write_file(con, HTTP_STATUS_OK, filename, line, &filestats))
{
cupsdCloseClient(con);
return;
}
break;
- case HTTP_POST_RECV :
+ case HTTP_STATE_POST_RECV :
/*
* See if the POST request includes a Content-Length field, and if
* so check the length against any limits that are set...
*/
- if (con->http.fields[HTTP_FIELD_CONTENT_LENGTH][0] &&
+ if (httpGetField(con->http, HTTP_FIELD_CONTENT_LENGTH)[0] &&
MaxRequestSize > 0 &&
- con->http.data_remaining > MaxRequestSize)
+ con->http->data_remaining > MaxRequestSize)
{
/*
* Request too large...
*/
- if (!cupsdSendError(con, HTTP_REQUEST_TOO_LARGE, CUPSD_AUTH_NONE))
+ if (!cupsdSendError(con, HTTP_STATUS_REQUEST_TOO_LARGE, CUPSD_AUTH_NONE))
{
cupsdCloseClient(con);
return;
break;
}
- else if (con->http.data_remaining < 0 ||
- (!con->http.fields[HTTP_FIELD_CONTENT_LENGTH][0] &&
- con->http.data_encoding == HTTP_ENCODE_LENGTH))
+ else if (con->http->data_remaining < 0 ||
+ (!httpGetField(con->http, HTTP_FIELD_CONTENT_LENGTH)[0] &&
+ con->http->data_encoding == HTTP_ENCODING_LENGTH))
{
/*
* Negative content lengths are invalid!
*/
- if (!cupsdSendError(con, HTTP_BAD_REQUEST, CUPSD_AUTH_NONE))
+ if (!cupsdSendError(con, HTTP_STATUS_BAD_REQUEST, CUPSD_AUTH_NONE))
{
cupsdCloseClient(con);
return;
* content-type field will be "application/ipp"...
*/
- if (!strcmp(con->http.fields[HTTP_FIELD_CONTENT_TYPE],
+ if (!strcmp(httpGetField(con->http, HTTP_FIELD_CONTENT_TYPE),
"application/ipp"))
con->request = ippNew();
else if (!WebInterface)
* Web interface is disabled. Show an appropriate message...
*/
- if (!cupsdSendError(con, HTTP_WEBIF_DISABLED, CUPSD_AUTH_NONE))
+ if (!cupsdSendError(con, HTTP_STATUS_CUPS_WEBIF_DISABLED, CUPSD_AUTH_NONE))
{
cupsdCloseClient(con);
return;
cupsdSetString(&con->options, NULL);
}
- if (con->http.version <= HTTP_1_0)
- con->http.keep_alive = HTTP_KEEPALIVE_OFF;
+ if (con->http->version <= HTTP_VERSION_1_0)
+ httpSetKeepAlive(con->http, HTTP_KEEPALIVE_OFF);
}
else
{
if ((filename = get_file(con, &filestats, buf,
sizeof(buf))) == NULL)
{
- if (!cupsdSendError(con, HTTP_NOT_FOUND, CUPSD_AUTH_NONE))
+ if (!cupsdSendError(con, HTTP_STATUS_NOT_FOUND, CUPSD_AUTH_NONE))
{
cupsdCloseClient(con);
return;
* Only POST to CGI's...
*/
- if (!cupsdSendError(con, HTTP_UNAUTHORIZED, CUPSD_AUTH_NONE))
+ if (!cupsdSendError(con, HTTP_STATUS_UNAUTHORIZED, CUPSD_AUTH_NONE))
{
cupsdCloseClient(con);
return;
}
break;
- case HTTP_PUT_RECV :
+ case HTTP_STATE_PUT_RECV :
/*
* Validate the resource name...
*/
- if (strncmp(con->uri, "/admin/conf/", 12) ||
- strchr(con->uri + 12, '/') ||
- strlen(con->uri) == 12)
+ if (strcmp(con->uri, "/admin/conf/cupsd.conf"))
{
/*
- * PUT can only be done to configuration files under
- * /admin/conf...
+ * PUT can only be done to the cupsd.conf file...
*/
- cupsdLogMessage(CUPSD_LOG_ERROR,
- "[Client %d] Request for subdirectory \"%s\".",
- con->http.fd, con->uri);
+ cupsdLogClient(con, CUPSD_LOG_ERROR,
+ "Disallowed PUT request for \"%s\".", con->uri);
- if (!cupsdSendError(con, HTTP_FORBIDDEN, CUPSD_AUTH_NONE))
+ if (!cupsdSendError(con, HTTP_STATUS_FORBIDDEN, CUPSD_AUTH_NONE))
{
cupsdCloseClient(con);
return;
* so check the length against any limits that are set...
*/
- if (con->http.fields[HTTP_FIELD_CONTENT_LENGTH][0] &&
+ if (httpGetField(con->http, HTTP_FIELD_CONTENT_LENGTH)[0] &&
MaxRequestSize > 0 &&
- con->http.data_remaining > MaxRequestSize)
+ con->http->data_remaining > MaxRequestSize)
{
/*
* Request too large...
*/
- if (!cupsdSendError(con, HTTP_REQUEST_TOO_LARGE, CUPSD_AUTH_NONE))
+ if (!cupsdSendError(con, HTTP_STATUS_REQUEST_TOO_LARGE, CUPSD_AUTH_NONE))
{
cupsdCloseClient(con);
return;
break;
}
- else if (con->http.data_remaining < 0)
+ else if (con->http->data_remaining < 0)
{
/*
* Negative content lengths are invalid!
*/
- if (!cupsdSendError(con, HTTP_BAD_REQUEST, CUPSD_AUTH_NONE))
+ if (!cupsdSendError(con, HTTP_STATUS_BAD_REQUEST, CUPSD_AUTH_NONE))
{
cupsdCloseClient(con);
return;
if (con->file < 0)
{
- cupsdLogMessage(CUPSD_LOG_ERROR,
- "[Client %d] Unable to create request file "
- "\"%s\": %s", con->http.fd, con->filename,
- strerror(errno));
+ cupsdLogClient(con, CUPSD_LOG_ERROR,
+ "Unable to create request file \"%s\": %s",
+ con->filename, strerror(errno));
- if (!cupsdSendError(con, HTTP_REQUEST_TOO_LARGE, CUPSD_AUTH_NONE))
+ if (!cupsdSendError(con, HTTP_STATUS_REQUEST_TOO_LARGE, CUPSD_AUTH_NONE))
{
cupsdCloseClient(con);
return;
fcntl(con->file, F_SETFD, fcntl(con->file, F_GETFD) | FD_CLOEXEC);
break;
- case HTTP_DELETE :
- case HTTP_TRACE :
- cupsdSendError(con, HTTP_NOT_IMPLEMENTED, CUPSD_AUTH_NONE);
+ case HTTP_STATE_DELETE :
+ case HTTP_STATE_TRACE :
+ cupsdSendError(con, HTTP_STATUS_NOT_IMPLEMENTED, CUPSD_AUTH_NONE);
cupsdCloseClient(con);
return;
- case HTTP_HEAD :
+ case HTTP_STATE_HEAD :
if (!strncmp(con->uri, "/printers/", 10) &&
!strcmp(con->uri + strlen(con->uri) - 4, ".ppd"))
{
snprintf(con->uri, sizeof(con->uri), "/ppd/%s.ppd", p->name);
else
{
- if (!cupsdSendError(con, HTTP_NOT_FOUND, CUPSD_AUTH_NONE))
+ if (!cupsdSendError(con, HTTP_STATUS_NOT_FOUND, CUPSD_AUTH_NONE))
{
cupsdCloseClient(con);
return;
snprintf(con->uri, sizeof(con->uri), "/icons/%s.png", p->name);
else
{
- if (!cupsdSendError(con, HTTP_NOT_FOUND, CUPSD_AUTH_NONE))
+ if (!cupsdSendError(con, HTTP_STATUS_NOT_FOUND, CUPSD_AUTH_NONE))
{
cupsdCloseClient(con);
return;
}
else if (!WebInterface)
{
- if (!cupsdSendHeader(con, HTTP_OK, line, CUPSD_AUTH_NONE))
+ if (!cupsdSendHeader(con, HTTP_STATUS_OK, NULL, CUPSD_AUTH_NONE))
{
cupsdCloseClient(con);
return;
}
- if (httpPrintf(HTTP(con), "\r\n") < 0)
+ if (httpPrintf(con->http, "\r\n") < 0)
{
cupsdCloseClient(con);
return;
return;
}
- con->http.state = HTTP_WAITING;
+ con->http->state = HTTP_STATE_WAITING;
+ DEBUG_puts("cupsdReadClient: Set state to HTTP_STATE_WAITING "
+ "after HEAD.");
break;
}
* CGI output...
*/
- if (!cupsdSendHeader(con, HTTP_OK, "text/html", CUPSD_AUTH_NONE))
+ if (!cupsdSendHeader(con, HTTP_STATUS_OK, "text/html", CUPSD_AUTH_NONE))
{
cupsdCloseClient(con);
return;
}
- if (httpPrintf(HTTP(con), "\r\n") < 0)
+ if (httpPrintf(con->http, "\r\n") < 0)
{
cupsdCloseClient(con);
return;
return;
}
- cupsdLogRequest(con, HTTP_OK);
+ cupsdLogRequest(con, HTTP_STATUS_OK);
}
else if ((!strncmp(con->uri, "/admin/conf/", 12) &&
(strchr(con->uri + 12, '/') ||
* /admin/conf...
*/
- cupsdLogMessage(CUPSD_LOG_ERROR,
- "[Client %d] Request for subdirectory \"%s\".",
- con->http.fd, con->uri);
+ cupsdLogClient(con, CUPSD_LOG_ERROR,
+ "Request for subdirectory \"%s\".", con->uri);
- if (!cupsdSendError(con, HTTP_FORBIDDEN, CUPSD_AUTH_NONE))
+ if (!cupsdSendError(con, HTTP_STATUS_FORBIDDEN, CUPSD_AUTH_NONE))
{
cupsdCloseClient(con);
return;
else if ((filename = get_file(con, &filestats, buf,
sizeof(buf))) == NULL)
{
- if (!cupsdSendHeader(con, HTTP_NOT_FOUND, "text/html",
+ if (!cupsdSendHeader(con, HTTP_STATUS_NOT_FOUND, "text/html",
CUPSD_AUTH_NONE))
{
cupsdCloseClient(con);
return;
}
- cupsdLogRequest(con, HTTP_NOT_FOUND);
+ cupsdLogRequest(con, HTTP_STATUS_NOT_FOUND);
}
else if (!check_if_modified(con, &filestats))
{
- if (!cupsdSendError(con, HTTP_NOT_MODIFIED, CUPSD_AUTH_NONE))
+ if (!cupsdSendError(con, HTTP_STATUS_NOT_MODIFIED, CUPSD_AUTH_NONE))
{
cupsdCloseClient(con);
return;
}
- cupsdLogRequest(con, HTTP_NOT_MODIFIED);
+ cupsdLogRequest(con, HTTP_STATUS_NOT_MODIFIED);
}
else
{
else
snprintf(line, sizeof(line), "%s/%s", type->super, type->type);
- if (!cupsdSendHeader(con, HTTP_OK, line, CUPSD_AUTH_NONE))
+ if (!cupsdSendHeader(con, HTTP_STATUS_OK, line, CUPSD_AUTH_NONE))
{
cupsdCloseClient(con);
return;
}
- if (httpPrintf(HTTP(con), "Last-Modified: %s\r\n",
+ if (httpPrintf(con->http, "Last-Modified: %s\r\n",
httpGetDateString(filestats.st_mtime)) < 0)
{
cupsdCloseClient(con);
return;
}
- if (httpPrintf(HTTP(con), "Content-Length: %lu\r\n",
+ if (httpPrintf(con->http, "Content-Length: %lu\r\n",
(unsigned long)filestats.st_size) < 0)
{
cupsdCloseClient(con);
return;
}
- cupsdLogRequest(con, HTTP_OK);
+ cupsdLogRequest(con, HTTP_STATUS_OK);
}
- if (httpPrintf(HTTP(con), "\r\n") < 0)
+ if (httpPrintf(con->http, "\r\n") < 0)
{
cupsdCloseClient(con);
return;
return;
}
- con->http.state = HTTP_WAITING;
+ con->http->state = HTTP_STATE_WAITING;
+ DEBUG_puts("cupsdReadClient: Set state to HTTP_STATE_WAITING "
+ "after HEAD.");
break;
default :
* Handle any incoming data...
*/
- switch (con->http.state)
+ switch (httpGetState(con->http))
{
- case HTTP_PUT_RECV :
+ case HTTP_STATE_PUT_RECV :
do
{
- if ((bytes = httpRead2(HTTP(con), line, sizeof(line))) < 0)
+ if ((bytes = httpRead2(con->http, line, sizeof(line))) < 0)
{
- if (con->http.error && con->http.error != EPIPE)
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "[Client %d] HTTP_PUT_RECV Closing for error "
- "%d (%s)", con->http.fd, con->http.error,
- strerror(con->http.error));
+ if (httpError(con->http) && httpError(con->http) != EPIPE)
+ cupsdLogClient(con, CUPSD_LOG_DEBUG,
+ "HTTP_STATE_PUT_RECV Closing for error %d (%s)",
+ httpError(con->http), strerror(httpError(con->http)));
else
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "[Client %d] HTTP_PUT_RECV Closing on EOF",
- con->http.fd);
+ cupsdLogClient(con, CUPSD_LOG_DEBUG,
+ "HTTP_STATE_PUT_RECV Closing on EOF.");
cupsdCloseClient(con);
return;
if (write(con->file, line, bytes) < bytes)
{
- cupsdLogMessage(CUPSD_LOG_ERROR,
- "[Client %d] Unable to write %d bytes to "
- "\"%s\": %s", con->http.fd, bytes, con->filename,
- strerror(errno));
+ cupsdLogClient(con, CUPSD_LOG_ERROR,
+ "Unable to write %d bytes to \"%s\": %s", bytes,
+ con->filename, strerror(errno));
close(con->file);
con->file = -1;
unlink(con->filename);
cupsdClearString(&con->filename);
- if (!cupsdSendError(con, HTTP_REQUEST_TOO_LARGE, CUPSD_AUTH_NONE))
+ if (!cupsdSendError(con, HTTP_STATUS_REQUEST_TOO_LARGE, CUPSD_AUTH_NONE))
{
cupsdCloseClient(con);
return;
}
}
}
- while (con->http.state == HTTP_PUT_RECV && data_ready(con));
+ while (httpGetState(con->http) == HTTP_STATE_PUT_RECV && httpGetReady(con->http));
- if (con->http.state == HTTP_WAITING)
+ if (httpGetState(con->http) == HTTP_STATE_STATUS)
{
/*
* End of file, see how big it is...
unlink(con->filename);
cupsdClearString(&con->filename);
- if (!cupsdSendError(con, HTTP_REQUEST_TOO_LARGE, CUPSD_AUTH_NONE))
+ if (!cupsdSendError(con, HTTP_STATUS_REQUEST_TOO_LARGE, CUPSD_AUTH_NONE))
{
cupsdCloseClient(con);
return;
* Install the configuration file...
*/
- status = install_conf_file(con);
+ status = install_cupsd_conf(con);
/*
* Return the status to the client...
}
break;
- case HTTP_POST_RECV :
+ case HTTP_STATE_POST_RECV :
do
{
if (con->request && con->file < 0)
* Grab any request data from the connection...
*/
- if ((ipp_state = ippRead(&(con->http), con->request)) == IPP_ERROR)
+ if ((ipp_state = ippRead(con->http, con->request)) == IPP_STATE_ERROR)
{
- cupsdLogMessage(CUPSD_LOG_ERROR,
- "[Client %d] IPP read error: %s", con->http.fd,
- cupsLastErrorString());
+ cupsdLogClient(con, CUPSD_LOG_ERROR, "IPP read error: %s",
+ cupsLastErrorString());
- cupsdSendError(con, HTTP_BAD_REQUEST, CUPSD_AUTH_NONE);
+ cupsdSendError(con, HTTP_STATUS_BAD_REQUEST, CUPSD_AUTH_NONE);
cupsdCloseClient(con);
return;
}
- else if (ipp_state != IPP_DATA)
+ else if (ipp_state != IPP_STATE_DATA)
{
- if (con->http.state == HTTP_POST_SEND)
+ if (httpGetState(con->http) == HTTP_STATE_POST_SEND)
{
- cupsdSendError(con, HTTP_BAD_REQUEST, CUPSD_AUTH_NONE);
+ cupsdSendError(con, HTTP_STATUS_BAD_REQUEST, CUPSD_AUTH_NONE);
cupsdCloseClient(con);
return;
}
+ if (httpGetReady(con->http))
+ continue;
break;
}
else
{
- cupsdLogMessage(CUPSD_LOG_DEBUG, "[Client %d] %d.%d %s %d",
- con->http.fd, con->request->request.op.version[0],
+ cupsdLogClient(con, CUPSD_LOG_DEBUG, "%d.%d %s %d",
+ con->request->request.op.version[0],
con->request->request.op.version[1],
ippOpString(con->request->request.op.operation_id),
con->request->request.op.request_id);
}
}
- if (con->file < 0 && con->http.state != HTTP_POST_SEND)
+ if (con->file < 0 && httpGetState(con->http) != HTTP_STATE_POST_SEND)
{
/*
* Create a file as needed for the request data...
if (con->file < 0)
{
- cupsdLogMessage(CUPSD_LOG_ERROR,
- "[Client %d] Unable to create request file "
- "\"%s\": %s", con->http.fd, con->filename,
- strerror(errno));
+ cupsdLogClient(con, CUPSD_LOG_ERROR,
+ "Unable to create request file \"%s\": %s",
+ con->filename, strerror(errno));
- if (!cupsdSendError(con, HTTP_REQUEST_TOO_LARGE, CUPSD_AUTH_NONE))
+ if (!cupsdSendError(con, HTTP_STATUS_REQUEST_TOO_LARGE, CUPSD_AUTH_NONE))
{
cupsdCloseClient(con);
return;
fcntl(con->file, F_SETFD, fcntl(con->file, F_GETFD) | FD_CLOEXEC);
}
- if (con->http.state != HTTP_POST_SEND)
+ if (httpGetState(con->http) != HTTP_STATE_POST_SEND)
{
- if ((bytes = httpRead2(HTTP(con), line, sizeof(line))) < 0)
+ if (!httpWait(con->http, 0))
+ return;
+ else if ((bytes = httpRead2(con->http, line, sizeof(line))) < 0)
{
- if (con->http.error && con->http.error != EPIPE)
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "[Client %d] HTTP_POST_SEND Closing for "
- "error %d (%s)", con->http.fd, con->http.error,
- strerror(con->http.error));
+ if (httpError(con->http) && httpError(con->http) != EPIPE)
+ cupsdLogClient(con, CUPSD_LOG_DEBUG,
+ "HTTP_STATE_POST_SEND Closing for error %d (%s)",
+ httpError(con->http), strerror(httpError(con->http)));
else
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "[Client %d] HTTP_POST_SEND Closing on EOF",
- con->http.fd);
+ cupsdLogClient(con, CUPSD_LOG_DEBUG,
+ "HTTP_STATE_POST_SEND Closing on EOF.");
cupsdCloseClient(con);
return;
if (write(con->file, line, bytes) < bytes)
{
- cupsdLogMessage(CUPSD_LOG_ERROR,
- "[Client %d] Unable to write %d bytes to "
- "\"%s\": %s", con->http.fd, bytes,
- con->filename, strerror(errno));
+ cupsdLogClient(con, CUPSD_LOG_ERROR,
+ "Unable to write %d bytes to \"%s\": %s",
+ bytes, con->filename, strerror(errno));
close(con->file);
con->file = -1;
unlink(con->filename);
cupsdClearString(&con->filename);
- if (!cupsdSendError(con, HTTP_REQUEST_TOO_LARGE,
+ if (!cupsdSendError(con, HTTP_STATUS_REQUEST_TOO_LARGE,
CUPSD_AUTH_NONE))
{
cupsdCloseClient(con);
}
}
}
- else if (con->http.state == HTTP_POST_RECV)
+ else if (httpGetState(con->http) == HTTP_STATE_POST_RECV)
return;
- else if (con->http.state != HTTP_POST_SEND)
+ else if (httpGetState(con->http) != HTTP_STATE_POST_SEND)
{
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "[Client %d] Closing on unexpected state %s.",
- con->http.fd, http_states[con->http.state]);
+ cupsdLogClient(con, CUPSD_LOG_DEBUG,
+ "Closing on unexpected state %s.",
+ httpStateString(httpGetState(con->http)));
cupsdCloseClient(con);
return;
}
}
}
- while (con->http.state == HTTP_POST_RECV && data_ready(con));
+ while (httpGetState(con->http) == HTTP_STATE_POST_RECV && httpGetReady(con->http));
- if (con->http.state == HTTP_POST_SEND)
+ if (httpGetState(con->http) == HTTP_STATE_POST_SEND)
{
if (con->file >= 0)
{
con->request = NULL;
}
- if (!cupsdSendError(con, HTTP_REQUEST_TOO_LARGE, CUPSD_AUTH_NONE))
+ if (!cupsdSendError(con, HTTP_STATUS_REQUEST_TOO_LARGE, CUPSD_AUTH_NONE))
{
cupsdCloseClient(con);
return;
{
if (!cupsdSendCommand(con, con->command, con->options, 0))
{
- if (!cupsdSendError(con, HTTP_NOT_FOUND, CUPSD_AUTH_NONE))
+ if (!cupsdSendError(con, HTTP_STATUS_NOT_FOUND, CUPSD_AUTH_NONE))
{
cupsdCloseClient(con);
return;
}
}
else
- cupsdLogRequest(con, HTTP_OK);
+ cupsdLogRequest(con, HTTP_STATUS_OK);
}
}
break; /* Anti-compiler-warning-code */
}
- if (con->http.state == HTTP_WAITING)
+ if (httpGetState(con->http) == HTTP_STATE_WAITING)
{
- if (!con->http.keep_alive)
+ if (!httpGetKeepAlive(con->http))
{
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "[Client %d] Closing because Keep-Alive disabled",
- con->http.fd);
+ cupsdLogClient(con, CUPSD_LOG_DEBUG,
+ "Closing because Keep-Alive is disabled.");
cupsdCloseClient(con);
}
else
if (fd < 0)
{
- cupsdLogMessage(CUPSD_LOG_ERROR,
- "[Client %d] Unable to open \"%s\" for reading: %s",
- con->http.fd, con->filename ? con->filename : "/dev/null",
- strerror(errno));
+ cupsdLogClient(con, CUPSD_LOG_ERROR,
+ "Unable to open \"%s\" for reading: %s",
+ con->filename ? con->filename : "/dev/null",
+ strerror(errno));
return (0);
}
if (fd >= 0)
close(fd);
- cupsdLogMessage(CUPSD_LOG_INFO, "[Client %d] Started \"%s\" (pid=%d)",
- con->http.fd, command, con->pipe_pid);
-
- cupsdLogMessage(CUPSD_LOG_DEBUG, "[Client %d] file=%d", con->http.fd,
- con->file);
+ cupsdLogClient(con, CUPSD_LOG_INFO, "Started \"%s\" (pid=%d, file=%d)",
+ command, con->pipe_pid, con->file);
if (con->pipe_pid == 0)
return (0);
cupsdAddSelect(con->file, (cupsd_selfunc_t)write_pipe, NULL, con);
+ cupsdLogClient(con, CUPSD_LOG_DEBUG, "Waiting for CGI data.");
+
con->sent_header = 0;
con->file_ready = 0;
con->got_fields = 0;
http_status_t code, /* I - Error code */
int auth_type)/* I - Authentication type */
{
- cupsdLogMessage(CUPSD_LOG_DEBUG2,
- "[Client %d] cupsdSendError code=%d, auth_type=%d",
- con->http.fd, code, auth_type);
+ cupsdLogClient(con, CUPSD_LOG_DEBUG2, "cupsdSendError code=%d, auth_type=%d",
+ code, auth_type);
#ifdef HAVE_SSL
/*
* server is configured...
*/
- if (code == HTTP_UNAUTHORIZED &&
- DefaultEncryption == HTTP_ENCRYPT_REQUIRED &&
- _cups_strcasecmp(con->http.hostname, "localhost") &&
- !con->http.tls)
+ if (code == HTTP_STATUS_UNAUTHORIZED &&
+ DefaultEncryption == HTTP_ENCRYPTION_REQUIRED &&
+ _cups_strcasecmp(httpGetHostname(con->http, NULL, 0), "localhost") &&
+ !httpIsEncrypted(con->http))
{
- code = HTTP_UPGRADE_REQUIRED;
+ code = HTTP_STATUS_UPGRADE_REQUIRED;
}
#endif /* HAVE_SSL */
* never disable it in that case.
*/
- if (code >= HTTP_BAD_REQUEST && con->http.auth_type != CUPSD_AUTH_NEGOTIATE)
- con->http.keep_alive = HTTP_KEEPALIVE_OFF;
+ if (code >= HTTP_STATUS_BAD_REQUEST && con->type != CUPSD_AUTH_NEGOTIATE)
+ httpSetKeepAlive(con->http, HTTP_KEEPALIVE_OFF);
/*
* Send an error message back to the client. If the error code is a
return (0);
#ifdef HAVE_SSL
- if (code == HTTP_UPGRADE_REQUIRED)
- if (httpPrintf(HTTP(con), "Connection: Upgrade\r\n") < 0)
+ if (code == HTTP_STATUS_UPGRADE_REQUIRED)
+ if (httpPrintf(con->http, "Connection: Upgrade\r\n") < 0)
return (0);
- if (httpPrintf(HTTP(con), "Upgrade: TLS/1.0,HTTP/1.1\r\n") < 0)
+ if (httpPrintf(con->http, "Upgrade: TLS/1.2,TLS/1.1,TLS/1.0\r\n") < 0)
return (0);
#endif /* HAVE_SSL */
- if (con->http.version >= HTTP_1_1 &&
- con->http.keep_alive == HTTP_KEEPALIVE_OFF)
+ if (con->http->version >= HTTP_VERSION_1_1 &&
+ httpGetKeepAlive(con->http) == HTTP_KEEPALIVE_OFF)
{
- if (httpPrintf(HTTP(con), "Connection: close\r\n") < 0)
+ if (httpPrintf(con->http, "Connection: close\r\n") < 0)
return (0);
}
- if (code >= HTTP_BAD_REQUEST)
+ if (code >= HTTP_STATUS_BAD_REQUEST)
{
/*
* Send a human-readable error message.
redirect[0] = '\0';
- if (code == HTTP_UNAUTHORIZED)
+ if (code == HTTP_STATUS_UNAUTHORIZED)
text = _cupsLangString(con->language,
_("Enter your username and password or the "
"root username and password to access this "
"page. If you are using Kerberos authentication, "
"make sure you have a valid Kerberos ticket."));
- else if (code == HTTP_UPGRADE_REQUIRED)
+ else if (code == HTTP_STATUS_UPGRADE_REQUIRED)
{
text = urltext;
"CONTENT=\"3;URL=https://%s:%d%s\">\n",
con->servername, con->serverport, con->uri);
}
- else if (code == HTTP_WEBIF_DISABLED)
+ else if (code == HTTP_STATUS_CUPS_WEBIF_DISABLED)
text = _cupsLangString(con->language,
_("The web interface is currently disabled. Run "
"\"cupsctl WebInterface=yes\" to enable it."));
"<P>%s</P>\n"
"</BODY>\n"
"</HTML>\n",
- httpStatus(code), redirect, httpStatus(code), text);
+ _httpStatus(con->language, code), redirect,
+ _httpStatus(con->language, code), text);
- if (httpPrintf(HTTP(con), "Content-Type: text/html; charset=utf-8\r\n") < 0)
+ if (httpPrintf(con->http, "Content-Type: text/html; charset=utf-8\r\n") < 0)
return (0);
- if (httpPrintf(HTTP(con), "Content-Length: %d\r\n",
+ if (httpPrintf(con->http, "Content-Length: %d\r\n",
(int)strlen(message)) < 0)
return (0);
- if (httpPrintf(HTTP(con), "\r\n") < 0)
+ if (httpPrintf(con->http, "\r\n") < 0)
return (0);
- if (httpPrintf(HTTP(con), "%s", message) < 0)
+ if (httpPrintf(con->http, "%s", message) < 0)
return (0);
}
- else if (httpPrintf(HTTP(con), "\r\n") < 0)
+ else if (httpPrintf(con->http, "\r\n") < 0)
return (0);
if (cupsdFlushHeader(con) < 0)
return (0);
- con->http.state = HTTP_WAITING;
+ con->http->state = HTTP_STATE_WAITING;
+
+ DEBUG_puts("cupsdSendError: Set state to HTTP_STATE_WAITING.");
return (1);
}
* Send the HTTP status header...
*/
- if (code == HTTP_CONTINUE)
+ if (code == HTTP_STATUS_CONTINUE)
{
/*
* 100-continue doesn't send any headers...
*/
- return (httpPrintf(HTTP(con), "HTTP/%d.%d 100 Continue\r\n\r\n",
- con->http.version / 100, con->http.version % 100) > 0);
+ return (httpPrintf(con->http, "HTTP/%d.%d 100 Continue\r\n\r\n",
+ con->http->version / 100, con->http->version % 100) > 0);
}
- else if (code == HTTP_WEBIF_DISABLED)
+ else if (code == HTTP_STATUS_CUPS_WEBIF_DISABLED)
{
/*
* Treat our special "web interface is disabled" status as "200 OK" for web
* browsers.
*/
- code = HTTP_OK;
+ code = HTTP_STATUS_OK;
}
- httpFlushWrite(HTTP(con));
+ httpFlushWrite(con->http);
- con->http.data_encoding = HTTP_ENCODE_FIELDS;
+ con->http->data_encoding = HTTP_ENCODING_FIELDS;
- if (httpPrintf(HTTP(con), "HTTP/%d.%d %d %s\r\n", con->http.version / 100,
- con->http.version % 100, code, httpStatus(code)) < 0)
+ if (httpPrintf(con->http, "HTTP/%d.%d %d %s\r\n", con->http->version / 100,
+ con->http->version % 100, code, httpStatus(code)) < 0)
return (0);
- if (httpPrintf(HTTP(con), "Date: %s\r\n", httpGetDateString(time(NULL))) < 0)
+ if (httpPrintf(con->http, "Date: %s\r\n", httpGetDateString(time(NULL))) < 0)
return (0);
if (ServerHeader)
- if (httpPrintf(HTTP(con), "Server: %s\r\n", ServerHeader) < 0)
+ if (httpPrintf(con->http, "Server: %s\r\n", ServerHeader) < 0)
return (0);
- if (con->http.keep_alive && con->http.version >= HTTP_1_0)
+ if (httpGetKeepAlive(con->http) && con->http->version >= HTTP_VERSION_1_0)
{
- if (httpPrintf(HTTP(con), "Connection: Keep-Alive\r\n") < 0)
+ if (httpPrintf(con->http, "Connection: Keep-Alive\r\n") < 0)
return (0);
- if (httpPrintf(HTTP(con), "Keep-Alive: timeout=%d\r\n",
+ if (httpPrintf(con->http, "Keep-Alive: timeout=%d\r\n",
KeepAliveTimeout) < 0)
return (0);
}
- if (code == HTTP_METHOD_NOT_ALLOWED)
- if (httpPrintf(HTTP(con), "Allow: GET, HEAD, OPTIONS, POST, PUT\r\n") < 0)
+ else if (httpPrintf(con->http, "Connection: close\r\n") < 0)
+ return (0);
+
+ if (code == HTTP_STATUS_METHOD_NOT_ALLOWED)
+ if (httpPrintf(con->http, "Allow: GET, HEAD, OPTIONS, POST, PUT\r\n") < 0)
return (0);
- if (code == HTTP_UNAUTHORIZED)
+ if (code == HTTP_STATUS_UNAUTHORIZED)
{
if (auth_type == CUPSD_AUTH_NONE)
{
strlcpy(auth_str, "Basic realm=\"CUPS\"", sizeof(auth_str));
else if (auth_type == CUPSD_AUTH_DIGEST)
snprintf(auth_str, sizeof(auth_str), "Digest realm=\"CUPS\", nonce=\"%s\"",
- con->http.hostname);
+ httpGetHostname(con->http, NULL, 0));
#ifdef HAVE_GSSAPI
else if (auth_type == CUPSD_AUTH_NEGOTIATE)
{
# ifdef AF_LOCAL
- if (_httpAddrFamily(con->http.hostaddr) == AF_LOCAL)
+ if (httpAddrFamily(httpGetAddress(con->http)) == AF_LOCAL)
strlcpy(auth_str, "Basic realm=\"CUPS\"", sizeof(auth_str));
else
# endif /* AF_LOCAL */
#endif /* HAVE_GSSAPI */
if (con->best && auth_type != CUPSD_AUTH_NEGOTIATE &&
- !_cups_strcasecmp(con->http.hostname, "localhost"))
+ !_cups_strcasecmp(httpGetHostname(con->http, NULL, 0), "localhost"))
{
/*
* Add a "trc" (try root certification) parameter for local non-Kerberos
if (auth_str[0])
{
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "[Client %d] WWW-Authenticate: %s", con->http.fd,
- auth_str);
+ cupsdLogClient(con, CUPSD_LOG_DEBUG, "WWW-Authenticate: %s", auth_str);
- if (httpPrintf(HTTP(con), "WWW-Authenticate: %s\r\n", auth_str) < 0)
+ if (httpPrintf(con->http, "WWW-Authenticate: %s\r\n", auth_str) < 0)
return (0);
}
}
if (con->language && strcmp(con->language->language, "C"))
{
- if (httpPrintf(HTTP(con), "Content-Language: %s\r\n",
+ if (httpPrintf(con->http, "Content-Language: %s\r\n",
con->language->language) < 0)
return (0);
}
{
if (!strcmp(type, "text/html"))
{
- if (httpPrintf(HTTP(con),
+ if (httpPrintf(con->http,
"Content-Type: text/html; charset=utf-8\r\n") < 0)
return (0);
}
- else if (httpPrintf(HTTP(con), "Content-Type: %s\r\n", type) < 0)
+ else if (httpPrintf(con->http, "Content-Type: %s\r\n", type) < 0)
return (0);
}
ipp_state_t ipp_state; /* IPP state value */
- cupsdLogMessage(CUPSD_LOG_DEBUG2,
- "[Client %d] cupsdWriteClient "
- "error=%d, "
- "used=%d, "
- "state=%s, "
- "data_encoding=HTTP_ENCODE_%s, "
- "data_remaining=" CUPS_LLFMT ", "
- "response=%p(%s), "
- "pipe_pid=%d, "
- "file=%d",
- con->http.fd, con->http.error, con->http.used,
- http_states[con->http.state],
- con->http.data_encoding == HTTP_ENCODE_CHUNKED ?
- "CHUNKED" : "LENGTH",
- CUPS_LLCAST con->http.data_remaining,
- con->response,
- con->response ? ipp_states[con->response->state] : "",
- con->pipe_pid, con->file);
-
- if (con->http.state != HTTP_GET_SEND &&
- con->http.state != HTTP_POST_SEND)
+ cupsdLogClient(con, CUPSD_LOG_DEBUG, "con->http=%p", con->http);
+ cupsdLogClient(con, CUPSD_LOG_DEBUG,
+ "cupsdWriteClient "
+ "error=%d, "
+ "used=%d, "
+ "state=%s, "
+ "data_encoding=HTTP_ENCODING_%s, "
+ "data_remaining=" CUPS_LLFMT ", "
+ "response=%p(%s), "
+ "pipe_pid=%d, "
+ "file=%d",
+ httpError(con->http), (int)httpGetReady(con->http),
+ httpStateString(httpGetState(con->http)),
+ con->http->data_encoding == HTTP_ENCODING_CHUNKED ?
+ "CHUNKED" : "LENGTH",
+ CUPS_LLCAST con->http->data_remaining,
+ con->response,
+ con->response ? ipp_states[con->response->state] : "",
+ con->pipe_pid, con->file);
+
+ if (httpGetState(con->http) != HTTP_STATE_GET_SEND &&
+ httpGetState(con->http) != HTTP_STATE_POST_SEND)
{
/*
* If we get called in the wrong state, then something went wrong with the
* connection and we need to shut it down...
*/
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "[Client %d] Closing on unexpected HTTP state %s.",
- con->http.fd, http_states[con->http.state]);
+ cupsdLogClient(con, CUPSD_LOG_DEBUG, "Closing on unexpected HTTP state %s.",
+ httpStateString(httpGetState(con->http)));
cupsdCloseClient(con);
return;
}
cupsdAddSelect(con->file, (cupsd_selfunc_t)write_pipe, NULL, con);
+ cupsdLogClient(con, CUPSD_LOG_DEBUG, "Waiting for CGI data.");
+
if (!con->file_ready)
{
/*
* Try again later when there is CGI output available...
*/
- cupsdRemoveSelect(con->http.fd);
+ cupsdRemoveSelect(httpGetFd(con->http));
return;
}
con->file_ready = 0;
}
- if (con->response && con->response->state != IPP_DATA)
+ if (con->response && con->response->state != IPP_STATE_DATA)
{
- ipp_state = ippWrite(HTTP(con), con->response);
- bytes = ipp_state != IPP_ERROR &&
- (con->file >= 0 || ipp_state != IPP_DATA);
+ int wused = con->http->wused; /* Previous write buffer use */
+
+ do
+ {
+ /*
+ * Write a single attribute or the IPP message header...
+ */
+
+ ipp_state = ippWrite(con->http, con->response);
+
+ /*
+ * If the write buffer has been flushed, stop buffering up attributes...
+ */
+
+ if (con->http->wused <= wused)
+ break;
+ }
+ while (ipp_state != IPP_STATE_DATA && ipp_state != IPP_STATE_ERROR);
+
+ cupsdLogClient(con, CUPSD_LOG_DEBUG,
+ "Writing IPP response, ipp_state=%s, old "
+ "wused=%d, new wused=%d",
+ ipp_state == IPP_STATE_ERROR ? "ERROR" :
+ ipp_state == IPP_STATE_IDLE ? "IDLE" :
+ ipp_state == IPP_STATE_HEADER ? "HEADER" :
+ ipp_state == IPP_STATE_ATTRIBUTE ? "ATTRIBUTE" : "DATA",
+ wused, con->http->wused);
+
+ if (con->http->wused > 0)
+ httpFlushWrite(con->http);
+
+ bytes = ipp_state != IPP_STATE_ERROR &&
+ (con->file >= 0 || ipp_state != IPP_STATE_DATA);
+
+ cupsdLogClient(con, CUPSD_LOG_DEBUG,
+ "bytes=%d, http_state=%d, data_remaining=" CUPS_LLFMT,
+ (int)bytes, httpGetState(con->http),
+ CUPS_LLCAST con->http->data_remaining);
}
else if ((bytes = read(con->file, con->header + con->header_used,
sizeof(con->header) - con->header_used)) > 0)
bufptr[-1] = '\0';
*bufptr++ = '\0';
- cupsdLogMessage(CUPSD_LOG_DEBUG, "Script header: %s", con->header);
+ cupsdLogClient(con, CUPSD_LOG_DEBUG, "Script header: %s", con->header);
if (!con->sent_header)
{
if (!_cups_strncasecmp(con->header, "Location:", 9))
{
- if (!cupsdSendHeader(con, HTTP_SEE_OTHER, NULL, CUPSD_AUTH_NONE))
+ if (!cupsdSendHeader(con, HTTP_STATUS_SEE_OTHER, NULL, CUPSD_AUTH_NONE))
{
cupsdCloseClient(con);
return;
con->sent_header = 2;
- if (httpPrintf(HTTP(con), "Content-Length: 0\r\n") < 0)
+ if (httpPrintf(con->http, "Content-Length: 0\r\n") < 0)
return;
}
else if (!_cups_strncasecmp(con->header, "Status:", 7))
}
else
{
- if (!cupsdSendHeader(con, HTTP_OK, NULL, CUPSD_AUTH_NONE))
+ if (!cupsdSendHeader(con, HTTP_STATUS_OK, NULL, CUPSD_AUTH_NONE))
{
cupsdCloseClient(con);
return;
con->sent_header = 1;
- if (con->http.version == HTTP_1_1)
+ if (con->http->version == HTTP_VERSION_1_1)
{
- if (httpPrintf(HTTP(con), "Transfer-Encoding: chunked\r\n") < 0)
+ if (httpPrintf(con->http, "Transfer-Encoding: chunked\r\n") < 0)
return;
}
}
}
if (_cups_strncasecmp(con->header, "Status:", 7))
- httpPrintf(HTTP(con), "%s\r\n", con->header);
+ httpPrintf(con->http, "%s\r\n", con->header);
/*
* Update buffer...
return;
}
- if (con->http.version == HTTP_1_1)
- con->http.data_encoding = HTTP_ENCODE_CHUNKED;
+ if (con->http->version == HTTP_VERSION_1_1)
+ con->http->data_encoding = HTTP_ENCODING_CHUNKED;
}
else
field_col = 0;
if (!con->got_fields)
{
- con->http.activity = time(NULL);
+ con->http->activity = time(NULL);
return;
}
}
if (con->header_used > 0)
{
- if (httpWrite2(HTTP(con), con->header, con->header_used) < 0)
+ if (httpWrite2(con->http, con->header, con->header_used) < 0)
{
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "[Client %d] Closing for error %d (%s)",
- con->http.fd, con->http.error,
- strerror(con->http.error));
+ cupsdLogClient(con, CUPSD_LOG_DEBUG, "Closing for error %d (%s)",
+ httpError(con->http), strerror(httpError(con->http)));
cupsdCloseClient(con);
return;
}
- if (con->http.data_encoding == HTTP_ENCODE_CHUNKED)
- httpFlushWrite(HTTP(con));
+ if (con->http->data_encoding == HTTP_ENCODING_CHUNKED)
+ httpFlushWrite(con->http);
con->bytes += con->header_used;
- if (con->http.state == HTTP_WAITING)
+ if (httpGetState(con->http) == HTTP_STATE_WAITING)
bytes = 0;
else
bytes = con->header_used;
}
if (bytes <= 0 ||
- (con->http.state != HTTP_GET_SEND && con->http.state != HTTP_POST_SEND))
+ (httpGetState(con->http) != HTTP_STATE_GET_SEND &&
+ httpGetState(con->http) != HTTP_STATE_POST_SEND))
{
if (!con->sent_header && con->pipe_pid)
- cupsdSendError(con, HTTP_SERVER_ERROR, CUPSD_AUTH_NONE);
+ cupsdSendError(con, HTTP_STATUS_SERVER_ERROR, CUPSD_AUTH_NONE);
else
{
- cupsdLogRequest(con, HTTP_OK);
+ cupsdLogRequest(con, HTTP_STATUS_OK);
- httpFlushWrite(HTTP(con));
+ httpFlushWrite(con->http);
- if (con->http.data_encoding == HTTP_ENCODE_CHUNKED && con->sent_header == 1)
+ if (con->http->data_encoding == HTTP_ENCODING_CHUNKED &&
+ con->sent_header == 1)
{
- if (httpWrite2(HTTP(con), "", 0) < 0)
+ if (httpWrite2(con->http, "", 0) < 0)
{
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "[Client %d] Closing for error %d (%s)",
- con->http.fd, con->http.error,
- strerror(con->http.error));
+ cupsdLogClient(con, CUPSD_LOG_DEBUG, "Closing for error %d (%s)",
+ httpError(con->http), strerror(httpError(con->http)));
cupsdCloseClient(con);
return;
}
}
}
- con->http.state = HTTP_WAITING;
+ con->http->state = HTTP_STATE_WAITING;
- cupsdAddSelect(con->http.fd, (cupsd_selfunc_t)cupsdReadClient, NULL, con);
+ cupsdAddSelect(httpGetFd(con->http), (cupsd_selfunc_t)cupsdReadClient, NULL, con);
+
+ cupsdLogClient(con, CUPSD_LOG_DEBUG, "Waiting for request.");
if (con->file >= 0)
{
cupsdClearString(&con->options);
cupsdClearString(&con->query_string);
- if (!con->http.keep_alive)
+ if (!httpGetKeepAlive(con->http))
{
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "[Client %d] Closing because Keep-Alive disabled.",
- con->http.fd);
+ cupsdLogClient(con, CUPSD_LOG_DEBUG,
+ "Closing because Keep-Alive is disabled.");
cupsdCloseClient(con);
return;
}
}
}
- con->http.activity = time(NULL);
+ con->http->activity = time(NULL);
}
cupsd_client_t *con, /* I - Client connection */
struct stat *filestats) /* I - File information */
{
- char *ptr; /* Pointer into field */
+ const char *ptr; /* Pointer into field */
time_t date; /* Time/date value */
off_t size; /* Size/length value */
size = 0;
date = 0;
- ptr = con->http.fields[HTTP_FIELD_IF_MODIFIED_SINCE];
+ ptr = httpGetField(con->http, HTTP_FIELD_IF_MODIFIED_SINCE);
if (*ptr == '\0')
return (1);
- cupsdLogMessage(CUPSD_LOG_DEBUG2,
- "[Client %d] check_if_modified "
- "filestats=%p(" CUPS_LLFMT ", %d)) If-Modified-Since=\"%s\"",
- con->http.fd, filestats, CUPS_LLCAST filestats->st_size,
- (int)filestats->st_mtime, ptr);
+ cupsdLogClient(con, CUPSD_LOG_DEBUG2,
+ "check_if_modified "
+ "filestats=%p(" CUPS_LLFMT ", %d)) If-Modified-Since=\"%s\"",
+ filestats, CUPS_LLCAST filestats->st_size,
+ (int)filestats->st_mtime, ptr);
while (*ptr != '\0')
{
}
-/*
- * 'data_ready()' - Check whether data is available from a client.
- */
-
-static int /* O - 1 if data is ready, 0 otherwise */
-data_ready(cupsd_client_t *con) /* I - Client */
-{
- if (con->http.used > 0)
- return (1);
-#ifdef HAVE_SSL
- else if (con->http.tls)
- {
-# ifdef HAVE_LIBSSL
- if (SSL_pending((SSL *)(con->http.tls)))
- return (1);
-# elif defined(HAVE_GNUTLS)
- if (gnutls_record_check_pending(con->http.tls))
- return (1);
-# elif defined(HAVE_CDSASSL)
- size_t bytes; /* Bytes that are available */
-
- if (!SSLGetBufferedReadSize(con->http.tls, &bytes) && bytes > 0)
- return (1);
-# endif /* HAVE_LIBSSL */
- }
-#endif /* HAVE_SSL */
-
- return (0);
-}
-
-
/*
* 'get_file()' - Get a filename and state info.
*/
while (status && language[0]);
}
- cupsdLogMessage(CUPSD_LOG_DEBUG2,
- "[Client %d] get_file filestats=%p, filename=%p, len=%d, "
- "returning \"%s\".", con->http.fd, filestats, filename, len,
- status ? "(null)" : filename);
+ cupsdLogClient(con, CUPSD_LOG_DEBUG2,
+ "get_file filestats=%p, filename=%p, len=%d, "
+ "returning \"%s\".", filestats, filename, len,
+ status ? "(null)" : filename);
if (status)
return (NULL);
/*
- * 'install_conf_file()' - Install a configuration file.
+ * 'install_cupsd_conf()' - Install a configuration file.
*/
static http_status_t /* O - Status */
-install_conf_file(cupsd_client_t *con) /* I - Connection */
+install_cupsd_conf(cupsd_client_t *con) /* I - Connection */
{
char filename[1024]; /* Configuration filename */
- mode_t mode; /* Permissions */
cups_file_t *in, /* Input file */
*out; /* Output file */
char buffer[16384]; /* Copy buffer */
if ((in = cupsFileOpen(con->filename, "rb")) == NULL)
{
- cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to open request file \"%s\": %s",
+ cupsdLogClient(con, CUPSD_LOG_ERROR, "Unable to open request file \"%s\": %s",
con->filename, strerror(errno));
- return (HTTP_SERVER_ERROR);
+ return (HTTP_STATUS_SERVER_ERROR);
}
/*
* Open the new config file...
*/
- snprintf(filename, sizeof(filename), "%s%s", ServerRoot, con->uri + 11);
- if (!strcmp(con->uri, "/admin/conf/printers.conf"))
- mode = ConfigFilePerm & 0600;
- else
- mode = ConfigFilePerm;
-
- if ((out = cupsdCreateConfFile(filename, mode)) == NULL)
+ if ((out = cupsdCreateConfFile(ConfigurationFile, ConfigFilePerm)) == NULL)
{
cupsFileClose(in);
- return (HTTP_SERVER_ERROR);
+ return (HTTP_STATUS_SERVER_ERROR);
}
- cupsdLogMessage(CUPSD_LOG_INFO, "Installing config file \"%s\"...", filename);
+ cupsdLogClient(con, CUPSD_LOG_INFO, "Installing config file \"%s\"...",
+ ConfigurationFile);
/*
* Copy from the request to the new config file...
while ((bytes = cupsFileRead(in, buffer, sizeof(buffer))) > 0)
if (cupsFileWrite(out, buffer, bytes) < bytes)
{
- cupsdLogMessage(CUPSD_LOG_ERROR,
+ cupsdLogClient(con, CUPSD_LOG_ERROR,
"Unable to copy to config file \"%s\": %s",
- filename, strerror(errno));
+ ConfigurationFile, strerror(errno));
cupsFileClose(in);
cupsFileClose(out);
- snprintf(filename, sizeof(filename), "%s%s.N", ServerRoot, con->uri + 11);
- cupsdRemoveFile(filename);
+ snprintf(filename, sizeof(filename), "%s.N", ConfigurationFile);
+ cupsdUnlinkOrRemoveFile(filename);
- return (HTTP_SERVER_ERROR);
+ return (HTTP_STATUS_SERVER_ERROR);
}
/*
cupsFileClose(in);
- if (cupsdCloseCreatedConfFile(out, filename))
- return (HTTP_SERVER_ERROR);
+ if (cupsdCloseCreatedConfFile(out, ConfigurationFile))
+ return (HTTP_STATUS_SERVER_ERROR);
/*
* Remove the request file...
*/
- cupsdRemoveFile(con->filename);
+ cupsdUnlinkOrRemoveFile(con->filename);
cupsdClearString(&con->filename);
/*
- * If the cupsd.conf file was updated, set the NeedReload flag...
+ * Set the NeedReload flag...
*/
- if (!strcmp(con->uri, "/admin/conf/cupsd.conf"))
- NeedReload = RELOAD_CUPSD;
- else
- NeedReload = RELOAD_ALL;
-
+ NeedReload = RELOAD_CUPSD;
ReloadTime = time(NULL);
/*
* Return that the file was created successfully...
*/
- return (HTTP_CREATED);
+ return (HTTP_STATUS_CREATED);
}
if (!type || _cups_strcasecmp(type->super, "application"))
{
- cupsdLogMessage(CUPSD_LOG_DEBUG2,
- "[Client %d] is_cgi filename=\"%s\", filestats=%p, "
- "type=%s/%s, returning 0", con->http.fd, filename,
- filestats, type ? type->super : "unknown",
- type ? type->type : "unknown");
+ cupsdLogClient(con, CUPSD_LOG_DEBUG2,
+ "is_cgi filename=\"%s\", filestats=%p, "
+ "type=%s/%s, returning 0", filename,
+ filestats, type ? type->super : "unknown",
+ type ? type->type : "unknown");
return (0);
}
if (options)
cupsdSetStringf(&con->options, " %s", options);
- cupsdLogMessage(CUPSD_LOG_DEBUG2,
- "[Client %d] is_cgi filename=\"%s\", filestats=%p, "
- "type=%s/%s, returning 1", con->http.fd, filename,
- filestats, type->super, type->type);
+ cupsdLogClient(con, CUPSD_LOG_DEBUG2,
+ "is_cgi filename=\"%s\", filestats=%p, "
+ "type=%s/%s, returning 1", filename,
+ filestats, type->super, type->type);
return (1);
}
#ifdef HAVE_JAVA
else
cupsdSetStringf(&con->options, " %s", filename);
- cupsdLogMessage(CUPSD_LOG_DEBUG2,
- "[Client %d] is_cgi filename=\"%s\", filestats=%p, "
- "type=%s/%s, returning 1", con->http.fd, filename,
- filestats, type->super, type->type);
+ cupsdLogClient(con, CUPSD_LOG_DEBUG2,
+ "is_cgi filename=\"%s\", filestats=%p, "
+ "type=%s/%s, returning 1", filename,
+ filestats, type->super, type->type);
return (1);
}
#endif /* HAVE_JAVA */
else
cupsdSetStringf(&con->options, " %s", filename);
- cupsdLogMessage(CUPSD_LOG_DEBUG2,
- "[Client %d] is_cgi filename=\"%s\", filestats=%p, "
- "type=%s/%s, returning 1", con->http.fd, filename,
- filestats, type->super, type->type);
+ cupsdLogClient(con, CUPSD_LOG_DEBUG2,
+ "is_cgi filename=\"%s\", filestats=%p, "
+ "type=%s/%s, returning 1", filename,
+ filestats, type->super, type->type);
return (1);
}
#endif /* HAVE_PERL */
else
cupsdSetStringf(&con->options, " %s", filename);
- cupsdLogMessage(CUPSD_LOG_DEBUG2,
- "[Client %d] is_cgi filename=\"%s\", filestats=%p, "
- "type=%s/%s, returning 1", con->http.fd, filename,
- filestats, type->super, type->type);
+ cupsdLogClient(con, CUPSD_LOG_DEBUG2,
+ "is_cgi filename=\"%s\", filestats=%p, "
+ "type=%s/%s, returning 1", filename,
+ filestats, type->super, type->type);
return (1);
}
#endif /* HAVE_PHP */
else
cupsdSetStringf(&con->options, " %s", filename);
- cupsdLogMessage(CUPSD_LOG_DEBUG2,
- "[Client %d] is_cgi filename=\"%s\", filestats=%p, "
- "type=%s/%s, returning 1", con->http.fd, filename,
- filestats, type->super, type->type);
+ cupsdLogClient(con, CUPSD_LOG_DEBUG2,
+ "is_cgi filename=\"%s\", filestats=%p, "
+ "type=%s/%s, returning 1", filename,
+ filestats, type->super, type->type);
return (1);
}
#endif /* HAVE_PYTHON */
- cupsdLogMessage(CUPSD_LOG_DEBUG2,
- "[Client %d] is_cgi filename=\"%s\", filestats=%p, "
- "type=%s/%s, returning 0", con->http.fd, filename,
- filestats, type->super, type->type);
+ cupsdLogClient(con, CUPSD_LOG_DEBUG2,
+ "is_cgi filename=\"%s\", filestats=%p, "
+ "type=%s/%s, returning 0", filename,
+ filestats, type->super, type->type);
return (0);
}
server_name[1024], /* SERVER_NAME environment variable */
server_port[1024]; /* SERVER_PORT environment variable */
ipp_attribute_t *attr; /* attributes-natural-language attribute */
- void *ccache = NULL; /* Kerberos credentials */
/*
* be consistent with Apache...
*/
- cupsdLogMessage(CUPSD_LOG_DEBUG2,
- "[Client %d] pipe_command infile=%d, outfile=%p, "
- "command=\"%s\", options=\"%s\", root=%d",
- con->http.fd, infile, outfile, command,
- options ? options : "(null)", root);
+ cupsdLogClient(con, CUPSD_LOG_DEBUG2,
+ "pipe_command infile=%d, outfile=%p, "
+ "command=\"%s\", options=\"%s\", root=%d",
+ infile, outfile, command,
+ options ? options : "(null)", root);
argv[0] = command;
commptr ++;
}
- if (*commptr == '?' && con->operation == HTTP_GET && !con->query_string)
+ if (*commptr == '?' && con->operation == HTTP_STATE_GET && !con->query_string)
{
commptr ++;
cupsdSetStringf(&(con->query_string), "QUERY_STRING=%s", commptr);
if (con->username[0])
{
snprintf(auth_type, sizeof(auth_type), "AUTH_TYPE=%s",
- httpGetField(HTTP(con), HTTP_FIELD_AUTHORIZATION));
+ httpGetField(con->http, HTTP_FIELD_AUTHORIZATION));
if ((uriptr = strchr(auth_type + 10, ' ')) != NULL)
*uriptr = '\0';
strlcpy(lang, "LANG=C", sizeof(lang));
strlcpy(remote_addr, "REMOTE_ADDR=", sizeof(remote_addr));
- httpAddrString(con->http.hostaddr, remote_addr + 12,
+ httpAddrString(httpGetAddress(con->http), remote_addr + 12,
sizeof(remote_addr) - 12);
snprintf(remote_host, sizeof(remote_host), "REMOTE_HOST=%s",
- con->http.hostname);
+ httpGetHostname(con->http, NULL, 0));
snprintf(script_name, sizeof(script_name), "SCRIPT_NAME=%s", con->uri);
if ((uriptr = strchr(script_name, '?')) != NULL)
sprintf(server_port, "SERVER_PORT=%d", con->serverport);
- if (con->http.fields[HTTP_FIELD_HOST][0])
+ if (httpGetField(con->http, HTTP_FIELD_HOST)[0])
{
char *nameptr; /* Pointer to ":port" */
snprintf(server_name, sizeof(server_name), "SERVER_NAME=%s",
- con->http.fields[HTTP_FIELD_HOST]);
+ httpGetField(con->http, HTTP_FIELD_HOST));
if ((nameptr = strrchr(server_name, ':')) != NULL && !strchr(nameptr, ']'))
*nameptr = '\0'; /* Strip trailing ":port" */
}
envp[envc ++] = remote_user;
}
- if (con->http.version == HTTP_1_1)
+ if (con->http->version == HTTP_VERSION_1_1)
envp[envc ++] = "SERVER_PROTOCOL=HTTP/1.1";
- else if (con->http.version == HTTP_1_0)
+ else if (con->http->version == HTTP_VERSION_1_0)
envp[envc ++] = "SERVER_PROTOCOL=HTTP/1.0";
else
envp[envc ++] = "SERVER_PROTOCOL=HTTP/0.9";
- if (con->http.cookie)
+ if (con->http->cookie)
{
snprintf(http_cookie, sizeof(http_cookie), "HTTP_COOKIE=%s",
- con->http.cookie);
+ con->http->cookie);
envp[envc ++] = http_cookie;
}
- if (con->http.fields[HTTP_FIELD_USER_AGENT][0])
+ if (httpGetField(con->http, HTTP_FIELD_USER_AGENT)[0])
{
snprintf(http_user_agent, sizeof(http_user_agent), "HTTP_USER_AGENT=%s",
- con->http.fields[HTTP_FIELD_USER_AGENT]);
+ httpGetField(con->http, HTTP_FIELD_USER_AGENT));
envp[envc ++] = http_user_agent;
}
- if (con->http.fields[HTTP_FIELD_REFERER][0])
+ if (httpGetField(con->http, HTTP_FIELD_REFERER)[0])
{
snprintf(http_referer, sizeof(http_referer), "HTTP_REFERER=%s",
- con->http.fields[HTTP_FIELD_REFERER]);
+ httpGetField(con->http, HTTP_FIELD_REFERER));
envp[envc ++] = http_referer;
}
- if (con->operation == HTTP_GET)
+ if (con->operation == HTTP_STATE_GET)
{
envp[envc ++] = "REQUEST_METHOD=GET";
sprintf(content_length, "CONTENT_LENGTH=" CUPS_LLFMT,
CUPS_LLCAST con->bytes);
snprintf(content_type, sizeof(content_type), "CONTENT_TYPE=%s",
- con->http.fields[HTTP_FIELD_CONTENT_TYPE]);
+ httpGetField(con->http, HTTP_FIELD_CONTENT_TYPE));
envp[envc ++] = "REQUEST_METHOD=POST";
envp[envc ++] = content_length;
* Tell the CGI if we are using encryption...
*/
- if (con->http.tls)
+ if (con->http->tls)
envp[envc ++] = "HTTPS=ON";
/*
*/
if (con->username[0])
- cupsdAddCert(pid, con->username, ccache);
+ cupsdAddCert(pid, con->username, con->type);
cupsdLogMessage(CUPSD_LOG_DEBUG, "[CGI] Started %s (PID %d)", command, pid);
{
cupsd_alias_t *a; /* Current alias */
cupsd_netif_t *netif; /* Current network interface */
- const char *host, /* Host field */
- *end; /* End character */
+ const char *end; /* End character */
+ char *ptr; /* Pointer into host value */
- host = con->http.fields[HTTP_FIELD_HOST];
+ /*
+ * Copy the Host: header for later use...
+ */
- if (httpAddrLocalhost(con->http.hostaddr))
+ strlcpy(con->clientname, httpGetField(con->http, HTTP_FIELD_HOST),
+ sizeof(con->clientname));
+ if ((ptr = strrchr(con->clientname, ':')) != NULL && !strchr(ptr, ']'))
+ {
+ *ptr++ = '\0';
+ con->clientport = atoi(ptr);
+ }
+ else
+ con->clientport = con->serverport;
+
+ /*
+ * Then validate...
+ */
+
+ if (httpAddrLocalhost(httpGetAddress(con->http)))
{
/*
* Only allow "localhost" or the equivalent IPv4 or IPv6 numerical
* addresses when accessing CUPS via the loopback interface...
*/
- return (!_cups_strcasecmp(host, "localhost") ||
- !_cups_strncasecmp(host, "localhost:", 10) ||
- !_cups_strcasecmp(host, "localhost.") ||
- !_cups_strncasecmp(host, "localhost.:", 11) ||
+ return (!_cups_strcasecmp(con->clientname, "localhost") ||
+ !_cups_strcasecmp(con->clientname, "localhost.") ||
#ifdef __linux
- !_cups_strcasecmp(host, "localhost.localdomain") ||
- !_cups_strncasecmp(host, "localhost.localdomain:", 22) ||
+ !_cups_strcasecmp(con->clientname, "localhost.localdomain") ||
#endif /* __linux */
- !strcmp(host, "127.0.0.1") ||
- !strncmp(host, "127.0.0.1:", 10) ||
- !strcmp(host, "[::1]") ||
- !strncmp(host, "[::1]:", 6));
+ !strcmp(con->clientname, "127.0.0.1") ||
+ !strcmp(con->clientname, "[::1]"));
}
#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
* Check if the hostname is something.local (Bonjour); if so, allow it.
*/
- if ((end = strrchr(host, '.')) != NULL && end > host &&
- (!end[1] || end[1] == ':'))
+ if ((end = strrchr(con->clientname, '.')) != NULL && end > con->clientname &&
+ !end[1])
{
/*
* "." on end, work back to second-to-last "."...
*/
- for (end --; end > host && *end != '.'; end --);
+
+ for (end --; end > con->clientname && *end != '.'; end --);
}
if (end && (!_cups_strcasecmp(end, ".local") ||
- !_cups_strncasecmp(end, ".local:", 7) ||
- !_cups_strcasecmp(end, ".local.") ||
- !_cups_strncasecmp(end, ".local.:", 8)))
+ !_cups_strcasecmp(end, ".local.")))
return (1);
#endif /* HAVE_DNSSD || HAVE_AVAHI */
* Check if the hostname is an IP address...
*/
- if (isdigit(*host & 255) || *host == '[')
+ if (isdigit(con->clientname[0] & 255) || con->clientname[0] == '[')
{
/*
* Possible IPv4/IPv6 address...
*/
- char temp[1024], /* Temporary string */
- *ptr; /* Pointer into temporary string */
http_addrlist_t *addrlist; /* List of addresses */
- strlcpy(temp, host, sizeof(temp));
- if ((ptr = strrchr(temp, ':')) != NULL && !strchr(ptr, ']'))
- *ptr = '\0'; /* Strip :port from host value */
-
- if ((addrlist = httpAddrGetList(temp, AF_UNSPEC, NULL)) != NULL)
+ if ((addrlist = httpAddrGetList(con->clientname, AF_UNSPEC, NULL)) != NULL)
{
/*
* Good IPv4/IPv6 address...
if (!strcmp(a->name, "*"))
return (1);
- if (!_cups_strncasecmp(host, a->name, a->namelen))
+ if (!_cups_strncasecmp(con->clientname, a->name, a->namelen))
{
/*
- * Prefix matches; check the character at the end - it must be ":", ".",
- * ".:", or nul...
+ * Prefix matches; check the character at the end - it must be "." or nul.
*/
- end = host + a->namelen;
+ end = con->clientname + a->namelen;
- if (!*end || *end == ':' || (*end == '.' && (!end[1] || end[1] == ':')))
+ if (!*end || (*end == '.' && !end[1]))
return (1);
}
}
if (!strcmp(a->name, "*"))
return (1);
- if (!_cups_strncasecmp(host, a->name, a->namelen))
+ if (!_cups_strncasecmp(con->clientname, a->name, a->namelen))
{
/*
- * Prefix matches; check the character at the end - it must be ":", ".",
- * ".:", or nul...
+ * Prefix matches; check the character at the end - it must be "." or nul.
*/
- end = host + a->namelen;
+ end = con->clientname + a->namelen;
- if (!*end || *end == ':' || (*end == '.' && (!end[1] || end[1] == ':')))
+ if (!*end || (*end == '.' && !end[1]))
return (1);
}
}
netif;
netif = (cupsd_netif_t *)cupsArrayNext(NetIFList))
{
- if (!_cups_strncasecmp(host, netif->hostname, netif->hostlen))
+ if (!_cups_strncasecmp(con->clientname, netif->hostname, netif->hostlen))
{
/*
- * Prefix matches; check the character at the end - it must be ":", ".",
- * ".:", or nul...
+ * Prefix matches; check the character at the end - it must be "." or nul.
*/
- end = host + netif->hostlen;
+ end = con->clientname + netif->hostlen;
- if (!*end || *end == ':' || (*end == '.' && (!end[1] || end[1] == ':')))
+ if (!*end || (*end == '.' && !end[1]))
return (1);
}
}
{
con->file = open(filename, O_RDONLY);
- cupsdLogMessage(CUPSD_LOG_DEBUG2,
- "[Client %d] write_file code=%d, filename=\"%s\" (%d), "
- "type=\"%s\", filestats=%p", con->http.fd,
- code, filename, con->file, type ? type : "(null)", filestats);
+ cupsdLogClient(con, CUPSD_LOG_DEBUG2,
+ "write_file code=%d, filename=\"%s\" (%d), "
+ "type=\"%s\", filestats=%p",
+ code, filename, con->file, type ? type : "(null)", filestats);
if (con->file < 0)
return (0);
if (!cupsdSendHeader(con, code, type, CUPSD_AUTH_NONE))
return (0);
- if (httpPrintf(HTTP(con), "Last-Modified: %s\r\n",
+ if (httpPrintf(con->http, "Last-Modified: %s\r\n",
httpGetDateString(filestats->st_mtime)) < 0)
return (0);
- if (httpPrintf(HTTP(con), "Content-Length: " CUPS_LLFMT "\r\n",
+ if (httpPrintf(con->http, "Content-Length: " CUPS_LLFMT "\r\n",
CUPS_LLCAST filestats->st_size) < 0)
return (0);
- if (httpPrintf(HTTP(con), "\r\n") < 0)
+ if (httpPrintf(con->http, "\r\n") < 0)
return (0);
if (cupsdFlushHeader(con) < 0)
return (0);
- con->http.data_encoding = HTTP_ENCODE_LENGTH;
- con->http.data_remaining = filestats->st_size;
+ con->http->data_encoding = HTTP_ENCODING_LENGTH;
+ con->http->data_remaining = filestats->st_size;
- if (con->http.data_remaining <= INT_MAX)
- con->http._data_remaining = con->http.data_remaining;
+ if (con->http->data_remaining <= INT_MAX)
+ con->http->_data_remaining = con->http->data_remaining;
else
- con->http._data_remaining = INT_MAX;
+ con->http->_data_remaining = INT_MAX;
- cupsdAddSelect(con->http.fd, (cupsd_selfunc_t)cupsdReadClient,
+ cupsdAddSelect(httpGetFd(con->http), (cupsd_selfunc_t)cupsdReadClient,
(cupsd_selfunc_t)cupsdWriteClient, con);
+ cupsdLogClient(con, CUPSD_LOG_DEBUG, "Sending file.");
+
return (1);
}
static void
write_pipe(cupsd_client_t *con) /* I - Client connection */
{
- cupsdLogMessage(CUPSD_LOG_DEBUG2,
- "[Client %d] write_pipe CGI output on fd %d",
- con->http.fd, con->file);
+ cupsdLogClient(con, CUPSD_LOG_DEBUG2, "write_pipe CGI output on fd %d",
+ con->file);
con->file_ready = 1;
cupsdRemoveSelect(con->file);
- cupsdAddSelect(con->http.fd, NULL, (cupsd_selfunc_t)cupsdWriteClient, con);
+ cupsdAddSelect(httpGetFd(con->http), NULL, (cupsd_selfunc_t)cupsdWriteClient, con);
+
+ cupsdLogClient(con, CUPSD_LOG_DEBUG, "CGI data ready to be sent.");
}
/*
- * End of "$Id: client.c 7950 2008-09-17 00:21:59Z mike $".
+ * End of "$Id$".
*/
projects / thirdparty / cups.git / blobdiff