Leahnaya/pkmn-classic-framework
1
0
Fork 0
mirror of https://github.com/mm201/pkmn-classic-framework.git synced 2026-09-30 21:26:43 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Sanitize GTS post requests a bit better.

Browse Source
This commit is contained in:
Greg Edwards
2014-07-14 11:50:49 -04:00
parent e82e7b73c6
commit 06f9c04053
4 changed files with 17 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gts/pokemondpds.ashx.cs
View File

@@ -283,6 +283,8 @@ namespace PkmnFoundations.GTS
// the following two fields are blank in the uploaded record.
// The server must provide them instead.
record.TimeDeposited = DateTime.UtcNow;
record.TimeWithdrawn = null;
record.IsExchanged = 0;
record.PID = pid;
session.Tag = record;

6
gts/syachi2ds.ashx.cs
View File

@@ -276,9 +276,7 @@ namespace PkmnFoundations.GTS
// todo: figure out what bytes 304-439 do:
// appears to be 4 bytes of 00, 128 bytes of stuff, 4 bytes of 80 00 00 00
// projectpokemon says it's a "signature of pokémon struct."
// does this mean sha1 with a secret const?
// if it's just a checksum, we can probably ignore it for now.
// probably a pkvldtprod signature
if (!record.Validate())
{
@@ -292,6 +290,8 @@ namespace PkmnFoundations.GTS
// the following two fields are blank in the uploaded record.
// The server must provide them instead.
record.TimeDeposited = DateTime.UtcNow;
record.TimeWithdrawn = null;
record.IsExchanged = 0;
record.PID = pid;
session.Tag = record;

10
library/Structures/GtsRecord4.cs
View File

@@ -203,8 +203,14 @@ namespace PkmnFoundations.Structures
byte second = (byte)((timestamp >> 0x08) & 0xff);
//byte fractional = (byte)(timestamp & 0xff); // always 0
// allow ArgumentOutOfRangeExceptions to escape
return new DateTime(year, month, day, hour, minute, second);
try
{
return new DateTime(year, month, day, hour, minute, second);
}
catch (ArgumentOutOfRangeException)
{
return null;
}
}
public static ulong DateToTimestamp(DateTime ? date)

37
library/Structures/GtsRecord5.cs
View File

@@ -108,8 +108,8 @@ namespace PkmnFoundations.Structures
s.WriteByte(Unknown1);
s.WriteByte((byte)TrainerGender);
s.WriteByte(Unknown2);
s.Write(BitConverter.GetBytes(DateToTimestamp(TimeDeposited)), 0, 8);
s.Write(BitConverter.GetBytes(DateToTimestamp(TimeWithdrawn)), 0, 8);
s.Write(BitConverter.GetBytes(GtsRecord4.DateToTimestamp(TimeDeposited)), 0, 8);
s.Write(BitConverter.GetBytes(GtsRecord4.DateToTimestamp(TimeWithdrawn)), 0, 8);
s.Write(BitConverter.GetBytes(PID), 0, 4);
s.Write(BitConverter.GetBytes(TrainerOT), 0, 4);
s.Write(TrainerName.RawData, 0, 0x10);
@@ -143,8 +143,8 @@ namespace PkmnFoundations.Structures
Unknown1 = data[0xF5];
TrainerGender = (TrainerGenders)data[0xF6];
Unknown2 = data[0xF7];
TimeDeposited = TimestampToDate(BitConverter.ToUInt64(data, 0xF8));
TimeWithdrawn = TimestampToDate(BitConverter.ToUInt64(data, 0x100));
TimeDeposited = GtsRecord4.TimestampToDate(BitConverter.ToUInt64(data, 0xF8));
TimeWithdrawn = GtsRecord4.TimestampToDate(BitConverter.ToUInt64(data, 0x100));
PID = BitConverter.ToInt32(data, 0x108);
TrainerOT = BitConverter.ToUInt32(data, 0x10C);
TrainerName = new EncodedString5(data, 0x110, 0x10);
@@ -206,35 +206,6 @@ namespace PkmnFoundations.Structures
return other >= min && other <= max;
}
public static DateTime ? TimestampToDate(ulong timestamp)
{
if (timestamp == 0) return null;
ushort year = (ushort)((timestamp >> 0x30) & 0xffff);
byte month = (byte)((timestamp >> 0x28) & 0xff);
byte day = (byte)((timestamp >> 0x20) & 0xff);
byte hour = (byte)((timestamp >> 0x18) & 0xff);
byte minute = (byte)((timestamp >> 0x10) & 0xff);
byte second = (byte)((timestamp >> 0x08) & 0xff);
//byte fractional = (byte)(timestamp & 0xff); // always 0
// allow ArgumentOutOfRangeExceptions to escape
return new DateTime(year, month, day, hour, minute, second);
}
public static ulong DateToTimestamp(DateTime ? date)
{
if (date == null) return 0;
DateTime date2 = (DateTime)date;
return (ulong)(date2.Year & 0xffff) << 0x30
| (ulong)(date2.Month & 0xff) << 0x28
| (ulong)(date2.Day & 0xff) << 0x20
| (ulong)(date2.Hour & 0xff) << 0x18
| (ulong)(date2.Minute & 0xff) << 0x10
| (ulong)(date2.Second & 0xff) << 0x08;
}
public static bool operator ==(GtsRecord5 a, GtsRecord5 b)
{
if ((object)a == null && (object)b == null) return true;