Compare commits

..

4 Commits

Author SHA1 Message Date
max
b8d2573d78 [CHANGE] Fixes library db 2025-09-28 18:59:39 +02:00
max
a2a420d596 [CHANGE] Small optimizations 2025-09-28 18:34:45 +02:00
max
c170b8db1f [CHANGE] Added cookie rotation with state. Updated cookie table 2025-09-28 18:05:52 +02:00
max
abc1505b6e [CHANGE] Cookie import by netscape cookie txt format 2025-09-28 17:47:34 +02:00
9 changed files with 167 additions and 112 deletions

View File

@@ -27,44 +27,66 @@
<MudStack Row Spacing="2" Style="height: 100%">
<MudPaper Elevation="0" Outlined Class="pa-2" Style="width: 50%;">
<MudText>Import cookies</MudText>
<MudText Typo="Typo.caption">@($"{ImportCookies.Count} cookie(s) imported")</MudText>
<MudForm @bind-IsValid="@_cookieImportTextValid">
<MudTextField @bind-Value="@_cookieDomain" Immediate Required Label="Domain"
RequiredError="Domain is required."/>
<MudText>Import cookies (Netscape Cookie format)</MudText>
<MudStack Spacing="2">
<MudStack Row Spacing="2">
<MudFileUpload T="IBrowserFile" Accept=".txt" FilesChanged="UploadFiles">
<ActivatorContent>
<MudButton Variant="Variant.Filled"
Color="Color.Primary"
StartIcon="@Icons.Material.Filled.CloudUpload">
Upload cookie txt
</MudButton>
</ActivatorContent>
</MudFileUpload>
<MudButton Variant="Variant.Outlined"
OnClick="ParseCookies" Disabled="@(string.IsNullOrWhiteSpace(_cookieText))">Import
</MudButton>
</MudStack>
@if (MissingCookies.Any())
{
<MudPaper Class="pa-2" Elevation="0" Outlined>
<MudAlert Severity="Severity.Warning" Square Class="mb-2 mt-3">Some required cookies are not found, add the following cookie(s) to continue.</MudAlert>
<MudChipSet T="string" ReadOnly>
@foreach (var missingCookieName in MissingCookies)
{
<MudChip Variant="Variant.Text" Color="Color.Info">@missingCookieName</MudChip>
}
</MudChipSet>
</MudPaper>
}
<MudTextField Class="my-2" Lines="4" AutoGrow @bind-Value="@_cookieText" Immediate
Required Label="Cookies" Variant="Variant.Outlined"
Placeholder="EXAMPLE: Cookie1=Value1; Cookie2=Value2;"
Validation="@(new Func<string, string?>(ValidateCookieText))"/>
<MudButton Variant="Variant.Outlined" Disabled="@(!_cookieImportTextValid)"
OnClick="ParseCookies">Import
</MudButton>
</MudForm>
Required Label="Cookies" Variant="Variant.Outlined"/>
</MudStack>
</MudPaper>
<MudDataGrid Items="ImportCookies" Dense Elevation="0" Outlined Style="width: 50%;">
<Header>
<MudStack Class="ma-2">
<MudText>Cookies</MudText>
</MudStack>
</Header>
<ToolBarContent>
<MudText>Cookies</MudText>
<MudSpacer />
<MudText Typo="Typo.caption">@($"{ImportCookies.Count} cookie(s)")</MudText>
</ToolBarContent>
<Columns>
<TemplateColumn Title="Name">
<CellTemplate>
<MudTextField Variant="Variant.Text" @bind-Value="@context.Item.Name"
Immediate/>
<MudText>@context.Item.Name</MudText>
</CellTemplate>
</TemplateColumn>
<TemplateColumn Title="Domain">
<CellTemplate>
<MudTextField Variant="Variant.Text" @bind-Value="@context.Item.Domain"
Immediate/>
<MudText>@context.Item.Domain</MudText>
</CellTemplate>
</TemplateColumn>
<TemplateColumn Title="Expires">
<CellTemplate>
<MudText>@context.Item.Expires</MudText>
</CellTemplate>
</TemplateColumn>
<TemplateColumn Title="Value">
<CellTemplate>
<MudTextField Variant="Variant.Text" @bind-Value="@context.Item.Value"
Immediate/>
<MudTooltip Text="@context.Item.Value">
<MudText Style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis; max-width: 250px;">@context.Item.Value</MudText>
</MudTooltip>
</CellTemplate>
</TemplateColumn>
</Columns>

