mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-11-21 01:15:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

HTTP: Fix method_POST param by moving it to OSSL_HTTP_REQ_CTX_set_request_line()

Browse Source 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14699)
This commit is contained in:
Dr. David von Oheimb 2021-03-20 22:04:58 +01:00 committed by Dr. David von Oheimb
parent c37b947957
commit 534725fd43
5 changed files with 33 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
crypto/http/http_client.c
View File

@ -73,8 +73,7 @@ struct ossl_http_req_ctx_st {
#define OHS_HTTP_HEADER (9 | OHS_NOREAD) /* Headers set, w/o final \r\n */ #define OHS_HTTP_HEADER (9 | OHS_NOREAD) /* Headers set, w/o final \r\n */
OSSL_HTTP_REQ_CTX *OSSL_HTTP_REQ_CTX_new(BIO *wbio, BIO *rbio, OSSL_HTTP_REQ_CTX *OSSL_HTTP_REQ_CTX_new(BIO *wbio, BIO *rbio,
int method_POST, int maxline, int maxline, unsigned long max_resp_len,
unsigned long max_resp_len,
int timeout, const char *expected_ct, int timeout, const char *expected_ct,
int expect_asn1) int expect_asn1)
{ {
@ -96,7 +95,6 @@ OSSL_HTTP_REQ_CTX *OSSL_HTTP_REQ_CTX_new(BIO *wbio, BIO *rbio,
OPENSSL_free(rctx); OPENSSL_free(rctx);
return NULL; return NULL;
} }
rctx->method_POST = method_POST;
rctx->expected_ct = expected_ct; rctx->expected_ct = expected_ct;
rctx->expect_asn1 = expect_asn1; rctx->expect_asn1 = expect_asn1;
rctx->resp_len = 0; rctx->resp_len = 0;
@ -135,10 +133,10 @@ void OSSL_HTTP_REQ_CTX_set_max_response_length(OSSL_HTTP_REQ_CTX *rctx,
} }
/* /*
* Create request line using |ctx| and |path| (or "/" in case |path| is NULL). * Create request line using |rctx| and |path| (or "/" in case |path| is NULL).
* Server name (and port) must be given if and only if plain HTTP proxy is used. * Server name (and port) must be given if and only if plain HTTP proxy is used.
*/ */
int OSSL_HTTP_REQ_CTX_set_request_line(OSSL_HTTP_REQ_CTX *rctx, int OSSL_HTTP_REQ_CTX_set_request_line(OSSL_HTTP_REQ_CTX *rctx, int method_POST,
const char *server, const char *port, const char *server, const char *port,
const char *path) const char *path)
{ {
@ -150,6 +148,7 @@ int OSSL_HTTP_REQ_CTX_set_request_line(OSSL_HTTP_REQ_CTX *rctx,
if ((rctx->mem = BIO_new(BIO_s_mem())) == NULL) if ((rctx->mem = BIO_new(BIO_s_mem())) == NULL)
return 0; return 0;
rctx->method_POST = method_POST != 0;
if (BIO_printf(rctx->mem, "%s ", rctx->method_POST ? "POST" : "GET") <= 0) if (BIO_printf(rctx->mem, "%s ", rctx->method_POST ? "POST" : "GET") <= 0)
return 0; return 0;
@ -202,7 +201,7 @@ int OSSL_HTTP_REQ_CTX_add1_header(OSSL_HTTP_REQ_CTX *rctx,
return 1; return 1;
} }
static int OSSL_HTTP_REQ_CTX_set_content(OSSL_HTTP_REQ_CTX *rctx, static int ossl_http_req_ctx_set_content(OSSL_HTTP_REQ_CTX *rctx,
const char *content_type, BIO *req_mem) const char *content_type, BIO *req_mem)
{ {
const unsigned char *req; const unsigned char *req;
@ -259,7 +258,7 @@ int OSSL_HTTP_REQ_CTX_set1_req(OSSL_HTTP_REQ_CTX *rctx, const char *content_type
} }
res = (mem = ossl_http_asn1_item2bio(it, req)) != NULL res = (mem = ossl_http_asn1_item2bio(it, req)) != NULL
&& OSSL_HTTP_REQ_CTX_set_content(rctx, content_type, mem); && ossl_http_req_ctx_set_content(rctx, content_type, mem);
BIO_free(mem); BIO_free(mem);
return res; return res;
} }
@ -308,18 +307,17 @@ OSSL_HTTP_REQ_CTX
} }
/* remaining parameters are checked indirectly by the functions called */ /* remaining parameters are checked indirectly by the functions called */
if ((rctx = OSSL_HTTP_REQ_CTX_new(wbio, rbio, req_mem != NULL, maxline, if ((rctx = OSSL_HTTP_REQ_CTX_new(wbio, rbio, maxline, max_resp_len, timeout,
max_resp_len, timeout,
expected_ct, expect_asn1)) expected_ct, expect_asn1))
== NULL) == NULL)
return NULL; return NULL;
if (OSSL_HTTP_REQ_CTX_set_request_line(rctx, if (OSSL_HTTP_REQ_CTX_set_request_line(rctx, req_mem != NULL,
use_http_proxy ? server : NULL, port, use_http_proxy ? server : NULL, port,
path) path)
&& OSSL_HTTP_REQ_CTX_add1_headers(rctx, headers, server) && OSSL_HTTP_REQ_CTX_add1_headers(rctx, headers, server)
&& (req_mem == NULL && (req_mem == NULL
|| OSSL_HTTP_REQ_CTX_set_content(rctx, content_type, req_mem))) || ossl_http_req_ctx_set_content(rctx, content_type, req_mem)))
return rctx; return rctx;
OSSL_HTTP_REQ_CTX_free(rctx); OSSL_HTTP_REQ_CTX_free(rctx);

