mirror of
https://github.com/itflow-org/itflow
synced 2026-09-21 14:11:17 +00:00
Update imapengine dependancies too
This commit is contained in:
@@ -7,19 +7,33 @@ namespace GuzzleHttp\Psr7;
|
||||
use Psr\Http\Message\UriInterface;
|
||||
|
||||
/**
|
||||
* Provides methods to determine if a modified URL should be considered cross-origin.
|
||||
* Provides methods to determine if a modified URI should be considered
|
||||
* cross-origin.
|
||||
*
|
||||
* @author Graham Campbell
|
||||
*/
|
||||
final class UriComparator
|
||||
{
|
||||
/**
|
||||
* Determines if a modified URL should be considered cross-origin with
|
||||
* respect to an original URL.
|
||||
* Determines if a modified URI should be considered cross-origin with
|
||||
* respect to an original URI.
|
||||
*
|
||||
* Two URIs are cross-origin when their scheme, host, or effective port
|
||||
* differ. Host comparison is case-insensitive, and bracketed IPv6 literals
|
||||
* are canonicalized to their RFC 5952 form from any PSR-7 implementation
|
||||
* before comparison, so equivalent spellings of the same address are
|
||||
* same-origin. IPvFuture literals and bracketed values that cannot be
|
||||
* parsed as an IPv6 address, such as those carrying zone identifiers,
|
||||
* still compare as case-insensitive text. Missing ports use the default
|
||||
* port for `http`, `https`, `ws`, or `wss`. Other schemes do not receive
|
||||
* implicit default ports.
|
||||
*
|
||||
* This helper only compares URI origins. It does not implement redirect
|
||||
* handling or credential policy.
|
||||
*/
|
||||
public static function isCrossOrigin(UriInterface $original, UriInterface $modified): bool
|
||||
{
|
||||
if (!Utils::caselessEquals($original->getHost(), $modified->getHost())) {
|
||||
if (!Utils::caselessEquals(self::normalizeHost($original), self::normalizeHost($modified))) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -34,6 +48,28 @@ final class UriComparator
|
||||
return false;
|
||||
}
|
||||
|
||||
private static function normalizeHost(UriInterface $uri): string
|
||||
{
|
||||
$host = $uri->getHost();
|
||||
if (!str_starts_with($host, '[') || !str_ends_with($host, ']')) {
|
||||
return $host;
|
||||
}
|
||||
|
||||
// Foreign UriInterface implementations may carry non-canonical IPv6
|
||||
// spellings; canonicalize what is unambiguously an IPv6 address so
|
||||
// equivalent literals compare as same-origin, and leave IPvFuture,
|
||||
// zone-identifier, and invalid text to the caseless textual
|
||||
// comparison. Validation is platform-independent, so a spelling only
|
||||
// some OS parsers accept, such as zero-padded dotted octets, is
|
||||
// cross-origin everywhere instead of same-origin on some systems.
|
||||
$canonical = Rfc3986::tryCanonicalizeIpv6(substr($host, 1, -1));
|
||||
if ($canonical === null) {
|
||||
return $host;
|
||||
}
|
||||
|
||||
return '['.$canonical.']';
|
||||
}
|
||||
|
||||
private static function computePort(UriInterface $uri): ?int
|
||||
{
|
||||
$port = $uri->getPort();
|
||||
@@ -42,11 +78,11 @@ final class UriComparator
|
||||
return $port;
|
||||
}
|
||||
|
||||
if ('http' === $uri->getScheme()) {
|
||||
if (\in_array($uri->getScheme(), ['http', 'ws'], true)) {
|
||||
return 80;
|
||||
}
|
||||
|
||||
if ('https' === $uri->getScheme()) {
|
||||
if (\in_array($uri->getScheme(), ['https', 'wss'], true)) {
|
||||
return 443;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user