Merge pull request 'Fix hwp bugs' (#209) from fix/hwp into release/v8…

….3.0 Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/209
ONLYOFFICE · Jan 31, 2025 · 1e8d220 · 1e8d220
2 parents 81a4d9c + 90bcd47
commit 1e8d220
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 10 deletions.
diff --git a/HwpFile/HWPFile.pro b/HwpFile/HWPFile.pro
@@ -12,7 +12,7 @@ PWD_ROOT_DIR = $$PWD
 
 include($$CORE_ROOT_DIR/Common/base.pri)
 
-ADD_DEPENDENCY(kernel, UnicodeConverter, graphics)
+ADD_DEPENDENCY(kernel, UnicodeConverter, graphics, CryptoPPLib)
 
 DEFINES += HWPFILE_USE_DYNAMIC_LIBRARY
 

diff --git a/HwpFile/HwpDoc/Conversion/Converter2OOXML.cpp b/HwpFile/HwpDoc/Conversion/Converter2OOXML.cpp
@@ -1561,10 +1561,11 @@ void CConverter2OOXML::WriteRunnerStyle(short shCharShapeID, NSStringUtils::CStr
 	if (!bStrike && pCharShape->StrikeOut())
 		oBuilder.WriteString(L"<w:strike/>");
 
-	double dSpacing = ((double)pCharShape->GetHeight() / 100.) * ((double)pCharShape->GetSpacing(ELang::HANGUL) / 100) * 0.8 + 0.4;
-	dSpacing *= 20; // pt to twips (20 = 1440 / 72)
+	//TODO:: на данный момент вычисляется не правильно. Необходимо более точно разобраться
+	// double dSpacing = ((double)pCharShape->GetHeight() / 100.) * ((double)pCharShape->GetSpacing(ELang::HANGUL) / 100) * 0.8 + 0.4;
+	// dSpacing *= 20; // pt to twips (20 = 1440 / 72)
 
-	oBuilder.WriteString(L"<w:spacing w:val=\"" + std::to_wstring((int)std::round(dSpacing)) + L"\"/>");
+	// oBuilder.WriteString(L"<w:spacing w:val=\"" + std::to_wstring((int)std::round(dSpacing)) + L"\"/>");
 
 	if (nullptr != oState.m_pHighlightColor)
 		oBuilder.WriteString(L"<w:highlight w:val=\"" + ConvertIntRgbToStr(*oState.m_pHighlightColor) + L"\"/>");

diff --git a/HwpFile/HwpDoc/HWPFile.cpp b/HwpFile/HwpDoc/HWPFile.cpp
@@ -4,6 +4,12 @@
 #include "../OfficeUtils/src/OfficeUtils.h"
 #include "../DesktopEditor/common/Directory.h"
 
+// For decrypt
+#include "../../Common/3dParty/cryptopp/modes.h"
+#include "../../Common/3dParty/cryptopp/aes.h"
+#include "../../Common/3dParty/cryptopp/filters.h"
+// ----------
+
 #define DEFAULT_BUFFER_SIZE 8096
 
 namespace HWP
@@ -67,7 +73,7 @@ bool CHWPFile::Open()
 	if (!m_oFileHeader.Distributable() && !GetBodyText(m_nVersion))
 		return false;
 
-	if (!m_oFileHeader.Distributable() && !GetViewText(m_nVersion))
+	if (m_oFileHeader.Distributable() && !GetViewText(m_nVersion))
 		return false;
 
 	return true;
@@ -292,8 +298,43 @@ bool CHWPFile::Decrypt(CHWPStream& oInput, CHWPStream& oBuffer)
 	if (256 != nSize)
 		return false;
 
-	//TODO:: реализовать
-	return false;
+	CHWPStream oDocData(256);
+	oDocData.Copy(oInput, 256);
+	oInput.Skip(256);
+
+	int nSeed;
+	oDocData.ReadInt(nSeed);
+	oDocData.Skip(-4);
+
+	srand(nSeed);
+
+	unsigned char chKey;
+
+	for (unsigned int unIndex = 0, unCount = 0; unIndex < 256; ++unIndex)
+	{
+		if (0 == unCount)
+		{
+			chKey = rand() & 0xFF;
+			unCount = (rand() & 0xF) + 1;
+		}
+		if (unIndex >= 4)
+			*(oDocData.GetCurPtr() + unIndex) = oDocData[unIndex] ^ chKey;
+
+		--unCount;
+	}
+
+	int nHashOffset = (nSeed & 0x0f) + 4;
+
+	oBuffer.Expand(oInput.SizeToEnd());
+
+	using namespace CryptoPP;
+
+	ECB_Mode<AES>::Decryption oDecryptor;
+	oDecryptor.SetKey((byte*)(oDocData.GetCurPtr() + nHashOffset), 16);
+
+	ArraySource((byte*)oInput.GetCurPtr(), oInput.SizeToEnd(), true, new StreamTransformationFilter(oDecryptor, new ArraySink( (byte*)oBuffer.GetCurPtr(), oBuffer.GetSize()), StreamTransformationFilter::NO_PADDING));
+
+	return true;
 }
 
 bool CHWPFile::GetBodyText(int nVersion)

diff --git a/HwpFile/HwpDoc/HWPSection.cpp b/HwpFile/HwpDoc/HWPSection.cpp
@@ -529,8 +529,6 @@ int CHWPSection::ParseCtrlRecurse(CCtrl* pCurrCtrl, int nRunLevel, CHWPStream& o
 						ParseRecurse(pNewPara, nLevel, oBuffer, 0, nVersion);
 					}
 					else if (ECtrlObjectType::Shape == pCtrl->GetCtrlType())
-					// else if (nullptr != dynamic_cast<CCtrlShapeRect*>(pCtrl) ||
-					//          nullptr != dynamic_cast<CCtrlGeneralShape*>(pCtrl))
 					{
 						CCtrlCommon* pCtrlCommon = (CCtrlCommon*)pCtrl;
 						oBuffer.Skip(-6);
@@ -573,7 +571,6 @@ int CHWPSection::ParseCtrlRecurse(CCtrl* pCurrCtrl, int nRunLevel, CHWPStream& o
 				case HWPTAG_SHAPE_COMPONENT_TEXTART:
 				case HWPTAG_SHAPE_COMPONENT_UNKNOWN:
 				{
-					// if (nullptr != dynamic_cast<CCtrlGeneralShape*>(pCtrl))
 					if (ECtrlObjectType::Shape == pCtrl->GetCtrlType())
 						ParseCtrlRecurse((CCtrlGeneralShape*)pCtrl, nLevel, oBuffer, 0, nVersion);
 					else
@@ -856,6 +853,8 @@ int CHWPSection::ParseCtrlRecurse(CCtrl* pCurrCtrl, int nRunLevel, CHWPStream& o
 		}
 	}
 
+	oBuffer.RemoveLastSavedPos();
+
 	return 0;
 }
 
@@ -895,6 +894,7 @@ int CHWPSection::ParseContainerRecurse(CCtrlContainer* pContainer, int nRunLevel
 	while (oBuffer.CanRead())
 	{
 		oBuffer.ReadInt(nHeader);
+		oBuffer.Skip(-4);
 		nTagNum = nHeader & 0x3FF; // 10 bits (0 - 9 bit)
 		nLevel = (nHeader & 0xFFC00) >> 10; // 10 bits (10-19 bit)
 		nSize = (nHeader & 0xFFF00000) >> 20; // 12 bits (20-31 bit)

diff --git a/HwpFile/HwpDoc/HWPStream.cpp b/HwpFile/HwpDoc/HWPStream.cpp
@@ -36,6 +36,11 @@ void CHWPStream::Clear()
 		m_arSavedPositions.pop();
 }
 
+void CHWPStream::Copy(CHWPStream& oStream, unsigned long ulSize)
+{
+	memcpy(m_pCur, oStream.GetCurPtr(), (std::min)(SizeToEnd(), (unsigned long)(std::min)(ulSize, oStream.SizeToEnd())));
+}
+
 void CHWPStream::SetStream(HWP_BYTE* pBuffer, unsigned long ulSize, bool bExternalBuffer)
 {
 	m_pBegin = pBuffer;

diff --git a/HwpFile/HwpDoc/HWPStream.h b/HwpFile/HwpDoc/HWPStream.h
@@ -28,6 +28,7 @@ class CHWPStream
 	~CHWPStream();
 
 	void Clear();
+	void Copy(CHWPStream& oStream, unsigned long ulSize);
 
 	void SetStream(HWP_BYTE* pBuffer, unsigned long ulSize, bool bExternalBuffer = true);