izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Improvements to loading/validation/logging of pak signature files. Better logging of errors.

Browse Source 
#jira UE-73250

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: graeme.thornton
#ROBOMERGE-SOURCE: CL 6095198 via CL 6095203 via CL 6096453 via CL 6096500
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 6122197 by graeme thornton in Dev-Build branch]
This commit is contained in:
graeme thornton
2019-04-26 21:43:40 -04:00
parent d9a646a6de
commit a782a573ec
2 changed files with 65 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
Engine/Source/Runtime/PakFile/Private/IPlatformFilePak.cpp
View File

@@ -4382,10 +4382,10 @@ void FPakFile::Initialize(FArchive* Reader)
{
ensure(Check());
}
// LoadIndex should crash in case of an error, so just assume everything is ok if we got here.
bIsValid = true;
}
// LoadIndex should crash in case of an error, so just assume everything is ok if we got here.
bIsValid = true;
}
}
@@ -5570,53 +5570,52 @@ bool FPakPlatformFile::Mount(const TCHAR* InPakFilename, uint32 PakOrder, const
FPakFile* Pak = new FPakFile(LowerLevel, InPakFilename, bSigned);
if (Pak->IsValid())
{
if (InPath != NULL)
if (GetRegisteredEncryptionKeys().HasKey(Pak->GetInfo().EncryptionKeyGuid))
{
Pak->SetMountPoint(InPath);
}
FString PakFilename = InPakFilename;
if (PakFilename.EndsWith(TEXT("_P.pak")))
{
// Prioritize based on the chunk version number
// Default to version 1 for single patch system
uint32 ChunkVersionNumber = 1;
FString StrippedPakFilename = PakFilename.LeftChop(6);
int32 VersionEndIndex = PakFilename.Find("_", ESearchCase::CaseSensitive, ESearchDir::FromEnd);
if (VersionEndIndex != INDEX_NONE && VersionEndIndex > 0)
if (InPath != NULL)
{
int32 VersionStartIndex = PakFilename.Find("_", ESearchCase::CaseSensitive, ESearchDir::FromEnd, VersionEndIndex - 1);
if (VersionStartIndex != INDEX_NONE)
Pak->SetMountPoint(InPath);
}
FString PakFilename = InPakFilename;
if (PakFilename.EndsWith(TEXT("_P.pak")))
{
// Prioritize based on the chunk version number
// Default to version 1 for single patch system
uint32 ChunkVersionNumber = 1;
FString StrippedPakFilename = PakFilename.LeftChop(6);
int32 VersionEndIndex = PakFilename.Find("_", ESearchCase::CaseSensitive, ESearchDir::FromEnd);
if (VersionEndIndex != INDEX_NONE && VersionEndIndex > 0)
{
VersionStartIndex++;
FString VersionString = PakFilename.Mid(VersionStartIndex, VersionEndIndex - VersionStartIndex);
if (VersionString.IsNumeric())
int32 VersionStartIndex = PakFilename.Find("_", ESearchCase::CaseSensitive, ESearchDir::FromEnd, VersionEndIndex - 1);
if (VersionStartIndex != INDEX_NONE)
{
int32 ChunkVersionSigned = FCString::Atoi(*VersionString);
if (ChunkVersionSigned >= 1)
VersionStartIndex++;
FString VersionString = PakFilename.Mid(VersionStartIndex, VersionEndIndex - VersionStartIndex);
if (VersionString.IsNumeric())
{
// Increment by one so that the first patch file still gets more priority than the base pak file
ChunkVersionNumber = (uint32)ChunkVersionSigned + 1;
int32 ChunkVersionSigned = FCString::Atoi(*VersionString);
if (ChunkVersionSigned >= 1)
{
// Increment by one so that the first patch file still gets more priority than the base pak file
ChunkVersionNumber = (uint32)ChunkVersionSigned + 1;
}
}
}
}
PakOrder += 100 * ChunkVersionNumber;
}
PakOrder += 100 * ChunkVersionNumber;
{
// Add new pak file
FScopeLock ScopedLock(&PakListCritical);
FPakListEntry Entry;
Entry.ReadOrder = PakOrder;
Entry.PakFile = Pak;
PakFiles.Add(Entry);
PakFiles.StableSort();
}
bSuccess = true;
}
{
// Add new pak file
FScopeLock ScopedLock(&PakListCritical);
FPakListEntry Entry;
Entry.ReadOrder = PakOrder;
Entry.PakFile = Pak;
PakFiles.Add(Entry);
PakFiles.StableSort();
}
bSuccess = true;
}
else
{
bool bPassedSignatureChecks = !bSigned || Pak->PassedSignatureChecks();
if (bPassedSignatureChecks && Pak->GetInfo().EncryptionKeyGuid.IsValid())
else
{
UE_LOG(LogPakFile, Display, TEXT("Deferring mount of pak \"%s\" until encryption key '%s' becomes available"), InPakFilename, *Pak->GetInfo().EncryptionKeyGuid.ToString());
@@ -5632,15 +5631,15 @@ bool FPakPlatformFile::Mount(const TCHAR* InPakFilename, uint32 PakOrder, const
PakHandle.Reset();
return false;
}
else
{
UE_LOG(LogPakFile, Warning, TEXT("Failed to mount pak \"%s\", pak is invalid."), InPakFilename);
}
}
else
{
UE_LOG(LogPakFile, Warning, TEXT("Failed to mount pak \"%s\", pak is invalid."), InPakFilename);
}
}
else
{
UE_LOG(LogPakFile, Warning, TEXT("Pak \"%s\" does not exist!"), InPakFilename);
UE_LOG(LogPakFile, Warning, TEXT("Failed to open pak \"%s\""), InPakFilename);
}
return bSuccess;
}

