github-mirrors/radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr.git synced 2025-04-24 14:37:07 -04:00
Code Issues Projects Releases Packages Wiki Activity

API key improvements

Browse source 
Fixed: Special characters in API key
New: Add heathcheck for API Key

(cherry picked from commit 9325140b90f8ac625ae5b26075748c22f6f06158)
This commit is contained in:
Bogdan 2023-05-08 06:56:26 +03:00
parent d021517f4b
commit e0389ca08c
4 changed files with 39 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
frontend/src/Calendar/iCal/CalendarLinkModalContent.js
View file

@ -36,7 +36,7 @@ function getUrls(state) {
icalUrl += `tags=${tags.toString()}&`;
}
icalUrl += `apikey=${window.Radarr.apiKey}`;
icalUrl += `apikey=${encodeURIComponent(window.Radarr.apiKey)}`;
const iCalHttpUrl = `${window.location.protocol}//${icalUrl}`;
const iCalWebCalUrl = `webcal://${icalUrl}`;

4
frontend/src/Components/SignalRConnector.js
View file

@ -61,7 +61,7 @@ function Logger(minimumLogLevel) {
}
Logger.prototype.cleanse = function(message) {
const apikey = new RegExp(`access_token=${window.Radarr.apiKey}`, 'g');
const apikey = new RegExp(`access_token=${encodeURIComponent(window.Radarr.apiKey)}`, 'g');
return message.replace(apikey, 'access_token=(removed)');
};
@ -105,7 +105,7 @@ class SignalRConnector extends Component {
this.connection = new signalR.HubConnectionBuilder()
.configureLogging(new Logger(signalR.LogLevel.Information))
.withUrl(`${url}?access_token=${window.Radarr.apiKey}`)
.withUrl(`${url}?access_token=${encodeURIComponent(window.Radarr.apiKey)}`)
.withAutomaticReconnect({
nextRetryDelayInMilliseconds: (retryContext) => {
if (retryContext.elapsedMilliseconds > 180000) {

35
src/NzbDrone.Core/HealthCheck/Checks/ApiKeyValidationCheck.cs Normal file
View file

@ -0,0 +1,35 @@
using NLog;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Configuration.Events;
using NzbDrone.Core.Lifecycle;
using NzbDrone.Core.Localization;
namespace NzbDrone.Core.HealthCheck.Checks
{
[CheckOn(typeof(ApplicationStartedEvent))]
[CheckOn(typeof(ConfigSavedEvent))]
public class ApiKeyValidationCheck : HealthCheckBase
{
private readonly IConfigFileProvider _configFileProvider;
private readonly Logger _logger;
public ApiKeyValidationCheck(IConfigFileProvider configFileProvider, ILocalizationService localizationService, Logger logger)
: base(localizationService)
{
_configFileProvider = configFileProvider;
_logger = logger;
}
public override HealthCheck Check()
{
if (_configFileProvider.ApiKey.Length < 20)
{
_logger.Warn("Please update your API key to be at least 20 characters long. You can do this via settings or the config file");
return new HealthCheck(GetType(), HealthCheckResult.Warning, _localizationService.GetLocalizedString("ApiKeyValidationHealthCheckMessage"), "#invalid-api-key");
}
return new HealthCheck(GetType());
}
}
}

1
src/NzbDrone.Core/Localization/Core/en.json
View file

@ -48,6 +48,7 @@
"Announced": "Announced",
"AnnouncedMsg": "Movie is announced",
"ApiKey": "API Key",
"ApiKeyValidationHealthCheckMessage": "Please update your API key to be at least 20 characters long. You can do this via settings or the config file",
"AppDataDirectory": "AppData directory",
"AppDataLocationHealthCheckMessage": "Updating will not be possible to prevent deleting AppData on Update",
"ApplicationURL": "Application URL",