X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fcups.git;a=blobdiff_plain;f=cups%2Fhttp-support.c;h=95135e0493f92cd67957a2424dbdd78a9acef72b;hp=3103007aadd9a8d1078f6d207a48dbc12e34fd1a;hb=e310189747c161ac6e737eedadf8f45d11bf2253;hpb=a4d045870e17abe8840b77615c0d59f4b332ee31 diff --git a/cups/http-support.c b/cups/http-support.c index 3103007aa..95135e049 100644 --- a/cups/http-support.c +++ b/cups/http-support.c @@ -1,70 +1,58 @@ /* - * "$Id: http-support.c 5023 2006-01-29 14:39:44Z mike $" + * HTTP support routines for CUPS. * - * HTTP support routines for the Common UNIX Printing System (CUPS) scheduler. + * Copyright 2007-2017 by Apple Inc. + * Copyright 1997-2007 by Easy Software Products, all rights reserved. * - * Copyright 1997-2006 by Easy Software Products, all rights reserved. - * - * These coded instructions, statements, and computer programs are the - * property of Easy Software Products 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 missing or damaged please contact Easy Software Products - * at: - * - * Attn: CUPS Licensing Information - * Easy Software Products - * 44141 Airport View Drive, Suite 204 - * Hollywood, Maryland 20636 USA - * - * Voice: (301) 373-9600 - * EMail: cups-info@cups.org - * WWW: http://www.cups.org - * - * This file is subject to the Apple OS-Developed Software exception. - * - * Contents: - * - * httpAssembleURI() - Assemble a uniform resource identifier from its - * components. - * httpAssembleURIf() - Assemble a uniform resource identifier from its - * components with a formatted resource. - * httpDecode64() - Base64-decode a string. - * httpDecode64_2() - Base64-decode a string. - * httpEncode64() - Base64-encode a string. - * httpEncode64_2() - Base64-encode a string. - * httpGetDateString() - Get a formatted date/time string from a time value. - * httpGetDateString2() - Get a formatted date/time string from a time value. - * httpGetDateTime() - Get a time value from a formatted date/time string. - * httpSeparate() - Separate a Universal Resource Identifier into its - * components. - * httpSeparate2() - Separate a Universal Resource Identifier into its - * components. - * httpSeparateURI() - Separate a Universal Resource Identifier into its - * components. - * httpStatus() - Return a short string describing a HTTP status code. - * _cups_hstrerror() - hstrerror() emulation function for Solaris and - * others... - * http_copy_decode() - Copy and decode a URI. - * http_copy_encode() - Copy and encode a URI. + * Licensed under Apache License v2.0. See the file "LICENSE" for more information. */ /* * Include necessary headers... */ -#include "debug.h" -#include "globals.h" -#include +#include "cups-private.h" +#ifdef HAVE_DNSSD +# include +# ifdef WIN32 +# include +# elif defined(HAVE_POLL) +# include +# else +# include +# endif /* WIN32 */ +#elif defined(HAVE_AVAHI) +# include +# include +# include +#endif /* HAVE_DNSSD */ + + +/* + * Local types... + */ + +typedef struct _http_uribuf_s /* URI buffer */ +{ +#ifdef HAVE_AVAHI + AvahiSimplePoll *poll; /* Poll state */ +#endif /* HAVE_AVAHI */ + char *buffer; /* Pointer to buffer */ + size_t bufsize; /* Size of buffer */ + int options; /* Options passed to _httpResolveURI */ + const char *resource; /* Resource from URI */ + const char *uuid; /* UUID from URI */ +} _http_uribuf_t; /* * Local globals... */ -static const char * const http_days[7] = +static const char * const http_days[7] =/* Days of the week */ { - "Sun", "Mon", + "Sun", + "Mon", "Tue", "Wed", "Thu", @@ -72,7 +60,7 @@ static const char * const http_days[7] = "Sat" }; static const char * const http_months[12] = - { + { /* Months of the year */ "Jan", "Feb", "Mar", @@ -86,6 +74,26 @@ static const char * const http_months[12] = "Nov", "Dec" }; +static const char * const http_states[] = + { /* HTTP state strings */ + "HTTP_STATE_ERROR", + "HTTP_STATE_WAITING", + "HTTP_STATE_OPTIONS", + "HTTP_STATE_GET", + "HTTP_STATE_GET_SEND", + "HTTP_STATE_HEAD", + "HTTP_STATE_POST", + "HTTP_STATE_POST_RECV", + "HTTP_STATE_POST_SEND", + "HTTP_STATE_PUT", + "HTTP_STATE_PUT_RECV", + "HTTP_STATE_DELETE", + "HTTP_STATE_TRACE", + "HTTP_STATE_CONNECT", + "HTTP_STATE_STATUS", + "HTTP_STATE_UNKNOWN_METHOD", + "HTTP_STATE_UNKNOWN_VERSION" + }; /* @@ -98,17 +106,45 @@ static const char *http_copy_decode(char *dst, const char *src, static char *http_copy_encode(char *dst, const char *src, char *dstend, const char *reserved, const char *term, int encode); +#ifdef HAVE_DNSSD +static void DNSSD_API http_resolve_cb(DNSServiceRef sdRef, + DNSServiceFlags flags, + uint32_t interfaceIndex, + DNSServiceErrorType errorCode, + const char *fullName, + const char *hostTarget, + uint16_t port, uint16_t txtLen, + const unsigned char *txtRecord, + void *context); +#endif /* HAVE_DNSSD */ + +#ifdef HAVE_AVAHI +static void http_client_cb(AvahiClient *client, + AvahiClientState state, void *simple_poll); +static int http_poll_cb(struct pollfd *pollfds, unsigned int num_pollfds, + int timeout, void *context); +static void http_resolve_cb(AvahiServiceResolver *resolver, + AvahiIfIndex interface, + AvahiProtocol protocol, + AvahiResolverEvent event, + const char *name, const char *type, + const char *domain, const char *host_name, + const AvahiAddress *address, uint16_t port, + AvahiStringList *txt, + AvahiLookupResultFlags flags, void *context); +#endif /* HAVE_AVAHI */ /* * 'httpAssembleURI()' - Assemble a uniform resource identifier from its * components. * - * This function properly escapes all reserved characters in a URI. You - * should use this function in place of traditional string functions - * whenever you need to create a URI string. + * This function escapes reserved characters in the URI depending on the + * value of the "encoding" argument. You should use this function in + * place of traditional string functions whenever you need to create a + * URI string. * - * @since CUPS 1.2@ + * @since CUPS 1.2/macOS 10.5@ */ http_uri_status_t /* O - URI status */ @@ -135,7 +171,7 @@ httpAssembleURI( if (uri) *uri = '\0'; - return (HTTP_URI_BAD_ARGUMENTS); + return (HTTP_URI_STATUS_BAD_ARGUMENTS); } /* @@ -148,10 +184,10 @@ httpAssembleURI( if (!ptr) goto assemble_overflow; - if (!strcmp(scheme, "mailto:")) + if (!strcmp(scheme, "geo") || !strcmp(scheme, "mailto") || !strcmp(scheme, "tel")) { /* - * mailto: only has :, no //... + * geo:, mailto:, and tel: only have :, no //... */ if (ptr < end) @@ -162,7 +198,7 @@ httpAssembleURI( else { /* - * Schemes other than mailto: all have //... + * Schemes other than geo:, mailto:, and tel: typically have //... */ if ((ptr + 2) < end) @@ -181,13 +217,16 @@ httpAssembleURI( if (host) { + const char *hostptr; /* Pointer into hostname */ + int have_ipv6; /* Do we have an IPv6 address? */ + if (username && *username) { /* * Add username@ first... */ - ptr = http_copy_encode(ptr, username, end, "/?@", NULL, + ptr = http_copy_encode(ptr, username, end, "/?#[]@", NULL, encoding & HTTP_URI_CODING_USERNAME); if (!ptr) @@ -201,18 +240,30 @@ httpAssembleURI( /* * Then add the hostname. Since IPv6 is a particular pain to deal - * with, we have several special cases to deal with... If we get + * with, we have several special cases to deal with. If we get * an IPv6 address with brackets around it, assume it is already in - * URI format... + * URI format. Since DNS-SD service names can sometimes look like + * raw IPv6 addresses, we specifically look for "._tcp" in the name, + * too... */ - if (host[0] != '[' && strchr(host, ':')) + for (hostptr = host, + have_ipv6 = strchr(host, ':') && !strstr(host, "._tcp"); + *hostptr && have_ipv6; + hostptr ++) + if (*hostptr != ':' && !isxdigit(*hostptr & 255)) + { + have_ipv6 = *hostptr == '%'; + break; + } + + if (have_ipv6) { /* - * We have an IPv6 address... + * We have a raw IPv6 address... */ - if (strchr(host, '%')) + if (strchr(host, '%') && !(encoding & HTTP_URI_CODING_RFC6874)) { /* * We have a link-local address, add "[v1." prefix... @@ -231,7 +282,7 @@ httpAssembleURI( else { /* - * We have a normal address, add "[" prefix... + * We have a normal (or RFC 6874 link-local) address, add "[" prefix... */ if (ptr < end) @@ -247,8 +298,23 @@ httpAssembleURI( while (ptr < end && *host) { if (*host == '%') - { - *ptr++ = '+'; /* Convert zone separator */ + { + /* + * Convert/encode zone separator + */ + + if (encoding & HTTP_URI_CODING_RFC6874) + { + if (ptr >= (end - 2)) + goto assemble_overflow; + + *ptr++ = '%'; + *ptr++ = '2'; + *ptr++ = '5'; + } + else + *ptr++ = '+'; + host ++; } else @@ -266,10 +332,12 @@ httpAssembleURI( else { /* - * Otherwise, just copy the host string... + * Otherwise, just copy the host string (the extra chars are not in the + * "reg-name" ABNF rule; anything <= SP or >= DEL plus % gets automatically + * percent-encoded. */ - ptr = http_copy_encode(ptr, host, end, NULL, NULL, + ptr = http_copy_encode(ptr, host, end, "\"#/:<>?@[\\]^`{|}", NULL, encoding & HTTP_URI_CODING_HOSTNAME); if (!ptr) @@ -282,7 +350,7 @@ httpAssembleURI( if (port > 0) { - snprintf(ptr, end - ptr + 1, ":%d", port); + snprintf(ptr, (size_t)(end - ptr + 1), ":%d", port); ptr += strlen(ptr); if (ptr >= end) @@ -332,7 +400,7 @@ httpAssembleURI( *ptr = '\0'; - return (HTTP_URI_OK); + return (HTTP_URI_STATUS_OK); /* * Clear the URI string and return an overflow error; I don't usually @@ -342,7 +410,7 @@ httpAssembleURI( assemble_overflow: *uri = '\0'; - return (HTTP_URI_OVERFLOW); + return (HTTP_URI_STATUS_OVERFLOW); } @@ -351,11 +419,12 @@ httpAssembleURI( * components with a formatted resource. * * This function creates a formatted version of the resource string - * argument "resourcef" and properly escapes all reserved characters - * in a URI. You should use this function in place of traditional - * string functions whenever you need to create a URI string. + * argument "resourcef" and escapes reserved characters in the URI + * depending on the value of the "encoding" argument. You should use + * this function in place of traditional string functions whenever + * you need to create a URI string. * - * @since CUPS 1.2@ + * @since CUPS 1.2/macOS 10.5@ */ http_uri_status_t /* O - URI status */ @@ -384,7 +453,7 @@ httpAssembleURIf( if (uri) *uri = '\0'; - return (HTTP_URI_BAD_ARGUMENTS); + return (HTTP_URI_STATUS_BAD_ARGUMENTS); } /* @@ -395,10 +464,10 @@ httpAssembleURIf( bytes = vsnprintf(resource, sizeof(resource), resourcef, ap); va_end(ap); - if (bytes >= sizeof(resource)) + if ((size_t)bytes >= sizeof(resource)) { *uri = '\0'; - return (HTTP_URI_OVERFLOW); + return (HTTP_URI_STATUS_OVERFLOW); } else return (httpAssembleURI(encoding, uri, urilen, scheme, username, host, @@ -406,8 +475,66 @@ httpAssembleURIf( } +/* + * 'httpAssembleUUID()' - Assemble a name-based UUID URN conforming to RFC 4122. + * + * This function creates a unique 128-bit identifying number using the server + * name, port number, random data, and optionally an object name and/or object + * number. The result is formatted as a UUID URN as defined in RFC 4122. + * + * The buffer needs to be at least 46 bytes in size. + * + * @since CUPS 1.7/macOS 10.9@ + */ + +char * /* I - UUID string */ +httpAssembleUUID(const char *server, /* I - Server name */ + int port, /* I - Port number */ + const char *name, /* I - Object name or NULL */ + int number, /* I - Object number or 0 */ + char *buffer, /* I - String buffer */ + size_t bufsize) /* I - Size of buffer */ +{ + char data[1024]; /* Source string for MD5 */ + unsigned char md5sum[16]; /* MD5 digest/sum */ + + + /* + * Build a version 3 UUID conforming to RFC 4122. + * + * Start with the MD5 sum of the server, port, object name and + * number, and some random data on the end. + */ + + snprintf(data, sizeof(data), "%s:%d:%s:%d:%04x:%04x", server, + port, name ? name : server, number, + (unsigned)CUPS_RAND() & 0xffff, (unsigned)CUPS_RAND() & 0xffff); + + cupsHashData("md5", (unsigned char *)data, strlen(data), md5sum, sizeof(md5sum)); + + /* + * Generate the UUID from the MD5... + */ + + snprintf(buffer, bufsize, + "urn:uuid:%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-" + "%02x%02x%02x%02x%02x%02x", + md5sum[0], md5sum[1], md5sum[2], md5sum[3], md5sum[4], md5sum[5], + (md5sum[6] & 15) | 0x30, md5sum[7], (md5sum[8] & 0x3f) | 0x40, + md5sum[9], md5sum[10], md5sum[11], md5sum[12], md5sum[13], + md5sum[14], md5sum[15]); + + return (buffer); +} + + /* * 'httpDecode64()' - Base64-decode a string. + * + * This function is deprecated. Use the httpDecode64_2() function instead + * which provides buffer length arguments. + * + * @deprecated@ @exclude all@ */ char * /* O - Decoded string */ @@ -430,7 +557,11 @@ httpDecode64(char *out, /* I - String to write to */ /* * 'httpDecode64_2()' - Base64-decode a string. * - * @since CUPS 1.1.21@ + * The caller must initialize "outlen" to the maximum size of the decoded + * string before calling @code httpDecode64_2@. On return "outlen" contains the + * decoded length of the string. + * + * @since CUPS 1.1.21/macOS 10.4@ */ char * /* O - Decoded string */ @@ -438,10 +569,10 @@ httpDecode64_2(char *out, /* I - String to write to */ int *outlen, /* IO - Size of output string */ const char *in) /* I - String to read from */ { - int pos, /* Bit position */ - base64; /* Value of this character */ - char *outptr, /* Output pointer */ - *outend; /* End of output buffer */ + int pos; /* Bit position */ + unsigned base64; /* Value of this character */ + char *outptr, /* Output pointer */ + *outend; /* End of output buffer */ /* @@ -470,11 +601,11 @@ httpDecode64_2(char *out, /* I - String to write to */ */ if (*in >= 'A' && *in <= 'Z') - base64 = *in - 'A'; + base64 = (unsigned)(*in - 'A'); else if (*in >= 'a' && *in <= 'z') - base64 = *in - 'a' + 26; + base64 = (unsigned)(*in - 'a' + 26); else if (*in >= '0' && *in <= '9') - base64 = *in - '0' + 52; + base64 = (unsigned)(*in - '0' + 52); else if (*in == '+') base64 = 62; else if (*in == '/') @@ -492,26 +623,26 @@ httpDecode64_2(char *out, /* I - String to write to */ { case 0 : if (outptr < outend) - *outptr = base64 << 2; + *outptr = (char)(base64 << 2); pos ++; break; case 1 : if (outptr < outend) - *outptr++ |= (base64 >> 4) & 3; + *outptr++ |= (char)((base64 >> 4) & 3); if (outptr < outend) - *outptr = (base64 << 4) & 255; + *outptr = (char)((base64 << 4) & 255); pos ++; break; case 2 : if (outptr < outend) - *outptr++ |= (base64 >> 2) & 15; + *outptr++ |= (char)((base64 >> 2) & 15); if (outptr < outend) - *outptr = (base64 << 6) & 255; + *outptr = (char)((base64 << 6) & 255); pos ++; break; case 3 : if (outptr < outend) - *outptr++ |= base64; + *outptr++ |= (char)base64; pos = 0; break; } @@ -531,25 +662,30 @@ httpDecode64_2(char *out, /* I - String to write to */ /* * 'httpEncode64()' - Base64-encode a string. + * + * This function is deprecated. Use the httpEncode64_2() function instead + * which provides buffer length arguments. + * + * @deprecated@ @exclude all@ */ char * /* O - Encoded string */ httpEncode64(char *out, /* I - String to write to */ const char *in) /* I - String to read from */ { - return (httpEncode64_2(out, 512, in, strlen(in))); + return (httpEncode64_2(out, 512, in, (int)strlen(in))); } /* * 'httpEncode64_2()' - Base64-encode a string. * - * @since CUPS 1.1.21@ + * @since CUPS 1.1.21/macOS 10.4@ */ char * /* O - Encoded string */ httpEncode64_2(char *out, /* I - String to write to */ - int outlen, /* I - Size of output string */ + int outlen, /* I - Maximum size of output string */ const char *in, /* I - String to read from */ int inlen) /* I - Size of input string */ { @@ -583,8 +719,14 @@ httpEncode64_2(char *out, /* I - String to write to */ if (outptr < outend) *outptr ++ = base64[(in[0] & 255) >> 2]; + if (outptr < outend) - *outptr ++ = base64[(((in[0] & 255) << 4) | ((in[1] & 255) >> 4)) & 63]; + { + if (inlen > 1) + *outptr ++ = base64[(((in[0] & 255) << 4) | ((in[1] & 255) >> 4)) & 63]; + else + *outptr ++ = base64[((in[0] & 255) << 4) & 63]; + } in ++; inlen --; @@ -598,7 +740,12 @@ httpEncode64_2(char *out, /* I - String to write to */ } if (outptr < outend) - *outptr ++ = base64[(((in[0] & 255) << 2) | ((in[1] & 255) >> 6)) & 63]; + { + if (inlen > 1) + *outptr ++ = base64[(((in[0] & 255) << 2) | ((in[1] & 255) >> 6)) & 63]; + else + *outptr ++ = base64[((in[0] & 255) << 2) & 63]; + } in ++; inlen --; @@ -626,11 +773,11 @@ httpEncode64_2(char *out, /* I - String to write to */ /* * 'httpGetDateString()' - Get a formatted date/time string from a time value. * - * @deprecated@ + * @deprecated@ @exclude all@ */ const char * /* O - Date/time string */ -httpGetDateString(time_t t) /* I - UNIX time */ +httpGetDateString(time_t t) /* I - Time in seconds */ { _cups_globals_t *cg = _cupsGlobals(); /* Pointer to library globals */ @@ -642,11 +789,11 @@ httpGetDateString(time_t t) /* I - UNIX time */ /* * 'httpGetDateString2()' - Get a formatted date/time string from a time value. * - * @since CUPS 1.2@ + * @since CUPS 1.2/macOS 10.5@ */ const char * /* O - Date/time string */ -httpGetDateString2(time_t t, /* I - UNIX time */ +httpGetDateString2(time_t t, /* I - Time in seconds */ char *s, /* I - String buffer */ int slen) /* I - Size of string buffer */ { @@ -654,10 +801,10 @@ httpGetDateString2(time_t t, /* I - UNIX time */ tdate = gmtime(&t); - snprintf(s, slen, "%s, %02d %s %d %02d:%02d:%02d GMT", - http_days[tdate->tm_wday], tdate->tm_mday, - http_months[tdate->tm_mon], tdate->tm_year + 1900, - tdate->tm_hour, tdate->tm_min, tdate->tm_sec); + if (tdate) + snprintf(s, (size_t)slen, "%s, %02d %s %d %02d:%02d:%02d GMT", http_days[tdate->tm_wday], tdate->tm_mday, http_months[tdate->tm_mon], tdate->tm_year + 1900, tdate->tm_hour, tdate->tm_min, tdate->tm_sec); + else + s[0] = '\0'; return (s); } @@ -667,7 +814,7 @@ httpGetDateString2(time_t t, /* I - UNIX time */ * 'httpGetDateTime()' - Get a time value from a formatted date/time string. */ -time_t /* O - UNIX time */ +time_t /* O - Time in seconds */ httpGetDateTime(const char *s) /* I - Date/time string */ { int i; /* Looping var */ @@ -681,7 +828,7 @@ httpGetDateTime(const char *s) /* I - Date/time string */ { 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 }; - DEBUG_printf(("httpGetDateTime(s=\"%s\")\n", s)); + DEBUG_printf(("2httpGetDateTime(s=\"%s\")", s)); /* * Extract the date and time from the formatted string... @@ -690,21 +837,21 @@ httpGetDateTime(const char *s) /* I - Date/time string */ if (sscanf(s, "%*s%d%15s%d%d:%d:%d", &day, mon, &year, &hour, &min, &sec) < 6) return (0); - DEBUG_printf((" day=%d, mon=\"%s\", year=%d, hour=%d, min=%d, sec=%d\n", - day, mon, year, hour, min, sec)); + DEBUG_printf(("4httpGetDateTime: day=%d, mon=\"%s\", year=%d, hour=%d, " + "min=%d, sec=%d", day, mon, year, hour, min, sec)); /* * Convert the month name to a number from 0 to 11. */ for (i = 0; i < 12; i ++) - if (!strcasecmp(mon, http_months[i])) + if (!_cups_strcasecmp(mon, http_months[i])) break; if (i >= 12) return (0); - DEBUG_printf((" i=%d\n", i)); + DEBUG_printf(("4httpGetDateTime: i=%d", i)); /* * Now convert the date and time to a UNIX time value in seconds since @@ -717,14 +864,14 @@ httpGetDateTime(const char *s) /* I - Date/time string */ else days = normal_days[i] + day - 1; - DEBUG_printf((" days=%d\n", days)); + DEBUG_printf(("4httpGetDateTime: days=%d", days)); days += (year - 1970) * 365 + /* 365 days per year (normally) */ ((year - 1) / 4 - 492) - /* + leap days */ ((year - 1) / 100 - 19) + /* - 100 year days */ ((year - 1) / 400 - 4); /* + 400 year days */ - DEBUG_printf((" days=%d\n", days)); + DEBUG_printf(("4httpGetDateTime: days=%d\n", days)); return (days * 86400 + hour * 3600 + min * 60 + sec); } @@ -733,6 +880,10 @@ httpGetDateTime(const char *s) /* I - Date/time string */ /* * 'httpSeparate()' - Separate a Universal Resource Identifier into its * components. + * + * This function is deprecated; use the httpSeparateURI() function instead. + * + * @deprecated@ @exclude all@ */ void @@ -753,7 +904,10 @@ httpSeparate(const char *uri, /* I - Universal Resource Identifier */ * 'httpSeparate2()' - Separate a Universal Resource Identifier into its * components. * - * @since CUPS 1.1.21@ + * This function is deprecated; use the httpSeparateURI() function instead. + * + * @since CUPS 1.1.21/macOS 10.4@ + * @deprecated@ @exclude all@ */ void @@ -777,7 +931,7 @@ httpSeparate2(const char *uri, /* I - Universal Resource Identifier */ * 'httpSeparateURI()' - Separate a Universal Resource Identifier into its * components. * - * @since CUPS 1.2@ + * @since CUPS 1.2/macOS 10.5@ */ http_uri_status_t /* O - Result of separation */ @@ -826,16 +980,16 @@ httpSeparateURI( if (!uri || !port || !scheme || schemelen <= 0 || !username || usernamelen <= 0 || !host || hostlen <= 0 || !resource || resourcelen <= 0) - return (HTTP_URI_BAD_ARGUMENTS); + return (HTTP_URI_STATUS_BAD_ARGUMENTS); if (!*uri) - return (HTTP_URI_BAD_URI); + return (HTTP_URI_STATUS_BAD_URI); /* * Grab the scheme portion of the URI... */ - status = HTTP_URI_OK; + status = HTTP_URI_STATUS_OK; if (!strncmp(uri, "//", 2)) { @@ -843,8 +997,8 @@ httpSeparateURI( * Workaround for HP IPP client bug... */ - strlcpy(scheme, "ipp", schemelen); - status = HTTP_URI_MISSING_SCHEME; + strlcpy(scheme, "ipp", (size_t)schemelen); + status = HTTP_URI_STATUS_MISSING_SCHEME; } else if (*uri == '/') { @@ -852,8 +1006,8 @@ httpSeparateURI( * Filename... */ - strlcpy(scheme, "file", schemelen); - status = HTTP_URI_MISSING_SCHEME; + strlcpy(scheme, "file", (size_t)schemelen); + status = HTTP_URI_STATUS_MISSING_SCHEME; } else { @@ -863,7 +1017,9 @@ httpSeparateURI( for (ptr = scheme, end = scheme + schemelen - 1; *uri && *uri != ':' && ptr < end;) - if (isalnum(*uri & 255) || *uri == '-' || *uri == '+' || *uri == '.') + if (strchr("ABCDEFGHIJKLMNOPQRSTUVWXYZ" + "abcdefghijklmnopqrstuvwxyz" + "0123456789-+.", *uri) != NULL) *ptr++ = *uri++; else break; @@ -873,7 +1029,7 @@ httpSeparateURI( if (*uri != ':') { *scheme = '\0'; - return (HTTP_URI_BAD_SCHEME); + return (HTTP_URI_STATUS_BAD_SCHEME); } uri ++; @@ -887,14 +1043,14 @@ httpSeparateURI( *port = 80; else if (!strcmp(scheme, "https")) *port = 443; - else if (!strcmp(scheme, "ipp")) + else if (!strcmp(scheme, "ipp") || !strcmp(scheme, "ipps")) *port = 631; - else if (!strcasecmp(scheme, "lpd")) + else if (!_cups_strcasecmp(scheme, "lpd")) *port = 515; else if (!strcmp(scheme, "socket")) /* Not yet registered with IANA... */ *port = 9100; - else if (strcmp(scheme, "file") && strcmp(scheme, "mailto")) - status = HTTP_URI_UNKNOWN_SCHEME; + else if (strcmp(scheme, "file") && strcmp(scheme, "mailto") && strcmp(scheme, "tel")) + status = HTTP_URI_STATUS_UNKNOWN_SCHEME; /* * Now see if we have a hostname... @@ -924,7 +1080,7 @@ httpSeparateURI( if (!uri) { *username = '\0'; - return (HTTP_URI_BAD_USERNAME); + return (HTTP_URI_STATUS_BAD_USERNAME); } uri ++; @@ -941,8 +1097,25 @@ httpSeparateURI( */ uri ++; - if (!strncmp(uri, "v1.", 3)) - uri += 3; /* Skip IPvN leader... */ + if (*uri == 'v') + { + /* + * Skip IPvFuture ("vXXXX.") prefix... + */ + + uri ++; + + while (isxdigit(*uri & 255)) + uri ++; + + if (*uri != '.') + { + *host = '\0'; + return (HTTP_URI_STATUS_BAD_HOSTNAME); + } + + uri ++; + } uri = http_copy_decode(host, uri, hostlen, "]", decoding & HTTP_URI_CODING_HOSTNAME); @@ -950,7 +1123,7 @@ httpSeparateURI( if (!uri) { *host = '\0'; - return (HTTP_URI_BAD_HOSTNAME); + return (HTTP_URI_STATUS_BAD_HOSTNAME); } /* @@ -960,7 +1133,7 @@ httpSeparateURI( if (*uri != ']') { *host = '\0'; - return (HTTP_URI_BAD_HOSTNAME); + return (HTTP_URI_STATUS_BAD_HOSTNAME); } uri ++; @@ -975,16 +1148,43 @@ httpSeparateURI( *ptr = '%'; break; } + else if (*ptr == '%') + { + /* + * Stop at zone separator (RFC 6874) + */ + + break; + } else if (*ptr != ':' && *ptr != '.' && !isxdigit(*ptr & 255)) { *host = '\0'; - return (HTTP_URI_BAD_HOSTNAME); + return (HTTP_URI_STATUS_BAD_HOSTNAME); } } else { /* - * Grab hostname or IPv4 address... + * Validate the hostname or IPv4 address first... + */ + + for (ptr = (char *)uri; *ptr; ptr ++) + if (strchr(":?/", *ptr)) + break; + else if (!strchr("abcdefghijklmnopqrstuvwxyz" /* unreserved */ + "ABCDEFGHIJKLMNOPQRSTUVWXYZ" /* unreserved */ + "0123456789" /* unreserved */ + "-._~" /* unreserved */ + "%" /* pct-encoded */ + "!$&'()*+,;=" /* sub-delims */ + "\\", *ptr)) /* SMB domain */ + { + *host = '\0'; + return (HTTP_URI_STATUS_BAD_HOSTNAME); + } + + /* + * Then copy the hostname or IPv4 address to the buffer... */ uri = http_copy_decode(host, uri, hostlen, ":?/", @@ -993,23 +1193,8 @@ httpSeparateURI( if (!uri) { *host = '\0'; - return (HTTP_URI_BAD_HOSTNAME); + return (HTTP_URI_STATUS_BAD_HOSTNAME); } - - /* - * Validate value... - */ - - for (ptr = host; *ptr; ptr ++) - if (!strchr("abcdefghijklmnopqrstuvwxyz" - "ABCDEFGHIJKLMNOPQRSTUVWXYZ" - "0123456789" - "-._~" - "!$&'()*+,;=", *ptr)) - { - *host = '\0'; - return (HTTP_URI_BAD_HOSTNAME); - } } /* @@ -1020,7 +1205,7 @@ httpSeparateURI( if (!strcmp(scheme, "file") && strcmp(host, "localhost") && host[0]) { *host = '\0'; - return (HTTP_URI_BAD_HOSTNAME); + return (HTTP_URI_STATUS_BAD_HOSTNAME); } /* @@ -1033,12 +1218,24 @@ httpSeparateURI( * Yes, collect the port number... */ - *port = strtol(uri + 1, (char **)&uri, 10); + if (!isdigit(uri[1] & 255)) + { + *port = 0; + return (HTTP_URI_STATUS_BAD_PORT); + } + + *port = (int)strtol(uri + 1, (char **)&uri, 10); + + if (*port <= 0 || *port > 65535) + { + *port = 0; + return (HTTP_URI_STATUS_BAD_PORT); + } - if (*uri != '/') + if (*uri != '/' && *uri) { *port = 0; - return (HTTP_URI_BAD_PORT); + return (HTTP_URI_STATUS_BAD_PORT); } } } @@ -1053,7 +1250,7 @@ httpSeparateURI( * Hostname but no path... */ - status = HTTP_URI_MISSING_RESOURCE; + status = HTTP_URI_STATUS_MISSING_RESOURCE; *resource = '/'; /* @@ -1079,15 +1276,16 @@ httpSeparateURI( char *resptr = resource + strlen(resource); - uri = http_copy_decode(resptr, uri, resourcelen - (resptr - resource), - NULL, decoding & HTTP_URI_CODING_QUERY); + uri = http_copy_decode(resptr, uri, + resourcelen - (int)(resptr - resource), NULL, + decoding & HTTP_URI_CODING_QUERY); } } if (!uri) { *resource = '\0'; - return (HTTP_URI_BAD_RESOURCE); + return (HTTP_URI_STATUS_BAD_RESOURCE); } /* @@ -1098,56 +1296,207 @@ httpSeparateURI( } +/* + * 'httpStateString()' - Return the string describing a HTTP state value. + * + * @since CUPS 2.0/OS 10.10@ + */ + +const char * /* O - State string */ +httpStateString(http_state_t state) /* I - HTTP state value */ +{ + if (state < HTTP_STATE_ERROR || state > HTTP_STATE_UNKNOWN_VERSION) + return ("HTTP_STATE_???"); + else + return (http_states[state - HTTP_STATE_ERROR]); +} + + +/* + * '_httpStatus()' - Return the localized string describing a HTTP status code. + * + * The returned string is localized using the passed message catalog. + */ + +const char * /* O - Localized status string */ +_httpStatus(cups_lang_t *lang, /* I - Language */ + http_status_t status) /* I - HTTP status code */ +{ + const char *s; /* Status string */ + + + switch (status) + { + case HTTP_STATUS_ERROR : + s = strerror(errno); + break; + case HTTP_STATUS_CONTINUE : + s = _("Continue"); + break; + case HTTP_STATUS_SWITCHING_PROTOCOLS : + s = _("Switching Protocols"); + break; + case HTTP_STATUS_OK : + s = _("OK"); + break; + case HTTP_STATUS_CREATED : + s = _("Created"); + break; + case HTTP_STATUS_ACCEPTED : + s = _("Accepted"); + break; + case HTTP_STATUS_NO_CONTENT : + s = _("No Content"); + break; + case HTTP_STATUS_MOVED_PERMANENTLY : + s = _("Moved Permanently"); + break; + case HTTP_STATUS_SEE_OTHER : + s = _("See Other"); + break; + case HTTP_STATUS_NOT_MODIFIED : + s = _("Not Modified"); + break; + case HTTP_STATUS_BAD_REQUEST : + s = _("Bad Request"); + break; + case HTTP_STATUS_UNAUTHORIZED : + case HTTP_STATUS_CUPS_AUTHORIZATION_CANCELED : + s = _("Unauthorized"); + break; + case HTTP_STATUS_FORBIDDEN : + s = _("Forbidden"); + break; + case HTTP_STATUS_NOT_FOUND : + s = _("Not Found"); + break; + case HTTP_STATUS_REQUEST_TOO_LARGE : + s = _("Request Entity Too Large"); + break; + case HTTP_STATUS_URI_TOO_LONG : + s = _("URI Too Long"); + break; + case HTTP_STATUS_UPGRADE_REQUIRED : + s = _("Upgrade Required"); + break; + case HTTP_STATUS_NOT_IMPLEMENTED : + s = _("Not Implemented"); + break; + case HTTP_STATUS_NOT_SUPPORTED : + s = _("Not Supported"); + break; + case HTTP_STATUS_EXPECTATION_FAILED : + s = _("Expectation Failed"); + break; + case HTTP_STATUS_SERVICE_UNAVAILABLE : + s = _("Service Unavailable"); + break; + case HTTP_STATUS_SERVER_ERROR : + s = _("Internal Server Error"); + break; + case HTTP_STATUS_CUPS_PKI_ERROR : + s = _("SSL/TLS Negotiation Error"); + break; + case HTTP_STATUS_CUPS_WEBIF_DISABLED : + s = _("Web Interface is Disabled"); + break; + + default : + s = _("Unknown"); + break; + } + + return (_cupsLangString(lang, s)); +} + + /* * 'httpStatus()' - Return a short string describing a HTTP status code. + * + * The returned string is localized to the current POSIX locale and is based + * on the status strings defined in RFC 7231. */ -const char * /* O - String or NULL */ +const char * /* O - Localized status string */ httpStatus(http_status_t status) /* I - HTTP status code */ { + _cups_globals_t *cg = _cupsGlobals(); /* Global data */ + + + if (!cg->lang_default) + cg->lang_default = cupsLangDefault(); + + return (_httpStatus(cg->lang_default, status)); +} + +/* + * 'httpURIStatusString()' - Return a string describing a URI status code. + * + * @since CUPS 2.0/OS 10.10@ + */ + +const char * /* O - Localized status string */ +httpURIStatusString( + http_uri_status_t status) /* I - URI status code */ +{ + const char *s; /* Status string */ + _cups_globals_t *cg = _cupsGlobals(); /* Global data */ + + + if (!cg->lang_default) + cg->lang_default = cupsLangDefault(); + switch (status) { - case HTTP_CONTINUE : - return ("Continue"); - case HTTP_SWITCHING_PROTOCOLS : - return ("Switching Protocols"); - case HTTP_OK : - return ("OK"); - case HTTP_CREATED : - return ("Created"); - case HTTP_ACCEPTED : - return ("Accepted"); - case HTTP_NO_CONTENT : - return ("No Content"); - case HTTP_NOT_MODIFIED : - return ("Not Modified"); - case HTTP_BAD_REQUEST : - return ("Bad Request"); - case HTTP_UNAUTHORIZED : - return ("Unauthorized"); - case HTTP_FORBIDDEN : - return ("Forbidden"); - case HTTP_NOT_FOUND : - return ("Not Found"); - case HTTP_REQUEST_TOO_LARGE : - return ("Request Entity Too Large"); - case HTTP_URI_TOO_LONG : - return ("URI Too Long"); - case HTTP_UPGRADE_REQUIRED : - return ("Upgrade Required"); - case HTTP_NOT_IMPLEMENTED : - return ("Not Implemented"); - case HTTP_NOT_SUPPORTED : - return ("Not Supported"); - default : - return ("Unknown"); + case HTTP_URI_STATUS_OVERFLOW : + s = _("URI too large"); + break; + case HTTP_URI_STATUS_BAD_ARGUMENTS : + s = _("Bad arguments to function"); + break; + case HTTP_URI_STATUS_BAD_RESOURCE : + s = _("Bad resource in URI"); + break; + case HTTP_URI_STATUS_BAD_PORT : + s = _("Bad port number in URI"); + break; + case HTTP_URI_STATUS_BAD_HOSTNAME : + s = _("Bad hostname/address in URI"); + break; + case HTTP_URI_STATUS_BAD_USERNAME : + s = _("Bad username in URI"); + break; + case HTTP_URI_STATUS_BAD_SCHEME : + s = _("Bad scheme in URI"); + break; + case HTTP_URI_STATUS_BAD_URI : + s = _("Bad/empty URI"); + break; + case HTTP_URI_STATUS_OK : + s = _("OK"); + break; + case HTTP_URI_STATUS_MISSING_SCHEME : + s = _("Missing scheme in URI"); + break; + case HTTP_URI_STATUS_UNKNOWN_SCHEME : + s = _("Unknown scheme in URI"); + break; + case HTTP_URI_STATUS_MISSING_RESOURCE : + s = _("Missing resource in URI"); + break; + + default: + s = _("Unknown"); + break; } + + return (_cupsLangString(cg->lang_default, s)); } #ifndef HAVE_HSTRERROR /* - * '_cups_hstrerror()' - hstrerror() emulation function for Solaris and others... + * '_cups_hstrerror()' - hstrerror() emulation function for Solaris and others. */ const char * /* O - Error string */ @@ -1171,12 +1520,482 @@ _cups_hstrerror(int error) /* I - Error number */ #endif /* !HAVE_HSTRERROR */ +/* + * '_httpDecodeURI()' - Percent-decode a HTTP request URI. + */ + +char * /* O - Decoded URI or NULL on error */ +_httpDecodeURI(char *dst, /* I - Destination buffer */ + const char *src, /* I - Source URI */ + size_t dstsize) /* I - Size of destination buffer */ +{ + if (http_copy_decode(dst, src, (int)dstsize, NULL, 1)) + return (dst); + else + return (NULL); +} + + +/* + * '_httpEncodeURI()' - Percent-encode a HTTP request URI. + */ + +char * /* O - Encoded URI */ +_httpEncodeURI(char *dst, /* I - Destination buffer */ + const char *src, /* I - Source URI */ + size_t dstsize) /* I - Size of destination buffer */ +{ + http_copy_encode(dst, src, dst + dstsize - 1, NULL, NULL, 1); + return (dst); +} + + +/* + * '_httpResolveURI()' - Resolve a DNS-SD URI. + */ + +const char * /* O - Resolved URI */ +_httpResolveURI( + const char *uri, /* I - DNS-SD URI */ + char *resolved_uri, /* I - Buffer for resolved URI */ + size_t resolved_size, /* I - Size of URI buffer */ + int options, /* I - Resolve options */ + int (*cb)(void *context), /* I - Continue callback function */ + void *context) /* I - Context pointer for callback */ +{ + char scheme[32], /* URI components... */ + userpass[256], + hostname[1024], + resource[1024]; + int port; +#ifdef DEBUG + http_uri_status_t status; /* URI decode status */ +#endif /* DEBUG */ + + + DEBUG_printf(("_httpResolveURI(uri=\"%s\", resolved_uri=%p, resolved_size=" CUPS_LLFMT ", options=0x%x, cb=%p, context=%p)", uri, (void *)resolved_uri, CUPS_LLCAST resolved_size, options, (void *)cb, context)); + + /* + * Get the device URI... + */ + +#ifdef DEBUG + if ((status = httpSeparateURI(HTTP_URI_CODING_ALL, uri, scheme, + sizeof(scheme), userpass, sizeof(userpass), + hostname, sizeof(hostname), &port, resource, + sizeof(resource))) < HTTP_URI_STATUS_OK) +#else + if (httpSeparateURI(HTTP_URI_CODING_ALL, uri, scheme, + sizeof(scheme), userpass, sizeof(userpass), + hostname, sizeof(hostname), &port, resource, + sizeof(resource)) < HTTP_URI_STATUS_OK) +#endif /* DEBUG */ + { + if (options & _HTTP_RESOLVE_STDERR) + _cupsLangPrintFilter(stderr, "ERROR", _("Bad device-uri \"%s\"."), uri); + + DEBUG_printf(("2_httpResolveURI: httpSeparateURI returned %d!", status)); + DEBUG_puts("2_httpResolveURI: Returning NULL"); + return (NULL); + } + + /* + * Resolve it as needed... + */ + + if (strstr(hostname, "._tcp")) + { +#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) + char *regtype, /* Pointer to type in hostname */ + *domain, /* Pointer to domain in hostname */ + *uuid, /* Pointer to UUID in URI */ + *uuidend; /* Pointer to end of UUID in URI */ + _http_uribuf_t uribuf; /* URI buffer */ + int offline = 0; /* offline-report state set? */ +# ifdef HAVE_DNSSD +# ifdef WIN32 +# pragma comment(lib, "dnssd.lib") +# endif /* WIN32 */ + DNSServiceRef ref, /* DNS-SD master service reference */ + domainref = NULL,/* DNS-SD service reference for domain */ + ippref = NULL, /* DNS-SD service reference for network IPP */ + ippsref = NULL, /* DNS-SD service reference for network IPPS */ + localref; /* DNS-SD service reference for .local */ + int extrasent = 0; /* Send the domain/IPP/IPPS resolves? */ +# ifdef HAVE_POLL + struct pollfd polldata; /* Polling data */ +# else /* select() */ + fd_set input_set; /* Input set for select() */ + struct timeval stimeout; /* Timeout value for select() */ +# endif /* HAVE_POLL */ +# elif defined(HAVE_AVAHI) + AvahiClient *client; /* Client information */ + int error; /* Status */ +# endif /* HAVE_DNSSD */ + + if (options & _HTTP_RESOLVE_STDERR) + fprintf(stderr, "DEBUG: Resolving \"%s\"...\n", hostname); + + /* + * Separate the hostname into service name, registration type, and domain... + */ + + for (regtype = strstr(hostname, "._tcp") - 2; + regtype > hostname; + regtype --) + if (regtype[0] == '.' && regtype[1] == '_') + { + /* + * Found ._servicetype in front of ._tcp... + */ + + *regtype++ = '\0'; + break; + } + + if (regtype <= hostname) + { + DEBUG_puts("2_httpResolveURI: Bad hostname, returning NULL"); + return (NULL); + } + + for (domain = strchr(regtype, '.'); + domain; + domain = strchr(domain + 1, '.')) + if (domain[1] != '_') + break; + + if (domain) + *domain++ = '\0'; + + if ((uuid = strstr(resource, "?uuid=")) != NULL) + { + *uuid = '\0'; + uuid += 6; + if ((uuidend = strchr(uuid, '&')) != NULL) + *uuidend = '\0'; + } + + resolved_uri[0] = '\0'; + + uribuf.buffer = resolved_uri; + uribuf.bufsize = resolved_size; + uribuf.options = options; + uribuf.resource = resource; + uribuf.uuid = uuid; + + DEBUG_printf(("2_httpResolveURI: Resolving hostname=\"%s\", regtype=\"%s\", " + "domain=\"%s\"\n", hostname, regtype, domain)); + if (options & _HTTP_RESOLVE_STDERR) + { + fputs("STATE: +connecting-to-device\n", stderr); + fprintf(stderr, "DEBUG: Resolving \"%s\", regtype=\"%s\", " + "domain=\"local.\"...\n", hostname, regtype); + } + + uri = NULL; + +# ifdef HAVE_DNSSD + if (DNSServiceCreateConnection(&ref) == kDNSServiceErr_NoError) + { + uint32_t myinterface = kDNSServiceInterfaceIndexAny; + /* Lookup on any interface */ + + if (!strcmp(scheme, "ippusb")) + myinterface = kDNSServiceInterfaceIndexLocalOnly; + + localref = ref; + if (DNSServiceResolve(&localref, + kDNSServiceFlagsShareConnection, myinterface, + hostname, regtype, "local.", http_resolve_cb, + &uribuf) == kDNSServiceErr_NoError) + { + int fds; /* Number of ready descriptors */ + time_t timeout, /* Poll timeout */ + start_time = time(NULL),/* Start time */ + end_time = start_time + 90; + /* End time */ + + while (time(NULL) < end_time) + { + if (options & _HTTP_RESOLVE_STDERR) + _cupsLangPrintFilter(stderr, "INFO", _("Looking for printer.")); + + if (cb && !(*cb)(context)) + { + DEBUG_puts("2_httpResolveURI: callback returned 0 (stop)"); + break; + } + + /* + * Wakeup every 2 seconds to emit a "looking for printer" message... + */ + + if ((timeout = end_time - time(NULL)) > 2) + timeout = 2; + +# ifdef HAVE_POLL + polldata.fd = DNSServiceRefSockFD(ref); + polldata.events = POLLIN; + + fds = poll(&polldata, 1, (int)(1000 * timeout)); + +# else /* select() */ + FD_ZERO(&input_set); + FD_SET(DNSServiceRefSockFD(ref), &input_set); + +# ifdef WIN32 + stimeout.tv_sec = (long)timeout; +# else + stimeout.tv_sec = timeout; +# endif /* WIN32 */ + stimeout.tv_usec = 0; + + fds = select(DNSServiceRefSockFD(ref)+1, &input_set, NULL, NULL, + &stimeout); +# endif /* HAVE_POLL */ + + if (fds < 0) + { + if (errno != EINTR && errno != EAGAIN) + { + DEBUG_printf(("2_httpResolveURI: poll error: %s", strerror(errno))); + break; + } + } + else if (fds == 0) + { + /* + * Wait 2 seconds for a response to the local resolve; if nothing + * comes in, do an additional domain resolution... + */ + + if (extrasent == 0 && domain && _cups_strcasecmp(domain, "local.")) + { + if (options & _HTTP_RESOLVE_STDERR) + fprintf(stderr, + "DEBUG: Resolving \"%s\", regtype=\"%s\", " + "domain=\"%s\"...\n", hostname, regtype, + domain ? domain : ""); + + domainref = ref; + if (DNSServiceResolve(&domainref, + kDNSServiceFlagsShareConnection, + myinterface, hostname, regtype, domain, + http_resolve_cb, + &uribuf) == kDNSServiceErr_NoError) + extrasent = 1; + } + else if (extrasent == 0 && !strcmp(scheme, "ippusb")) + { + if (options & _HTTP_RESOLVE_STDERR) + fprintf(stderr, "DEBUG: Resolving \"%s\", regtype=\"_ipps._tcp\", domain=\"local.\"...\n", hostname); + + ippsref = ref; + if (DNSServiceResolve(&ippsref, + kDNSServiceFlagsShareConnection, + kDNSServiceInterfaceIndexAny, hostname, + "_ipps._tcp", domain, http_resolve_cb, + &uribuf) == kDNSServiceErr_NoError) + extrasent = 1; + } + else if (extrasent == 1 && !strcmp(scheme, "ippusb")) + { + if (options & _HTTP_RESOLVE_STDERR) + fprintf(stderr, "DEBUG: Resolving \"%s\", regtype=\"_ipp._tcp\", domain=\"local.\"...\n", hostname); + + ippref = ref; + if (DNSServiceResolve(&ippref, + kDNSServiceFlagsShareConnection, + kDNSServiceInterfaceIndexAny, hostname, + "_ipp._tcp", domain, http_resolve_cb, + &uribuf) == kDNSServiceErr_NoError) + extrasent = 2; + } + + /* + * If it hasn't resolved within 5 seconds set the offline-report + * printer-state-reason... + */ + + if ((options & _HTTP_RESOLVE_STDERR) && offline == 0 && + time(NULL) > (start_time + 5)) + { + fputs("STATE: +offline-report\n", stderr); + offline = 1; + } + } + else + { + if (DNSServiceProcessResult(ref) == kDNSServiceErr_NoError && + resolved_uri[0]) + { + uri = resolved_uri; + break; + } + } + } + + if (extrasent) + { + if (domainref) + DNSServiceRefDeallocate(domainref); + if (ippref) + DNSServiceRefDeallocate(ippref); + if (ippsref) + DNSServiceRefDeallocate(ippsref); + } + + DNSServiceRefDeallocate(localref); + } + + DNSServiceRefDeallocate(ref); + } +# else /* HAVE_AVAHI */ + if ((uribuf.poll = avahi_simple_poll_new()) != NULL) + { + avahi_simple_poll_set_func(uribuf.poll, http_poll_cb, NULL); + + if ((client = avahi_client_new(avahi_simple_poll_get(uribuf.poll), + 0, http_client_cb, + &uribuf, &error)) != NULL) + { + if (avahi_service_resolver_new(client, AVAHI_IF_UNSPEC, + AVAHI_PROTO_UNSPEC, hostname, + regtype, "local.", AVAHI_PROTO_UNSPEC, 0, + http_resolve_cb, &uribuf) != NULL) + { + time_t start_time = time(NULL), + /* Start time */ + end_time = start_time + 90; + /* End time */ + int pstatus; /* Poll status */ + + pstatus = avahi_simple_poll_iterate(uribuf.poll, 2000); + + if (pstatus == 0 && !resolved_uri[0] && domain && + _cups_strcasecmp(domain, "local.")) + { + /* + * Resolve for .local hasn't returned anything, try the listed + * domain... + */ + + avahi_service_resolver_new(client, AVAHI_IF_UNSPEC, + AVAHI_PROTO_UNSPEC, hostname, + regtype, domain, AVAHI_PROTO_UNSPEC, 0, + http_resolve_cb, &uribuf); + } + + while (!pstatus && !resolved_uri[0] && time(NULL) < end_time) + { + if ((pstatus = avahi_simple_poll_iterate(uribuf.poll, 2000)) != 0) + break; + + /* + * If it hasn't resolved within 5 seconds set the offline-report + * printer-state-reason... + */ + + if ((options & _HTTP_RESOLVE_STDERR) && offline == 0 && + time(NULL) > (start_time + 5)) + { + fputs("STATE: +offline-report\n", stderr); + offline = 1; + } + } + + /* + * Collect the result (if we got one). + */ + + if (resolved_uri[0]) + uri = resolved_uri; + } + + avahi_client_free(client); + } + + avahi_simple_poll_free(uribuf.poll); + } +# endif /* HAVE_DNSSD */ + + if (options & _HTTP_RESOLVE_STDERR) + { + if (uri) + { + fprintf(stderr, "DEBUG: Resolved as \"%s\"...\n", uri); + fputs("STATE: -connecting-to-device,offline-report\n", stderr); + } + else + { + fputs("DEBUG: Unable to resolve URI\n", stderr); + fputs("STATE: -connecting-to-device\n", stderr); + } + } + +#else /* HAVE_DNSSD || HAVE_AVAHI */ + /* + * No DNS-SD support... + */ + + uri = NULL; +#endif /* HAVE_DNSSD || HAVE_AVAHI */ + + if ((options & _HTTP_RESOLVE_STDERR) && !uri) + _cupsLangPrintFilter(stderr, "INFO", _("Unable to find printer.")); + } + else + { + /* + * Nothing more to do... + */ + + strlcpy(resolved_uri, uri, resolved_size); + uri = resolved_uri; + } + + DEBUG_printf(("2_httpResolveURI: Returning \"%s\"", uri)); + + return (uri); +} + + +#ifdef HAVE_AVAHI +/* + * 'http_client_cb()' - Client callback for resolving URI. + */ + +static void +http_client_cb( + AvahiClient *client, /* I - Client information */ + AvahiClientState state, /* I - Current state */ + void *context) /* I - Pointer to URI buffer */ +{ + DEBUG_printf(("7http_client_cb(client=%p, state=%d, context=%p)", client, + state, context)); + + /* + * If the connection drops, quit. + */ + + if (state == AVAHI_CLIENT_FAILURE) + { + _http_uribuf_t *uribuf = (_http_uribuf_t *)context; + /* URI buffer */ + + avahi_simple_poll_quit(uribuf->poll); + } +} +#endif /* HAVE_AVAHI */ + + /* * 'http_copy_decode()' - Copy and decode a URI. */ static const char * /* O - New source pointer or NULL on error */ -http_copy_decode(char *dst, /* O - Destination buffer */ +http_copy_decode(char *dst, /* O - Destination buffer */ const char *src, /* I - Source pointer */ int dstsize, /* I - Destination size */ const char *term, /* I - Terminating characters */ @@ -1192,7 +2011,9 @@ http_copy_decode(char *dst, /* O - Destination buffer */ * or the end of the string. */ - for (ptr = dst, end = dst + dstsize - 1; *src && !strchr(term, *src); src ++) + for (ptr = dst, end = dst + dstsize - 1; + *src && (!term || !strchr(term, *src)); + src ++) if (ptr < end) { if (*src == '%' && decode) @@ -1215,7 +2036,7 @@ http_copy_decode(char *dst, /* O - Destination buffer */ else quoted |= *src - '0'; - *ptr++ = quoted; + *ptr++ = (char)quoted; } else { @@ -1227,6 +2048,11 @@ http_copy_decode(char *dst, /* O - Destination buffer */ return (NULL); } } + else if ((*src & 255) <= 0x20 || (*src & 255) >= 0x7f) + { + *ptr = '\0'; + return (NULL); + } else *ptr++ = *src; } @@ -1242,14 +2068,14 @@ http_copy_decode(char *dst, /* O - Destination buffer */ */ static char * /* O - End of current URI */ -http_copy_encode(char *dst, /* O - Destination buffer */ +http_copy_encode(char *dst, /* O - Destination buffer */ const char *src, /* I - Source pointer */ char *dstend, /* I - End of destination buffer */ const char *reserved, /* I - Extra reserved characters */ const char *term, /* I - Terminating characters */ int encode) /* I - %-encode reserved chars? */ { - static const char *hex = "0123456789ABCDEF"; + static const char hex[] = "0123456789ABCDEF"; while (*src && dst < dstend) @@ -1277,6 +2103,8 @@ http_copy_encode(char *dst, /* O - Destination buffer */ *dst++ = *src++; } + *dst = '\0'; + if (*src) return (NULL); else @@ -1284,6 +2112,427 @@ http_copy_encode(char *dst, /* O - Destination buffer */ } +#ifdef HAVE_DNSSD /* - * End of "$Id: http-support.c 5023 2006-01-29 14:39:44Z mike $". + * 'http_resolve_cb()' - Build a device URI for the given service name. */ + +static void DNSSD_API +http_resolve_cb( + DNSServiceRef sdRef, /* I - Service reference */ + DNSServiceFlags flags, /* I - Results flags */ + uint32_t interfaceIndex, /* I - Interface number */ + DNSServiceErrorType errorCode, /* I - Error, if any */ + const char *fullName, /* I - Full service name */ + const char *hostTarget, /* I - Hostname */ + uint16_t port, /* I - Port number */ + uint16_t txtLen, /* I - Length of TXT record */ + const unsigned char *txtRecord, /* I - TXT record data */ + void *context) /* I - Pointer to URI buffer */ +{ + _http_uribuf_t *uribuf = (_http_uribuf_t *)context; + /* URI buffer */ + const char *scheme, /* URI scheme */ + *hostptr, /* Pointer into hostTarget */ + *reskey, /* "rp" or "rfo" */ + *resdefault; /* Default path */ + char resource[257], /* Remote path */ + fqdn[256]; /* FQDN of the .local name */ + const void *value; /* Value from TXT record */ + uint8_t valueLen; /* Length of value */ + + + DEBUG_printf(("4http_resolve_cb(sdRef=%p, flags=%x, interfaceIndex=%u, errorCode=%d, fullName=\"%s\", hostTarget=\"%s\", port=%u, txtLen=%u, txtRecord=%p, context=%p)", (void *)sdRef, flags, interfaceIndex, errorCode, fullName, hostTarget, port, txtLen, (void *)txtRecord, context)); + + /* + * If we have a UUID, compare it... + */ + + if (uribuf->uuid && + (value = TXTRecordGetValuePtr(txtLen, txtRecord, "UUID", + &valueLen)) != NULL) + { + char uuid[256]; /* UUID value */ + + memcpy(uuid, value, valueLen); + uuid[valueLen] = '\0'; + + if (_cups_strcasecmp(uuid, uribuf->uuid)) + { + if (uribuf->options & _HTTP_RESOLVE_STDERR) + fprintf(stderr, "DEBUG: Found UUID %s, looking for %s.", uuid, + uribuf->uuid); + + DEBUG_printf(("5http_resolve_cb: Found UUID %s, looking for %s.", uuid, + uribuf->uuid)); + return; + } + } + + /* + * Figure out the scheme from the full name... + */ + + if (strstr(fullName, "._ipps") || strstr(fullName, "._ipp-tls")) + scheme = "ipps"; + else if (strstr(fullName, "._ipp") || strstr(fullName, "._fax-ipp")) + scheme = "ipp"; + else if (strstr(fullName, "._http.")) + scheme = "http"; + else if (strstr(fullName, "._https.")) + scheme = "https"; + else if (strstr(fullName, "._printer.")) + scheme = "lpd"; + else if (strstr(fullName, "._pdl-datastream.")) + scheme = "socket"; + else + scheme = "riousbprint"; + + /* + * Extract the "remote printer" key from the TXT record... + */ + + if ((uribuf->options & _HTTP_RESOLVE_FAXOUT) && + (!strcmp(scheme, "ipp") || !strcmp(scheme, "ipps")) && + !TXTRecordGetValuePtr(txtLen, txtRecord, "printer-type", &valueLen)) + { + reskey = "rfo"; + resdefault = "/ipp/faxout"; + } + else + { + reskey = "rp"; + resdefault = "/"; + } + + if ((value = TXTRecordGetValuePtr(txtLen, txtRecord, reskey, + &valueLen)) != NULL) + { + if (((char *)value)[0] == '/') + { + /* + * Value (incorrectly) has a leading slash already... + */ + + memcpy(resource, value, valueLen); + resource[valueLen] = '\0'; + } + else + { + /* + * Convert to resource by concatenating with a leading "/"... + */ + + resource[0] = '/'; + memcpy(resource + 1, value, valueLen); + resource[valueLen + 1] = '\0'; + } + } + else + { + /* + * Use the default value... + */ + + strlcpy(resource, resdefault, sizeof(resource)); + } + + /* + * Lookup the FQDN if needed... + */ + + if ((uribuf->options & _HTTP_RESOLVE_FQDN) && + (hostptr = hostTarget + strlen(hostTarget) - 7) > hostTarget && + !_cups_strcasecmp(hostptr, ".local.")) + { + /* + * OK, we got a .local name but the caller needs a real domain. Start by + * getting the IP address of the .local name and then do reverse-lookups... + */ + + http_addrlist_t *addrlist, /* List of addresses */ + *addr; /* Current address */ + + DEBUG_printf(("5http_resolve_cb: Looking up \"%s\".", hostTarget)); + + snprintf(fqdn, sizeof(fqdn), "%d", ntohs(port)); + if ((addrlist = httpAddrGetList(hostTarget, AF_UNSPEC, fqdn)) != NULL) + { + for (addr = addrlist; addr; addr = addr->next) + { + int error = getnameinfo(&(addr->addr.addr), (socklen_t)httpAddrLength(&(addr->addr)), fqdn, sizeof(fqdn), NULL, 0, NI_NAMEREQD); + + if (!error) + { + DEBUG_printf(("5http_resolve_cb: Found \"%s\".", fqdn)); + + if ((hostptr = fqdn + strlen(fqdn) - 6) <= fqdn || + _cups_strcasecmp(hostptr, ".local")) + { + hostTarget = fqdn; + break; + } + } +#ifdef DEBUG + else + DEBUG_printf(("5http_resolve_cb: \"%s\" did not resolve: %d", + httpAddrString(&(addr->addr), fqdn, sizeof(fqdn)), + error)); +#endif /* DEBUG */ + } + + httpAddrFreeList(addrlist); + } + } + + /* + * Assemble the final device URI... + */ + + if ((!strcmp(scheme, "ipp") || !strcmp(scheme, "ipps")) && + !strcmp(uribuf->resource, "/cups")) + httpAssembleURIf(HTTP_URI_CODING_ALL, uribuf->buffer, (int)uribuf->bufsize, scheme, NULL, hostTarget, ntohs(port), "%s?snmp=false", resource); + else + httpAssembleURI(HTTP_URI_CODING_ALL, uribuf->buffer, (int)uribuf->bufsize, scheme, NULL, hostTarget, ntohs(port), resource); + + DEBUG_printf(("5http_resolve_cb: Resolved URI is \"%s\"...", uribuf->buffer)); +} + +#elif defined(HAVE_AVAHI) +/* + * 'http_poll_cb()' - Wait for input on the specified file descriptors. + * + * Note: This function is needed because avahi_simple_poll_iterate is broken + * and always uses a timeout of 0 (!) milliseconds. + * (Avahi Ticket #364) + * + * @private@ + */ + +static int /* O - Number of file descriptors matching */ +http_poll_cb( + struct pollfd *pollfds, /* I - File descriptors */ + unsigned int num_pollfds, /* I - Number of file descriptors */ + int timeout, /* I - Timeout in milliseconds (used) */ + void *context) /* I - User data (unused) */ +{ + (void)timeout; + (void)context; + + return (poll(pollfds, num_pollfds, 2000)); +} + + +/* + * 'http_resolve_cb()' - Build a device URI for the given service name. + */ + +static void +http_resolve_cb( + AvahiServiceResolver *resolver, /* I - Resolver (unused) */ + AvahiIfIndex interface, /* I - Interface index (unused) */ + AvahiProtocol protocol, /* I - Network protocol (unused) */ + AvahiResolverEvent event, /* I - Event (found, etc.) */ + const char *name, /* I - Service name */ + const char *type, /* I - Registration type */ + const char *domain, /* I - Domain (unused) */ + const char *hostTarget, /* I - Hostname */ + const AvahiAddress *address, /* I - Address (unused) */ + uint16_t port, /* I - Port number */ + AvahiStringList *txt, /* I - TXT record */ + AvahiLookupResultFlags flags, /* I - Lookup flags (unused) */ + void *context) /* I - Pointer to URI buffer */ +{ + _http_uribuf_t *uribuf = (_http_uribuf_t *)context; + /* URI buffer */ + const char *scheme, /* URI scheme */ + *hostptr, /* Pointer into hostTarget */ + *reskey, /* "rp" or "rfo" */ + *resdefault; /* Default path */ + char resource[257], /* Remote path */ + fqdn[256]; /* FQDN of the .local name */ + AvahiStringList *pair; /* Current TXT record key/value pair */ + char *value; /* Value for "rp" key */ + size_t valueLen = 0; /* Length of "rp" key */ + + + DEBUG_printf(("4http_resolve_cb(resolver=%p, " + "interface=%d, protocol=%d, event=%d, name=\"%s\", " + "type=\"%s\", domain=\"%s\", hostTarget=\"%s\", address=%p, " + "port=%d, txt=%p, flags=%d, context=%p)", + resolver, interface, protocol, event, name, type, domain, + hostTarget, address, port, txt, flags, context)); + + if (event != AVAHI_RESOLVER_FOUND) + { + avahi_service_resolver_free(resolver); + avahi_simple_poll_quit(uribuf->poll); + return; + } + + /* + * If we have a UUID, compare it... + */ + + if (uribuf->uuid && (pair = avahi_string_list_find(txt, "UUID")) != NULL) + { + char uuid[256]; /* UUID value */ + + avahi_string_list_get_pair(pair, NULL, &value, &valueLen); + + memcpy(uuid, value, valueLen); + uuid[valueLen] = '\0'; + + if (_cups_strcasecmp(uuid, uribuf->uuid)) + { + if (uribuf->options & _HTTP_RESOLVE_STDERR) + fprintf(stderr, "DEBUG: Found UUID %s, looking for %s.", uuid, + uribuf->uuid); + + DEBUG_printf(("5http_resolve_cb: Found UUID %s, looking for %s.", uuid, + uribuf->uuid)); + return; + } + } + + /* + * Figure out the scheme from the full name... + */ + + if (strstr(type, "_ipp.")) + scheme = "ipp"; + else if (strstr(type, "_printer.")) + scheme = "lpd"; + else if (strstr(type, "_pdl-datastream.")) + scheme = "socket"; + else + scheme = "riousbprint"; + + if (!strncmp(type, "_ipps.", 6) || !strncmp(type, "_ipp-tls.", 9)) + scheme = "ipps"; + else if (!strncmp(type, "_ipp.", 5) || !strncmp(type, "_fax-ipp.", 9)) + scheme = "ipp"; + else if (!strncmp(type, "_http.", 6)) + scheme = "http"; + else if (!strncmp(type, "_https.", 7)) + scheme = "https"; + else if (!strncmp(type, "_printer.", 9)) + scheme = "lpd"; + else if (!strncmp(type, "_pdl-datastream.", 16)) + scheme = "socket"; + else + { + avahi_service_resolver_free(resolver); + avahi_simple_poll_quit(uribuf->poll); + return; + } + + /* + * Extract the remote resource key from the TXT record... + */ + + if ((uribuf->options & _HTTP_RESOLVE_FAXOUT) && + (!strcmp(scheme, "ipp") || !strcmp(scheme, "ipps")) && + !avahi_string_list_find(txt, "printer-type")) + { + reskey = "rfo"; + resdefault = "/ipp/faxout"; + } + else + { + reskey = "rp"; + resdefault = "/"; + } + + if ((pair = avahi_string_list_find(txt, reskey)) != NULL) + { + avahi_string_list_get_pair(pair, NULL, &value, &valueLen); + + if (value[0] == '/') + { + /* + * Value (incorrectly) has a leading slash already... + */ + + memcpy(resource, value, valueLen); + resource[valueLen] = '\0'; + } + else + { + /* + * Convert to resource by concatenating with a leading "/"... + */ + + resource[0] = '/'; + memcpy(resource + 1, value, valueLen); + resource[valueLen + 1] = '\0'; + } + } + else + { + /* + * Use the default value... + */ + + strlcpy(resource, resdefault, sizeof(resource)); + } + + /* + * Lookup the FQDN if needed... + */ + + if ((uribuf->options & _HTTP_RESOLVE_FQDN) && + (hostptr = hostTarget + strlen(hostTarget) - 6) > hostTarget && + !_cups_strcasecmp(hostptr, ".local")) + { + /* + * OK, we got a .local name but the caller needs a real domain. Start by + * getting the IP address of the .local name and then do reverse-lookups... + */ + + http_addrlist_t *addrlist, /* List of addresses */ + *addr; /* Current address */ + + DEBUG_printf(("5http_resolve_cb: Looking up \"%s\".", hostTarget)); + + snprintf(fqdn, sizeof(fqdn), "%d", ntohs(port)); + if ((addrlist = httpAddrGetList(hostTarget, AF_UNSPEC, fqdn)) != NULL) + { + for (addr = addrlist; addr; addr = addr->next) + { + int error = getnameinfo(&(addr->addr.addr), (socklen_t)httpAddrLength(&(addr->addr)), fqdn, sizeof(fqdn), NULL, 0, NI_NAMEREQD); + + if (!error) + { + DEBUG_printf(("5http_resolve_cb: Found \"%s\".", fqdn)); + + if ((hostptr = fqdn + strlen(fqdn) - 6) <= fqdn || + _cups_strcasecmp(hostptr, ".local")) + { + hostTarget = fqdn; + break; + } + } +#ifdef DEBUG + else + DEBUG_printf(("5http_resolve_cb: \"%s\" did not resolve: %d", + httpAddrString(&(addr->addr), fqdn, sizeof(fqdn)), + error)); +#endif /* DEBUG */ + } + + httpAddrFreeList(addrlist); + } + } + + /* + * Assemble the final device URI using the resolved hostname... + */ + + httpAssembleURI(HTTP_URI_CODING_ALL, uribuf->buffer, (int)uribuf->bufsize, scheme, + NULL, hostTarget, port, resource); + DEBUG_printf(("5http_resolve_cb: Resolved URI is \"%s\".", uribuf->buffer)); + + avahi_simple_poll_quit(uribuf->poll); +} +#endif /* HAVE_DNSSD */