Skip to content

[FEATURE] Handle basic auth correctly #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
julianhofmann wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[FEATURE] Handle basic auth correctly #96

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions Classes/Resource/Handler/DomainResource.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ class DomainResource implements RemoteResourceInterface
{
protected readonly RequestFactory $requestFactory;
protected readonly string $url;
protected readonly array $requestOptions;

/**
* @param string $configuration
Expand All @@ -37,9 +38,20 @@ class DomainResource implements RemoteResourceInterface
public function __construct($configuration, ?RequestFactory $requestFactory = null)
{
$this->requestFactory = $requestFactory ?: GeneralUtility::makeInstance(RequestFactory::class);
$urlParts = parse_url((string)$configuration);
$urlParts = parse_url((string) $configuration);
$urlParts['scheme'] = $urlParts['scheme'] ?? $_SERVER['REQUEST_SCHEME'];
$this->url = rtrim(HttpUtility::buildUrl($urlParts), '/') . '/';

if (isset($urlParts['user']) && isset($urlParts['pass'])) {
$this->requestOptions = [
'auth' => [
$urlParts['user'],
$urlParts['pass'],
],
];
} else {
$this->requestOptions = [];
}
}

/**
Expand All @@ -51,7 +63,7 @@ public function __construct($configuration, ?RequestFactory $requestFactory = nu
public function hasFile($fileIdentifier, $filePath, ?FileInterface $fileObject = null): bool
{
try {
$response = $this->requestFactory->request($this->url . ltrim($filePath, '/'), 'HEAD');
$response = $this->requestFactory->request($this->url . ltrim($filePath, '/'), 'HEAD', $this->requestOptions);

return $response->getStatusCode() === 200;
} catch (TransferException $e) {
Expand All @@ -70,7 +82,7 @@ public function getFile($fileIdentifier, $filePath, ?FileInterface $fileObject =
try {
$fileName = $this->url . ltrim($filePath, '/');

return @fopen($fileName, 'r') ?: $this->requestFactory->request($fileName)->getBody()->getContents();
return @fopen($fileName, 'r') ?: $this->requestFactory->request($fileName, 'GET', $this->requestOptions)->getBody()->getContents();
} catch (RequestException $e) {
return false;
}
Expand Down
Loading