openharmony/third_party_curl
1
0
Fork 0
mirror of https://github.com/openharmony/third_party_curl.git synced 2026-08-24 09:22:56 -04:00
Code Issues Packages Projects Releases Wiki Activity
Files
master
third_party_curl/0007-CookiesSecureHook.patch
T
mosdhaha 5f5fc4a0fa add Cookie secure 
Signed-off-by: mosdhaha <maosiping@huawei.com>
2025-12-29 21:30:25 +08:00

271 lines
9.4 KiB
Diff
Raw Permalink Blame History

From 7cb982f99e49b8707d888bbcbb33664d8f4dea19 Mon Sep 17 00:00:00 2001
From: w00804699 <wangzeyu43@huawei.com>
Date: Mon, 29 Dec 2025 21:22:24 +0800
Subject: [PATCH] TicketNo:AR20251021709939 Description: use huks to encrypt
cookie files Team:HarmonyOS Feature or Bugfix:Feature Binary Source:No
PrivateCode(Yes/No):No
Change-Id: Ieb938c98dd7f24d84928286aec4e41365c2bb111
---
include/curl/curl.h | 10 ++++++++++
lib/cookie.c | 44 ++++++++++++++++++++++++++++++++++++++++----
lib/cookie.h | 7 +++++++
lib/easy.c | 11 +++++++++++
lib/setopt.c | 36 ++++++++++++++++++++++++++++++++++++
lib/url.c | 11 +++++++++++
lib/urldata.h | 13 +++++++++++++
7 files changed, 128 insertions(+), 4 deletions(-)
diff --git a/include/curl/curl.h b/include/curl/curl.h
index 4198c7a53..ba3a649c7 100644
--- a/include/curl/curl.h
+++ b/include/curl/curl.h
@@ -1131,6 +1131,16 @@ typedef CURLSTScode (*curl_hstswrite_callback)(CURL *easy,
typedef enum {
#ifdef USE_ARES
CURLOPT(CURLOPT_BALANCED_CONNECTION, CURLOPTTYPE_LONG, 2000),
+ CURLOPT(CURLOPT_ENABLE_COOKIE_VALUE_CHANGE, CURLOPTTYPE_LONG, 2001),
+ CURLOPT(CURLOPT_COOKIES_LINE_MAX_SIZE_MULTIPLIER, CURLOPTTYPE_LONG, 2002),
+ CURLOPT(CURLOPT_COOKIES_ENCODER, CURLOPTTYPE_FUNCTIONPOINT, 2003),
+ CURLOPT(CURLOPT_COOKIES_ENCODER_DATA, CURLOPTTYPE_CBPOINT, 2004),
+ CURLOPT(CURLOPT_COOKIES_DECODER, CURLOPTTYPE_FUNCTIONPOINT, 2005),
+ CURLOPT(CURLOPT_COOKIES_DECODER_DATA, CURLOPTTYPE_CBPOINT, 2006),
+ CURLOPT(CURLOPT_COOKIES_ENCODER_FREE, CURLOPTTYPE_FUNCTIONPOINT, 2007),
+ CURLOPT(CURLOPT_COOKIES_ENCODER_FREE_DATA, CURLOPTTYPE_CBPOINT, 2008),
+ CURLOPT(CURLOPT_COOKIES_DECODER_FREE, CURLOPTTYPE_FUNCTIONPOINT, 2009),
+ CURLOPT(CURLOPT_COOKIES_DECODER_FREE_DATA, CURLOPTTYPE_CBPOINT, 2010),
#endif
/* This is the FILE * or void * the regular output should be written to. */
diff --git a/lib/cookie.c b/lib/cookie.c
index 6dc9142ed..297acf30e 100644
--- a/lib/cookie.c
+++ b/lib/cookie.c
@@ -1245,9 +1245,25 @@ struct CookieInfo *Curl_cookie_init(struct Curl_easy *data,
c->running = FALSE; /* this is not running, this is init */
if(fp) {
struct dynbuf buf;
- Curl_dyn_init(&buf, MAX_COOKIE_LINE);
+#ifdef USE_ARES
+ if (data->set.enable_cookie_value_change) {
+ Curl_dyn_init(&buf, MAX_COOKIE_LINE * data->set.cookies_line_max_size_multiplier);
+ } else {
+#endif
+ Curl_dyn_init(&buf, MAX_COOKIE_LINE);
+#ifdef USE_ARES
+ }
+#endif
while(Curl_get_line(&buf, fp)) {
char *lineptr = Curl_dyn_ptr(&buf);
+#ifdef USE_ARES
+ if (data->set.enable_cookie_value_change && data->set.cookies_decode) {
+ lineptr = data->set.cookies_decode(lineptr, data->set.cookies_decode_data);
+ }
+ if (!lineptr) {
+ continue;
+ }
+#endif
bool headerline = FALSE;
if(checkprefix("Set-Cookie:", lineptr)) {
/* This is a cookie line, get it! */
@@ -1258,6 +1274,11 @@ struct CookieInfo *Curl_cookie_init(struct Curl_easy *data,
}
Curl_cookie_add(data, c, headerline, TRUE, lineptr, NULL, NULL, TRUE);
+#ifdef USE_ARES
+ if (data->set.enable_cookie_value_change && data->set.cookies_decode_free) {
+ data->set.cookies_decode_free(lineptr, data->set.cookies_decode_free_data);
+ }
+#endif
}
Curl_dyn_free(&buf); /* free the line buffer */
@@ -1636,12 +1657,12 @@ static CURLcode cookie_output(struct Curl_easy *data,
if(error)
goto error;
}
-
+#ifndef USE_ARES
fputs("# Netscape HTTP Cookie File\n"
"# https://curl.se/docs/http-cookies.html\n"
"# This file was generated by libcurl! Edit at your own risk.\n\n",
out);
-
+#endif
if(c->numcookies) {
unsigned int i;
size_t nvalid = 0;
@@ -1666,13 +1687,28 @@ static CURLcode cookie_output(struct Curl_easy *data,
for(i = 0; i < nvalid; i++) {
char *format_ptr = get_netscape_format(array[i]);
+#ifdef USE_ARES
+ if (data->set.enable_cookie_value_change && data->set.cookies_encode) {
+ char *origin_ptr = format_ptr;
+ format_ptr = data->set.cookies_encode(format_ptr, data->set.cookies_encode_data);
+ free(origin_ptr);
+ }
+#endif
if(!format_ptr) {
free(array);
error = CURLE_OUT_OF_MEMORY;
goto error;
}
fprintf(out, "%s\n", format_ptr);
- free(format_ptr);
+#ifdef USE_ARES
+ if (data->set.enable_cookie_value_change && data->set.cookies_encode_free) {
+ data->set.cookies_encode_free(format_ptr, data->set.cookies_encode_free_data);
+ } else {
+#endif
+ free(format_ptr);
+#ifdef USE_ARES
+ }
+#endif
}
free(array);
diff --git a/lib/cookie.h b/lib/cookie.h
index 012dd892c..2c64ba5e7 100644
--- a/lib/cookie.h
+++ b/lib/cookie.h
@@ -52,6 +52,13 @@ struct Cookie {
#define COOKIE_HASH_SIZE 63
+#ifdef USE_ARES
+typedef char *(*cookies_encode_function)(char *, void *user_ptr);
+typedef char *(*cookies_decode_function)(char *, void *user_ptr);
+typedef void (*cookies_encode_free_function)(char *, void *user_ptr);
+typedef void (*cookies_decode_free_function)(char *, void *user_ptr);
+#endif
+
struct CookieInfo {
/* linked list of cookies we know of */
struct Cookie *cookies[COOKIE_HASH_SIZE];
diff --git a/lib/easy.c b/lib/easy.c
index e0a9f22a8..171846a20 100644
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -952,6 +952,17 @@ struct Curl_easy *curl_easy_duphandle(struct Curl_easy *data)
outcurl->dns_status = CURL_DNS_STATUS_INIT;
outcurl->is_dns_from_netsys_cache = 0;
+
+ outcurl->set.enable_cookie_value_change = 0;
+ outcurl->set.cookies_line_max_size_multiplier = 1;
+ outcurl->set.cookies_encode = NULL;
+ outcurl->set.cookies_encode_data = NULL;
+ outcurl->set.cookies_decode = NULL;
+ outcurl->set.cookies_decode_data = NULL;
+ outcurl->set.cookies_encode_free = NULL;
+ outcurl->set.cookies_encode_free_data = NULL;
+ outcurl->set.cookies_decode_free = NULL;
+ outcurl->set.cookies_decode_free_data = NULL;
#endif
/* copy all userdefined values */
diff --git a/lib/setopt.c b/lib/setopt.c
index 3b7ad1a53..32249610f 100644
--- a/lib/setopt.c
+++ b/lib/setopt.c
@@ -197,6 +197,42 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param)
curl_off_t bigsize;
switch(option) {
+#ifdef USE_ARES
+ case CURLOPT_ENABLE_COOKIE_VALUE_CHANGE:
+ data->set.enable_cookie_value_change = (0 != va_arg(param, long));
+ break;
+ case CURLOPT_COOKIES_LINE_MAX_SIZE_MULTIPLIER:
+ arg = va_arg(param, long);
+ if(arg < 0)
+ return CURLE_BAD_FUNCTION_ARGUMENT;
+ data->set.cookies_line_max_size_multiplier = arg;
+ break;
+ case CURLOPT_COOKIES_ENCODER:
+ data->set.cookies_encode = va_arg(param, cookies_encode_function);
+ break;
+ case CURLOPT_COOKIES_ENCODER_DATA:
+ data->set.cookies_encode_data = va_arg(param, void *);
+ break;
+ case CURLOPT_COOKIES_DECODER:
+ data->set.cookies_decode = va_arg(param, cookies_decode_function);
+ break;
+ case CURLOPT_COOKIES_DECODER_DATA:
+ data->set.cookies_decode_data = va_arg(param, void *);
+ break;
+ case CURLOPT_COOKIES_ENCODER_FREE:
+ data->set.cookies_encode_free = va_arg(param, cookies_encode_free_function);
+ break;
+ case CURLOPT_COOKIES_ENCODER_FREE_DATA:
+ data->set.cookies_encode_free_data = va_arg(param, void *);
+ break;
+ case CURLOPT_COOKIES_DECODER_FREE:
+ data->set.cookies_decode_free = va_arg(param, cookies_decode_free_function);
+ break;
+ case CURLOPT_COOKIES_DECODER_FREE_DATA:
+ data->set.cookies_decode_free_data = va_arg(param, void *);
+ break;
+#endif
+
case CURLOPT_ARES_SOCKET_FUNCTION:
#ifdef USE_ARES
{
diff --git a/lib/url.c b/lib/url.c
index f406decab..8345672f3 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -562,6 +562,17 @@ CURLcode Curl_open(struct Curl_easy **curl)
data->dns_status = CURL_DNS_STATUS_INIT;
data->is_dns_from_netsys_cache = 0;
+
+ data->set.enable_cookie_value_change = 0;
+ data->set.cookies_line_max_size_multiplier = 1;
+ data->set.cookies_encode = NULL;
+ data->set.cookies_encode_data = NULL;
+ data->set.cookies_decode = NULL;
+ data->set.cookies_decode_data = NULL;
+ data->set.cookies_encode_free = NULL;
+ data->set.cookies_encode_free_data = NULL;
+ data->set.cookies_decode_free = NULL;
+ data->set.cookies_decode_free_data = NULL;
#endif
Curl_req_init(&data->req);
diff --git a/lib/urldata.h b/lib/urldata.h
index 02216c47f..71ecc74f3 100644
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -1612,6 +1612,18 @@ struct UserDefined {
in case the 'localport' one can't be
bind()ed */
#endif
+#ifdef USE_ARES
+ long cookies_line_max_size_multiplier;
+ cookies_encode_function cookies_encode;
+ void *cookies_encode_data;
+ cookies_decode_function cookies_decode;
+ void *cookies_decode_data;
+ cookies_encode_free_function cookies_encode_free;
+ void *cookies_encode_free_data;
+ cookies_decode_free_function cookies_decode_free;
+ void *cookies_decode_free_data;
+#endif
+
curl_write_callback fwrite_func; /* function that stores the output */
curl_write_callback fwrite_header; /* function that stores headers */
curl_write_callback fwrite_rtp; /* function that stores interleaved RTP */
@@ -1896,6 +1908,7 @@ struct UserDefined {
#ifdef USE_ARES
BIT(http_balanced_connection); /* balanced HTTP connection */
+ BIT(enable_cookie_value_change); /* user defined cookie file */
#endif
BIT(mms_reserved_default_port);
--
2.45.2.huawei.10
Reference in New Issue View Git Blame Copy Permalink