michaelrsweet commented 20 years ago

Version: 1.1.20rc2 CUPS.org User: steve.p.walsh.hp

OS is Solaris 8

Hope the following is of some help in reproducing this problem.

Attached file includes error_log extract access_log extract and saved source of printers page plus cupsd.conf.

You can see from the page source that localhost is explicitly defined for the Default Desination but all other printers are defined relative to current location.

Steps taken were:

open page https://UWSAU28W1001/ select Manage Printers

go to https://UWSAU28W1001/printers select first printer in list - NAA21CD3_001P
go to https://UWSAU28W1001/printers/NAA21CD3_001P select Default Destination ( NAA21MD4_003P )
go to http://localhost:631/printers/NAA21MD4_003P select Printers from ESP bar
go to http://localhost:631/printers

From then on ( not in logs ) if I select Default I am taken to http:://UWSAU28W1001:631, then select Printers followed by Default again I get http://localhost:631 and so on in a loop.

michaelrsweet commented 20 years ago

CUPS.org User: mike

OK, I think I've discovered the source of the problems; the current code does not rewrite the default printer URI the same way as the other printers; specifically, it forces a http: URL... :)

This will be fixed in CVS shortly...

michaelrsweet commented 20 years ago

CUPS.org User: mike

OK, see the attached patch for a fix; will be part of 1.1.20... :)

michaelrsweet commented 20 years ago

"str369.patch":

Index: classes.c

