From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Tue, 26 May 2020 21:59:49 +0000 (+0300)
Subject: auth: db-oauth2 - Add and use db_oauth2_field_find()
X-Git-Tag: 2.3.14.rc1~263
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0895ff34c2dad8ff8ccc9581be83a3a883c5fef;p=thirdparty%2Fdovecot%2Fcore.git

auth: db-oauth2 - Add and use db_oauth2_field_find()
---

diff --git a/src/auth/db-oauth2.c b/src/auth/db-oauth2.c
index a7f8178196..9d89deee4e 100644
--- a/src/auth/db-oauth2.c
+++ b/src/auth/db-oauth2.c
@@ -484,6 +484,18 @@ static void db_oauth2_fields_merge(struct db_oauth2_request *req,
 	}
 }
 
+static const char *
+db_oauth2_field_find(const ARRAY_TYPE(oauth2_field) *fields, const char *name)
+{
+	const struct oauth2_field *f;
+
+	array_foreach(fields, f) {
+		if (strcmp(f->name, name) == 0)
+			return f->value;
+	}
+	return NULL;
+}
+
 static void db_oauth2_callback(struct db_oauth2_request *req,
 			       enum passdb_result result,
 			       const char *error)
@@ -714,20 +726,18 @@ db_oauth2_lookup_passwd_grant(struct oauth2_request_result *result,
 			      struct db_oauth2_request *req)
 {
 	enum passdb_result passdb_result;
-	const char *error;
-	const struct oauth2_field *f;
+	const char *token, *error;
 
 	i_assert(req->token == NULL);
 	req->req = NULL;
 
 	if (result->valid) {
-		array_foreach(result->fields, f)
-			if (strcmp(f->name, "access_token") == 0)
-				req->token = p_strdup(req->pool, f->value);
-		if (req->token == NULL) {
+		token = db_oauth2_field_find(result->fields, "access_token");
+		if (token == NULL) {
 			db_oauth2_callback(req, PASSDB_RESULT_INTERNAL_FAILURE,
 					   "OAuth2 token missing from reply");
 		} else {
+			req->token = p_strdup(req->pool, token);
 			db_oauth2_lookup_continue(result, req);
 		}
 		return;
@@ -738,13 +748,7 @@ db_oauth2_lookup_passwd_grant(struct oauth2_request_result *result,
 		error = result->error;
 	else {
 		passdb_result = PASSDB_RESULT_INTERNAL_FAILURE;
-		error = NULL;
-		array_foreach(result->fields, f) {
-			if (strcmp(f->name, "error") == 0) {
-				error = f->value;
-				break;
-			}
-		}
+		error = db_oauth2_field_find(result->fields, "error");
 		if (error != NULL &&
 		    strcmp("invalid_grant", error) == 0) {
 			passdb_result = PASSDB_RESULT_PASSWORD_MISMATCH;