Skip to content

Fix proxy handling when no proxy is configured #23

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

Closed
Saeid-Abadi wants to merge 1 commit into from
Closed

Fix proxy handling when no proxy is configured #23

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
29 changes: 25 additions & 4 deletions library/Servicenowimport/Api/Servicenow.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ public function __construct(string $baseUri, bool $tlsVerify = true, int $timeou
];

$method = $auth['method'] ?? 'UNKNOWN';
$proxyType = $auth['proxy_type'] ?? 'UNKNOWN';
// Director does not store empty settings, so an unconfigured proxy arrives as null
$proxyType = (string) ($auth['proxy_type'] ?? '');

try {
if ($method === 'BASIC') {
Expand All @@ -53,9 +54,20 @@ public function __construct(string $baseUri, bool $tlsVerify = true, int $timeou
throw new RuntimeException(sprintf("Failed to set authentication method %s", $e->getMessage()));
}

if ($proxyType !== '') {
if (in_array($proxyType, ['HTTP', 'SOCKS5'], true)) {
try {
$proxyAddress = parse_url($auth['proxy_address']);
$rawProxy = trim((string) ($auth['proxy_address'] ?? ''));
if ($rawProxy === '') {
throw new RuntimeException('no proxy address configured');
}

// parse_url() only detects a host if a scheme or a port is given,
// so "proxy.example.com" alone would end up in 'path'
$proxyAddress = parse_url(strpos($rawProxy, '://') === false ? '//' . $rawProxy : $rawProxy);
if (! is_array($proxyAddress) || empty($proxyAddress['host'])) {
throw new RuntimeException(sprintf('invalid proxy address "%s"', $rawProxy));
}

$proxyHost = $proxyAddress['host'];
$proxyScheme = 'https';
$proxyPort = 443;
Expand All @@ -69,7 +81,16 @@ public function __construct(string $baseUri, bool $tlsVerify = true, int $timeou
$proxyPort = $proxyAddress['port'] ?? 1028;
}

$c['proxy'] = sprintf('%s://%s:%s@%s:%d', $proxyScheme, $auth['proxy_user'], $auth['proxy_password'], $proxyHost, $proxyPort);
$proxyCredentials = '';
if (($auth['proxy_user'] ?? '') !== '') {
$proxyCredentials = sprintf(
'%s:%s@',
rawurlencode($auth['proxy_user']),
rawurlencode($auth['proxy_password'] ?? '')
);
}

$c['proxy'] = sprintf('%s://%s%s:%d', $proxyScheme, $proxyCredentials, $proxyHost, $proxyPort);
} catch (\Exception $e) {
throw new RuntimeException(sprintf("Failed to set proxy method %s", $e->getMessage()));
}
Expand Down