github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-08-21 05:53:33 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed: Report certificate validation failures when configuring Plex Media Server connection

Browse source 
Closes #2520

(cherry picked from commit ec62884649f7af5f0a29346741754590e6de99ce)
This commit is contained in:
Mark McDowall 2021-12-06 20:15:35 -08:00 • committed by Qstick
commit fc4170d9dc
2 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/NzbDrone.Core/Notifications/Plex/Server/PlexServerProxy.cs
View file

@ -195,7 +195,12 @@ namespace NzbDrone.Core.Notifications.Plex.Server
} }
catch (WebException ex) catch (WebException ex)
{ {
throw new PlexException("Unable to connect to Plex Media Server", ex); if (ex.Status == WebExceptionStatus.TrustFailure)
{
throw new PlexException("Unable to connect to Plex Media Server, certificate validation failed.", ex);
}
throw new PlexException($"Unable to connect to Plex Media Server, {ex.Message}", ex);
} }
return response.Content; return response.Content;

15
src/NzbDrone.Core/Notifications/Plex/Server/PlexServerService.cs
View file

@ -8,6 +8,7 @@ using NLog;
using NzbDrone.Common.Cache; using NzbDrone.Common.Cache;
using NzbDrone.Common.Extensions; using NzbDrone.Common.Extensions;
using NzbDrone.Core.Music; using NzbDrone.Core.Music;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Notifications.Plex.Server namespace NzbDrone.Core.Notifications.Plex.Server
{ {
@ -192,13 +193,21 @@ namespace NzbDrone.Core.Notifications.Plex.Server
} }
catch (PlexAuthenticationException ex) catch (PlexAuthenticationException ex)
{ {
_logger.Error(ex, "Unable to connect to Plex Server"); _logger.Error(ex, "Unable to connect to Plex Media Server");
return new ValidationFailure("AuthToken", "Invalid authentication token"); return new ValidationFailure("AuthToken", "Invalid authentication token");
} }
catch (PlexException ex)
{
return new NzbDroneValidationFailure("Host", ex.Message);
}
catch (Exception ex) catch (Exception ex)
{ {
_logger.Error(ex, "Unable to connect to Plex Server"); _logger.Error(ex, "Unable to connect to Plex Media Server");
return new ValidationFailure("Host", "Unable to connect to Plex Server");
return new NzbDroneValidationFailure("Host", "Unable to connect to Plex Media Server")
{
DetailedDescription = ex.Message
};
} }
return null; return null;