Merge pull request #1255 from OpenPrinting/oauth-web-ui

Integrate OAuth Web UI changes to master.

Author: michaelrsweet

.github/codeql.yml

@@ -2,6 +2,8 @@ paths-ignore:
   - locale
 
 query-filters:
+  - exclude:
+      id: cpp/guarded-free
   - exclude:
       id: cpp/cleartext-transmission
   - exclude:

CHANGES.md

@@ -7,9 +7,8 @@ Changes in CUPS v2.5b1 (YYYY-MM-DD)
 - Added multiple language support for IPP Everywhere.
 - Added `cupsConcatString`, `cupsCopyString`, and `cupsFormatString` string
   APIs.
-- Added new `cupsRasterInitHeader` API.
-- Added `httpConnectURI` API.
-- Added `httpGetSecurity` API.
+- Added `cupsRasterInitHeader` API.
+- Added `httpConnectURI`, `httpGetCookieValue`, and `httpGetSecurity` APIs.
 - Added `ippAddCredentialsString`, `ippGetFirstAttribute`,
   `ippGetNextAttribute`, `ippRestore`, and `ippSave` APIs.
 - Added new DNS-SD APIs.
@@ -33,8 +32,8 @@ Changes in CUPS v2.5b1 (YYYY-MM-DD)
 - Added a systemd slice to the systemd services included with the scheduler
 - Added localizations for deprecated IPP attributes/options (Issue #1020)
 - Added support for specifying permissions with the `cupsFileOpen` API.
-- Added new `cupsGetClock` API.
-- Added new `cupsParseOptions2` API with "end" argument.
+- Added `cupsGetClock` API.
+- Added `cupsParseOptions2` API with "end" argument.
 - Added `cups-oauth` and `cups-x509` utilities (Issue #1184)
 - Added `DNSSDComputerName` directive to "cupsd.conf" and updated cupsd to
   correctly update the mDNS hostname only if the `DNSSDHostName` directive is
@@ -77,6 +76,8 @@ Changes in CUPS v2.5b1 (YYYY-MM-DD)
   filtering options in client.conf (Issue #1180)
 - Updated the CUPS web interface to make administrative tasks more discoverable
   (Issue #1207)
+- Updated the `httpSetCookie` API to support multiple "Set-Cookie:" header
+  values.
 - Deprecated the "page-border" Job Template attribute (Issue #1020)
 - Removed the `cups-config` utility (use `pkg-config` instead)
 - Fixed use-after-free in `cupsdAcceptClient()` when we log warning during error

cgi-bin/Dependencies

@@ -52,11 +52,8 @@ admin.o: admin.c cgi-private.h cgi.h ../cups/cups.h ../cups/file.h \
   \
   \
   \
-  \
-  \
-  \
-  ../cups/ppd-private.h ../cups/ppd.h ../cups/raster.h \
-  ../cups/pwg-private.h ../cups/adminutil.h
+  ../cups/ppd-private.h ../cups/ppd.h \
+  ../cups/raster.h ../cups/pwg-private.h ../cups/adminutil.h
 classes.o: classes.c cgi-private.h cgi.h ../cups/cups.h ../cups/file.h \
   ../cups/base.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
   ../cups/language.h ../cups/pwg.h help-index.h ../cups/debug-private.h \
@@ -67,6 +64,11 @@ help.o: help.c cgi-private.h cgi.h ../cups/cups.h ../cups/file.h \
   ../cups/language.h ../cups/pwg.h help-index.h ../cups/debug-private.h \
   ../cups/language-private.h ../config.h ../cups/transcode.h \
   ../cups/string-private.h ../cups/ipp-private.h
+home.o: home.c cgi-private.h cgi.h ../cups/cups.h ../cups/file.h \
+  ../cups/base.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
+  ../cups/language.h ../cups/pwg.h help-index.h ../cups/debug-private.h \
+  ../cups/language-private.h ../config.h ../cups/transcode.h \
+  ../cups/string-private.h ../cups/ipp-private.h
 jobs.o: jobs.c cgi-private.h cgi.h ../cups/cups.h ../cups/file.h \
   ../cups/base.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
   ../cups/language.h ../cups/pwg.h help-index.h ../cups/debug-private.h \

cgi-bin/Makefile

@@ -1,7 +1,7 @@
 #
 # CGI makefile for CUPS.
 #
-# Copyright © 2020-2024 by OpenPrinting.
+# Copyright © 2020-2025 by OpenPrinting.
 # Copyright © 2007-2019 by Apple Inc.
 # Copyright © 1997-2006 by Easy Software Products.
 #
@@ -23,6 +23,7 @@ OBJS	=	\
 		admin.o \
 		classes.o \
 		help.o \
+		home.o \
 		jobs.o \
 		printers.o \
 		testcgi.o \
@@ -32,6 +33,7 @@ CGIS	=	\
 		admin.cgi \
 		classes.cgi \
 		help.cgi \
+		home.cgi \
 		jobs.cgi \
 		printers.cgi
 LIBTARGETS =	\
@@ -192,6 +194,16 @@ help.cgi:	help.o ../Makedefs ../cups/$(LIBCUPS) libcupscgi.a
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
+#
+# home.cgi
+#
+
+home.cgi:	home.o ../Makedefs ../cups/$(LIBCUPS) libcupscgi.a
+	echo Linking $@...
+	$(LD_CC) $(ALL_LDFLAGS) -o $@ home.o libcupscgi.a $(LINKCUPS)
+	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
+
+
 #
 # jobs.cgi
 #

cgi-bin/cgi.h

@@ -1,7 +1,7 @@
 /*
  * CGI support library definitions for CUPS.
  *
- * Copyright © 2020-2024 by OpenPrinting.
+ * Copyright © 2020-2025 by OpenPrinting.
  * Copyright © 2007-2019 by Apple Inc.
  * Copyright © 1997-2006 by Easy Software Products.
  *
@@ -37,6 +37,14 @@
 extern "C" {
 #  endif /* __cplusplus */
 
+
+/*
+ * Constants...
+ */
+
+#  define CUPS_SID	"org.cups.sid"	/* Session ID cookie/variable */
+
+
 /*
  * Types...
  */