lib-oauth2: Remove obsolete files.

diff --git a/src/lib-oauth2/oauth2-introspect.c b/src/lib-oauth2/oauth2-introspect.c
deleted file mode 100644 (file)
index 3400ed6..0000000
--- a/src/lib-oauth2/oauth2-introspect.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/* Copyright (c) 2017-2018 Dovecot authors, see the included COPYING file */
-
-#include "lib.h"
-#include "str.h"
-#include "ioloop.h"
-#include "istream.h"
-#include "http-client.h"
-#include "http-url.h"
-#include "json-parser.h"
-#include "oauth2.h"
-#include "oauth2-private.h"
-
-static void
-oauth2_introspection_callback(struct oauth2_request *req,
-                             struct oauth2_introspection_result *res)
-{
-       i_assert(res->success == (res->error == NULL));
-       i_assert(req->is_callback != NULL);
-       oauth2_introspection_callback_t *callback = req->is_callback;
-       req->is_callback = NULL;
-       callback(res, req->is_context);
-       oauth2_request_free_internal(req);
-}
-
-static void
-oauth2_introspect_continue(struct oauth2_request *req, bool success,
-                          const char *error)
-{
-       struct oauth2_introspection_result res;
-       i_zero(&res);
-
-       res.success = success;
-       res.error = error;
-       res.fields = &req->fields;
-
-       oauth2_introspection_callback(req, &res);
-}
-
-static void
-oauth2_introspect_response(const struct http_response *response,
-                          struct oauth2_request *req)
-{
-       if (response->status / 100 != 2) {
-               oauth2_introspect_continue(req, FALSE, response->reason);
-       } else {
-               if (response->payload == NULL) {
-                       oauth2_introspect_continue(req, FALSE, "Missing response body");
-                       return;
-               }
-               p_array_init(&req->fields, req->pool, 1);
-               req->is = response->payload;
-               i_stream_ref(req->is);
-               req->parser = json_parser_init(req->is);
-               req->json_parsed_cb = oauth2_introspect_continue;
-               req->io = io_add_istream(req->is, oauth2_parse_json, req);
-               req->field_name = NULL;
-               oauth2_parse_json(req);
-       }
-}
-
-#undef oauth2_introspection_start
-struct oauth2_request*
-oauth2_introspection_start(const struct oauth2_settings *set,
-                          const struct oauth2_request_input *input,
-                          oauth2_introspection_callback_t *callback,
-                          void *context)
-{
-       i_assert(oauth2_valid_token(input->token));
-
-       pool_t pool = pool_alloconly_create_clean("oauth2 introspection", 1024);
-       struct oauth2_request *req =
-               p_new(pool, struct oauth2_request, 1);
-
-       req->pool = pool;
-       req->set = set;
-       req->is_callback = callback;
-       req->is_context = context;
-
-       string_t *enc = t_str_new(64);
-       str_append(enc, req->set->introspection_url);
-
-       if (set->introspection_mode == INTROSPECTION_MODE_GET) {
-               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->introspection_mode == INTROSPECTION_MODE_POST) {
-               req->req = http_client_request_url_str(req->set->client, "POST", str_c(enc),
-                                                      oauth2_introspect_response,
-                                                      req);
-               /* add token */
-               enc = t_str_new(strlen(input->token)+6);
-               str_append(enc, "token=");
-               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);
-               http_client_request_add_header(req->req, "Content-Type",
-                                              "application/x-www-form-urlencoded");
-               http_client_request_set_payload_data(req->req, enc->data, enc->used);
-       } else {
-               req->req = http_client_request_url_str(req->set->client, "GET", str_c(enc),
-                                                      oauth2_introspect_response,
-                                                      req);
-       }
-
-       if (http_client_request_get_origin_url(req->req)->user == NULL &&
-           set->introspection_mode == INTROSPECTION_MODE_GET_AUTH)
-               http_client_request_add_header(req->req,
-                                              "Authorization",
-                                              t_strdup_printf("Bearer %s",
-                                                              input->token));
-       oauth2_request_set_headers(req, input);
-
-       http_client_request_set_timeout_msecs(req->req,
-                                             req->set->timeout_msecs);
-       http_client_request_submit(req->req);
-
-       return req;
-}
-