View File

@@ -1,7 +1,12 @@
using System.Net;
using System.Net.Mime;
using System.Text;
using Manager.App.Models.Library;
using Manager.YouTube;
using Manager.YouTube.Constants;
using Manager.YouTube.Parsers;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Forms;
using MudBlazor;
namespace Manager.App.Components.Dialogs
@@ -12,12 +17,11 @@ namespace Manager.App.Components.Dialogs
[Parameter] public string DefaultUserAgent { get; set; } = "";
private ClientChannel? ClientChannel { get; set; }
private CookieCollection ImportCookies { get; set; } = [];
private IEnumerable<string> MissingCookies => CookieConstants.RequiredCookiesNames.Where(req => !ImportCookies.Select(c => c.Name).ToHashSet().Contains(req)).ToList();
private bool _isLoading;
private AccountImportSteps _steps = AccountImportSteps.Authenticate;
private bool _cookieImportTextValid;
private string _cookieText = "";
private string _cookieDomain = ".youtube.com";
private bool CanSave()
{
@@ -70,13 +74,40 @@ namespace Manager.App.Components.Dialogs
}
await InvokeAsync(StateHasChanged);
}
private void ParseCookies()
private async Task UploadFiles(IBrowserFile? file)
{
if (file == null)
{
SnackbarService.Add("File is null!", Severity.Error);
return;
}
if (file.ContentType != MediaTypeNames.Text.Plain)
{
SnackbarService.Add($"File uploaded with unsupported content type: {file.ContentType}", Severity.Warning);
return;
}
_isLoading = true;
var streamReader = new StreamReader(file.OpenReadStream(), Encoding.UTF8);
_cookieText = await streamReader.ReadToEndAsync();
_isLoading = false;
await InvokeAsync(StateHasChanged);
}
private async Task ParseCookies()
{
if (string.IsNullOrEmpty(_cookieText))
{
return;
}
try
{
ImportCookies.Clear();
ImportCookies.Add(ParseCookieHeader(_cookieText, _cookieDomain));
var parsedCookies = await CookieTxtParser.ParseAsync(new MemoryStream(Encoding.UTF8.GetBytes(_cookieText)), CookieConstants.RequiredCookiesNames.ToHashSet());
ImportCookies.Add(parsedCookies);
_cookieText = string.Empty;
}
catch (Exception e)
@@ -94,50 +125,6 @@ namespace Manager.App.Components.Dialogs
_steps = AccountImportSteps.Authenticate;
StateHasChanged();
}
private static string? ValidateCookieText(string text)
{
if (string.IsNullOrWhiteSpace(text))
return "Cookies are required";
var pairs = text.Split(';', StringSplitOptions.RemoveEmptyEntries);
foreach (var pair in pairs)
{
if (!pair.Contains('=')) return "Invalid.";
var key = pair[..pair.IndexOf('=')].Trim();
if (string.IsNullOrEmpty(key)) return "Invalid.";
}
return null;
}
public static CookieCollection ParseCookieHeader(string cookieHeader, string domain = "")
{
var collection = new CookieCollection();
if (string.IsNullOrWhiteSpace(cookieHeader))
return collection;
var cookies = cookieHeader.Split(';', StringSplitOptions.RemoveEmptyEntries);
foreach (var cookieStr in cookies)
{
var parts = cookieStr.Split('=', 2);
if (parts.Length != 2) continue;
var name = parts[0].Trim();
var value = parts[1].Trim();
var cookie = new Cookie(name, value)
{
Path = "/",
Domain = domain
};
collection.Add(cookie);
}
return collection;
}
private async Task BuildClient()
{

View File

@@ -8,7 +8,6 @@ namespace Manager.App.Services;
public interface ILibraryService
{
public Task<Result> FetchChannelImagesAsync(InnertubeChannel innertubeChannel);
public Task<Result> SaveClientAsync(ClientAccountEntity client, CancellationToken cancellationToken = default);
public Task<Result<LibraryFile>> GetFileByIdAsync(Guid id, CancellationToken cancellationToken = default);
public Task<Result<ChannelEntity>> GetChannelByIdAsync(string id, CancellationToken cancellationToken = default);

View File

@@ -32,31 +32,6 @@ public class LibraryService : ILibraryService
Directory.CreateDirectory(Path.Combine(_librarySettings.Path, LibraryConstants.Directories.SubDirMedia));
Directory.CreateDirectory(Path.Combine(_librarySettings.Path, LibraryConstants.Directories.SubDirChannels));
}
public async Task<Result> FetchChannelImagesAsync(InnertubeChannel innertubeChannel)
{
try
{
await using var context = await _dbContextFactory.CreateDbContextAsync();
await AddWebImagesAsync(context, innertubeChannel.AvatarImages, innertubeChannel.Id, "avatars", LibraryConstants.FileTypes.ChannelAvatar, LibraryConstants.Directories.SubDirChannels);
await AddWebImagesAsync(context, innertubeChannel.BannerImages, innertubeChannel.Id, "banners", LibraryConstants.FileTypes.ChannelBanner, LibraryConstants.Directories.SubDirChannels);
if (!context.ChangeTracker.HasChanges())
{
_logger.LogInformation("No changes detected. Skipping.");
return Result.Success();
}
await context.SaveChangesAsync();
}
catch (Exception e)
{
return HandleException(e);
}
return Result.Success();
}
private async Task AddWebImagesAsync(LibraryDbContext context, List<WebImage> images, string foreignKey, string libSubDir, string fileType, string subDir)
{
@@ -191,13 +166,7 @@ public class LibraryService : ILibraryService
public async Task<Result> SaveChannelAsync(InnertubeChannel innertubeChannel, CancellationToken cancellationToken = default)
{
try
{
var imagesResult = await FetchChannelImagesAsync(innertubeChannel);
if (!imagesResult.IsSuccess)
{
return ResultError.Fail("Failed to fetch channel images!");
}
{
await using var context = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
var channelResult = await GetChannelByIdAsync(innertubeChannel.Id, cancellationToken);
@@ -228,7 +197,7 @@ public class LibraryService : ILibraryService
return ResultError.Error(e);
}
if (context.Channels.Any(c => c.Id == innertubeChannel.Id))
if (channelResult.IsSuccess)
{
context.Channels.Update(channelEntity);
}
@@ -237,6 +206,9 @@ public class LibraryService : ILibraryService
context.Channels.Add(channelEntity);
}
await AddWebImagesAsync(context, innertubeChannel.AvatarImages, innertubeChannel.Id, "avatars", LibraryConstants.FileTypes.ChannelAvatar, LibraryConstants.Directories.SubDirChannels);
await AddWebImagesAsync(context, innertubeChannel.BannerImages, innertubeChannel.Id, "banners", LibraryConstants.FileTypes.ChannelBanner, LibraryConstants.Directories.SubDirChannels);
var changed = await context.SaveChangesAsync(cancellationToken);
return changed <= 0 ? ResultError.Fail("Failed to save channel!") : Result.Success();
}

View File

@@ -107,7 +107,7 @@ public class ClientService(IServiceScopeFactory scopeFactory, ILogger<ClientServ
}
List<HttpCookieEntity> httpCookies = [];
httpCookies.AddRange(client.CookieContainer.GetAllCookies()
httpCookies.AddRange(client.CookieContainer.GetAllCookies().Where(c => c.Expires != DateTime.MinValue)
.ToList()
.Select(cookie => new HttpCookieEntity
{

View File

@@ -56,7 +56,7 @@ public class AuditInterceptor : SaveChangesInterceptor
break;
case EntityState.Modified:
audits.AddRange(allowedProperties
.Where(p => p.IsModified)
.Where(p => p.IsModified && !Equals(p.OriginalValue, p.CurrentValue))
.Select(p => CreateAudit(entry, p, entry.State, primaryKey))
);
break;
@@ -82,7 +82,7 @@ public class AuditInterceptor : SaveChangesInterceptor
EntityName = entry.Entity.GetType().Name,
EntityId = primaryKey ?? "Unknown",
PropertyName = prop.Metadata.Name,
OldValue = SerializeValue(prop.OriginalValue),
OldValue = changeType == EntityState.Added ? null : SerializeValue(prop.OriginalValue),
NewValue = SerializeValue(prop.CurrentValue),
ModifiedUtc = DateTime.UtcNow,
ChangedBy = "SYSTEM",

View File

@@ -0,0 +1,22 @@
namespace Manager.YouTube.Constants;
public static class CookieConstants
{
public static readonly IReadOnlyCollection<string> RequiredCookiesNames = new HashSet<string>
{
"SID",
"SIDCC",
"HSID",
"SSID",
"APISID",
"SAPISID",
"__Secure-1PAPISID",
"__Secure-1PSID",
"__Secure-1PSIDCC",
"__Secure-1PSIDTS",
"__Secure-3PAPISID",
"__Secure-3PSID",
"__Secure-3PSIDCC",
"__Secure-3PSIDTS"
};
}

View File

@@ -0,0 +1,53 @@
using System.Net;
namespace Manager.YouTube.Parsers;
public static class CookieTxtParser
{
public static async Task<CookieCollection> ParseAsync(Stream stream, HashSet<string>? allowedCookies = null)
{
var cookieCollection = new CookieCollection();
using var reader = new StreamReader(stream);
while (await reader.ReadLineAsync() is { } line)
{
if (string.IsNullOrWhiteSpace(line) || line.StartsWith('#'))
{
continue;
}
var lineParts = line.Split('\t');
if (lineParts.Length < 7)
{
continue;
}
var domain = lineParts[0];
//var includeSubdomains = lineParts[1].Equals("TRUE", StringComparison.OrdinalIgnoreCase);
var path = lineParts[2];
var secure = lineParts[3].Equals("TRUE", StringComparison.OrdinalIgnoreCase);
var unixExpiry = long.TryParse(lineParts[4], out var exp) ? exp : 0;
var name = lineParts[5];
var value = lineParts[6];
if (!allowedCookies?.Contains(name) ?? false)
{
continue;
}
var cookie = new Cookie(name, value, path, domain)
{
Secure = secure
};
if (unixExpiry is > 0 and < int.MaxValue)
{
cookie.Expires = DateTimeOffset.FromUnixTimeSeconds(unixExpiry).DateTime;
}
cookieCollection.Add(cookie);
}
return cookieCollection;
}
}

View File

@@ -140,15 +140,15 @@ public sealed class YouTubeClient : IDisposable
return ResultError.Error(e, "Error while parsing JSON!");
}
if (State == null)
{
return ResultError.Fail("Unable to parse client state!");
}
State.IsPremiumUser = clientStateResult.Value.Item2;
return Result.Success();
var cookieRotationResult = await RotateCookiesPageAsync();
return !cookieRotationResult.IsSuccess ? cookieRotationResult : Result.Success();
}
public async Task<Result<InnertubeChannel>> GetChannelByIdAsync(string channelId)