diff options
Diffstat (limited to 'cups/auth.c')
| -rw-r--r-- | cups/auth.c | 516 |
1 files changed, 378 insertions, 138 deletions
diff --git a/cups/auth.c b/cups/auth.c index c051c86b..a1f50423 100644 --- a/cups/auth.c +++ b/cups/auth.c @@ -1,8 +1,8 @@ /* * Authentication functions for CUPS. * - * Copyright 2007-2016 by Apple Inc. - * Copyright 1997-2007 by Easy Software Products. + * Copyright © 2007-2018 by Apple Inc. + * Copyright © 1997-2007 by Easy Software Products. * * This file contains Kerberos support code, copyright 2006 by * Jelmer Vernooij. @@ -23,11 +23,11 @@ #include "cups-private.h" #include <fcntl.h> #include <sys/stat.h> -#if defined(WIN32) || defined(__EMX__) +#if defined(_WIN32) || defined(__EMX__) # include <io.h> #else # include <unistd.h> -#endif /* WIN32 || __EMX__ */ +#endif /* _WIN32 || __EMX__ */ #if HAVE_AUTHORIZATION_H # include <Security/Authorization.h> @@ -47,6 +47,10 @@ extern const char *cssmErrorString(int error); * Local functions... */ +static const char *cups_auth_find(const char *www_authenticate, const char *scheme); +static const char *cups_auth_param(const char *scheme, const char *name, char *value, size_t valsize); +static const char *cups_auth_scheme(const char *www_authenticate, char *scheme, size_t schemesize); + #ifdef HAVE_GSSAPI # ifdef HAVE_GSS_ACQUIRE_CRED_EX_F # ifdef HAVE_GSS_GSSAPI_SPI_H @@ -112,10 +116,10 @@ cupsDoAuthentication( const char *resource) /* I - Resource path */ { const char *password, /* Password string */ - *www_auth; /* WWW-Authenticate header */ - char prompt[1024], /* Prompt for user */ - realm[HTTP_MAX_VALUE], /* realm="xyz" string */ - nonce[HTTP_MAX_VALUE]; /* nonce="xyz" string */ + *www_auth, /* WWW-Authenticate header */ + *schemedata; /* Scheme-specific data */ + char scheme[256], /* Scheme name */ + prompt[1024]; /* Prompt for user */ int localauth; /* Local authentication result */ _cups_globals_t *cg; /* Global data */ @@ -163,122 +167,129 @@ cupsDoAuthentication( } /* - * Nope, see if we should retry the current username:password... + * Nope, loop through the authentication schemes to find the first we support. */ - www_auth = http->fields[HTTP_FIELD_WWW_AUTHENTICATE]; + www_auth = httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE); - if ((http->digest_tries > 1 || !http->userpass[0]) && - (!_cups_strncasecmp(www_auth, "Basic", 5) || - !_cups_strncasecmp(www_auth, "Digest", 6))) + for (schemedata = cups_auth_scheme(www_auth, scheme, sizeof(scheme)); schemedata; schemedata = cups_auth_scheme(schemedata + strlen(scheme), scheme, sizeof(scheme))) { /* - * Nope - get a new password from the user... + * Check the scheme name... */ - char default_username[HTTP_MAX_VALUE]; - /* Default username */ +#ifdef HAVE_GSSAPI + if (!_cups_strcasecmp(scheme, "Negotiate")) + { + /* + * Kerberos authentication... + */ - cg = _cupsGlobals(); + if (_cupsSetNegotiateAuthString(http, method, resource)) + { + http->status = HTTP_STATUS_CUPS_AUTHORIZATION_CANCELED; + return (-1); + } - if (!cg->lang_default) - cg->lang_default = cupsLangDefault(); + break; + } + else +#endif /* HAVE_GSSAPI */ + if (_cups_strcasecmp(scheme, "Basic") && _cups_strcasecmp(scheme, "Digest")) + continue; /* Not supported (yet) */ - if (httpGetSubField(http, HTTP_FIELD_WWW_AUTHENTICATE, "username", - default_username)) - cupsSetUser(default_username); + /* + * See if we should retry the current username:password... + */ - snprintf(prompt, sizeof(prompt), - _cupsLangString(cg->lang_default, _("Password for %s on %s? ")), - cupsUser(), - http->hostname[0] == '/' ? "localhost" : http->hostname); + if ((http->digest_tries > 1 || !http->userpass[0]) && (!_cups_strcasecmp(scheme, "Basic") || (!_cups_strcasecmp(scheme, "Digest")))) + { + /* + * Nope - get a new password from the user... + */ - http->digest_tries = _cups_strncasecmp(www_auth, "Digest", 6) != 0; - http->userpass[0] = '\0'; + char default_username[HTTP_MAX_VALUE]; + /* Default username */ - if ((password = cupsGetPassword2(prompt, http, method, resource)) == NULL) - { - http->status = HTTP_STATUS_CUPS_AUTHORIZATION_CANCELED; - return (-1); - } + cg = _cupsGlobals(); - snprintf(http->userpass, sizeof(http->userpass), "%s:%s", cupsUser(), - password); - } - else if (http->status == HTTP_STATUS_UNAUTHORIZED) - http->digest_tries ++; + if (!cg->lang_default) + cg->lang_default = cupsLangDefault(); - if (http->status == HTTP_STATUS_UNAUTHORIZED && http->digest_tries >= 3) - { - DEBUG_printf(("1cupsDoAuthentication: Too many authentication tries (%d)", - http->digest_tries)); + if (cups_auth_param(schemedata, "username", default_username, sizeof(default_username))) + cupsSetUser(default_username); - http->status = HTTP_STATUS_CUPS_AUTHORIZATION_CANCELED; - return (-1); - } + snprintf(prompt, sizeof(prompt), _cupsLangString(cg->lang_default, _("Password for %s on %s? ")), cupsUser(), http->hostname[0] == '/' ? "localhost" : http->hostname); - /* - * Got a password; encode it for the server... - */ + http->digest_tries = _cups_strncasecmp(scheme, "Digest", 6) != 0; + http->userpass[0] = '\0'; -#ifdef HAVE_GSSAPI - if (!_cups_strncasecmp(www_auth, "Negotiate", 9)) - { - /* - * Kerberos authentication... - */ + if ((password = cupsGetPassword2(prompt, http, method, resource)) == NULL) + { + http->status = HTTP_STATUS_CUPS_AUTHORIZATION_CANCELED; + return (-1); + } - if (_cupsSetNegotiateAuthString(http, method, resource)) + snprintf(http->userpass, sizeof(http->userpass), "%s:%s", cupsUser(), password); + } + else if (http->status == HTTP_STATUS_UNAUTHORIZED) + http->digest_tries ++; + + if (http->status == HTTP_STATUS_UNAUTHORIZED && http->digest_tries >= 3) { + DEBUG_printf(("1cupsDoAuthentication: Too many authentication tries (%d)", http->digest_tries)); + http->status = HTTP_STATUS_CUPS_AUTHORIZATION_CANCELED; return (-1); } - } - else -#endif /* HAVE_GSSAPI */ - if (!_cups_strncasecmp(www_auth, "Basic", 5)) - { + /* - * Basic authentication... + * Got a password; encode it for the server... */ - char encode[256]; /* Base64 buffer */ + if (!_cups_strcasecmp(scheme, "Basic")) + { + /* + * Basic authentication... + */ + char encode[256]; /* Base64 buffer */ - httpEncode64_2(encode, sizeof(encode), http->userpass, - (int)strlen(http->userpass)); - httpSetAuthString(http, "Basic", encode); - } - else if (!_cups_strncasecmp(www_auth, "Digest", 6)) - { - /* - * Digest authentication... - */ + httpEncode64_2(encode, sizeof(encode), http->userpass, (int)strlen(http->userpass)); + httpSetAuthString(http, "Basic", encode); + break; + } + else if (!_cups_strcasecmp(scheme, "Digest")) + { + /* + * Digest authentication... + */ - char encode[33], /* MD5 buffer */ - digest[1024]; /* Digest auth data */ + char nonce[HTTP_MAX_VALUE]; /* nonce="xyz" string */ - httpGetSubField(http, HTTP_FIELD_WWW_AUTHENTICATE, "realm", realm); - httpGetSubField(http, HTTP_FIELD_WWW_AUTHENTICATE, "nonce", nonce); + cups_auth_param(schemedata, "algorithm", http->algorithm, sizeof(http->algorithm)); + cups_auth_param(schemedata, "opaque", http->opaque, sizeof(http->opaque)); + cups_auth_param(schemedata, "nonce", nonce, sizeof(nonce)); + cups_auth_param(schemedata, "realm", http->realm, sizeof(http->realm)); - httpMD5(cupsUser(), realm, strchr(http->userpass, ':') + 1, encode); - httpMD5Final(nonce, method, resource, encode); - snprintf(digest, sizeof(digest), - "username=\"%s\", realm=\"%s\", nonce=\"%s\", uri=\"%s\", " - "response=\"%s\"", cupsUser(), realm, nonce, resource, encode); - httpSetAuthString(http, "Digest", digest); + if (_httpSetDigestAuthString(http, nonce, method, resource)) + break; + } + } + + if (http->authstring) + { + DEBUG_printf(("1cupsDoAuthentication: authstring=\"%s\"", http->authstring)); + + return (0); } else { - DEBUG_printf(("1cupsDoAuthentication: Unknown auth type: \"%s\"", - www_auth)); + DEBUG_printf(("1cupsDoAuthentication: Unknown auth type: \"%s\"", www_auth)); http->status = HTTP_STATUS_CUPS_AUTHORIZATION_CANCELED; + return (-1); } - - DEBUG_printf(("1cupsDoAuthentication: authstring=\"%s\"", http->authstring)); - - return (0); } @@ -336,7 +347,7 @@ _cupsSetNegotiateAuthString( GSS_C_NO_BUFFER, &http->gssmech, &output_token, NULL, NULL); -#ifdef HAVE_GSS_ACQUIRE_CRED_EX_F +# ifdef HAVE_GSS_ACQUIRE_CRED_EX_F if (major_status == GSS_S_NO_CRED) { /* @@ -412,7 +423,7 @@ _cupsSetNegotiateAuthString( } } } -#endif /* HAVE_GSS_ACQUIRED_CRED_EX_F */ +# endif /* HAVE_GSS_ACQUIRED_CRED_EX_F */ if (GSS_ERROR(major_status)) { @@ -422,11 +433,11 @@ _cupsSetNegotiateAuthString( return (-1); } -#ifdef DEBUG +# ifdef DEBUG else if (major_status == GSS_S_CONTINUE_NEEDED) cups_gss_printf(major_status, minor_status, "_cupsSetNegotiateAuthString: Continuation needed!"); -#endif /* DEBUG */ +# endif /* DEBUG */ if (output_token.length > 0 && output_token.length <= 65536) { @@ -464,8 +475,259 @@ _cupsSetNegotiateAuthString( return (0); } +#endif /* HAVE_GSSAPI */ + + +/* + * 'cups_auth_find()' - Find the named WWW-Authenticate scheme. + * + * The "www_authenticate" parameter points to the current position in the header. + * + * Returns @code NULL@ if the auth scheme is not present. + */ + +static const char * /* O - Start of matching scheme or @code NULL@ if not found */ +cups_auth_find(const char *www_authenticate, /* I - Pointer into WWW-Authenticate header */ + const char *scheme) /* I - Authentication scheme */ +{ + size_t schemelen = strlen(scheme); /* Length of scheme */ + + + DEBUG_printf(("8cups_auth_find(www_authenticate=\"%s\", scheme=\"%s\"(%d))", www_authenticate, scheme, (int)schemelen)); + + while (*www_authenticate) + { + /* + * Skip leading whitespace and commas... + */ + + DEBUG_printf(("9cups_auth_find: Before whitespace: \"%s\"", www_authenticate)); + while (isspace(*www_authenticate & 255) || *www_authenticate == ',') + www_authenticate ++; + DEBUG_printf(("9cups_auth_find: After whitespace: \"%s\"", www_authenticate)); + + /* + * See if this is "Scheme" followed by whitespace or the end of the string. + */ + + if (!strncmp(www_authenticate, scheme, schemelen) && (isspace(www_authenticate[schemelen] & 255) || www_authenticate[schemelen] == ',' || !www_authenticate[schemelen])) + { + /* + * Yes, this is the start of the scheme-specific information... + */ + + DEBUG_printf(("9cups_auth_find: Returning \"%s\".", www_authenticate)); + + return (www_authenticate); + } + + /* + * Skip the scheme name or param="value" string... + */ + + while (!isspace(*www_authenticate & 255) && *www_authenticate) + { + if (*www_authenticate == '\"') + { + /* + * Skip quoted value... + */ + + www_authenticate ++; + while (*www_authenticate && *www_authenticate != '\"') + www_authenticate ++; + + DEBUG_printf(("9cups_auth_find: After quoted: \"%s\"", www_authenticate)); + } + + www_authenticate ++; + } + + DEBUG_printf(("9cups_auth_find: After skip: \"%s\"", www_authenticate)); + } + + DEBUG_puts("9cups_auth_find: Returning NULL."); + + return (NULL); +} +/* + * 'cups_auth_param()' - Copy the value for the named authentication parameter, + * if present. + */ + +static const char * /* O - Parameter value or @code NULL@ if not present */ +cups_auth_param(const char *scheme, /* I - Pointer to auth data */ + const char *name, /* I - Name of parameter */ + char *value, /* I - Value buffer */ + size_t valsize) /* I - Size of value buffer */ +{ + char *valptr = value, /* Pointer into value buffer */ + *valend = value + valsize - 1; /* Pointer to end of buffer */ + size_t namelen = strlen(name); /* Name length */ + int param; /* Is this a parameter? */ + + + DEBUG_printf(("8cups_auth_param(scheme=\"%s\", name=\"%s\", value=%p, valsize=%d)", scheme, name, (void *)value, (int)valsize)); + + while (!isspace(*scheme & 255) && *scheme) + scheme ++; + + while (*scheme) + { + while (isspace(*scheme & 255) || *scheme == ',') + scheme ++; + + if (!strncmp(scheme, name, namelen) && scheme[namelen] == '=') + { + /* + * Found the parameter, copy the value... + */ + + scheme += namelen + 1; + if (*scheme == '\"') + { + scheme ++; + + while (*scheme && *scheme != '\"') + { + if (valptr < valend) + *valptr++ = *scheme; + + scheme ++; + } + } + else + { + while (*scheme && strchr("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~+/=", *scheme)) + { + if (valptr < valend) + *valptr++ = *scheme; + + scheme ++; + } + } + + *valptr = '\0'; + + DEBUG_printf(("9cups_auth_param: Returning \"%s\".", value)); + + return (value); + } + + /* + * Skip the param=value string... + */ + + param = 0; + + while (!isspace(*scheme & 255) && *scheme) + { + if (*scheme == '=') + param = 1; + else if (*scheme == '\"') + { + /* + * Skip quoted value... + */ + + scheme ++; + while (*scheme && *scheme != '\"') + scheme ++; + } + + scheme ++; + } + + /* + * If this wasn't a parameter, we are at the end of this scheme's + * parameters... + */ + + if (!param) + break; + } + + *value = '\0'; + + DEBUG_puts("9cups_auth_param: Returning NULL."); + + return (NULL); +} + + +/* + * 'cups_auth_scheme()' - Get the (next) WWW-Authenticate scheme. + * + * The "www_authenticate" parameter points to the current position in the header. + * + * Returns @code NULL@ if there are no (more) auth schemes present. + */ + +static const char * /* O - Start of scheme or @code NULL@ if not found */ +cups_auth_scheme(const char *www_authenticate, /* I - Pointer into WWW-Authenticate header */ + char *scheme, /* I - Scheme name buffer */ + size_t schemesize) /* I - Size of buffer */ +{ + const char *start; /* Start of scheme data */ + char *sptr = scheme, /* Pointer into scheme buffer */ + *send = scheme + schemesize - 1;/* End of scheme buffer */ + int param; /* Is this a parameter? */ + + + DEBUG_printf(("8cups_auth_scheme(www_authenticate=\"%s\", scheme=%p, schemesize=%d)", www_authenticate, (void *)scheme, (int)schemesize)); + + while (*www_authenticate) + { + /* + * Skip leading whitespace and commas... + */ + + while (isspace(*www_authenticate & 255) || *www_authenticate == ',') + www_authenticate ++; + + /* + * Parse the scheme name or param="value" string... + */ + + for (sptr = scheme, start = www_authenticate, param = 0; *www_authenticate && *www_authenticate != ',' && !isspace(*www_authenticate & 255); www_authenticate ++) + { + if (*www_authenticate == '=') + param = 1; + else if (!param && sptr < send) + *sptr++ = *www_authenticate; + else if (*www_authenticate == '\"') + { + /* + * Skip quoted value... + */ + + www_authenticate ++; + while (*www_authenticate && *www_authenticate != '\"') + www_authenticate ++; + } + } + + if (sptr > scheme && !param) + { + *sptr = '\0'; + + DEBUG_printf(("9cups_auth_scheme: Returning \"%s\".", start)); + + return (start); + } + } + + *scheme = '\0'; + + DEBUG_puts("9cups_auth_scheme: Returning NULL."); + + return (NULL); +} + + +#ifdef HAVE_GSSAPI # ifdef HAVE_GSS_ACQUIRE_CRED_EX_F /* * 'cups_gss_acquire()' - Kerberos credentials callback. @@ -639,9 +901,9 @@ static int /* O - 0 if available */ /* -1 error */ cups_local_auth(http_t *http) /* I - HTTP connection to server */ { -#if defined(WIN32) || defined(__EMX__) +#if defined(_WIN32) || defined(__EMX__) /* - * Currently WIN32 and OS-2 do not support the CUPS server... + * Currently _WIN32 and OS-2 do not support the CUPS server... */ return (1); @@ -650,6 +912,8 @@ cups_local_auth(http_t *http) /* I - HTTP connection to server */ FILE *fp; /* Certificate file */ char trc[16], /* Try Root Certificate parameter */ filename[1024]; /* Certificate filename */ + const char *www_auth, /* WWW-Authenticate header */ + *schemedata; /* Data for the named auth scheme */ _cups_globals_t *cg = _cupsGlobals(); /* Global data */ # if defined(HAVE_AUTHORIZATION_H) OSStatus status; /* Status */ @@ -668,13 +932,14 @@ cups_local_auth(http_t *http) /* I - HTTP connection to server */ * See if we are accessing localhost... */ - if (!httpAddrLocalhost(http->hostaddr) && - _cups_strcasecmp(http->hostname, "localhost") != 0) + if (!httpAddrLocalhost(http->hostaddr) && _cups_strcasecmp(http->hostname, "localhost") != 0) { DEBUG_puts("8cups_local_auth: Not a local connection!"); return (1); } + www_auth = httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE); + # if defined(HAVE_AUTHORIZATION_H) /* * Delete any previous authorization reference... @@ -686,12 +951,9 @@ cups_local_auth(http_t *http) /* I - HTTP connection to server */ http->auth_ref = NULL; } - if (!getenv("GATEWAY_INTERFACE") && - httpGetSubField2(http, HTTP_FIELD_WWW_AUTHENTICATE, "authkey", - auth_key, sizeof(auth_key))) + if (!getenv("GATEWAY_INTERFACE") && (schemedata = cups_auth_find(www_auth, "AuthRef")) != NULL && cups_auth_param(schemedata, "key", auth_key, sizeof(auth_key))) { - status = AuthorizationCreate(NULL, kAuthorizationEmptyEnvironment, - kAuthorizationFlagDefaults, &http->auth_ref); + status = AuthorizationCreate(NULL, kAuthorizationEmptyEnvironment, kAuthorizationFlagDefaults, &http->auth_ref); if (status != errAuthorizationSuccess) { DEBUG_printf(("8cups_local_auth: AuthorizationCreate() returned %d (%s)", @@ -745,6 +1007,11 @@ cups_local_auth(http_t *http) /* I - HTTP connection to server */ } # endif /* HAVE_AUTHORIZATION_H */ +# ifdef HAVE_GSSAPI + if (cups_auth_find(www_auth, "Negotiate")) + return (1); +# endif /* HAVE_GSSAPI */ + # if defined(SO_PEERCRED) && defined(AF_LOCAL) /* * See if we can authenticate using the peer credentials provided over a @@ -752,16 +1019,9 @@ cups_local_auth(http_t *http) /* I - HTTP connection to server */ * information... */ - if ( -# ifdef HAVE_GSSAPI - _cups_strncasecmp(http->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Negotiate", 9) && -# endif /* HAVE_GSSAPI */ -# ifdef HAVE_AUTHORIZATION_H - !httpGetSubField2(http, HTTP_FIELD_WWW_AUTHENTICATE, "authkey", - auth_key, sizeof(auth_key)) && -# endif /* HAVE_AUTHORIZATION_H */ - http->hostaddr->addr.sa_family == AF_LOCAL && - !getenv("GATEWAY_INTERFACE")) /* Not via CGI programs... */ + if (http->hostaddr->addr.sa_family == AF_LOCAL && + !getenv("GATEWAY_INTERFACE") && /* Not via CGI programs... */ + cups_auth_find(www_auth, "PeerCred")) { /* * Verify that the current cupsUser() matches the current UID... @@ -784,6 +1044,9 @@ cups_local_auth(http_t *http) /* I - HTTP connection to server */ } # endif /* SO_PEERCRED && AF_LOCAL */ + if ((schemedata = cups_auth_find(www_auth, "Local")) == NULL) + return (1); + /* * Try opening a certificate file for this PID. If that fails, * try the root certificate... @@ -797,33 +1060,9 @@ cups_local_auth(http_t *http) /* I - HTTP connection to server */ * No certificate for this PID; see if we can get the root certificate... */ - DEBUG_printf(("9cups_local_auth: Unable to open file %s: %s", - filename, strerror(errno))); + DEBUG_printf(("9cups_local_auth: Unable to open file \"%s\": %s", filename, strerror(errno))); -# ifdef HAVE_GSSAPI - if (!_cups_strncasecmp(http->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Negotiate", 9)) - { - /* - * Kerberos required, don't try the root certificate... - */ - - return (1); - } -# endif /* HAVE_GSSAPI */ - -# ifdef HAVE_AUTHORIZATION_H - if (httpGetSubField2(http, HTTP_FIELD_WWW_AUTHENTICATE, "authkey", - auth_key, sizeof(auth_key))) - { - /* - * Don't use the root certificate as a replacement for an authkey... - */ - - return (1); - } -# endif /* HAVE_AUTHORIZATION_H */ - if (!httpGetSubField2(http, HTTP_FIELD_WWW_AUTHENTICATE, "trc", trc, - sizeof(trc))) + if (!cups_auth_param(schemedata, "trc", trc, sizeof(trc))) { /* * Scheduler doesn't want us to use the root certificate... @@ -833,7 +1072,8 @@ cups_local_auth(http_t *http) /* I - HTTP connection to server */ } snprintf(filename, sizeof(filename), "%s/certs/0", cg->cups_statedir); - fp = fopen(filename, "r"); + if ((fp = fopen(filename, "r")) == NULL) + DEBUG_printf(("9cups_local_auth: Unable to open file \"%s\": %s", filename, strerror(errno))); } if (fp) @@ -864,5 +1104,5 @@ cups_local_auth(http_t *http) /* I - HTTP connection to server */ } return (1); -#endif /* WIN32 || __EMX__ */ +#endif /* _WIN32 || __EMX__ */ } |