andy/blackwall-auth-sdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Security hardening: enforce secure URLs and transport safeguards

Browse Source
This commit is contained in:
Andy Dixon
2026-02-26 09:10:09 +00:00
parent 94c85fc8d5
commit 3ff5b7aa26
6 changed files with 185 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Auth/Config.php
+50 -6
View File
@@ -13,7 +13,8 @@ final class Config
public readonly string $redirectUri,
public readonly ?string $userInfoUrl = null,
public readonly ?string $clientSecret = null,
public readonly string $defaultScope = 'openid profile email'
public readonly string $defaultScope = 'openid profile email',
public readonly bool $allowInsecureHttp = false
) {
}
@@ -28,14 +29,57 @@ final class Config
}
}
$allowInsecureHttp = isset($config['allowInsecureHttp']) && (bool) $config['allowInsecureHttp'];
$authorizeUrl = rtrim(trim((string) $config['authorizeUrl']), '/');
$tokenUrl = rtrim(trim((string) $config['tokenUrl']), '/');
$redirectUri = trim((string) $config['redirectUri']);
$userInfoUrl = isset($config['userInfoUrl']) ? rtrim(trim((string) $config['userInfoUrl']), '/') : null;
self::assertSecureUrl($authorizeUrl, 'authorizeUrl', $allowInsecureHttp);
self::assertSecureUrl($tokenUrl, 'tokenUrl', $allowInsecureHttp);
self::assertSecureUrl($redirectUri, 'redirectUri', $allowInsecureHttp);
if ($userInfoUrl !== null && $userInfoUrl !== '') {
self::assertSecureUrl($userInfoUrl, 'userInfoUrl', $allowInsecureHttp);
}
return new self(
clientId: $config['clientId'],
authorizeUrl: rtrim($config['authorizeUrl'], '/'),
tokenUrl: rtrim($config['tokenUrl'], '/'),
redirectUri: $config['redirectUri'],
userInfoUrl: isset($config['userInfoUrl']) ? rtrim((string) $config['userInfoUrl'], '/') : null,
authorizeUrl: $authorizeUrl,
tokenUrl: $tokenUrl,
redirectUri: $redirectUri,
userInfoUrl: $userInfoUrl,
clientSecret: isset($config['clientSecret']) ? (string) $config['clientSecret'] : null,
defaultScope: isset($config['scope']) ? (string) $config['scope'] : 'openid profile email'
defaultScope: isset($config['scope']) ? (string) $config['scope'] : 'openid profile email',
allowInsecureHttp: $allowInsecureHttp
);
}
private static function assertSecureUrl(string $url, string $field, bool $allowInsecureHttp): void
{
$parts = parse_url($url);
if ($parts === false || !isset($parts['scheme'])) {
throw new \InvalidArgumentException("{$field} must be a valid absolute URL");
}
$scheme = strtolower((string) $parts['scheme']);
if (!in_array($scheme, ['https', 'http'], true)) {
throw new \InvalidArgumentException("{$field} must use http or https");
}
if ($scheme === 'https') {
return;
}
if ($allowInsecureHttp && self::isLocalHost((string) ($parts['host'] ?? ''))) {
return;
}
throw new \InvalidArgumentException("{$field} must use https (set allowInsecureHttp=true for localhost development)");
}
private static function isLocalHost(string $host): bool
{
$normalized = strtolower(trim($host));
return in_array($normalized, ['localhost', '127.0.0.1', '::1'], true);
}
}
src/Auth/Http/CurlHttpClient.php
+61 -5
View File
@@ -8,15 +8,19 @@ use BlackWall\Auth\Exception\TransportException;
final class CurlHttpClient implements HttpClientInterface
{
public function __construct(private readonly int $timeoutSeconds = 20)
public function __construct(
private readonly int $timeoutSeconds = 20,
private readonly int $connectTimeoutSeconds = 10
)
{
}
public function postForm(string $url, array $fields, array $headers = []): array
{
$this->assertValidUrl($url);
$ch = curl_init($url);
if ($ch === false) {
throw new TransportException('Unable to initialise cURL for POST request');
throw new TransportException('Unable to initialise cURL for POST request', 'curl_init_failed');
}
$headerLines = $this->normaliseHeaders(array_merge([
@@ -29,16 +33,31 @@ final class CurlHttpClient implements HttpClientInterface
CURLOPT_POSTFIELDS => http_build_query($fields, '', '&', PHP_QUERY_RFC3986),
CURLOPT_HTTPHEADER => $headerLines,
CURLOPT_RETURNTRANSFER => true,
CURLOPT_CONNECTTIMEOUT => $this->connectTimeoutSeconds,
CURLOPT_TIMEOUT => $this->timeoutSeconds,
CURLOPT_SSL_VERIFYPEER => true,
CURLOPT_SSL_VERIFYHOST => 2,
CURLOPT_FOLLOWLOCATION => false,
CURLOPT_MAXREDIRS => 0,
]);
if (defined('CURLOPT_PROTOCOLS')) {
curl_setopt($ch, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
}
if (defined('CURLOPT_REDIR_PROTOCOLS')) {
curl_setopt($ch, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
}
$body = curl_exec($ch);
$status = (int) curl_getinfo($ch, CURLINFO_RESPONSE_CODE);
$errno = curl_errno($ch);
$error = curl_error($ch);
curl_close($ch);
if ($body === false) {
throw new TransportException($error !== '' ? $error : 'Unknown cURL POST error');
throw new TransportException(
$error !== '' ? $error : 'Unknown cURL POST error',
$errno > 0 ? ('curl_errno_' . $errno) : 'curl_post_failed'
);
}
return ['status' => $status, 'body' => $body];
@@ -46,9 +65,10 @@ final class CurlHttpClient implements HttpClientInterface
public function get(string $url, array $headers = []): array
{
$this->assertValidUrl($url);
$ch = curl_init($url);
if ($ch === false) {
throw new TransportException('Unable to initialise cURL for GET request');
throw new TransportException('Unable to initialise cURL for GET request', 'curl_init_failed');
}
$headerLines = $this->normaliseHeaders(array_merge([
@@ -58,16 +78,31 @@ final class CurlHttpClient implements HttpClientInterface
curl_setopt_array($ch, [
CURLOPT_HTTPHEADER => $headerLines,
CURLOPT_RETURNTRANSFER => true,
CURLOPT_CONNECTTIMEOUT => $this->connectTimeoutSeconds,
CURLOPT_TIMEOUT => $this->timeoutSeconds,
CURLOPT_SSL_VERIFYPEER => true,
CURLOPT_SSL_VERIFYHOST => 2,
CURLOPT_FOLLOWLOCATION => false,
CURLOPT_MAXREDIRS => 0,
]);
if (defined('CURLOPT_PROTOCOLS')) {
curl_setopt($ch, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
}
if (defined('CURLOPT_REDIR_PROTOCOLS')) {
curl_setopt($ch, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
}
$body = curl_exec($ch);
$status = (int) curl_getinfo($ch, CURLINFO_RESPONSE_CODE);
$errno = curl_errno($ch);
$error = curl_error($ch);
curl_close($ch);
if ($body === false) {
throw new TransportException($error !== '' ? $error : 'Unknown cURL GET error');
throw new TransportException(
$error !== '' ? $error : 'Unknown cURL GET error',
$errno > 0 ? ('curl_errno_' . $errno) : 'curl_get_failed'
);
}
return ['status' => $status, 'body' => $body];
@@ -81,9 +116,30 @@ final class CurlHttpClient implements HttpClientInterface
{
$result = [];
foreach ($headers as $name => $value) {
if (
str_contains((string) $name, "\r")
|| str_contains((string) $name, "\n")
|| str_contains((string) $value, "\r")
|| str_contains((string) $value, "\n")
) {
throw new TransportException('Header names/values must not contain CR/LF characters', 'invalid_header');
}
$result[] = sprintf('%s: %s', $name, $value);
}
return $result;
}
private function assertValidUrl(string $url): void
{
$parts = parse_url($url);
if ($parts === false || !isset($parts['scheme'])) {
throw new TransportException('Request URL must be an absolute URL', 'invalid_url');
}
$scheme = strtolower((string) $parts['scheme']);
if (!in_array($scheme, ['http', 'https'], true)) {
throw new TransportException('Only http/https URLs are supported', 'invalid_url_scheme');
}
}
}