Add tests for bearer validation and do some style(9).

Makefile

@@ -193,6 +193,7 @@ REGRESS		 = regress/test-abort-validator \
 		   regress/test-bearer \
 		   regress/test-bearer-curl \
 		   regress/test-bearer-empty \
+		   regress/test-bearer-validate \
 		   regress/test-bigfile \
 		   regress/test-buf \
 		   regress/test-date2epoch \

regress/test-basic.c

@@ -30,8 +30,8 @@
 static int
 parent(CURL *curl)
 {
-	struct curl_slist *list = NULL;
-	int c;
+	struct curl_slist	*list = NULL;
+	int			 c;
 
 	curl_easy_setopt(curl, CURLOPT_URL, 
 		"http://localhost:17123/");
@@ -40,7 +40,7 @@ parent(CURL *curl)
 	curl_easy_setopt(curl, CURLOPT_HTTPHEADER, list);
 	c = curl_easy_perform(curl);
 	curl_slist_free_all(list); 
-	return(CURLE_OK == c);
+	return c == CURLE_OK;
 }
 
 static int
@@ -52,12 +52,12 @@ child(void)
 
 	rc = 0;
 	if (khttp_fcgi_test())
-		return(0);
-	if (KCGI_OK != khttp_parse(&r, NULL, 0, &page, 1, 0))
-		return(0);
-	if (KAUTH_BASIC != r.rawauth.type) 
+		return 0;
+	if (khttp_parse(&r, NULL, 0, &page, 1, 0) != KCGI_OK)
+		return 0;
+	if (r.rawauth.type != KAUTH_BASIC) 
 		goto out;
-	else if (0 == r.rawauth.authorised)
+	else if (!r.rawauth.authorised)
 		goto out;
 	else if (khttpbasic_validate(&r, "Aladdin", "open sesame") <= 0)
 		goto out;
@@ -70,12 +70,12 @@ child(void)
 	rc = 1;
 out:
 	khttp_free(&r);
-	return(rc);
+	return rc;
 }
 
 int
 main(int argc, char *argv[])
 {
 
-	return(regress_cgi(parent, child) ? EXIT_SUCCESS : EXIT_FAILURE);
+	return !regress_cgi(parent, child);
 }

regress/test-bearer-empty.c

@@ -30,15 +30,15 @@
 static int
 parent(CURL *curl)
 {
-	struct curl_slist *list = NULL;
-	int c;
+	struct curl_slist 	*list = NULL;
+	CURLcode		 c;
 
 	curl_easy_setopt(curl, CURLOPT_URL, "http://localhost:17123/");
 	list = curl_slist_append(list, "Authorization: Bearer  ");
 	curl_easy_setopt(curl, CURLOPT_HTTPHEADER, list);
 	c = curl_easy_perform(curl);
 	curl_slist_free_all(list); 
-	return(CURLE_OK == c);
+	return c == CURLE_OK;
 }
 
 static int

regress/test-bearer-validate.c

@@ -0,0 +1,79 @@
+/*	$Id$ */
+/*
+ * Copyright (c) 2021 Kristaps Dzonsons <kristaps@bsd.lv>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+#include "../config.h"
+
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <curl/curl.h>
+
+#include "../kcgi.h"
+#include "regress.h"
+
+static int
+parent(CURL *curl)
+{
+	struct curl_slist	*list = NULL;
+	CURLcode		 c;
+
+	curl_easy_setopt(curl, CURLOPT_URL, "http://localhost:17123/");
+	list = curl_slist_append(list, 
+		"Authorization: Bearer QWxhZGRpbjpvcGVuIHNlc2FtZQ==");
+	curl_easy_setopt(curl, CURLOPT_HTTPHEADER, list);
+	c = curl_easy_perform(curl);
+	curl_slist_free_all(list); 
+	return c == CURLE_OK;
+}
+
+static int
+child(void)
+{
+	struct kreq	 r;
+	const char 	*page = "index";
+	int		 rc = 0;
+
+	if (khttp_fcgi_test())
+		return 0;
+	if (khttp_parse(&r, NULL, 0, &page, 1, 0) != KCGI_OK)
+		return 0;
+	if (r.rawauth.type != KAUTH_BEARER) 
+		goto out;
+	if (!r.rawauth.authorised)
+		goto out;
+	else if (khttpbasic_validate(&r, "Aladdin", "open sesame") <= 0)
+		goto out;
+
+	khttp_head(&r, kresps[KRESP_STATUS], 
+		"%s", khttps[KHTTP_200]);
+	khttp_head(&r, kresps[KRESP_CONTENT_TYPE], 
+		"%s", kmimetypes[KMIME_TEXT_HTML]);
+	khttp_body(&r);
+	rc = 1;
+out:
+	khttp_free(&r);
+	return rc;
+}
+
+int
+main(int argc, char *argv[])
+{
+
+	return !regress_cgi(parent, child);
+}

regress/test-bearer.c

@@ -30,8 +30,8 @@
 static int
 parent(CURL *curl)
 {
-	struct curl_slist *list = NULL;
-	int c;
+	struct curl_slist	*list = NULL;
+	CURLcode		 c;
 
 	curl_easy_setopt(curl, CURLOPT_URL, "http://localhost:17123/");
 	list = curl_slist_append(list, 
@@ -39,7 +39,7 @@ parent(CURL *curl)
 	curl_easy_setopt(curl, CURLOPT_HTTPHEADER, list);
 	c = curl_easy_perform(curl);
 	curl_slist_free_all(list); 
-	return(CURLE_OK == c);
+	return c == CURLE_OK;
 }
 
 static int