zervo/seb-win-refactoring
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SEBWIN-533, #231: Improved probing of network configuration resources by always executing GET request in case HEAD fails.

Browse source
This commit is contained in:
Damian Büchel 2021-12-23 16:22:59 +01:00
parent aa88feb918
commit 0abbef749e
1 changed files with 26 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
SafeExamBrowser.Configuration/DataResources/NetworkResourceLoader.cs
View file

@ -151,37 +151,43 @@ namespace SafeExamBrowser.Configuration.DataResources
private bool IsAvailable(Uri resource) private bool IsAvailable(Uri resource)
{ {
var isAvailable = false;
var uri = BuildUriFor(resource);
try try
{ {
var uri = BuildUriFor(resource);
logger.Debug($"Sending HEAD request for '{uri}'..."); logger.Debug($"Sending HEAD request for '{uri}'...");
var request = new HttpRequestMessage(HttpMethod.Head, uri); var request = new HttpRequestMessage(HttpMethod.Head, uri);
var response = Execute(request); var response = Execute(request);
var isAvailable = response.IsSuccessStatusCode || IsUnauthorized(response);
isAvailable = response.IsSuccessStatusCode || IsUnauthorized(response);
logger.Debug($"Received response '{ToString(response)}'."); logger.Debug($"Received response '{ToString(response)}'.");
if (!isAvailable)
{
logger.Debug($"HEAD request was not successful, trying GET request for '{uri}'...");
request = new HttpRequestMessage(HttpMethod.Get, uri);
response = Execute(request);
isAvailable = response.IsSuccessStatusCode || IsUnauthorized(response);
logger.Debug($"Received response '{ToString(response)}'.");
}
return isAvailable;
} }
catch (Exception e) catch (Exception e)
{ {
logger.Error($"Failed to check availability of '{resource}'!", e); logger.Error($"Failed to check availability of '{resource}' via HEAD request!", e);
return false;
} }
if (!isAvailable)
{
try
{
logger.Debug($"HEAD request was not successful, trying GET request for '{uri}'...");
var request = new HttpRequestMessage(HttpMethod.Get, uri);
var response = Execute(request);
isAvailable = response.IsSuccessStatusCode || IsUnauthorized(response);
logger.Debug($"Received response '{ToString(response)}'.");
}
catch (Exception e)
{
logger.Error($"Failed to check availability of '{resource}' via GET request!", e);
}
}
return isAvailable;
} }
private bool IsUnauthorized(HttpResponseMessage response) private bool IsUnauthorized(HttpResponseMessage response)