diff --git a/src/lib-oauth2/oauth2-refresh.c b/src/lib-oauth2/oauth2-refresh.c
deleted file mode 100644 (file)
index 2c6b720..0000000
--- a/src/lib-oauth2/oauth2-refresh.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/* Copyright (c) 2017-2018 Dovecot authors, see the included COPYING file */
-
-#include "lib.h"
-#include "ioloop.h"
-#include "istream.h"
-#include "str.h"
-#include "http-client.h"
-#include "http-url.h"
-#include "json-parser.h"
-#include "oauth2.h"
-#include "oauth2-private.h"
-
-static void
-oauth2_refresh_callback(struct oauth2_request *req,
-                       struct oauth2_refresh_result *res)
-{
-       i_assert(res->success == (res->error == NULL));
-       i_assert(req->re_callback != NULL);
-       oauth2_refresh_callback_t *callback = req->re_callback;
-       req->re_callback = NULL;
-       callback(res, req->re_context);
-       oauth2_request_free_internal(req);
-}
-
-static bool
-oauth2_refresh_field_parse(const struct oauth2_field *field,
-                          struct oauth2_refresh_result *res)
-{
-       if (strcasecmp(field->name, "expires_in") == 0) {
-               uint32_t expires_in = 0;
-               if (str_to_uint32(field->value, &expires_in) < 0) {
-                       res->success = FALSE;
-                       res->error = t_strdup_printf(
-                               "Malformed number '%s' in expires_in",
-                               field->value);
-                       return FALSE;
-               } else {
-                       res->expires_at = ioloop_time + expires_in;
-               }
-       } else if (strcasecmp(field->name, "token_type") == 0) {
-               if (strcasecmp(field->value,"bearer") != 0) {
-                       res->success = FALSE;
-                       res->error = t_strdup_printf(
-                               "Expected Bearer token, got '%s'",
-                               field->value);
-                       return FALSE;
-               }
-       } else if (strcasecmp(field->name, "access_token") == 0) {
-                       /* pooled memory */
-                       res->bearer_token = field->value;
-       }
-       return TRUE;
-}
-
-static void
-oauth2_refresh_continue(struct oauth2_request *req, bool success,
-                       const char *error)
-{
-       struct oauth2_refresh_result res;
-       i_zero(&res);
-
-       res.success = success;
-       res.error = error;
-
-       if (res.success) {
-               const struct oauth2_field *field;
-               /* see if we can figure out when it expires */
-               array_foreach(&req->fields, field) {
-                       if (!oauth2_refresh_field_parse(field, &res))
-                               break;
-               }
-       }
-
-       res.fields = &req->fields;
-
-       oauth2_refresh_callback(req, &res);
-}
-
-static void
-oauth2_refresh_response(const struct http_response *response,
-                       struct oauth2_request *req)
-{
-       if (response->status / 100 != 2) {
-               oauth2_refresh_continue(req, FALSE, response->reason);
-       } else {
-               if (response->payload == NULL) {
-                       oauth2_refresh_continue(req, FALSE, "Missing response body");
-                       return;
-               }
-               p_array_init(&req->fields, req->pool, 1);
-               req->is = response->payload;
-               i_stream_ref(req->is);
-               req->parser = json_parser_init(req->is);
-               req->json_parsed_cb = oauth2_refresh_continue;
-               req->io = io_add_istream(req->is, oauth2_parse_json, req);
-               req->field_name = NULL;
-               oauth2_parse_json(req);
-       }
-}
-
-#undef oauth2_refresh_start
-struct oauth2_request*
-oauth2_refresh_start(const struct oauth2_settings *set,
-                    const struct oauth2_request_input *input,
-                    oauth2_refresh_callback_t *callback,
-                    void *context)
-{
-       i_assert(oauth2_valid_token(input->token));
-
-       pool_t pool = pool_alloconly_create_clean("oauth2 refresh", 1024);
-       struct oauth2_request *req =
-               p_new(pool, struct oauth2_request, 1);
-
-       req->pool = pool;
-       req->set = set;
-       req->re_callback = callback;
-       req->re_context = context;
-
-       req->req = http_client_request_url_str(req->set->client, "POST",
-                                              req->set->refresh_url,
-                                              oauth2_refresh_response,
-                                              req);
-       string_t *payload = str_new(req->pool, 128);
-       str_append(payload, "client_secret=");
-       http_url_escape_param(payload, req->set->client_secret);
-       str_append(payload, "&grant_type=refresh_token&refresh_token=");
-       http_url_escape_param(payload, input->token);
-       str_append(payload, "&client_id=");
-       http_url_escape_param(payload, req->set->client_id);
-
-       struct istream *is = i_stream_create_from_string(payload);
-
-       http_client_request_add_header(req->req, "Content-Type",
-                                      "application/x-www-form-urlencoded");
-
-       oauth2_request_set_headers(req, input);
-
-       http_client_request_set_payload(req->req, is, FALSE);
-       i_stream_unref(&is);
-       http_client_request_set_timeout_msecs(req->req,
-                                             req->set->timeout_msecs);
-       http_client_request_submit(req->req);
-
-       return req;
-}

