2016-05-13 06:42:28 +02:00
|
|
|
<?php
|
|
|
|
/**
|
|
|
|
* Cookie holder object
|
|
|
|
*
|
2021-12-06 22:30:03 +01:00
|
|
|
* @package Requests
|
|
|
|
* @subpackage Cookies
|
2016-05-13 06:42:28 +02:00
|
|
|
*/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Cookie holder object
|
|
|
|
*
|
2021-12-06 22:30:03 +01:00
|
|
|
* @package Requests
|
|
|
|
* @subpackage Cookies
|
2016-05-13 06:42:28 +02:00
|
|
|
*/
|
2021-12-06 22:30:03 +01:00
|
|
|
class Requests_Cookie_Jar implements ArrayAccess, IteratorAggregate {
|
2016-05-13 06:42:28 +02:00
|
|
|
/**
|
|
|
|
* Actual item data
|
|
|
|
*
|
|
|
|
* @var array
|
|
|
|
*/
|
2021-12-06 22:30:03 +01:00
|
|
|
protected $cookies = array();
|
2016-05-13 06:42:28 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Create a new jar
|
|
|
|
*
|
|
|
|
* @param array $cookies Existing cookie values
|
|
|
|
*/
|
2021-12-06 22:30:03 +01:00
|
|
|
public function __construct($cookies = array()) {
|
2016-05-13 06:42:28 +02:00
|
|
|
$this->cookies = $cookies;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2021-12-06 22:30:03 +01:00
|
|
|
* Normalise cookie data into a Requests_Cookie
|
2016-05-13 06:42:28 +02:00
|
|
|
*
|
2021-12-06 22:30:03 +01:00
|
|
|
* @param string|Requests_Cookie $cookie
|
|
|
|
* @return Requests_Cookie
|
2016-05-13 06:42:28 +02:00
|
|
|
*/
|
2021-12-06 22:30:03 +01:00
|
|
|
public function normalize_cookie($cookie, $key = null) {
|
|
|
|
if ($cookie instanceof Requests_Cookie) {
|
2016-05-13 06:42:28 +02:00
|
|
|
return $cookie;
|
|
|
|
}
|
|
|
|
|
2021-12-06 22:30:03 +01:00
|
|
|
return Requests_Cookie::parse($cookie, $key);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Normalise cookie data into a Requests_Cookie
|
|
|
|
*
|
|
|
|
* @codeCoverageIgnore
|
|
|
|
* @deprecated Use {@see Requests_Cookie_Jar::normalize_cookie}
|
|
|
|
* @return Requests_Cookie
|
|
|
|
*/
|
|
|
|
public function normalizeCookie($cookie, $key = null) {
|
|
|
|
return $this->normalize_cookie($cookie, $key);
|
2016-05-13 06:42:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Check if the given item exists
|
|
|
|
*
|
2021-12-06 22:30:03 +01:00
|
|
|
* @param string $key Item key
|
2016-05-13 06:42:28 +02:00
|
|
|
* @return boolean Does the item exist?
|
|
|
|
*/
|
2021-12-06 22:30:03 +01:00
|
|
|
public function offsetExists($key) {
|
|
|
|
return isset($this->cookies[$key]);
|
2016-05-13 06:42:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Get the value for the item
|
|
|
|
*
|
2021-12-06 22:30:03 +01:00
|
|
|
* @param string $key Item key
|
External Libraries: Update the Requests library to version `1.8.0`.
While some of the changes in the `1.8.0` release have already been copied to WordPress Core in earlier releases (see [38727], [46258], [47902] and [49382]), this release contains additional improvements, including:
- A significant performance fix when using cURL.
- Improved compliance with RFC2616.
The library has also been moved under the WordPress project’s GitHub organization and can now be found at https://github.com/WordPress/Requests.
Props jrf, dd32, rmccue, justinahinon, netweb, schlessera, TimothyBJacobs, soulseekah, ozh, skithund, carlalexander, travisnorthcutt, desrosj.
Fixes #53101.
Built from https://develop.svn.wordpress.org/trunk@50842
git-svn-id: http://core.svn.wordpress.org/trunk@50451 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-05-11 21:42:02 +02:00
|
|
|
* @return string|null Item value (null if offsetExists is false)
|
2016-05-13 06:42:28 +02:00
|
|
|
*/
|
2021-12-06 22:30:03 +01:00
|
|
|
public function offsetGet($key) {
|
|
|
|
if (!isset($this->cookies[$key])) {
|
2016-05-13 06:42:28 +02:00
|
|
|
return null;
|
|
|
|
}
|
|
|
|
|
2021-12-06 22:30:03 +01:00
|
|
|
return $this->cookies[$key];
|
2016-05-13 06:42:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Set the given item
|
|
|
|
*
|
2021-12-06 22:30:03 +01:00
|
|
|
* @throws Requests_Exception On attempting to use dictionary as list (`invalidset`)
|
External Libraries: Update the Requests library to version 2.0.0.
This is a major release and contains breaking changes.
Most important changes to be aware of for this release:
* All code is now namespaced. Though there is a full backward compatibility layer available and the old class names are still supported, using them will generate a deprecation notice (which can be silenced by plugins if they'd need to support multiple WP versions). See the [https://requests.ryanmccue.info/docs/upgrading.html upgrade guide] for more details.
* A lot of classes have been marked `final`. This should generally not affect userland code as care has been taken to not apply the `final` keyword to classes which are known to be extended in userland code.
* Extensive input validation has been added to Requests. When Requests is used as documented though, this will be unnoticable.
* A new `WpOrg\Requests\Requests::has_capabilities()` method has been introduced which can be used to address #37708.
* A new `WpOrg\Requests\Response::decode_body()` method has been introduced which may be usable to simplify some of the WP native wrapper code.
* Remaining PHP 8.0 compatibility fixed (support for named parameters).
* PHP 8.1 compatibility.
Release notes: https://github.com/WordPress/Requests/releases/tag/v2.0.0
For a full list of changes in this update, see the Requests GitHub:
https://github.com/WordPress/Requests/compare/v1.8.1...v2.0.0
Follow-up to [50842], [51078].
Props jrf, schlessera, datagutten, wojsmol, dd32, dustinrue, soulseekah, costdev, szepeviktor.
Fixes #54504.
Built from https://develop.svn.wordpress.org/trunk@52244
git-svn-id: http://core.svn.wordpress.org/trunk@51836 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-11-25 02:12:02 +01:00
|
|
|
*
|
2021-12-06 22:30:03 +01:00
|
|
|
* @param string $key Item name
|
|
|
|
* @param string $value Item value
|
2016-05-13 06:42:28 +02:00
|
|
|
*/
|
2021-12-06 22:30:03 +01:00
|
|
|
public function offsetSet($key, $value) {
|
|
|
|
if ($key === null) {
|
|
|
|
throw new Requests_Exception('Object is a dictionary, not a list', 'invalidset');
|
2016-05-13 06:42:28 +02:00
|
|
|
}
|
|
|
|
|
2021-12-06 22:30:03 +01:00
|
|
|
$this->cookies[$key] = $value;
|
2016-05-13 06:42:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Unset the given header
|
|
|
|
*
|
2021-12-06 22:30:03 +01:00
|
|
|
* @param string $key
|
2016-05-13 06:42:28 +02:00
|
|
|
*/
|
2021-12-06 22:30:03 +01:00
|
|
|
public function offsetUnset($key) {
|
|
|
|
unset($this->cookies[$key]);
|
2016-05-13 06:42:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Get an iterator for the data
|
|
|
|
*
|
2021-12-06 22:30:03 +01:00
|
|
|
* @return ArrayIterator
|
2016-05-13 06:42:28 +02:00
|
|
|
*/
|
|
|
|
public function getIterator() {
|
|
|
|
return new ArrayIterator($this->cookies);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Register the cookie handler with the request's hooking system
|
|
|
|
*
|
2021-12-06 22:30:03 +01:00
|
|
|
* @param Requests_Hooker $hooks Hooking system
|
2016-05-13 06:42:28 +02:00
|
|
|
*/
|
2021-12-06 22:30:03 +01:00
|
|
|
public function register(Requests_Hooker $hooks) {
|
|
|
|
$hooks->register('requests.before_request', array($this, 'before_request'));
|
|
|
|
$hooks->register('requests.before_redirect_check', array($this, 'before_redirect_check'));
|
2016-05-13 06:42:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Add Cookie header to a request if we have any
|
|
|
|
*
|
|
|
|
* As per RFC 6265, cookies are separated by '; '
|
|
|
|
*
|
|
|
|
* @param string $url
|
|
|
|
* @param array $headers
|
|
|
|
* @param array $data
|
|
|
|
* @param string $type
|
|
|
|
* @param array $options
|
|
|
|
*/
|
|
|
|
public function before_request($url, &$headers, &$data, &$type, &$options) {
|
2021-12-06 22:30:03 +01:00
|
|
|
if (!$url instanceof Requests_IRI) {
|
|
|
|
$url = new Requests_IRI($url);
|
2016-05-13 06:42:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!empty($this->cookies)) {
|
2021-12-06 22:30:03 +01:00
|
|
|
$cookies = array();
|
2016-05-13 06:42:28 +02:00
|
|
|
foreach ($this->cookies as $key => $cookie) {
|
|
|
|
$cookie = $this->normalize_cookie($cookie, $key);
|
|
|
|
|
|
|
|
// Skip expired cookies
|
|
|
|
if ($cookie->is_expired()) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ($cookie->domain_matches($url->host)) {
|
|
|
|
$cookies[] = $cookie->format_for_header();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
$headers['Cookie'] = implode('; ', $cookies);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Parse all cookies from a response and attach them to the response
|
|
|
|
*
|
2021-12-06 22:30:03 +01:00
|
|
|
* @var Requests_Response $response
|
2016-05-13 06:42:28 +02:00
|
|
|
*/
|
2021-12-06 22:30:03 +01:00
|
|
|
public function before_redirect_check(Requests_Response $return) {
|
|
|
|
$url = $return->url;
|
|
|
|
if (!$url instanceof Requests_IRI) {
|
|
|
|
$url = new Requests_IRI($url);
|
2016-05-13 06:42:28 +02:00
|
|
|
}
|
|
|
|
|
2021-12-06 22:30:03 +01:00
|
|
|
$cookies = Requests_Cookie::parse_from_headers($return->headers, $url);
|
|
|
|
$this->cookies = array_merge($this->cookies, $cookies);
|
|
|
|
$return->cookies = $this;
|
2016-05-13 06:42:28 +02:00
|
|
|
}
|
External Libraries: Update the Requests library to version `1.8.0`.
While some of the changes in the `1.8.0` release have already been copied to WordPress Core in earlier releases (see [38727], [46258], [47902] and [49382]), this release contains additional improvements, including:
- A significant performance fix when using cURL.
- Improved compliance with RFC2616.
The library has also been moved under the WordPress project’s GitHub organization and can now be found at https://github.com/WordPress/Requests.
Props jrf, dd32, rmccue, justinahinon, netweb, schlessera, TimothyBJacobs, soulseekah, ozh, skithund, carlalexander, travisnorthcutt, desrosj.
Fixes #53101.
Built from https://develop.svn.wordpress.org/trunk@50842
git-svn-id: http://core.svn.wordpress.org/trunk@50451 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-05-11 21:42:02 +02:00
|
|
|
}
|