Added Support for multiple Account

This commit is contained in:
Elias Stepanik 2023-03-15 13:27:24 +01:00
parent afb99636bc
commit f329be004c
4 changed files with 93 additions and 59 deletions

View File

@ -0,0 +1,13 @@
namespace DDNSUpdater.Models;
public class Domain
{
public Domain(string domain, string key)
{
DomainString = domain;
Key = key;
}
public string DomainString { get; set; }
public string Key { get; set; }
}

View File

@ -1,5 +1,7 @@
using System.Net; using System.Collections;
using System.Net;
using DDNSUpdater.Interfaces; using DDNSUpdater.Interfaces;
using DDNSUpdater.Models;
using DDNSUpdater.Models.Requests; using DDNSUpdater.Models.Requests;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
@ -11,28 +13,28 @@ namespace DDNSUpdater.Services;
public class DDNSService : IDDNSService public class DDNSService : IDDNSService
{ {
private string UpdateURL { get; set; } private List<string> UpdateURLs { get; set; }
public string APIKey { get; set; } public List<Domain> Domains { get; set; }
public List<string> Domains { get; set; }
private readonly ILogger<DDNSService> _logger; private readonly ILogger<DDNSService> _logger;
public DDNSService(ILogger<DDNSService> logger,IConfiguration configuration) public DDNSService(ILogger<DDNSService> logger,IConfiguration configuration)
{ {
_logger = logger; _logger = logger;
APIKey = configuration.GetValue<string>("APIKey");
if(Environment.GetEnvironmentVariable("API_Key") != "")
APIKey = Environment.GetEnvironmentVariable("API_Key");
logger.LogDebug($"Got the Following Key: {APIKey}"); foreach (DictionaryEntry de in Environment.GetEnvironmentVariables())
Domains = configuration.GetSection("Domains").Get<List<string>>();
if (Environment.GetEnvironmentVariable("DOMAINS") != "")
{ {
var domainsRaw = Environment.GetEnvironmentVariable("DOMAINS"); if (de.Key.ToString().Contains("DOMAIN"))
var domains = new List<string>(); {
domains = domainsRaw.Split(",").ToList(); var key = de.Value.ToString().Split("-").ToList();
domains.ForEach(x=>x.Replace(",",""));
Domains = domains; key.ForEach(x=>x.Replace("-",""));
var env = de.Value.ToString().Split(";").ToList();
Domains[int.Parse(key[1])] = new Domain(env[0],env[1]);
}
} }
@ -41,11 +43,13 @@ public class DDNSService : IDDNSService
public async void Start() public async void Start()
{ {
UpdateURL = await GetUpdateURL(); UpdateURLs = await GetUpdateURLs();
_logger.LogInformation("Got new Update URL: " + UpdateURL); _logger.LogInformation("Got new Update URLs: " + UpdateURLs);
} }
public async void Update() public async void Update()
{
foreach (var UpdateURL in UpdateURLs)
{ {
var client = new RestClient(UpdateURL); var client = new RestClient(UpdateURL);
var request = new RestRequest("",Method.Get); var request = new RestRequest("",Method.Get);
@ -63,19 +67,35 @@ public class DDNSService : IDDNSService
_logger.LogError(e.Message); _logger.LogError(e.Message);
throw; throw;
} }
}
} }
public async void SetUpdateURL() public async void SetUpdateURL()
{ {
UpdateURL = await GetUpdateURL(); UpdateURLs = await GetUpdateURLs();
} }
private async Task<string> GetUpdateURL() private async Task<List<string>> GetUpdateURLs()
{
List<string> updateURLs = new List<string>();
Dictionary<string, List<string>> domainDict = new Dictionary<string, List<string>>();
foreach (var domain in Domains)
{
if (!domainDict.ContainsKey(domain.Key))
{
domainDict.Add(domain.Key, new List<string>());
}
domainDict[domain.Key].Add(domain.DomainString);
}
foreach (var domainList in domainDict)
{ {
var dyndns = new DynamicDns() var dyndns = new DynamicDns()
{ {
Domains = Domains, Domains = domainList.Value,
Description = "My DynamicDns" Description = "My DynamicDns"
}; };
var content = JsonConvert.SerializeObject(dyndns); var content = JsonConvert.SerializeObject(dyndns);
@ -83,7 +103,7 @@ public class DDNSService : IDDNSService
var request = new RestRequest("/dyndns", Method.Post); var request = new RestRequest("/dyndns", Method.Post);
request.AddHeader("X-API-Key", APIKey); request.AddHeader("X-API-Key", domainList.Key);
request.AddStringBody(content, ContentType.Json); request.AddStringBody(content, ContentType.Json);
@ -91,12 +111,15 @@ public class DDNSService : IDDNSService
try try
{ {
var response = client.ExecutePost<DynamicDnsResponse>(request); var response = client.ExecutePost<DynamicDnsResponse>(request);
return response.Data.UpdateUrl; updateURLs.Add(response.Data.UpdateUrl);
} }
catch (Exception error) catch (Exception error)
{ {
_logger.LogError(error.Message); _logger.LogError(error.Message);
return ""; return null;
} }
} }
return updateURLs;
}
} }

View File

@ -15,6 +15,4 @@ RUN dotnet publish "DDNSUpdater.csproj" -c Release -o /app/publish
FROM base AS final FROM base AS final
WORKDIR /app WORKDIR /app
COPY --from=publish /app/publish . COPY --from=publish /app/publish .
ENV API_Key=default
ENV DOMAINS=default
ENTRYPOINT ["dotnet", "DDNSUpdater.dll"] ENTRYPOINT ["dotnet", "DDNSUpdater.dll"]

View File

@ -7,5 +7,5 @@ services:
tty: true tty: true
stdin_open: true stdin_open: true
environment: environment:
APIKey: "" Domains_0: "*.test.de;Key"
Domains_0: "*.test.de" Domains_1: "*.test.de;Key"