X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_cookie_api.c;h=5776b87caecd43d052efac87f3bb5e5b453a676a;hp=bc02315e6f9098880f3a6f416d0d4c0487c66222;hb=refs%2Fheads%2Fv1.7.x;hpb=e6b35fbe072a13b0e792952852fcd1499bd8e610

diff --git a/http_cookie_api.c b/http_cookie_api.c
index bc02315..5776b87 100644
--- a/http_cookie_api.c
+++ b/http_cookie_api.c
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -17,6 +17,9 @@
 #include "php_http_date_api.h"
 #include "php_http_cookie_api.h"
 
+#include "ext/standard/url.h"
+
+/* {{{ PHP_MINIT_FUNCTION(http_cookie) */
 PHP_MINIT_FUNCTION(http_cookie)
 {
 	HTTP_LONG_CONSTANT("HTTP_COOKIE_PARSE_RAW", HTTP_COOKIE_PARSE_RAW);
@@ -25,11 +28,13 @@ PHP_MINIT_FUNCTION(http_cookie)
 	
 	return SUCCESS;
 }
+/* }}} */
 
-PHP_HTTP_API http_cookie_list *_http_cookie_list_init(http_cookie_list *list TSRMLS_DC)
+/* {{{ http_cookie_list *http_cookie_list_init(http_cookie_list *) */
+PHP_HTTP_API http_cookie_list *_http_cookie_list_init(http_cookie_list *list ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC)
 {
 	if (!list) {
-		list = emalloc(sizeof(http_cookie_list));
+		list = emalloc_rel(sizeof(http_cookie_list));
 	}
 	
 	zend_hash_init(&list->cookies, 0, NULL, ZVAL_PTR_DTOR, 0);
@@ -42,7 +47,9 @@ PHP_HTTP_API http_cookie_list *_http_cookie_list_init(http_cookie_list *list TSR
 	
 	return list;
 }
+/* }}} */
 
+/* {{{ void http_cookie_list_dtor(http_cookie_list *) */
 PHP_HTTP_API void _http_cookie_list_dtor(http_cookie_list *list TSRMLS_DC)
 {
 	if (list) {
@@ -53,7 +60,9 @@ PHP_HTTP_API void _http_cookie_list_dtor(http_cookie_list *list TSRMLS_DC)
 		STR_SET(list->domain, NULL);
 	}
 }
+/* }}} */
 
+/* {{{ void http_cookie_list_free(http_cookie_list **) */
 PHP_HTTP_API void _http_cookie_list_free(http_cookie_list **list TSRMLS_DC)
 {
 	if (list) {
@@ -62,290 +71,295 @@ PHP_HTTP_API void _http_cookie_list_free(http_cookie_list **list TSRMLS_DC)
 		*list = NULL;
 	}
 }
+/* }}} */
 
+/* {{{ const char *http_cookie_list_get_cookie(http_cookie_list *, const char*, size_t) */
 PHP_HTTP_API const char *_http_cookie_list_get_cookie(http_cookie_list *list, const char *name, size_t name_len TSRMLS_DC)
 {
 	zval **cookie = NULL;
-	if ((SUCCESS != zend_hash_find(&list->cookies, name, name_len + 1, (void **) &cookie)) || (Z_TYPE_PP(cookie) != IS_STRING)) {
+	if ((SUCCESS != zend_hash_find(&list->cookies, HTTP_ZAPI_CONST_CAST(char *) name, name_len + 1, (void *) &cookie)) || (Z_TYPE_PP(cookie) != IS_STRING)) {
 		return NULL;
 	}
 	return Z_STRVAL_PP(cookie);
 }
+/* }}} */
 
+/* {{{ const char *http_cookie_list_get_extra(http_cookie_list *, const char *, size_t) */
 PHP_HTTP_API const char *_http_cookie_list_get_extra(http_cookie_list *list, const char *name, size_t name_len TSRMLS_DC)
 {
 	zval **extra = NULL;
-	if ((SUCCESS != zend_hash_find(&list->extras,name, name_len + 1, (void **) &extra)) || (Z_TYPE_PP(extra) != IS_STRING)) {
+	if ((SUCCESS != zend_hash_find(&list->extras, HTTP_ZAPI_CONST_CAST(char *) name, name_len + 1, (void *) &extra)) || (Z_TYPE_PP(extra) != IS_STRING)) {
 		return NULL;
 	}
 	return Z_STRVAL_PP(extra);
 }
+/* }}} */
 
+/* {{{ void http_cookie_list_add_cookie(http_cookie_list *, const char *, size_t, const char *, size_t) */
 PHP_HTTP_API void _http_cookie_list_add_cookie(http_cookie_list *list, const char *name, size_t name_len, const char *value, size_t value_len TSRMLS_DC)
 {
 	zval *cookie_value;
+	char *key = estrndup(name, name_len);
 	MAKE_STD_ZVAL(cookie_value);
 	ZVAL_STRINGL(cookie_value, estrndup(value, value_len), value_len, 0);
-	zend_hash_update(&list->cookies, name, name_len + 1, (void *) &cookie_value, sizeof(zval *), NULL);
+	zend_hash_update(&list->cookies, key, name_len + 1, (void *) &cookie_value, sizeof(zval *), NULL);
+	efree(key);
 }
+/* }}} */
 
+/* {{{ void http_cookie_list_add_extr(http_cookie_list *, const char *, size_t, const char *, size_t) */
 PHP_HTTP_API void _http_cookie_list_add_extra(http_cookie_list *list, const char *name, size_t name_len, const char *value, size_t value_len TSRMLS_DC)
 {
 	zval *cookie_value;
+	char *key = estrndup(name, name_len);
 	MAKE_STD_ZVAL(cookie_value);
 	ZVAL_STRINGL(cookie_value, estrndup(value, value_len), value_len, 0);
-	zend_hash_update(&list->extras, name, name_len + 1, (void *) &cookie_value, sizeof(zval *), NULL);
+	zend_hash_update(&list->extras, key, name_len + 1, (void *) &cookie_value, sizeof(zval *), NULL);
+	efree(key);
 }
+/* }}} */
+
+typedef struct _http_parse_param_cb_arg_t {
+	http_cookie_list *list;
+	long flags;
+	char **allowed_extras;
+} http_parse_param_cb_arg;
 
-#define http_cookie_list_set_item_ex(l, i, il, v, vl, f, a) _http_cookie_list_set_item_ex((l), (i), (il), (v), (vl), (f), (a) TSRMLS_CC)
-static inline void _http_cookie_list_set_item_ex(http_cookie_list *list, const char *item, int item_len, const char *value, int value_len, long flags, char **allowed_extras TSRMLS_DC)
+/* {{{ static void http_parse_cookie_callback */
+static void http_parse_cookie_callback(void *ptr, const char *key, int keylen, const char *val, int vallen TSRMLS_DC)
 {
-	char *key = estrndup(item, item_len);
+	http_parse_param_cb_arg *arg = (http_parse_param_cb_arg *) ptr;
 	
-	if (!strcasecmp(key, "path")) {
-		STR_SET(list->path, estrndup(value, value_len));
-	} else if (!strcasecmp(key, "domain")) {
-		STR_SET(list->domain, estrndup(value, value_len));
-	} else if (!strcasecmp(key, "expires")) {
-		const char *date = estrndup(value, value_len);
-		list->expires = http_parse_date(date);
+#define _KEY_IS(s) (keylen == lenof(s) && !strncasecmp(key, (s), keylen))
+	if _KEY_IS("path") {
+		STR_SET(arg->list->path, estrndup(val, vallen));
+	} else if _KEY_IS("domain") {
+		STR_SET(arg->list->domain, estrndup(val, vallen));
+	} else if _KEY_IS("expires") {
+		char *date = estrndup(val, vallen);
+		arg->list->expires = http_parse_date(date);
 		efree(date);
-	} else if (!strcasecmp(key, "secure")) {
-		list->flags |= HTTP_COOKIE_SECURE;
-	} else if (!strcasecmp(key, "httpOnly")) {
-		list->flags |= HTTP_COOKIE_HTTPONLY;
+	} else if _KEY_IS("secure") {
+		arg->list->flags |= HTTP_COOKIE_SECURE;
+	} else if _KEY_IS("httpOnly") {
+		arg->list->flags |= HTTP_COOKIE_HTTPONLY;
 	} else {
 		/* check for extra */
-		if (allowed_extras) {
-			for (; *allowed_extras; ++allowed_extras) {
-				if (!strcasecmp(key, *allowed_extras)) {
-					http_cookie_list_add_extra(list, key, item_len, value, value_len);
-					
-					efree(key);
+		if (arg->allowed_extras) {
+			char **ae = arg->allowed_extras;
+			
+			for (; *ae; ++ae) {
+				if ((size_t) keylen == strlen(*ae) && !strncasecmp(key, *ae, keylen)) {
+					if (arg->flags & HTTP_COOKIE_PARSE_RAW) {
+						http_cookie_list_add_extra(arg->list, key, keylen, val, vallen);
+					} else {
+						char *dec = estrndup(val, vallen);
+						int declen = php_url_decode(dec, vallen);
+						
+						http_cookie_list_add_extra(arg->list, key, keylen, dec, declen);
+						efree(dec);
+					}
 					return;
 				}
 			}
 		}
 		/* new cookie */
-		http_cookie_list_add_cookie(list, key, item_len, value, value_len);
+		if (arg->flags & HTTP_COOKIE_PARSE_RAW) {
+			http_cookie_list_add_cookie(arg->list, key, keylen, val, vallen);
+		} else {
+			char *dec = estrndup(val, vallen);
+			int declen = php_url_decode(dec, vallen);
+			
+			http_cookie_list_add_cookie(arg->list, key, keylen, dec, declen);
+			efree(dec);
+		}
 	}
-	efree(key);
 }
-
-
-#define ST_QUOTE	1
-#define ST_VALUE	2
-#define ST_KEY		3
-#define ST_ASSIGN	4
-#define ST_ADD		5
+/* }}} */
 
 /* {{{ http_cookie_list *http_parse_cookie(char *, long) */
 PHP_HTTP_API http_cookie_list *_http_parse_cookie_ex(http_cookie_list *list, const char *string, long flags, char **allowed_extras TSRMLS_DC)
 {
-	int free_list = !list, st = ST_KEY, keylen = 0, vallen = 0;
-	char *s, *c, *key = NULL, *val = NULL;
+	int free_list = !list;
+	http_parse_param_cb_arg arg;
 	
 	list = http_cookie_list_init(list);
 	
-	c = s = estrdup(string);
-	for(;;) {
-#if 0
-		char *tk = NULL, *tv = NULL;
-		
-		if (key) {
-			if (keylen) {
-				tk= estrndup(key, keylen);
-			} else {
-				tk = ecalloc(1, 7);
-				memcpy(tk, key, 3);
-				tk[3]='.'; tk[4]='.'; tk[5]='.';
-			}
-		}
-		if (val) {
-			if (vallen) {
-				tv = estrndup(val, vallen);
-			} else {
-				tv = ecalloc(1, 7);
-				memcpy(tv, val, 3);
-				tv[3]='.'; tv[4]='.'; tv[5]='.';
-			}
-		}
-		fprintf(stderr, "[%6s] %c \"%s=%s\"\n",
-				(
-						st == ST_QUOTE ? "QUOTE" :
-						st == ST_VALUE ? "VALUE" :
-						st == ST_KEY ? "KEY" :
-						st == ST_ASSIGN ? "ASSIGN" :
-						st == ST_ADD ? "ADD":
-						"HUH?"
-				), *c, tk, tv
-		);
-		STR_FREE(tk); STR_FREE(tv);
-#endif
-		switch (st)
-		{
-			case ST_QUOTE:
-				if (*c == '"') {
-					if (*(c-1) != '\\') {
-						st = ST_ADD;
-					} else {
-						memmove(c-1, c, strlen(c)+1);
-					}
-				} else {
-					if (!val) {
-						val = c;
-					}
-					if (!*c) {
-						--val;
-						st = ST_ADD;
-					}
-				}
-			break;
-				
-			case ST_VALUE:
-				switch (*c)
-				{
-					case '"':
-						if (!val) {
-							st = ST_QUOTE;
-						}
-					break;
-					
-					case ' ':
-					break;
-					
-					case ';':
-						if (!*(c+1)) {
-							goto add;
-						} 
-					case '\0':
-						st = ST_ADD;
-					break;
-					
-					default:
-						if (!val) {
-							val = c;
-						}
-					break;
-				}
-			break;
-				
-			case ST_KEY:
-				switch (*c)
-				{
-					case ',':
-					case '\r':
-					case '\n':
-					case '\t':
-					case '\013':
-					case '\014':
-						goto failure;
-					break;
-					
-					case '=':
-						if (key) {
-							keylen = c - key;
-							st = ST_VALUE;
-						} else {
-							goto failure;
-						}
-					break;
-					
-					case ' ':
-						if (key) {
-							keylen = c - key;
-							st = ST_ASSIGN;
-						}
-					break;
-					
-					case ';':
-					case '\0':
-						if (key) {
-							keylen = c - key;
-							st = ST_ADD;
-						}
-					break;
-					
-					default:
-						if (!key) {
-							key = c;
-						}
-					break;
-				}
-			break;
-				
-			case ST_ASSIGN:
-				if (*c == '=') {
-					st = ST_VALUE;
-				} else if (!*c || *c == ';') {
-					st = ST_ADD;
-				} else if (*c != ' ') {
-					goto failure;
-				}
-			break;
-				
-			case ST_ADD:
-			add:
-				if (val) {
-					vallen = c - val;
-					if (*c) --vallen;
-					while (val[vallen-1] == ' ') --vallen;
-				} else {
-					val = "";
-					vallen = 0;
-				}
-				http_cookie_list_set_item_ex(list, key, keylen, val, vallen, flags, allowed_extras);
-				st = ST_KEY;
-				key = val = NULL;
-				keylen = vallen = 0;
-			break;
-		}
-		
-		if (*c) {
-			++c;
-		} else if (st == ST_ADD) {
-			goto add;
+	arg.list = list;
+	arg.flags = flags;
+	arg.allowed_extras = allowed_extras;
+	
+	if (SUCCESS != http_parse_params_ex(string, HTTP_PARAMS_RAISE_ERROR, http_parse_cookie_callback, &arg)) {
+		if (free_list) {
+			http_cookie_list_free(&list);
 		} else {
-			break;
+			http_cookie_list_dtor(list);
 		}
+		list = NULL;
 	}
 	
-	efree(s);
 	return list;
-	
-failure:
-	http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Unexpected character (%c) at pos %tu of %zu", *c, c-s, strlen(s));
-	if (free_list) {
-		http_cookie_list_free(&list);
-	} else {
-		http_cookie_list_dtor(list);
-	}
-	efree(s);
-	return FAILURE;
 }
 /* }}} */
 
+/* {{{ void http_cookie_list_tostruct(http_cookie_list *, zval *) */
 PHP_HTTP_API void _http_cookie_list_tostruct(http_cookie_list *list, zval *strct TSRMLS_DC)
 {
 	zval array, *cookies, *extras;
 	
 	INIT_ZARR(array, HASH_OF(strct));
-		
+	
 	MAKE_STD_ZVAL(cookies);
 	array_init(cookies);
 	zend_hash_copy(Z_ARRVAL_P(cookies), &list->cookies, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
 	add_assoc_zval(&array, "cookies", cookies);
-		
+	
 	MAKE_STD_ZVAL(extras);
 	array_init(extras);
 	zend_hash_copy(Z_ARRVAL_P(extras), &list->extras, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
 	add_assoc_zval(&array, "extras", extras);
-		
+	
 	add_assoc_long(&array, "flags", list->flags);
 	add_assoc_long(&array, "expires", (long) list->expires);
-	add_assoc_string(&array, "path", list->path?list->path:"", 1);
-	add_assoc_string(&array, "domain", list->domain?list->domain:"", 1);
+	add_assoc_string(&array, "path", STR_PTR(list->path), 1);
+	add_assoc_string(&array, "domain", STR_PTR(list->domain), 1);
 }
+/* }}} */
+
+/* {{{ http_cookie_list *http_cookie_list_fromstruct(http_cookie_list *, zval *strct) */
+PHP_HTTP_API http_cookie_list *_http_cookie_list_fromstruct(http_cookie_list *list, zval *strct TSRMLS_DC)
+{
+	zval **tmp, *cpy;
+	HashTable *ht = HASH_OF(strct);
+	
+	list = http_cookie_list_init(list);
+	
+	if (SUCCESS == zend_hash_find(ht, "cookies", sizeof("cookies"), (void *) &tmp) && Z_TYPE_PP(tmp) == IS_ARRAY) {
+		zend_hash_copy(&list->cookies, Z_ARRVAL_PP(tmp), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
+	}
+	if (SUCCESS == zend_hash_find(ht, "extras", sizeof("extras"), (void *) &tmp) && Z_TYPE_PP(tmp) == IS_ARRAY) {
+		zend_hash_copy(&list->extras, Z_ARRVAL_PP(tmp), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
+	}
+	if (SUCCESS == zend_hash_find(ht, "flags", sizeof("flags"), (void *) &tmp)) {
+		switch (Z_TYPE_PP(tmp)) {
+			case IS_LONG:
+				list->flags = Z_LVAL_PP(tmp);
+				break;
+			case IS_DOUBLE:
+				list->flags = (long) Z_DVAL_PP(tmp);
+				break;
+			case IS_STRING:
+				cpy = http_zsep(IS_LONG, *tmp);
+				list->flags = Z_LVAL_P(cpy);
+				zval_ptr_dtor(&cpy);
+				break;
+			default:
+				break;
+		}
+	}
+	if (SUCCESS == zend_hash_find(ht, "expires", sizeof("expires"), (void *) &tmp)) {
+		switch (Z_TYPE_PP(tmp)) {
+			case IS_LONG:
+				list->expires = Z_LVAL_PP(tmp);
+				break;
+			case IS_DOUBLE:
+				list->expires = (long) Z_DVAL_PP(tmp);
+				break;
+			case IS_STRING:
+				cpy = http_zsep(IS_LONG, *tmp);
+				if (Z_LVAL_P(cpy)) {
+					list->expires = Z_LVAL_P(cpy);
+				} else {
+					time_t expires = http_parse_date(Z_STRVAL_PP(tmp));
+					if (expires > 0) {
+						list->expires = expires;
+					}
+				}
+				zval_ptr_dtor(&cpy);
+				break;
+			default:
+				break;
+		}
+	}
+	if (SUCCESS == zend_hash_find(ht, "path", sizeof("path"), (void *) &tmp) && Z_TYPE_PP(tmp) == IS_STRING) {
+		list->path = estrndup(Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp));
+	}
+	if (SUCCESS == zend_hash_find(ht, "domain", sizeof("domain"), (void *) &tmp) && Z_TYPE_PP(tmp) == IS_STRING) {
+		list->domain = estrndup(Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp));
+	}
+	
+	return list;
+}
+/* }}} */
+
+/* {{{ inline append_encoded */
+static inline void append_encoded(phpstr *buf, const char *key, size_t key_len, const char *val, size_t val_len)
+{
+	char *enc_str[2];
+	int enc_len[2];
+	
+	enc_str[0] = php_url_encode(key, key_len, &enc_len[0]);
+	enc_str[1] = php_url_encode(val, val_len, &enc_len[1]);
+	
+	phpstr_append(buf, enc_str[0], enc_len[0]);
+	phpstr_appends(buf, "=");
+	phpstr_append(buf, enc_str[1], enc_len[1]);
+	phpstr_appends(buf, "; ");
+	
+	efree(enc_str[0]);
+	efree(enc_str[1]);
+}
+/* }}} */
+
+/* {{{ void http_cookie_list_tostring(http_cookie_list *, char **, size_t *) */
+PHP_HTTP_API void _http_cookie_list_tostring(http_cookie_list *list, char **str, size_t *len TSRMLS_DC)
+{
+	phpstr buf;
+	zval **val;
+	HashKey key = initHashKey(0);
+	HashPosition pos;
+	
+	phpstr_init(&buf);
+	
+	FOREACH_HASH_KEYVAL(pos, &list->cookies, key, val) {
+		if (key.type == HASH_KEY_IS_STRING && key.len) {
+			zval *tmp = http_zsep(IS_STRING, *val);
+			append_encoded(&buf, key.str, key.len-1, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp));
+			zval_ptr_dtor(&tmp);
+		}
+	}
+	
+	if (list->domain && *list->domain) {
+		phpstr_appendf(&buf, "domain=%s; ", list->domain);
+	}
+	if (list->path && *list->path) {
+		phpstr_appendf(&buf, "path=%s; ", list->path);
+	}
+	if (list->expires) {
+		char *date = http_date(list->expires);
+		phpstr_appendf(&buf, "expires=%s; ", date);
+		efree(date);
+	}
+	
+	FOREACH_HASH_KEYVAL(pos, &list->extras, key, val) {
+		if (key.type == HASH_KEY_IS_STRING && key.len) {
+			zval *tmp = http_zsep(IS_STRING, *val);
+			append_encoded(&buf, key.str, key.len-1, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp));
+		}
+	}
+	
+	if (list->flags & HTTP_COOKIE_SECURE) {
+		phpstr_appends(&buf, "secure; ");
+	}
+	if (list->flags & HTTP_COOKIE_HTTPONLY) {
+		phpstr_appends(&buf, "httpOnly; ");
+	}
+	
+	phpstr_fix(&buf);
+	*str = PHPSTR_VAL(&buf);
+	*len = PHPSTR_LEN(&buf);
+}
+/* }}} */
 
 /*
  * Local variables: