From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Fri, 12 May 2023 08:48:25 +0000 (+0300)
Subject: lib-oauth2: Do not send empty client_id or client_secret
X-Git-Tag: 2.4.0~2726
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16112d31736420e2f19048c8947c93c245cf990a;p=thirdparty%2Fdovecot%2Fcore.git

lib-oauth2: Do not send empty client_id or client_secret
---

diff --git a/src/lib-oauth2/oauth2-request.c b/src/lib-oauth2/oauth2-request.c
index 59a9734a8b..295e112b87 100644
--- a/src/lib-oauth2/oauth2-request.c
+++ b/src/lib-oauth2/oauth2-request.c
@@ -268,10 +268,14 @@ oauth2_introspection_start(const struct oauth2_settings *set,
 		enc = t_str_new(64);
 		str_append(enc, set->introspection_url);
 		http_url_escape_param(enc, input->token);
-		str_append(enc, "&client_id=");
-		http_url_escape_param(enc, set->client_id);
-		str_append(enc, "&client_secret=");
-		http_url_escape_param(enc, set->client_secret);
+		if (*set->client_id != '\0') {
+			str_append(enc, "&client_id=");
+			http_url_escape_param(enc, set->client_id);
+		}
+		if (*set->client_secret != '\0') {
+			str_append(enc, "&client_secret=");
+			http_url_escape_param(enc, set->client_secret);
+		}
 		url = str_c(enc);
 		method = "GET";
 		break;
@@ -326,10 +330,14 @@ oauth2_passwd_grant_start(const struct oauth2_settings *set,
 	http_url_escape_param(payload, username);
 	str_append(payload, "&password=");
 	http_url_escape_param(payload, password);
-	str_append(payload, "&client_id=");
-	http_url_escape_param(payload, set->client_id);
-	str_append(payload, "&client_secret=");
-	http_url_escape_param(payload, set->client_secret);
+	if (*set->client_id != '\0') {
+		str_append(payload, "&client_id=");
+		http_url_escape_param(payload, set->client_id);
+	}
+	if (*set->client_secret != '\0') {
+		str_append(payload, "&client_secret=");
+		http_url_escape_param(payload, set->client_secret);
+	}
 	if (set->scope[0] != '\0') {
 		str_append(payload, "&scope=");
 		http_url_escape_param(payload, set->scope);