Mirror fixes and changes from CUPS 2.x:

- New "claims" argument for cupsJWTNew.
- Support CUPS_USERCONFIG and CUPS_SYSCONFIG environment variables.
- Add cupsOAuthGetUserId to use the userinfo endpoint, with caching.
- Support sharing the metadata, JWKS, and client_id/secret values between the
  system and user.

Author: michaelrsweet

CHANGES.md

@@ -4,8 +4,11 @@ Changes in libcups
 libcups v3.0.0 (YYYY-MM-DD)
 ---------------------------
 
-- Added `cupsOAuthGetJWKS` API.
+- Added `cupsOAuthGetJWKS` and `cupsOAuthGetUserId` APIs.
 - Added `httpGetCookieValue` and `httpGetSecurity` APIs.
+- Updated the `cupsOAuth` APIs to support sharing of some OAuth values between
+  the system (root) and per-user cache values.
+- Updated the `cupsJWTNew` API to accept an optional JSON claims object.
 - Updated the `httpSetCookie` API to support multiple "Set-Cookie:" header
   values.
 - Updated `ippfind` to use `cupsGetClock` API.

cups/globals.c

@@ -153,7 +153,9 @@ DllMain(HINSTANCE hinst,		// I - DLL module handle
 static _cups_globals_t *		// O - Pointer to global data
 cups_globals_alloc(void)
 {
-  _cups_globals_t *cg = malloc(sizeof(_cups_globals_t));
+  const char	*cups_userconfig = getenv("CUPS_USERCONFIG");
+					// Location of user config files
+  _cups_globals_t *cg = calloc(1, sizeof(_cups_globals_t));
 					// Pointer to global data
 #ifdef _WIN32
   HKEY		key;			// Registry key
@@ -231,7 +233,9 @@ cups_globals_alloc(void)
 
   DEBUG_printf("cups_globals_alloc: USERPROFILE=\"%s\"", userprofile);
 
-  if (userprofile)
+  if (cups_userconfig)
+    cupsCopyString(userconfig, cups_userconfig, sizeof(userconfig));
+  else if (userprofile)
     snprintf(userconfig, sizeof(userconfig), "%s/AppData/Local/cups", userprofile);
   else
     cupsCopyString(userconfig, "C:/cups", sizeof(userconfig));
@@ -267,15 +271,20 @@ cups_globals_alloc(void)
     // the system directories...
     cg->datadir   = CUPS_DATADIR;
     cg->sysconfig = CUPS_SERVERROOT;
+
+    cups_userconfig = NULL;
   }
   else
   {
     // Allow directories to be overridden by environment variables.
     if ((cg->datadir = getenv("CUPS_DATADIR")) == NULL)
       cg->datadir = CUPS_DATADIR;
 
-    if ((cg->sysconfig = getenv("CUPS_SERVERROOT")) == NULL)
-      cg->sysconfig = CUPS_SERVERROOT;
+    if ((cg->sysconfig = getenv("CUPS_SYSCONFIG")) == NULL)
+    {
+      if ((cg->sysconfig = getenv("CUPS_SERVERROOT")) == NULL)
+	cg->sysconfig = CUPS_SERVERROOT;
+    }
   }
 
   if (!getuid())
@@ -284,7 +293,14 @@ cups_globals_alloc(void)
     cg->userconfig = strdup(cg->sysconfig);
     return (cg);
   }
+  else if (cups_userconfig)
+  {
+    // Use the value of the CUPS_USERCONFIG environment variable...
+    cg->userconfig = strdup(cups_userconfig);
+    return (cg);
+  }
 
+  // Find the user configuration directory relative to the home directory...
 #  ifdef __APPLE__
   if (!home)
 #else

cups/jwt.c

@@ -1228,7 +1228,8 @@ cupsJWTMakePublicKey(cups_json_t *jwk)	// I - Private JSON Web Key
 //
 
 cups_jwt_t *				// O - JWT object
-cupsJWTNew(const char *type)		// I - JWT type or `NULL` for default ("JWT")
+cupsJWTNew(const char  *type,		// I - JWT type or `NULL` for default ("JWT")
+           cups_json_t *claims)		// I - JSON claims or `NULL` for empty
 {
   cups_jwt_t	*jwt;			// JWT object
 
@@ -1239,7 +1240,12 @@ cupsJWTNew(const char *type)		// I - JWT type or `NULL` for default ("JWT")
     {
       cupsJSONNewString(jwt->jose, cupsJSONNewKey(jwt->jose, NULL, "typ"), type ? type : "JWT");
 
-      if ((jwt->claims = cupsJSONNew(NULL, NULL, CUPS_JTYPE_OBJECT)) != NULL)
+      if (claims)
+        jwt->claims = claims;
+      else
+        jwt->claims = cupsJSONNew(NULL, NULL, CUPS_JTYPE_OBJECT);
+
+      if (jwt->claims)
         return (jwt);
     }
   }

cups/jwt.h

@@ -1,7 +1,7 @@
 //
 // JSON Web Token API definitions for CUPS.
 //
-// Copyright © 2023-2024 by OpenPrinting.
+// Copyright © 2023-2025 by OpenPrinting.
 //
 // Licensed under Apache License v2.0.  See the file "LICENSE" for more
 // information.
@@ -79,7 +79,7 @@ extern cups_jwt_t	*cupsJWTImportString(const char *s, cups_jws_format_t format)
 extern cups_json_t	*cupsJWTLoadCredentials(const char *path, const char *common_name) _CUPS_PUBLIC;
 extern cups_json_t	*cupsJWTMakePrivateKey(cups_jwa_t alg) _CUPS_PUBLIC;
 extern cups_json_t	*cupsJWTMakePublicKey(cups_json_t *jwk) _CUPS_PUBLIC;
-extern cups_jwt_t	*cupsJWTNew(const char *type) _CUPS_PUBLIC;
+extern cups_jwt_t	*cupsJWTNew(const char *type, cups_json_t *claims) _CUPS_PUBLIC;
 extern void		cupsJWTSetClaimNumber(cups_jwt_t *jwt, const char *claim, double value) _CUPS_PUBLIC;
 extern void		cupsJWTSetClaimString(cups_jwt_t *jwt, const char *claim, const char *value) _CUPS_PUBLIC;
 extern void		cupsJWTSetClaimValue(cups_jwt_t *jwt, const char *claim, cups_json_t *value) _CUPS_PUBLIC;