2073268 - 30-second delays printing to Windows 2016 server via HTTPS
This commit is contained in:
parent
bae21bb3a2
commit
dcee47abaa
55
0001-cups-tls-gnutls.c-Use-always-GNUTLS_SHUT_WR.patch
Normal file
55
0001-cups-tls-gnutls.c-Use-always-GNUTLS_SHUT_WR.patch
Normal file
@ -0,0 +1,55 @@
|
|||||||
|
From bdb1ca45454d90410031c4c2054005a995f76180 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Zdenek Dohnal <zdohnal@redhat.com>
|
||||||
|
Date: Wed, 6 Apr 2022 15:04:45 +0200
|
||||||
|
Subject: [PATCH] cups/tls-gnutls.c: Use always GNUTLS_SHUT_WR
|
||||||
|
|
||||||
|
The current mode for `gnutls_bye()` in client use cases strictly
|
||||||
|
follows TLS v1.2 standard, which in this particular part says:
|
||||||
|
|
||||||
|
```
|
||||||
|
Unless some other fatal alert has been transmitted, each party is
|
||||||
|
required to send a close_notify alert before closing the write
|
||||||
|
side of the connection. The other party MUST respond with a
|
||||||
|
close_notify alert of its own and close down the connection immediately,
|
||||||
|
discarding any pending writes. It is not required for the initiator
|
||||||
|
of the close to wait for the responding close_notify alert before
|
||||||
|
closing the read side of the connection.
|
||||||
|
```
|
||||||
|
|
||||||
|
and waits for the other side of TLS connection to confirm the close.
|
||||||
|
|
||||||
|
Unfortunately it can undesired for reasons:
|
||||||
|
- we support switching of TLS versions in CUPS, and this mode strictly
|
||||||
|
follows TLS v1.2 - so for older version this behavior is not expected
|
||||||
|
and can cause delays
|
||||||
|
- even some TLS v1.2 implementations (like Windows Server 2016) don't
|
||||||
|
comply TLS v1.2 behavior even if it says it does - in that case,
|
||||||
|
encrypted printing takes 30s till HTTP timeout is reached, because the
|
||||||
|
other side didn't send confirmation
|
||||||
|
- AFAIU openssl's SSL_shutdown() doesn't make this TLS v1.2 difference,
|
||||||
|
so we could end up with two TLS implementations in CUPS which will
|
||||||
|
behave differently
|
||||||
|
|
||||||
|
Since the standard defines that waiting for confirmation is not required
|
||||||
|
and due the problems above, I would propose using GNUTLS_SHUT_WR mode
|
||||||
|
regardless of HTTP mode.
|
||||||
|
---
|
||||||
|
cups/tls-gnutls.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/cups/tls-gnutls.c b/cups/tls-gnutls.c
|
||||||
|
index c55995b2b..f87b4f4df 100644
|
||||||
|
--- a/cups/tls-gnutls.c
|
||||||
|
+++ b/cups/tls-gnutls.c
|
||||||
|
@@ -1667,7 +1667,7 @@ _httpTLSStop(http_t *http) /* I - Connection to server */
|
||||||
|
int error; /* Error code */
|
||||||
|
|
||||||
|
|
||||||
|
- error = gnutls_bye(http->tls, http->mode == _HTTP_MODE_CLIENT ? GNUTLS_SHUT_RDWR : GNUTLS_SHUT_WR);
|
||||||
|
+ error = gnutls_bye(http->tls, GNUTLS_SHUT_WR);
|
||||||
|
if (error != GNUTLS_E_SUCCESS)
|
||||||
|
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, gnutls_strerror(errno), 0);
|
||||||
|
|
||||||
|
--
|
||||||
|
2.35.1
|
||||||
|
|
@ -15,7 +15,7 @@ Summary: CUPS printing system
|
|||||||
Name: cups
|
Name: cups
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 2.4.1
|
Version: 2.4.1
|
||||||
Release: 7%{?dist}
|
Release: 8%{?dist}
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
Url: https://openprinting.github.io/cups/
|
Url: https://openprinting.github.io/cups/
|
||||||
# Apple stopped uploading the new versions into github, use OpenPrinting fork
|
# Apple stopped uploading the new versions into github, use OpenPrinting fork
|
||||||
@ -78,6 +78,8 @@ Patch1001: cups-resolve-uri.patch
|
|||||||
Patch1002: 0001-Footer-message-corrected.patch
|
Patch1002: 0001-Footer-message-corrected.patch
|
||||||
# CSS issues in web ui
|
# CSS issues in web ui
|
||||||
Patch1003: 0001-Fix-some-web-interface-issues.patch
|
Patch1003: 0001-Fix-some-web-interface-issues.patch
|
||||||
|
# 2073268 - 30-second delays printing to Windows 2016 server via HTTPS
|
||||||
|
Patch1004: 0001-cups-tls-gnutls.c-Use-always-GNUTLS_SHUT_WR.patch
|
||||||
|
|
||||||
##### Patches removed because IMHO they aren't no longer needed
|
##### Patches removed because IMHO they aren't no longer needed
|
||||||
##### but still I'll leave them in git in case their removal
|
##### but still I'll leave them in git in case their removal
|
||||||
@ -291,6 +293,8 @@ to CUPS daemon. This solution will substitute printer drivers and raw queues in
|
|||||||
%patch1002 -p1 -b .trailer-copyright
|
%patch1002 -p1 -b .trailer-copyright
|
||||||
# CSS issues in web ui
|
# CSS issues in web ui
|
||||||
%patch1003 -p1 -b .css-issues
|
%patch1003 -p1 -b .css-issues
|
||||||
|
# 2073268 - 30-second delays printing to Windows 2016 server via HTTPS
|
||||||
|
%patch1004 -p1 -b .gnutlsbye
|
||||||
|
|
||||||
|
|
||||||
%if %{lspp}
|
%if %{lspp}
|
||||||
@ -674,6 +678,9 @@ rm -f %{cups_serverbin}/backend/smb
|
|||||||
%{_mandir}/man7/ippeveps.7.gz
|
%{_mandir}/man7/ippeveps.7.gz
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Apr 08 2022 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.4.1-8
|
||||||
|
- 2073268 - 30-second delays printing to Windows 2016 server via HTTPS
|
||||||
|
|
||||||
* Thu Mar 31 2022 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.4.1-7
|
* Thu Mar 31 2022 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.4.1-7
|
||||||
- remove ipp-usb for now until there is a migration path
|
- remove ipp-usb for now until there is a migration path
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user