TheCloud/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-08-04 02:07:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

net.http: fix post error with https on windows (#19334)

Browse Source
This commit is contained in:
shuankio 2023-09-12 05:43:13 -07:00 committed by GitHub
parent e8d133d548
commit a0490f2b67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
thirdparty/vschannel/vschannel.c vendored
View File

@ -87,7 +87,7 @@ void vschannel_init(TlsContext *tls_ctx) {
tls_ctx->creds_initialized = TRUE; tls_ctx->creds_initialized = TRUE;
} }
INT request(TlsContext *tls_ctx, INT iport, LPWSTR host, CHAR *req, CHAR **out) INT request(TlsContext *tls_ctx, INT iport, LPWSTR host, CHAR *req, DWORD req_len, CHAR **out)
{ {
SecBuffer ExtraData; SecBuffer ExtraData;
SECURITY_STATUS Status; SECURITY_STATUS Status;
@ -149,7 +149,7 @@ INT request(TlsContext *tls_ctx, INT iport, LPWSTR host, CHAR *req, CHAR **out)
tls_ctx->p_pemote_cert_context = NULL; tls_ctx->p_pemote_cert_context = NULL;
// Request from server // Request from server
if(https_make_request(tls_ctx, req, out, &resp_length)) { if(https_make_request(tls_ctx, req, req_len, out, &resp_length)) {
vschannel_cleanup(tls_ctx); vschannel_cleanup(tls_ctx);
return resp_length; return resp_length;
} }
@ -711,7 +711,7 @@ static SECURITY_STATUS client_handshake_loop(TlsContext *tls_ctx, BOOL fDoInitia
} }
static SECURITY_STATUS https_make_request(TlsContext *tls_ctx, CHAR *req, CHAR **out, int *length) { static SECURITY_STATUS https_make_request(TlsContext *tls_ctx, CHAR *req, DWORD req_len, CHAR **out, int *length) {
SecPkgContext_StreamSizes Sizes; SecPkgContext_StreamSizes Sizes;
SECURITY_STATUS scRet; SECURITY_STATUS scRet;
SecBufferDesc Message; SecBufferDesc Message;
@ -757,10 +757,8 @@ static SECURITY_STATUS https_make_request(TlsContext *tls_ctx, CHAR *req, CHAR *
// Build HTTP request. Note that I'm assuming that this is less than // Build HTTP request. Note that I'm assuming that this is less than
// the maximum message size. If it weren't, it would have to be broken up. // the maximum message size. If it weren't, it would have to be broken up.
sprintf(pbMessage, "%s", req); memcpy(pbMessage, req, req_len);
cbMessage = req_len;
cbMessage = (DWORD)strlen(pbMessage);
// Encrypt the HTTP request. // Encrypt the HTTP request.
Buffers[0].pvBuffer = pbIoBuffer; Buffers[0].pvBuffer = pbIoBuffer;

4
thirdparty/vschannel/vschannel.h vendored
View File

@ -32,9 +32,9 @@ static void vschannel_init(TlsContext *tls_ctx);
static void vschannel_cleanup(TlsContext *tls_ctx); static void vschannel_cleanup(TlsContext *tls_ctx);
static INT request(TlsContext *tls_ctx, INT iport, LPWSTR host, CHAR *req, CHAR **out); static INT request(TlsContext *tls_ctx, INT iport, LPWSTR host, CHAR *req, DWORD req_len, CHAR **out);
static SECURITY_STATUS https_make_request(TlsContext *tls_ctx, CHAR *req, CHAR **out, int *length); static SECURITY_STATUS https_make_request(TlsContext *tls_ctx, CHAR *req, DWORD req_len, CHAR **out, int *length);
static INT connect_to_server(TlsContext *tls_ctx, LPWSTR host, INT port_number); static INT connect_to_server(TlsContext *tls_ctx, LPWSTR host, INT port_number);

2
vlib/builtin/cfns.c.v
View File

@ -370,7 +370,7 @@ fn C.closesocket(int) int
fn C.vschannel_init(&C.TlsContext) fn C.vschannel_init(&C.TlsContext)
fn C.request(&C.TlsContext, int, &u16, &u8, &&u8) int fn C.request(&C.TlsContext, int, &u16, &u8, u32, &&u8) int
fn C.vschannel_cleanup(&C.TlsContext) fn C.vschannel_cleanup(&C.TlsContext)

2
vlib/net/http/backend_windows.c.v
View File

@ -22,7 +22,7 @@ fn (req &Request) ssl_do(port int, method Method, host_name string, path string)
$if trace_http_request ? { $if trace_http_request ? {
eprintln('> ${sdata}') eprintln('> ${sdata}')
} }
length := C.request(&ctx, port, addr.to_wide(), sdata.str, &buff) length := C.request(&ctx, port, addr.to_wide(), sdata.str, sdata.len, &buff)
C.vschannel_cleanup(&ctx) C.vschannel_cleanup(&ctx)
response_text := unsafe { buff.vstring_with_len(length) } response_text := unsafe { buff.vstring_with_len(length) }
if req.on_progress != unsafe { nil } { if req.on_progress != unsafe { nil } {