mirror of
https://github.com/streetwriters/notesnook-sync-server.git
synced 2026-02-12 19:22:45 +00:00
monograph: fix json content serialized as html
This commit is contained in:
@@ -330,32 +330,47 @@ namespace Notesnook.API.Controllers
|
||||
|
||||
private async Task<string> CleanupContentAsync(string content)
|
||||
{
|
||||
if (!Constants.IS_SELF_HOSTED && !ProUserRequirement.IsUserPro(User))
|
||||
try
|
||||
{
|
||||
var config = Configuration.Default.WithDefaultLoader();
|
||||
var context = BrowsingContext.New(config);
|
||||
var document = await context.OpenAsync(r => r.Content(content));
|
||||
foreach (var element in document.QuerySelectorAll("a,iframe,img,object,svg,button,link"))
|
||||
var json = JsonSerializer.Deserialize<MonographContent>(content);
|
||||
var html = json.Data;
|
||||
if (!Constants.IS_SELF_HOSTED && !ProUserRequirement.IsUserPro(User))
|
||||
{
|
||||
element.Remove();
|
||||
var config = Configuration.Default.WithDefaultLoader();
|
||||
var context = BrowsingContext.New(config);
|
||||
var document = await context.OpenAsync(r => r.Content(html));
|
||||
foreach (var element in document.QuerySelectorAll("a,iframe,img,object,svg,button,link"))
|
||||
{
|
||||
element.Remove();
|
||||
}
|
||||
html = document.ToHtml();
|
||||
}
|
||||
return document.ToHtml();
|
||||
}
|
||||
|
||||
if (ProUserRequirement.IsUserPro(User))
|
||||
{
|
||||
var config = Configuration.Default.WithDefaultLoader();
|
||||
var context = BrowsingContext.New(config);
|
||||
var document = await context.OpenAsync(r => r.Content(content));
|
||||
foreach (var element in document.QuerySelectorAll("a"))
|
||||
if (ProUserRequirement.IsUserPro(User))
|
||||
{
|
||||
var href = element.GetAttribute("href");
|
||||
if (string.IsNullOrEmpty(href)) continue;
|
||||
if (!await urlAnalyzer.IsURLSafeAsync(href)) element.RemoveAttribute("href");
|
||||
var config = Configuration.Default.WithDefaultLoader();
|
||||
var context = BrowsingContext.New(config);
|
||||
var document = await context.OpenAsync(r => r.Content(html));
|
||||
foreach (var element in document.QuerySelectorAll("a"))
|
||||
{
|
||||
var href = element.GetAttribute("href");
|
||||
if (string.IsNullOrEmpty(href)) continue;
|
||||
if (!await urlAnalyzer.IsURLSafeAsync(href)) element.RemoveAttribute("href");
|
||||
}
|
||||
html = document.ToHtml();
|
||||
}
|
||||
return document.ToHtml();
|
||||
|
||||
return JsonSerializer.Serialize<MonographContent>(new MonographContent
|
||||
{
|
||||
Type = json.Type,
|
||||
Data = html
|
||||
});
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
await Slogger<MonographsController>.Error("CleanupContentAsync", ex.ToString());
|
||||
return content;
|
||||
}
|
||||
return content;
|
||||
}
|
||||
}
|
||||
}
|
||||
35
Notesnook.API/Models/MonographContent.cs
Normal file
35
Notesnook.API/Models/MonographContent.cs
Normal file
@@ -0,0 +1,35 @@
|
||||
/*
|
||||
This file is part of the Notesnook Sync Server project (https://notesnook.com/)
|
||||
|
||||
Copyright (C) 2023 Streetwriters (Private) Limited
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the Affero GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
Affero GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the Affero GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
using System.Text.Json.Serialization;
|
||||
using MongoDB.Bson;
|
||||
using MongoDB.Bson.Serialization.Attributes;
|
||||
using System.Runtime.Serialization;
|
||||
|
||||
namespace Notesnook.API.Models
|
||||
{
|
||||
|
||||
public class MonographContent
|
||||
{
|
||||
[JsonPropertyName("data")]
|
||||
public string Data { get; set; }
|
||||
[JsonPropertyName("type")]
|
||||
public string Type { get; set; }
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user