diff --git a/src/lib-oauth2/oauth2-token-validate.c b/src/lib-oauth2/oauth2-token-validate.c
deleted file mode 100644 (file)
index 17d977d..0000000
--- a/src/lib-oauth2/oauth2-token-validate.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/* Copyright (c) 2017-2018 Dovecot authors, see the included COPYING file */
-
-#include "lib.h"
-#include "str.h"
-#include "ioloop.h"
-#include "istream.h"
-#include "strnum.h"
-#include "http-client.h"
-#include "http-url.h"
-#include "json-parser.h"
-#include "oauth2.h"
-#include "oauth2-private.h"
-
-static void
-oauth2_token_validation_callback(struct oauth2_request *req,
-                                struct oauth2_token_validation_result *res)
-{
-       i_assert(res->success == (res->error == NULL));
-       i_assert(req->tv_callback != NULL);
-       oauth2_token_validation_callback_t *callback = req->tv_callback;
-       req->tv_callback = NULL;
-       callback(res, req->tv_context);
-       oauth2_request_free_internal(req);
-}
-
-static void
-oauth2_token_validate_continue(struct oauth2_request *req, bool success,
-                              const char *error)
-{
-       struct oauth2_token_validation_result res;
-       i_zero(&res);
-
-       i_assert(array_is_created(&req->fields) || !success);
-
-       res.success = success;
-       res.error = error;
-       res.valid = req->valid;
-
-       if (res.success) {
-               const struct oauth2_field *field;
-               /* see if we can figure out when it expires */
-               array_foreach(&req->fields, field) {
-                       if (strcasecmp(field->name, "expires_in") == 0) {
-                               uint32_t expires_in = 0;
-                               if (str_to_uint32(field->value, &expires_in) < 0) {
-                                       res.success = FALSE;
-                                       res.error = "Malformed number in expires_in";
-                               } else {
-                                       res.expires_at = ioloop_time + expires_in;
-                               }
-                               break;
-                       }
-               }
-       }
-
-       res.fields = &req->fields;
-
-       oauth2_token_validation_callback(req, &res);
-}
-
-static void
-oauth2_token_validate_response(const struct http_response *response,
-                              struct oauth2_request *req)
-{
-       unsigned int status_1 = response->status / 100;
-
-       if (status_1 != 2 && status_1 != 4) {
-               oauth2_token_validate_continue(req, FALSE, response->reason);
-       } else {
-               if (status_1 == 2)
-                       req->valid = TRUE;
-               else
-                       req->valid = FALSE;
-               p_array_init(&req->fields, req->pool, 1);
-               /* 2xx is sufficient for token validation */
-               if (response->payload == NULL) {
-                       oauth2_token_validate_continue(req, TRUE, NULL);
-                       return;
-               }
-               req->is = response->payload;
-               i_stream_ref(req->is);
-               req->parser = json_parser_init(req->is);
-               req->json_parsed_cb = oauth2_token_validate_continue;
-               req->io = io_add_istream(req->is, oauth2_parse_json, req);
-               req->field_name = NULL;
-               oauth2_parse_json(req);
-       }
-}
-
-#undef oauth2_token_validation_start
-struct oauth2_request*
-oauth2_token_validation_start(const struct oauth2_settings *set,
-                             const struct oauth2_request_input *input,
-                             oauth2_token_validation_callback_t *callback,
-                             void *context)
-{
-       i_assert(oauth2_valid_token(input->token));
-
-       pool_t pool = pool_alloconly_create_clean("oauth2 token_validation", 1024);
-       struct oauth2_request *req =
-               p_new(pool, struct oauth2_request, 1);
-
-       req->pool = pool;
-       req->set = set;
-       req->tv_callback = callback;
-       req->tv_context = context;
-
-       string_t *enc = t_str_new(64);
-       str_append(enc, req->set->tokeninfo_url);
-       http_url_escape_param(enc, input->token);
-
-       req->req = http_client_request_url_str(req->set->client, "GET", str_c(enc),
-                                              oauth2_token_validate_response,
-                                              req);
-
-       if (http_client_request_get_origin_url(req->req)->user == NULL &&
-           set->introspection_mode == INTROSPECTION_MODE_GET_AUTH)
-               http_client_request_add_header(req->req,
-                                              "Authorization",
-                                              t_strdup_printf("Bearer %s",
-                                                              input->token));
-
-       oauth2_request_set_headers(req, input);
-
-       http_client_request_set_timeout_msecs(req->req,
-                                             req->set->timeout_msecs);
-       http_client_request_submit(req->req);
-
-       return req;
-}
-