aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2026-02-07 15:24:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ensuring that only tags that match release format raise notification

Browse Source 
Utilizing the same regex used on circleci
This commit is contained in:
rockstardev
2020-08-01 08:38:09 -05:00
parent c9d830f9ae
commit adefaf2fa8
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
BTCPayServer/HostedServices/NewVersionCheckerHostedService.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.Net.Http;
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
using BTCPayServer.Logging;
@@ -76,7 +77,7 @@ namespace BTCPayServer.HostedServices
Task<string> Fetch(CancellationToken cancellation);
}
public class GithubVersionFetcher : IVersionFetcher, IDisposable
public class GithubVersionFetcher : IVersionFetcher
{
private readonly HttpClient _httpClient;
public GithubVersionFetcher(IHttpClientFactory httpClientFactory)
@@ -86,11 +87,7 @@ namespace BTCPayServer.HostedServices
_httpClient.DefaultRequestHeaders.Add("User-Agent", "BTCPayServer/NewVersionChecker");
}
public void Dispose()
{
_httpClient.Dispose();
}
private static readonly Regex _releaseVersionTag = new Regex("^(v[1-9]+(\\.[0-9]+)*(-[0-9]+)?)$");
public async Task<string> Fetch(CancellationToken cancellation)
{
const string url = "https://api.github.com/repos/btcpayserver/btcpayserver/releases/latest";
@@ -99,9 +96,11 @@ namespace BTCPayServer.HostedServices
var strResp = await resp.Content.ReadAsStringAsync();
if (resp.IsSuccessStatusCode)
{
var jobj = new JObject(strResp);
var tag = jobj["name"].ToString();
return tag;
var jobj = JObject.Parse(strResp);
var tag = jobj["tag_name"].ToString();
var isReleaseVersionTag = _releaseVersionTag.IsMatch(tag);
return isReleaseVersionTag ? tag : null;
}
else
{