4
crypto/ocsp/ocsp_http.c
View File

@ -18,13 +18,13 @@ OSSL_HTTP_REQ_CTX *OCSP_sendreq_new(BIO *io, const char *path,
{ {
OSSL_HTTP_REQ_CTX *rctx = NULL; OSSL_HTTP_REQ_CTX *rctx = NULL;
if ((rctx = OSSL_HTTP_REQ_CTX_new(io, io, 1 /* POST */, if ((rctx = OSSL_HTTP_REQ_CTX_new(io, io,
maxline, 0 /* default max_resp_len */, maxline, 0 /* default max_resp_len */,
0 /* no timeout, blocking indefinitely */, 0 /* no timeout, blocking indefinitely */,
NULL, 1 /* expect_asn1 */)) == NULL) NULL, 1 /* expect_asn1 */)) == NULL)
return NULL; return NULL;
if (!OSSL_HTTP_REQ_CTX_set_request_line(rctx, NULL, NULL, path)) if (!OSSL_HTTP_REQ_CTX_set_request_line(rctx, 1 /* POST */, NULL, NULL, path))
goto err; goto err;
if (req != NULL if (req != NULL

35
doc/man3/OSSL_HTTP_REQ_CTX.pod
View File

@ -21,14 +21,13 @@ OSSL_HTTP_REQ_CTX_set_max_response_length
typedef struct ossl_http_req_ctx_st OSSL_HTTP_REQ_CTX; typedef struct ossl_http_req_ctx_st OSSL_HTTP_REQ_CTX;
OSSL_HTTP_REQ_CTX *OSSL_HTTP_REQ_CTX_new(BIO *wbio, BIO *rbio, OSSL_HTTP_REQ_CTX *OSSL_HTTP_REQ_CTX_new(BIO *wbio, BIO *rbio,
int method_POST, int maxline, int maxline, unsigned long max_resp_len,
unsigned long max_resp_len,
int timeout, int timeout,
const char *expected_content_type, const char *expected_content_type,
int expect_asn1); int expect_asn1);
void OSSL_HTTP_REQ_CTX_free(OSSL_HTTP_REQ_CTX *rctx); void OSSL_HTTP_REQ_CTX_free(OSSL_HTTP_REQ_CTX *rctx);
int OSSL_HTTP_REQ_CTX_set_request_line(OSSL_HTTP_REQ_CTX *rctx, int OSSL_HTTP_REQ_CTX_set_request_line(OSSL_HTTP_REQ_CTX *rctx, int method_POST,
const char *server, const char *port, const char *server, const char *port,
const char *path); const char *path);
int OSSL_HTTP_REQ_CTX_add1_header(OSSL_HTTP_REQ_CTX *rctx, int OSSL_HTTP_REQ_CTX_add1_header(OSSL_HTTP_REQ_CTX *rctx,
@ -59,8 +58,6 @@ the B<BIO> to read the response from (I<rbio>, which may be equal to I<wbio>),
the maximum expected response header line length (I<maxline>, where a value <= 0 the maximum expected response header line length (I<maxline>, where a value <= 0
indicates that the B<HTTP_DEFAULT_MAX_LINE_LENGTH> of 4KiB should be used; indicates that the B<HTTP_DEFAULT_MAX_LINE_LENGTH> of 4KiB should be used;
this length is also used as the number of content bytes read at a time), this length is also used as the number of content bytes read at a time),
the request method (I<method_POST>, which may be 1 to indicate that the C<POST>
method is to be used, or 0 to indicate that the C<GET> method is to be used),
the maximum allowed response content length (I<max_resp_len>, where 0 means the maximum allowed response content length (I<max_resp_len>, where 0 means
that the B<HTTP_DEFAULT_MAX_RESP_LEN> is used, which currently is 100 KiB), that the B<HTTP_DEFAULT_MAX_RESP_LEN> is used, which currently is 100 KiB),
a response timeout measure in seconds (I<timeout>, a response timeout measure in seconds (I<timeout>,
@ -78,11 +75,11 @@ The I<wbio> and I<rbio> are not free'd and it is up to the application
to do so. to do so.
OSSL_HTTP_REQ_CTX_set_request_line() adds the HTTP request line to the context. OSSL_HTTP_REQ_CTX_set_request_line() adds the HTTP request line to the context.
The request method itself becomes C<GET> or C<POST> depending on the value The HTTP method is determined by I<method_POST>,
of I<method_POST> in the OSSL_HTTP_REQ_CTX_new() call. I<server> and I<port> which should be 1 to indicate C<POST> or 0 to indicate C<GET>.
may be set to indicate a proxy server and port that the request should go I<server> and I<port> may be set to indicate a proxy server and port
through, otherwise they should be left NULL. I<path> is the HTTP request path; that the request should go through, otherwise they should be left NULL.
if left NULL, C</> is used. I<path> is the HTTP request path; if left NULL, C</> is used.
OSSL_HTTP_REQ_CTX_add1_header() adds header I<name> with value I<value> to the OSSL_HTTP_REQ_CTX_add1_header() adds header I<name> with value I<value> to the
context I<rctx>. It can be called more than once to add multiple headers. context I<rctx>. It can be called more than once to add multiple headers.
@ -90,12 +87,14 @@ For example, to add a C<Host> header for C<example.com> you would call:
OSSL_HTTP_REQ_CTX_add1_header(ctx, "Host", "example.com"); OSSL_HTTP_REQ_CTX_add1_header(ctx, "Host", "example.com");
OSSL_HTTP_REQ_CTX_set1_req() finalizes the HTTP request context by adding OSSL_HTTP_REQ_CTX_set1_req() is to be used if and only if the I<method_POST>
the DER encoding of I<req>, using the ASN.1 template I<it> to do the encoding. parameter in the OSSL_HTTP_REQ_CTX_set_request_line() call was 1.
The HTTP header C<Content-Length> is automatically filled out, and if It finalizes the HTTP request context by adding the DER encoding of I<req>,
I<content_type> isn't NULL, the HTTP header C<Content-Type> is also added with using the ASN.1 template I<it> to do the encoding.
its content as value. All of this ends up in the internal memory B<BIO>. The HTTP header C<Content-Length> is filled out with the length of the request.
This requires that I<method_POST> was 1 in the OSSL_HTTP_REQ_CTX_new() call. If I<content_type> isn't NULL,
the HTTP header C<Content-Type> is also added with its content as value.
All of this ends up in the internal memory B<BIO>.
OSSL_HTTP_REQ_CTX_nbio() attempts to send the request prepared I<rctx> OSSL_HTTP_REQ_CTX_nbio() attempts to send the request prepared I<rctx>
and gathering the response via HTTP, using the I<rbio> and I<wbio> and gathering the response via HTTP, using the I<rbio> and I<wbio>
@ -150,8 +149,8 @@ This is optional and may be done multiple times with different names.
=item 3. =item 3.
Add C<POST> data with OSSL_HTTP_REQ_CTX_set1_req(). This may only be done if Add C<POST> data with OSSL_HTTP_REQ_CTX_set1_req(). This may only be done if
I<method_POST> was 1 in the OSSL_HTTP_REQ_CTX_new() call, and must be done I<method_POST> was 1 in the OSSL_HTTP_REQ_CTX_set_request_line() call,
exactly once in that case. and must be done exactly once in that case.
=back =back

5
include/openssl/http.h
View File

@ -39,12 +39,11 @@ typedef BIO *(*OSSL_HTTP_bio_cb_t)(BIO *bio, void *arg, int connect, int detail)
#define HTTP_DEFAULT_MAX_RESP_LEN (100 * 1024) #define HTTP_DEFAULT_MAX_RESP_LEN (100 * 1024)
OSSL_HTTP_REQ_CTX *OSSL_HTTP_REQ_CTX_new(BIO *wbio, BIO *rbio, OSSL_HTTP_REQ_CTX *OSSL_HTTP_REQ_CTX_new(BIO *wbio, BIO *rbio,
int method_GET, int maxline, int maxline, unsigned long max_resp_len,
unsigned long max_resp_len,
int timeout, const char *expected_ct, int timeout, const char *expected_ct,
int expect_asn1); int expect_asn1);
void OSSL_HTTP_REQ_CTX_free(OSSL_HTTP_REQ_CTX *rctx); void OSSL_HTTP_REQ_CTX_free(OSSL_HTTP_REQ_CTX *rctx);
int OSSL_HTTP_REQ_CTX_set_request_line(OSSL_HTTP_REQ_CTX *rctx, int OSSL_HTTP_REQ_CTX_set_request_line(OSSL_HTTP_REQ_CTX *rctx, int method_POST,
const char *server, const char *port, const char *server, const char *port,
const char *path); const char *path);
int OSSL_HTTP_REQ_CTX_add1_header(OSSL_HTTP_REQ_CTX *rctx, int OSSL_HTTP_REQ_CTX_add1_header(OSSL_HTTP_REQ_CTX *rctx,

5
include/openssl/ocsp.h.in
View File

@ -178,11 +178,12 @@ int OCSP_sendreq_nbio(OCSP_RESPONSE **presp, OSSL_HTTP_REQ_CTX *rctx);
# ifndef OPENSSL_NO_DEPRECATED_3_0 # ifndef OPENSSL_NO_DEPRECATED_3_0
typedef OSSL_HTTP_REQ_CTX OCSP_REQ_CTX; typedef OSSL_HTTP_REQ_CTX OCSP_REQ_CTX;
# define OCSP_REQ_CTX_new(io, maxline) \ # define OCSP_REQ_CTX_new(io, maxline) \
OSSL_HTTP_REQ_CTX_new(io, io, 1, maxline, 0, 0, NULL, 1) OSSL_HTTP_REQ_CTX_new(io, io, maxline, 0, 0, NULL, 1)
# define OCSP_REQ_CTX_free(r) \ # define OCSP_REQ_CTX_free(r) \
OSSL_HTTP_REQ_CTX_free(r) OSSL_HTTP_REQ_CTX_free(r)
# define OCSP_REQ_CTX_http(rctx, op, path) \ # define OCSP_REQ_CTX_http(rctx, op, path) \
OSSL_HTTP_REQ_CTX_set_request_line(rctx, NULL, NULL, path) OSSL_HTTP_REQ_CTX_set_request_line(rctx, strcmp(op, "POST") == 0, \
NULL, NULL, path)
# define OCSP_REQ_CTX_add1_header(r, n, v) \ # define OCSP_REQ_CTX_add1_header(r, n, v) \
OSSL_HTTP_REQ_CTX_add1_header(r, n, v) OSSL_HTTP_REQ_CTX_add1_header(r, n, v)
# define OCSP_REQ_CTX_i2d(r, i, req) \ # define OCSP_REQ_CTX_i2d(r, i, req) \