themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fix mysql & sqlite ban manager migration during init

Browse source 
Tested with existing bans in both sqlite & mysql environments.
This is in addition to the syntax fix from earlier.
This commit is contained in:
Luke 2021-04-11 21:18:37 +10:00
parent 81b6872d6e
commit d0ce5746ea
1 changed files with 55 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

75
TShockAPI/DB/BanManager.cs
View file

@ -37,18 +37,7 @@ namespace TShockAPI.DB
/// <summary> /// <summary>
/// Readonly dictionary of Bans, keyed on ban ticket number. /// Readonly dictionary of Bans, keyed on ban ticket number.
/// </summary> /// </summary>
public ReadOnlyDictionary<int, Ban> Bans public ReadOnlyDictionary<int, Ban> Bans => new ReadOnlyDictionary<int, Ban>(_bans);
{
get
{
if (_bans == null)
{
_bans = RetrieveAllBans().ToDictionary(b => b.TicketNumber);
}
return new ReadOnlyDictionary<int, Ban>(_bans);
}
}
/// <summary> /// <summary>
/// Event invoked when a ban is checked for validity /// Event invoked when a ban is checked for validity
@ -93,12 +82,24 @@ namespace TShockAPI.DB
throw new Exception("Could not find a database library (probably Sqlite3.dll)"); throw new Exception("Could not find a database library (probably Sqlite3.dll)");
} }
EnsureBansCollection();
TryConvertBans(); TryConvertBans();
OnBanValidate += BanValidateCheck; OnBanValidate += BanValidateCheck;
OnBanPreAdd += BanAddedCheck; OnBanPreAdd += BanAddedCheck;
} }
/// <summary>
/// Ensures the <see cref="_bans"/> collection is ready to use.
/// </summary>
private void EnsureBansCollection()
{
if (_bans == null)
{
_bans = RetrieveAllBans().ToDictionary(b => b.TicketNumber);
}
}
/// <summary> /// <summary>
/// Converts bans from the old ban system to the new. /// Converts bans from the old ban system to the new.
/// </summary> /// </summary>
@ -116,6 +117,7 @@ namespace TShockAPI.DB
if (res != 0) if (res != 0)
{ {
var bans = new List<BanPreAddEventArgs>();
using (var reader = database.QueryReader("SELECT * FROM Bans")) using (var reader = database.QueryReader("SELECT * FROM Bans"))
{ {
while (reader.Read()) while (reader.Read())
@ -140,22 +142,46 @@ namespace TShockAPI.DB
if (!string.IsNullOrWhiteSpace(ip)) if (!string.IsNullOrWhiteSpace(ip))
{ {
InsertBan($"{Identifier.IP}{ip}", reason, banningUser, start, end); bans.Add(new BanPreAddEventArgs
{
Identifier = $"{Identifier.IP}{ip}",
Reason = reason,
BanningUser = banningUser,
BanDateTime = start,
ExpirationDateTime = end
});
} }
if (!string.IsNullOrWhiteSpace(account)) if (!string.IsNullOrWhiteSpace(account))
{ {
InsertBan($"{Identifier.Account}{account}", reason, banningUser, start, end); bans.Add(new BanPreAddEventArgs
{
Identifier = $"{Identifier.Account}{account}",
Reason = reason,
BanningUser = banningUser,
BanDateTime = start,
ExpirationDateTime = end
});
} }
if (!string.IsNullOrWhiteSpace(uuid)) if (!string.IsNullOrWhiteSpace(uuid))
{ {
InsertBan($"{Identifier.UUID}{uuid}", reason, banningUser, start, end); bans.Add(new BanPreAddEventArgs
{
Identifier = $"{Identifier.UUID}{uuid}",
Reason = reason,
BanningUser = banningUser,
BanDateTime = start,
ExpirationDateTime = end
});
} }
} }
} }
database.Query("DROP TABLE 'Bans'"); foreach (var ban in bans)
InsertBan(ban);
database.Query("DROP TABLE Bans");
} }
} }
@ -232,7 +258,7 @@ namespace TShockAPI.DB
args.Message = args.Valid ? null : "a current ban for this identifier already exists."; args.Message = args.Valid ? null : "a current ban for this identifier already exists.";
} }
} }
/// <summary> /// <summary>
/// Adds a new ban for the given identifier. Returns a Ban object if the ban was added, else null /// Adds a new ban for the given identifier. Returns a Ban object if the ban was added, else null
/// </summary> /// </summary>
@ -252,7 +278,16 @@ namespace TShockAPI.DB
BanDateTime = fromDate, BanDateTime = fromDate,
ExpirationDateTime = toDate ExpirationDateTime = toDate
}; };
return InsertBan(args);
}
/// <summary>
/// Adds a new ban for the given data. Returns a Ban object if the ban was added, else null
/// </summary>
/// <param name="args">A predefined instance of <see cref="BanPreAddEventArgs"/></param>
/// <returns></returns>
public AddBanResult InsertBan(BanPreAddEventArgs args)
{
OnBanPreAdd?.Invoke(this, args); OnBanPreAdd?.Invoke(this, args);
if (!args.Valid) if (!args.Valid)
@ -265,21 +300,21 @@ namespace TShockAPI.DB
if (database.GetSqlType() == SqlType.Mysql) if (database.GetSqlType() == SqlType.Mysql)
{ {
query += "SELECT CAST(LAST_INSERT_ID() as INT);"; query += "SELECT LAST_INSERT_ID();";
} }
else else
{ {
query += "SELECT CAST(last_insert_rowid() as INT);"; query += "SELECT CAST(last_insert_rowid() as INT);";
} }
int ticketId = database.QueryScalar<int>(query, identifier, reason, banningUser, fromDate.Ticks, toDate.Ticks); int ticketId = database.QueryScalar<int>(query, args.Identifier, args.Reason, args.BanningUser, args.BanDateTime.Ticks, args.ExpirationDateTime.Ticks);
if (ticketId == 0) if (ticketId == 0)
{ {
return new AddBanResult { Message = "Database insert failed." }; return new AddBanResult { Message = "Database insert failed." };
} }
Ban b = new Ban(ticketId, identifier, reason, banningUser, fromDate, toDate); Ban b = new Ban(ticketId, args.Identifier, args.Reason, args.BanningUser, args.BanDateTime, args.ExpirationDateTime);
_bans.Add(ticketId, b); _bans.Add(ticketId, b);
OnBanPostAdd?.Invoke(this, new BanEventArgs { Ban = b }); OnBanPostAdd?.Invoke(this, new BanEventArgs { Ban = b });