procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix keys destruction on logout.

This commit is contained in:
John Preston 2019-11-20 14:50:19 +03:00
parent bdc7f4114f
commit 4c24ec7725
2 changed files with 36 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
Telegram/SourceFiles/mtproto/connection.cpp
View File

@ -608,7 +608,7 @@ void ConnectionPrivate::tryToSend() {
} }
if (_keyCreator && _keyCreator->bindReadyToRequest()) { if (_keyCreator && _keyCreator->bindReadyToRequest()) {
bindDcKeyRequest = _keyCreator->prepareBindRequest( bindDcKeyRequest = _keyCreator->prepareBindRequest(
_temporaryKey, _encryptionKey,
_sessionId); _sessionId);
// This is a special request with msgId used inside the message // This is a special request with msgId used inside the message
@ -623,7 +623,7 @@ void ConnectionPrivate::tryToSend() {
// _shiftedDcId, // _shiftedDcId,
// keyForCheck); // keyForCheck);
// bindDcKeyRequest = _keyChecker->prepareRequest( // bindDcKeyRequest = _keyChecker->prepareRequest(
// _temporaryKey, // _encryptionKey,
// _sessionId); // _sessionId);
// // This is a special request with msgId used inside the message // // This is a special request with msgId used inside the message
@ -1201,7 +1201,7 @@ void ConnectionPrivate::requestCDNConfig() {
} }
void ConnectionPrivate::handleReceived() { void ConnectionPrivate::handleReceived() {
Expects(_temporaryKey != nullptr); Expects(_encryptionKey != nullptr);
onReceivedSome(); onReceivedSome();
@ -1235,9 +1235,9 @@ void ConnectionPrivate::handleReceived() {
auto msgKey = *(MTPint128*)(ints + 2); auto msgKey = *(MTPint128*)(ints + 2);
#ifdef TDESKTOP_MTPROTO_OLD #ifdef TDESKTOP_MTPROTO_OLD
aesIgeDecrypt_oldmtp(encryptedInts, decryptedBuffer.data(), encryptedBytesCount, _temporaryKey, msgKey); aesIgeDecrypt_oldmtp(encryptedInts, decryptedBuffer.data(), encryptedBytesCount, _encryptionKey, msgKey);
#else // TDESKTOP_MTPROTO_OLD #else // TDESKTOP_MTPROTO_OLD
aesIgeDecrypt(encryptedInts, decryptedBuffer.data(), encryptedBytesCount, _temporaryKey, msgKey); aesIgeDecrypt(encryptedInts, decryptedBuffer.data(), encryptedBytesCount, _encryptionKey, msgKey);
#endif // TDESKTOP_MTPROTO_OLD #endif // TDESKTOP_MTPROTO_OLD
auto decryptedInts = reinterpret_cast<const mtpPrime*>(decryptedBuffer.constData()); auto decryptedInts = reinterpret_cast<const mtpPrime*>(decryptedBuffer.constData());
@ -1284,7 +1284,7 @@ void ConnectionPrivate::handleReceived() {
SHA256_CTX msgKeyLargeContext; SHA256_CTX msgKeyLargeContext;
SHA256_Init(&msgKeyLargeContext); SHA256_Init(&msgKeyLargeContext);
SHA256_Update(&msgKeyLargeContext, _temporaryKey->partForMsgKey(false), 32); SHA256_Update(&msgKeyLargeContext, _encryptionKey->partForMsgKey(false), 32);
SHA256_Update(&msgKeyLargeContext, decryptedInts, encryptedBytesCount); SHA256_Update(&msgKeyLargeContext, decryptedInts, encryptedBytesCount);
SHA256_Final(sha256Buffer.data(), &msgKeyLargeContext); SHA256_Final(sha256Buffer.data(), &msgKeyLargeContext);
@ -1350,7 +1350,7 @@ void ConnectionPrivate::handleReceived() {
auto from = decryptedInts + kEncryptedHeaderIntsCount; auto from = decryptedInts + kEncryptedHeaderIntsCount;
auto end = from + (messageLength / kIntSize); auto end = from + (messageLength / kIntSize);
auto sfrom = decryptedInts + 4U; // msg_id + seq_no + length + message auto sfrom = decryptedInts + 4U; // msg_id + seq_no + length + message
MTP_LOG(_shiftedDcId, ("Recv: ") + details::DumpToText(sfrom, end) + QString(" (keyId:%1)").arg(_temporaryKey->keyId())); MTP_LOG(_shiftedDcId, ("Recv: ") + details::DumpToText(sfrom, end) + QString(" (keyId:%1)").arg(_encryptionKey->keyId()));
if (_receivedMessageIds.registerMsgId(msgId, needAck)) { if (_receivedMessageIds.registerMsgId(msgId, needAck)) {
res = handleOneReceived(from, end, msgId, serverTime, serverSalt, badTime); res = handleOneReceived(from, end, msgId, serverTime, serverSalt, badTime);
@ -1859,7 +1859,7 @@ ConnectionPrivate::HandleResult ConnectionPrivate::handleOneReceived(const mtpPr
response); response);
if (result == DcKeyBindState::Success) { if (result == DcKeyBindState::Success) {
_sessionData->releaseKeyCreationOnDone( _sessionData->releaseKeyCreationOnDone(
_temporaryKey, _encryptionKey,
base::take(_keyCreator)->bindPersistentKey()); base::take(_keyCreator)->bindPersistentKey());
_sessionData->queueNeedToResumeAndSend(); _sessionData->queueNeedToResumeAndSend();
return HandleResult::Success; return HandleResult::Success;
@ -2307,13 +2307,15 @@ void ConnectionPrivate::removeTestConnection(
void ConnectionPrivate::checkAuthKey() { void ConnectionPrivate::checkAuthKey() {
if (_keyId) { if (_keyId) {
authKeyChecked(); authKeyChecked();
} else if (_instance->isKeysDestroyer()) {
applyAuthKey(_sessionData->getPersistentKey());
} else { } else {
applyAuthKey(_sessionData->getTemporaryKey()); applyAuthKey(_sessionData->getTemporaryKey());
} }
} }
void ConnectionPrivate::updateAuthKey() { void ConnectionPrivate::updateAuthKey() {
if (_keyCreator) { if (_instance->isKeysDestroyer() || _keyCreator) {
return; return;
} }
@ -2331,9 +2333,9 @@ void ConnectionPrivate::setCurrentKeyId(uint64 newKeyId) {
changeSessionId(); changeSessionId();
} }
void ConnectionPrivate::applyAuthKey(AuthKeyPtr &&temporaryKey) { void ConnectionPrivate::applyAuthKey(AuthKeyPtr &&encryptionKey) {
_temporaryKey = std::move(temporaryKey); _encryptionKey = std::move(encryptionKey);
const auto newKeyId = _temporaryKey ? _temporaryKey->keyId() : 0; const auto newKeyId = _encryptionKey ? _encryptionKey->keyId() : 0;
if (_keyId) { if (_keyId) {
if (_keyId == newKeyId) { if (_keyId == newKeyId) {
return; return;
@ -2374,7 +2376,9 @@ void ConnectionPrivate::applyAuthKey(AuthKeyPtr &&temporaryKey) {
} }
void ConnectionPrivate::tryAcquireKeyCreation() { void ConnectionPrivate::tryAcquireKeyCreation() {
if (_keyCreator || !_sessionData->acquireKeyCreation()) { if (_instance->isKeysDestroyer()
|| _keyCreator
|| !_sessionData->acquireKeyCreation()) {
return; return;
} }
@ -2479,25 +2483,26 @@ void ConnectionPrivate::handleError(int errorCode) {
_waitForConnectedTimer.cancel(); _waitForConnectedTimer.cancel();
if (errorCode == -404) { if (errorCode == -404) {
if (_instance->isKeysDestroyer()) { destroyTemporaryKey();
LOG(("MTP Info: -404 error received in destroyer %1, assuming key was destroyed.").arg(_shiftedDcId)); } else {
_instance->checkIfKeyWasDestroyed(_shiftedDcId); MTP_LOG(_shiftedDcId, ("Restarting after error in connection, error code: %1...").arg(errorCode));
return; return restart();
} else if (_temporaryKey) {
LOG(("MTP Info: -404 error received in %1 with temporary key, assuming it was destroyed.").arg(_shiftedDcId));
destroyTemporaryKey();
}
} }
MTP_LOG(_shiftedDcId, ("Restarting after error in connection, error code: %1...").arg(errorCode));
return restart();
} }
void ConnectionPrivate::destroyTemporaryKey() { void ConnectionPrivate::destroyTemporaryKey() {
if (_instance->isKeysDestroyer()) {
LOG(("MTP Info: -404 error received in destroyer %1, assuming key was destroyed.").arg(_shiftedDcId));
_instance->checkIfKeyWasDestroyed(_shiftedDcId);
return;
}
LOG(("MTP Info: -404 error received in %1 with temporary key, assuming it was destroyed.").arg(_shiftedDcId));
releaseKeyCreationOnFail(); releaseKeyCreationOnFail();
if (_temporaryKey) { if (_encryptionKey) {
_sessionData->destroyTemporaryKey(_temporaryKey->keyId()); _sessionData->destroyTemporaryKey(_encryptionKey->keyId());
} }
applyAuthKey(nullptr); applyAuthKey(nullptr);
restart();
} }
bool ConnectionPrivate::sendSecureRequest( bool ConnectionPrivate::sendSecureRequest(
@ -2524,7 +2529,7 @@ bool ConnectionPrivate::sendSecureRequest(
memcpy(request->data() + 2, &_sessionId, 2 * sizeof(mtpPrime)); memcpy(request->data() + 2, &_sessionId, 2 * sizeof(mtpPrime));
auto from = request->constData() + 4; auto from = request->constData() + 4;
MTP_LOG(_shiftedDcId, ("Send: ") + details::DumpToText(from, from + messageSize) + QString(" (keyId:%1)").arg(_temporaryKey->keyId())); MTP_LOG(_shiftedDcId, ("Send: ") + details::DumpToText(from, from + messageSize) + QString(" (keyId:%1)").arg(_encryptionKey->keyId()));
#ifdef TDESKTOP_MTPROTO_OLD #ifdef TDESKTOP_MTPROTO_OLD
uint32 padding = fullSize - 4 - messageSize; uint32 padding = fullSize - 4 - messageSize;
@ -2544,7 +2549,7 @@ bool ConnectionPrivate::sendSecureRequest(
request->constData(), request->constData(),
&packet[prefix], &packet[prefix],
fullSize * sizeof(mtpPrime), fullSize * sizeof(mtpPrime),
_temporaryKey, _encryptionKey,
msgKey); msgKey);
#else // TDESKTOP_MTPROTO_OLD #else // TDESKTOP_MTPROTO_OLD
uchar encryptedSHA256[32]; uchar encryptedSHA256[32];
@ -2552,7 +2557,7 @@ bool ConnectionPrivate::sendSecureRequest(
SHA256_CTX msgKeyLargeContext; SHA256_CTX msgKeyLargeContext;
SHA256_Init(&msgKeyLargeContext); SHA256_Init(&msgKeyLargeContext);
SHA256_Update(&msgKeyLargeContext, _temporaryKey->partForMsgKey(true), 32); SHA256_Update(&msgKeyLargeContext, _encryptionKey->partForMsgKey(true), 32);
SHA256_Update(&msgKeyLargeContext, request->constData(), fullSize * sizeof(mtpPrime)); SHA256_Update(&msgKeyLargeContext, request->constData(), fullSize * sizeof(mtpPrime));
SHA256_Final(encryptedSHA256, &msgKeyLargeContext); SHA256_Final(encryptedSHA256, &msgKeyLargeContext);
@ -2564,7 +2569,7 @@ bool ConnectionPrivate::sendSecureRequest(
request->constData(), request->constData(),
&packet[prefix], &packet[prefix],
fullSize * sizeof(mtpPrime), fullSize * sizeof(mtpPrime),
_temporaryKey, _encryptionKey,
msgKey); msgKey);
#endif // TDESKTOP_MTPROTO_OLD #endif // TDESKTOP_MTPROTO_OLD

4
Telegram/SourceFiles/mtproto/connection.h
View File

@ -188,7 +188,7 @@ private:
void destroyTemporaryKey(); void destroyTemporaryKey();
void clearUnboundKeyCreator(); void clearUnboundKeyCreator();
void releaseKeyCreationOnFail(); void releaseKeyCreationOnFail();
void applyAuthKey(AuthKeyPtr &&temporaryKey); void applyAuthKey(AuthKeyPtr &&encryptionKey);
void setCurrentKeyId(uint64 newKeyId); void setCurrentKeyId(uint64 newKeyId);
void changeSessionId(); void changeSessionId();
@ -235,7 +235,7 @@ private:
std::shared_ptr<SessionData> _sessionData; std::shared_ptr<SessionData> _sessionData;
std::unique_ptr<ConnectionOptions> _connectionOptions; std::unique_ptr<ConnectionOptions> _connectionOptions;
AuthKeyPtr _temporaryKey; AuthKeyPtr _encryptionKey;
uint64 _keyId = 0; uint64 _keyId = 0;
uint64 _sessionId = 0; uint64 _sessionId = 0;
uint64 _sessionSalt = 0; uint64 _sessionSalt = 0;