haeaeae/duplicati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6851 from duplicati/feature/fix-db-fail-errors

Browse Source 
Fixed a settings save bug
This commit is contained in:
Kenneth Skovhede
2026-04-21 15:49:07 +02:00
committed by GitHub
parent c54a278050 5d4a15aad0
commit e9696ffdbf
1 changed files with 100 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Duplicati/Library/RestAPI/Database/Connection.cs
+100 -80
View File
@@ -266,21 +266,26 @@ namespace Duplicati.Server.Database
lock (m_lock)
{
var tr = transaction ?? m_connection.BeginTransaction();
OverwriteAndUpdateDb(
tr,
cmd => cmd.SetCommandAndParameters(@"DELETE FROM ""Metadata"" WHERE ""BackupID"" = @Id")
.SetParameterValue("@Id", id),
values ?? new Dictionary<string, string>(),
cmd => cmd.SetCommandAndParameters(@"INSERT INTO ""Metadata"" (""BackupID"", ""Name"", ""Value"") VALUES (@BackupId, @Name, @Value)"),
(cmd, f) => cmd.SetParameterValue("@BackupId", id)
.SetParameterValue("@Name", f.Key)
.SetParameterValue("@Value", f.Value)
);
if (transaction == null)
try
{
tr.Commit();
tr.Dispose();
OverwriteAndUpdateDb(
tr,
cmd => cmd.SetCommandAndParameters(@"DELETE FROM ""Metadata"" WHERE ""BackupID"" = @Id")
.SetParameterValue("@Id", id),
values ?? new Dictionary<string, string>(),
cmd => cmd.SetCommandAndParameters(@"INSERT INTO ""Metadata"" (""BackupID"", ""Name"", ""Value"") VALUES (@BackupId, @Name, @Value)"),
(cmd, f) => cmd.SetParameterValue("@BackupId", id)
.SetParameterValue("@Name", f.Key)
.SetParameterValue("@Value", f.Value)
);
if (transaction == null)
tr.Commit();
}
finally
{
if (transaction == null)
tr.Dispose();
}
}
}
@@ -305,22 +310,27 @@ namespace Duplicati.Server.Database
lock (m_lock)
{
var tr = transaction ?? m_connection.BeginTransaction();
OverwriteAndUpdateDb(
tr,
cmd => cmd.SetCommandAndParameters(@"DELETE FROM ""Filter"" WHERE ""BackupID"" = @Id")
.SetParameterValue("@Id", id),
values,
cmd => cmd.SetCommandAndParameters(@"INSERT INTO ""Filter"" (""BackupID"", ""Order"", ""Include"", ""Expression"") VALUES (@Id, @Order, @Include, @Expression)"),
(cmd, f) => cmd.SetParameterValue("@Id", id)
.SetParameterValue("@Order", f.Order)
.SetParameterValue("@Include", f.Include)
.SetParameterValue("@Expression", f.Expression)
);
if (transaction == null)
try
{
tr.Commit();
tr.Dispose();
OverwriteAndUpdateDb(
tr,
cmd => cmd.SetCommandAndParameters(@"DELETE FROM ""Filter"" WHERE ""BackupID"" = @Id")
.SetParameterValue("@Id", id),
values,
cmd => cmd.SetCommandAndParameters(@"INSERT INTO ""Filter"" (""BackupID"", ""Order"", ""Include"", ""Expression"") VALUES (@Id, @Order, @Include, @Expression)"),
(cmd, f) => cmd.SetParameterValue("@Id", id)
.SetParameterValue("@Order", f.Order)
.SetParameterValue("@Include", f.Include)
.SetParameterValue("@Expression", f.Expression)
);
if (transaction == null)
tr.Commit();
}
finally
{
if (transaction == null)
tr.Dispose();
}
}
}
@@ -369,36 +379,41 @@ namespace Duplicati.Server.Database
lock (m_lock)
{
var tr = transaction ?? m_connection.BeginTransaction();
if (m_encryptSensitiveFields)
values = values.Select(x => new Setting
{
Filter = x.Filter,
Name = x.Name,
Value = EncryptSensitiveFields(x.Name, x.Value, m_key)
}).ToList();
OverwriteAndUpdateDb(
tr,
cmd => cmd.SetCommandAndParameters(@"DELETE FROM ""Option"" WHERE ""BackupID"" = @Id")
.SetParameterValue("@Id", id),
values,
cmd => cmd.SetCommandAndParameters(@"INSERT INTO ""Option"" (""BackupID"", ""Filter"", ""Name"", ""Value"") VALUES (@BackupId, @Filter, @Name, @Value)"),
(cmd, f) =>
{
if (IsPasswordPlaceholder(f.Value))
throw new Exception("Attempted to save a property with the placeholder password");
cmd.SetParameterValue("@BackupId", id)
.SetParameterValue("@Filter", f.Filter ?? "")
.SetParameterValue("@Name", f.Name ?? "")
.SetParameterValue("@Value", f.Value ?? "");
}
);
if (transaction == null)
try
{
tr.Commit();
tr.Dispose();
if (m_encryptSensitiveFields)
values = values.Select(x => new Setting
{
Filter = x.Filter,
Name = x.Name,
Value = EncryptSensitiveFields(x.Name, x.Value, m_key)
}).ToList();
OverwriteAndUpdateDb(
tr,
cmd => cmd.SetCommandAndParameters(@"DELETE FROM ""Option"" WHERE ""BackupID"" = @Id")
.SetParameterValue("@Id", id),
values,
cmd => cmd.SetCommandAndParameters(@"INSERT INTO ""Option"" (""BackupID"", ""Filter"", ""Name"", ""Value"") VALUES (@BackupId, @Filter, @Name, @Value)"),
(cmd, f) =>
{
if (IsPasswordPlaceholder(f.Value))
throw new Exception("Attempted to save a property with the placeholder password");
cmd.SetParameterValue("@BackupId", id)
.SetParameterValue("@Filter", f.Filter ?? "")
.SetParameterValue("@Name", f.Name ?? "")
.SetParameterValue("@Value", f.Value ?? "");
}
);
if (transaction == null)
tr.Commit();
}
finally
{
if (transaction == null)
tr.Dispose();
}
}
@@ -445,29 +460,34 @@ namespace Duplicati.Server.Database
lock (m_lock)
{
var tr = transaction ?? m_connection.BeginTransaction();
OverwriteAndUpdateDb(
tr,
cmd => cmd.SetCommandAndParameters(@"DELETE FROM ""Source"" WHERE ""BackupID"" = @Id")
.SetParameterValue("@Id", id),
values,
cmd => cmd.SetCommandAndParameters(@"INSERT INTO ""Source"" (""BackupID"", ""Path"") VALUES (@BackupId, @Path)"),
(cmd, f) =>
{
if (SourceMasking.IsSpecialSource(f) && UrlContainsPasswordPlaceholder(SourceMasking.ExtractUrl(f)))
throw new Exception("Attempted to save a source with a placeholder password");
cmd.SetParameterValue("@BackupId", id)
.SetParameterValue("@Path",
m_encryptSensitiveFields && SourceMasking.IsSpecialSource(f)
? EncryptedFieldHelper.Encrypt(f, m_key)
: f);
}
);
if (transaction == null)
try
{
tr.Commit();
tr.Dispose();
OverwriteAndUpdateDb(
tr,
cmd => cmd.SetCommandAndParameters(@"DELETE FROM ""Source"" WHERE ""BackupID"" = @Id")
.SetParameterValue("@Id", id),
values,
cmd => cmd.SetCommandAndParameters(@"INSERT INTO ""Source"" (""BackupID"", ""Path"") VALUES (@BackupId, @Path)"),
(cmd, f) =>
{
if (SourceMasking.IsSpecialSource(f) && UrlContainsPasswordPlaceholder(SourceMasking.ExtractUrl(f)))
throw new Exception("Attempted to save a source with a placeholder password");
cmd.SetParameterValue("@BackupId", id)
.SetParameterValue("@Path",
m_encryptSensitiveFields && SourceMasking.IsSpecialSource(f)
? EncryptedFieldHelper.Encrypt(f, m_key)
: f);
}
);
if (transaction == null)
tr.Commit();
}
finally
{
if (transaction == null)
tr.Dispose();
}
}
}