38
Engine/Source/Runtime/PakFile/Public/IPlatformFilePak.h
View File

@@ -2389,7 +2389,7 @@ struct FPakSignatureFile
enum class EVersion
{
Legacy,
Invalid,
First,
Last,
@@ -2423,20 +2423,14 @@ struct FPakSignatureFile
*/
void Serialize(FArchive& Ar)
{
int64 StartPos = Ar.Tell();
uint32 FileMagic = Magic;
Ar << FileMagic;
if (Ar.IsLoading() && FileMagic != Magic)
{
// Old format with no versioning! Go back to where we were and mark our version as legacy
Ar.Seek(StartPos);
Version = EVersion::Legacy;
TEncryptionInt LegacyEncryptedCRC;
Ar << LegacyEncryptedCRC;
Ar << ChunkHashes;
// Note that we don't do any actual signature checking here because this is old data that won't have been
// encrypted with the new larger keys.
Version = EVersion::Invalid;
EncryptedHash.Empty();
ChunkHashes.Empty();
return;
}
@@ -2459,17 +2453,27 @@ struct FPakSignatureFile
*/
bool DecryptSignatureAndValidate(FRSA::TKeyPtr InKey, const FString& InFilename)
{
FRSA::Decrypt(FRSA::EKeyType::Public, EncryptedHash, DecryptedHash.Hash, ARRAY_COUNT(FSHAHash::Hash), InKey);
FSHAHash CurrentHash = ComputeCurrentMasterHash();
if (DecryptedHash != CurrentHash)
if (Version == EVersion::Invalid)
{
UE_LOG(LogPakFile, Warning, TEXT("Pak signature file for '%s' was invalid"), *InFilename);
}
else if (FRSA::Decrypt(FRSA::EKeyType::Public, EncryptedHash, DecryptedHash.Hash, ARRAY_COUNT(FSHAHash::Hash), InKey))
{
FSHAHash CurrentHash = ComputeCurrentMasterHash();
if (DecryptedHash == CurrentHash)
{
return true;
}
UE_LOG(LogPakFile, Warning, TEXT("Pak signature table validation failed for '%s'! Expected %s, Received %s"), *InFilename, *DecryptedHash.ToString(), *CurrentHash.ToString());
FPakPlatformFile::GetPakMasterSignatureTableCheckFailureHandler().Broadcast(InFilename);
return false;
}
else
{
UE_LOG(LogPakFile, Warning, TEXT("Pak signature table validation failed for '%s'! Failed to decrypt signature"), *InFilename);
}
return true;
FPakPlatformFile::GetPakMasterSignatureTableCheckFailureHandler().Broadcast(InFilename);
return false;
}
/**