RCS file: /development/cvs/cups/cgi-bin/classes.c,v retrieving revision 1.25 diff -u -r1.25 classes.c --- classes.c 20 Jul 2003 03:35:03 -0000 1.25 +++ classes.c 7 Nov 2003 18:50:11 -0000 @@ -128,38 +128,12 @@

   if ((attr = ippFindAttribute(response, "printer-uri-supported", IPP_TAG_URI)) != NULL)
   {

char method[HTTP_MAX_URI],
username[HTTP_MAX_URI],
hostname[HTTP_MAX_URI],
resource[HTTP_MAX_URI],
uri[HTTP_MAX_URI];
int port; /* URI data */
const char server; / Name of server */
char url[HTTP_MAX_URI]; /* New URL */
```
/*
```
* Map localhost access to localhost...

- */

- server = getenv("SERVER_NAME");

httpSeparate(attr->values[0].string.text, method, username,

- hostname, &port, resource);

if (strcasecmp(hostname, server) == 0 &&
(strcmp(getenv("REMOTE_HOST"), "127.0.0.1") == 0 ||
strcmp(getenv("REMOTE_HOST"), "localhost") == 0 ||
strcmp(getenv("REMOTE_HOST"), server) == 0))

- strcpy(hostname, "localhost");

/*
* Rewrite URI with HTTP address...

- */

snprintf(uri, sizeof(uri), "http://%s:%d%s", hostname, port,

- resource);

cgiSetVariable("DEFAULT_URI", uri);
cgiSetVariable("DEFAULT_URI",
ippRewriteURL(attr->values[0].string.text,
```
                     url, sizeof(url)));
```
}

ippDelete(response);

Index: ipp-var.c

RCS file: /development/cvs/cups/cgi-bin/ipp-var.c,v retrieving revision 1.39 diff -u -r1.39 ipp-var.c --- ipp-var.c 16 Oct 2003 19:13:41 -0000 1.39 +++ ipp-var.c 7 Nov 2003 18:50:11 -0000 @@ -26,6 +26,7 @@
- ippGetAttributes() - Get the list of attributes that are needed
- by the template file.
- ippGetTemplateDir() - Get the templates directory...
- ippRewriteURL() - Rewrite a printer URI into a web browser URL...
- ippSetServerVersion() - Set the server name and CUPS version...
- ippSetCGIVars() - Set CGI variables from an IPP response. */ @@ -186,6 +187,123 @@
/*
* 'ippRewriteURL()' - Rewrite a printer URI into a web browser URL...
/ + +char * / O - New URL / +ippRewriteURL(const char *uri, / I - Current URI */
char url, / O - New URL */
int urlsize) /* I - Size of URL buffer */ +{
char method[HTTP_MAX_URI],
userpass[HTTP_MAX_URI],
hostname[HTTP_MAX_URI],
rawresource[HTTP_MAX_URI],
resource[HTTP_MAX_URI],
/* URI components... */
rawptr, / Pointer into rawresource */
resptr; / Pointer into resource */
int port; /* Port number */
static int ishttps = -1; /* Using encryption? */
static const char server; / Name of server */
static char servername[1024];
/* Local server name */
static const char hexchars[] = "0123456789ABCDEF";
/* Hexadecimal conversion characters */ + +
/*
* Check if we have been called before...
*/ +
if (ishttps < 0)
{
/*
* No, initialize static vars for the conversion...
*
* First get the server name associated with the client interface as
* well as the locally configured hostname. We'll check both of
* these to see if the printer URL is local...
*/ +
server = getenv("SERVER_NAME");
gethostname(servername, sizeof(servername)); +
/*
* Then flag whether we are using SSL on this connection...
*/ +
ishttps = getenv("HTTPS") != NULL;
} +
/*
* Convert the URI to a URL...
*/ +
httpSeparate(uri, method, userpass, hostname, &port, rawresource); +
if (strcmp(method, "ipp") == 0 ||
strcmp(method, "http") == 0)
{
/*
* Rewrite the resource string so it doesn't contain any
* illegal chars...
*/ +
for (rawptr = rawresource, resptr = resource; *rawptr;)
if ((rawptr & 128) || rawptr == '%' || *rawptr == ' ' ||
rawptr == '#' || rawptr == '?' ||
rawptr == '.') / For MSIE */
{
if (resptr < (resource + sizeof(resource) - 3))
{
*resptr++ = '%';
_resptr++ = hexchars[(_rawptr >> 4) & 15];
_resptr++ = hexchars[_rawptr & 15];
}
}
else if (resptr < (resource + sizeof(resource) - 1))
resptr++ = rawptr++; +
*resptr = '\0'; +
/*
* Map local access to a local URI...
*/ +
if (strcasecmp(hostname, server) == 0 ||
strcasecmp(hostname, servername) == 0)
{
/*
* Make URI relative to the current server...
*/ +
strlcpy(url, resource, urlsize);
}
else
{
/*
* Rewrite URI with HTTP/HTTPS scheme...
*/ +
if (userpass[0])
snprintf(url, urlsize, "%s://%s@%s:%d%s",
ishttps ? "https" : "http",
userpass, hostname, port, resource);
else
snprintf(url, urlsize, "%s://%s:%d%s",
ishttps ? "https" : "http",
hostname, port, resource);
}
}
else
strlcpy(url, uri, urlsize); +
return (url); +} + + +/*
- 'ippSetServerVersion()' - Set the server name and CUPS version... */

@@ -221,22 +339,7 @@ nameptr, / Pointer into name / value[16384], / Value(s) / *valptr; / Pointer into value */

char method[HTTP_MAX_URI],
username[HTTP_MAX_URI],
hostname[HTTP_MAX_URI],
rawresource[HTTP_MAX_URI],
resource[HTTP_MAX_URI],
uri[HTTP_MAX_URI],
rawptr, / Pointer into rawresource */
resptr; / Pointer into resource */
int port; /* URI data */
int ishttps; /* Using encryption? */
const char server; / Name of server */
char servername[1024];
/* Locale server name / struct tm *date; / Date information */
static const char hexchars[] = "0123456789ABCDEF";
```
            /* Hexadecimal conversion characters */
```
DEBUG_printf(("
ippSetCGIVars(response=%p, filter_name=\"%s\", filter_value=\"%s\", prefix=\"%s\")\n", @@ -250,21 +353,6 @@ ippSetServerVersion();

/*
* Get the server name associated with the client interface as well as
* the locally configured hostname. We'll check both of these to
* see if the printer URL is local...

- */

server = getenv("SERVER_NAME");

- gethostname(servername, sizeof(servername));

/*
* Flag whether we are using SSL on this connection...

- */

- ishttps = getenv("HTTPS") != NULL;

/*
- Loop through the attributes and set them for the template... */

@@ -334,7 +422,7 @@ * attribute... */

if (strcmp(name, "job_printer_uri") == 0)
```
if (!strcmp(name, "job_printer_uri"))
```
{ if ((valptr = strrchr(attr->values[0].string.text, '/')) == NULL) valptr = "unknown"; @@ -407,66 +495,9 @@ * Rewrite URIs... */

httpSeparate(attr->values[i].string.text, method, username,

- hostname, &port, rawresource);

if (strcmp(method, "ipp") == 0 ||
strcmp(method, "http") == 0)
{
/*
* Rewrite the resource string so it doesn't contain any
* illegal chars...

- */

for (rawptr = rawresource, resptr = resource; *rawptr;)
if ((rawptr & 128) || rawptr == '%' || *rawptr == ' ' ||
rawptr == '#' || rawptr == '?' ||
rawptr == '.') / For MSIE */
{
if (resptr < (resource + sizeof(resource) - 3))
{
*resptr++ = '%';
_resptr++ = hexchars[(_rawptr >> 4) & 15];
_resptr++ = hexchars[_rawptr & 15];
}
}
else if (resptr < (resource + sizeof(resource) - 1))

- resptr++ = rawptr++;

- *resptr = '\0';

/*
* Map local access to a local URI...

- */

if (strcasecmp(hostname, server) == 0 ||
strcasecmp(hostname, servername) == 0)
{
/*
* Make URI relative to the current server...

- */

strlcpy(uri, resource, sizeof(uri));
}
else
{
/*
* Rewrite URI with HTTP address...

- */

if (username[0])
snprintf(uri, sizeof(uri), "%s://%s@%s:%d%s",
ishttps ? "https" : "http",
username, hostname, port, resource);
else
snprintf(uri, sizeof(uri), "%s://%s:%d%s",
ishttps ? "https" : "http",
hostname, port, resource);

- }

strlcat(valptr, uri, sizeof(value) - (valptr - value));
break;
}
ippRewriteURL(attr->values[i].string.text, valptr,
sizeof(value) - (valptr - value));
```
    break;
     }

 case IPP_TAG_STRING :
```
Index: ipp-var.h

RCS file: /development/cvs/cups/cgi-bin/ipp-var.h,v retrieving revision 1.10 diff -u -r1.10 ipp-var.h --- ipp-var.h 20 Jul 2003 03:35:04 -0000 1.10 +++ ipp-var.h 7 Nov 2003 18:50:11 -0000 @@ -47,6 +47,7 @@ extern void ippGetAttributes(ipp_t request, const char directory, const char tmpl, const char lang); extern char ippGetTemplateDir(void); +extern char ippRewriteURL(const char , char , int); extern void ippSetServerVersion(void); extern void ippSetCGIVars(ipp_t , const char , const char , const char , int);

Index: printers.c

RCS file: /development/cvs/cups/cgi-bin/printers.c,v retrieving revision 1.29 diff -u -r1.29 printers.c --- printers.c 20 Jul 2003 03:35:04 -0000 1.29 +++ printers.c 7 Nov 2003 18:50:11 -0000 @@ -129,38 +129,12 @@

if ((attr = ippFindAttribute(response, "printer-uri-supported", IPP_TAG_URI)) != NULL) {
char method[HTTP_MAX_URI],
username[HTTP_MAX_URI],
hostname[HTTP_MAX_URI],
resource[HTTP_MAX_URI],
uri[HTTP_MAX_URI];
int port; /* URI data */
const char server; / Name of server */
char url[HTTP_MAX_URI]; /* New URL */
```
/*
```
* Map localhost access to localhost...

- */

- server = getenv("SERVER_NAME");

httpSeparate(attr->values[0].string.text, method, username,

- hostname, &port, resource);

if (strcasecmp(hostname, server) == 0 &&
(strcmp(getenv("REMOTE_HOST"), "127.0.0.1") == 0 ||
strcmp(getenv("REMOTE_HOST"), "localhost") == 0 ||
strcmp(getenv("REMOTE_HOST"), server) == 0))

- strcpy(hostname, "localhost");

/*
* Rewrite URI with HTTP address...

- */

snprintf(uri, sizeof(uri), "http://%s:%d%s", hostname, port,

- resource);

cgiSetVariable("DEFAULT_URI", uri);
cgiSetVariable("DEFAULT_URI",
ippRewriteURL(attr->values[0].string.text,

                     url, sizeof(url)));

}

ippDelete(response);

apple / cups

Further to STR 299 #369

Index: classes.c

- */

- server = getenv("SERVER_NAME");

- hostname, &port, resource);

- strcpy(hostname, "localhost");

- */

- resource);

Index: ipp-var.c

- */

- gethostname(servername, sizeof(servername));

- */

- ishttps = getenv("HTTPS") != NULL;

- hostname, &port, rawresource);

- */

- resptr++ = rawptr++;

- *resptr = '\0';

- */

- */

- */

- }

Index: ipp-var.h

Index: printers.c

- */

- server = getenv("SERVER_NAME");

- hostname, &port, resource);

- strcpy(hostname, "localhost");

- */

- resource);