ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2026-01-24 04:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/peter-iakovlev/MtProtoKit

Browse Source
This commit is contained in:
Mikhail Filimonov
2018-05-21 00:39:39 +03:00
parent dd3443a039 87cbb88680
commit 5ecbcc8b47
5 changed files with 156 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
MTDatacenterVerificationData.h Normal file
View File

@@ -0,0 +1,10 @@
#import <Foundation/Foundation.h>
@interface MTDatacenterVerificationData : NSObject
@property (nonatomic, readonly) NSInteger datacenterId;
@property (nonatomic, readonly) bool isTestingEnvironment;
- (instancetype _Nonnull)initWithDatacenterId:(NSInteger)datacenterId isTestingEnvironment:(bool)isTestingEnvironment;
@end

18
MTDatacenterVerificationData.m Normal file
View File

@@ -0,0 +1,18 @@
#import "MTDatacenterVerificationData.h"
@implementation MTDatacenterVerificationData
- (instancetype _Nonnull)initWithDatacenterId:(NSInteger)datacenterId isTestingEnvironment:(bool)isTestingEnvironment {
self = [super init];
if (self != nil) {
_datacenterId = datacenterId;
_isTestingEnvironment = isTestingEnvironment;
}
return self;
}
- (NSString *)description {
return [NSString stringWithFormat:@"datacenterId: %d, isTestingEnvironment: %d", (int)_datacenterId, _isTestingEnvironment ? 1 : 0];
}
@end

113
MTProtoKit/MTDatacenterAuthAction.m
View File

@@ -1,10 +1,22 @@
#import "MTDatacenterAuthAction.h"
#import "MTLogging.h"
#import "MTContext.h"
#import "MTProto.h"
#import "MTRequest.h"
#import "MTDatacenterSaltInfo.h"
#import "MTDatacenterAuthInfo.h"
#import "MTApiEnvironment.h"
#import "MTSerialization.h"
#import "MTDatacenterAddressSet.h"
#if defined(MtProtoKitDynamicFramework)
# import <MTProtoKitDynamic/MTSignal.h>
#elif defined(MtProtoKitMacFramework)
# import <MTProtoKitMac/MTSignal.h>
#else
# import <MTProtoKit/MTSignal.h>
#endif
#import "MTDatacenterAuthMessageService.h"
#import "MTRequestMessageService.h"
@@ -20,6 +32,8 @@
bool _awaitingAddresSetUpdate;
MTProto *_authMtProto;
MTMetaDisposable *_verifyDisposable;
}
@end
@@ -31,6 +45,7 @@
if (self != nil) {
_tempAuth = tempAuth;
_tempAuthKeyType = tempAuthKeyType;
_verifyDisposable = [[MTMetaDisposable alloc] init];
}
return self;
}
@@ -88,17 +103,21 @@
[self fail];
}
- (void)authMessageServiceCompletedWithAuthKey:(MTDatacenterAuthKey *)authKey timestamp:(int64_t)timestamp
{
- (void)authMessageServiceCompletedWithAuthKey:(MTDatacenterAuthKey *)authKey timestamp:(int64_t)timestamp {
[self verifyEnvironmentAndCompleteWithAuthKey:authKey timestamp:timestamp];
}
- (void)completeWithAuthKey:(MTDatacenterAuthKey *)authKey timestamp:(int64_t)timestamp {
if (_tempAuth) {
MTContext *mainContext = _context;
MTDatacenterAuthInfo *mainAuthInfo = [mainContext authInfoForDatacenterWithId:_datacenterId];
if (mainContext != nil && mainAuthInfo != nil) {
if (mainContext != nil) {
MTContext *context = _context;
[context performBatchUpdates:^{
MTDatacenterAuthInfo *authInfo = [context authInfoForDatacenterWithId:_datacenterId];
authInfo = [authInfo withUpdatedTempAuthKeyWithType:_tempAuthKeyType key:authKey];
[context updateAuthInfoForDatacenterWithId:_datacenterId authInfo:authInfo];
if (authInfo != nil) {
authInfo = [authInfo withUpdatedTempAuthKeyWithType:_tempAuthKeyType key:authKey];
[context updateAuthInfoForDatacenterWithId:_datacenterId authInfo:authInfo];
}
}];
[self complete];
}
@@ -117,6 +136,8 @@
_authMtProto = nil;
[authMtProto stop];
[_verifyDisposable dispose];
}
- (void)cancel
@@ -125,6 +146,86 @@
[self fail];
}
+ (MTSignal *)fetchConfigFromDatacenter:(NSInteger)datacenterId currentContext:(MTContext *)currentContext authKey:(MTDatacenterAuthKey *)authKey timestamp:(int64_t)timestamp {
MTApiEnvironment *apiEnvironment = [currentContext.apiEnvironment copy];
apiEnvironment.disableUpdates = true;
MTContext *context = [[MTContext alloc] initWithSerialization:currentContext.serialization apiEnvironment:apiEnvironment useTempAuthKeys:false];
[context performBatchUpdates:^{
MTDatacenterAddressSet *addressSet = [currentContext addressSetForDatacenterWithId:datacenterId];
if (addressSet != nil) {
[context updateAddressSetForDatacenterWithId:datacenterId addressSet:addressSet forceUpdateSchemes:false];
}
MTTransportScheme *transportScheme = [currentContext transportSchemeForDatacenterWithId:datacenterId media:false isProxy:false];
MTTransportScheme *proxyTransportScheme = [currentContext transportSchemeForDatacenterWithId:datacenterId media:false isProxy:true];
if (transportScheme != nil) {
[context updateTransportSchemeForDatacenterWithId:datacenterId transportScheme:transportScheme media:false isProxy:false];
}
if (proxyTransportScheme != nil) {
[context updateTransportSchemeForDatacenterWithId:datacenterId transportScheme:proxyTransportScheme media:false isProxy:true];
}
MTDatacenterAuthInfo *authInfo = [[MTDatacenterAuthInfo alloc] initWithAuthKey:authKey.authKey authKeyId:authKey.authKeyId saltSet:@[[[MTDatacenterSaltInfo alloc] initWithSalt:0 firstValidMessageId:timestamp lastValidMessageId:timestamp + (29.0 * 60.0) * 4294967296]] authKeyAttributes:nil mainTempAuthKey:nil mediaTempAuthKey:nil];
[context updateAuthInfoForDatacenterWithId:datacenterId authInfo:authInfo];
}];
MTProto *mtProto = [[MTProto alloc] initWithContext:context datacenterId:datacenterId usageCalculationInfo:nil];
mtProto.useTempAuthKeys = false;
MTRequestMessageService *requestService = [[MTRequestMessageService alloc] initWithContext:context];
[mtProto addMessageService:requestService];
[mtProto resume];
MTRequest *request = [[MTRequest alloc] init];
NSData *getConfigData = nil;
MTDatacenterVerificationDataParser responseParser = [context.serialization requestDatacenterVerificationData:&getConfigData];
[request setPayload:getConfigData metadata:@"getConfig" responseParser:responseParser];
return [[MTSignal alloc] initWithGenerator:^id<MTDisposable>(MTSubscriber *subscriber) {
[request setCompleted:^(MTDatacenterVerificationData *result, __unused NSTimeInterval completionTimestamp, id error)
{
if (error == nil && result.datacenterId == datacenterId) {
[subscriber putNext:@true];
} else {
if (MTLogEnabled()) {
MTLog(@"[MTDatacenterAuthAction invalid datacenter verification data %@ for datacenterId: %d, isTestingEnvironment: %d]", result, (int)datacenterId, false);
}
[subscriber putNext:@false];
}
[subscriber putCompletion];
}];
[requestService addRequest:request];
id requestId = request.internalId;
return [[MTBlockDisposable alloc] initWithBlock:^{
[requestService removeRequestByInternalId:requestId];
[mtProto pause];
}];
}];
}
- (void)verifyEnvironmentAndCompleteWithAuthKey:(MTDatacenterAuthKey *)authKey timestamp:(int64_t)timestamp {
MTContext *mainContext = _context;
if (mainContext != nil && _datacenterId != 0) {
__weak MTDatacenterAuthAction *weakSelf = self;
[_verifyDisposable setDisposable:[[MTDatacenterAuthAction fetchConfigFromDatacenter:_datacenterId currentContext:mainContext authKey:authKey timestamp:timestamp] startWithNext:^(id next) {
__strong MTDatacenterAuthAction *strongSelf = weakSelf;
if (strongSelf == nil) {
return;
}
[strongSelf completeWithAuthKey:authKey timestamp:timestamp];
}]];
} else {
[self fail];
}
}
- (void)complete
{
id<MTDatacenterAuthActionDelegate> delegate = _delegate;

6
MTProtoKit/MTSerialization.h
View File

@@ -11,16 +11,20 @@
#if defined(MtProtoKitDynamicFramework)
# import <MTProtoKitDynamic/MTExportedAuthorizationData.h>
# import <MTProtoKitDynamic/MTDatacenterAddressListData.h>
# import <MTProtoKitDynamic/MTDatacenterVerificationData.h>
#elif defined(MtProtoKitMacFramework)
# import <MTProtoKitMac/MTExportedAuthorizationData.h>
# import <MTProtoKitMac/MTDatacenterAddressListData.h>
# import <MTProtoKitMac/MTDatacenterVerificationData.h>
#else
# import <MTProtoKit/MTExportedAuthorizationData.h>
# import <MTProtoKit/MTDatacenterAddressListData.h>
# import <MTProtoKit/MTDatacenterVerificationData.h>
#endif
typedef MTExportedAuthorizationData *(^MTExportAuthorizationResponseParser)(NSData *);
typedef MTDatacenterAddressListData *(^MTRequestDatacenterAddressListParser)(NSData *);
typedef MTDatacenterVerificationData *(^MTDatacenterVerificationDataParser)(NSData *);
typedef id (^MTRequestNoopParser)(NSData *);
@protocol MTSerialization <NSObject>
@@ -31,8 +35,8 @@ typedef id (^MTRequestNoopParser)(NSData *);
- (MTExportAuthorizationResponseParser)exportAuthorization:(int32_t)datacenterId data:(__autoreleasing NSData **)data;
- (NSData *)importAuthorization:(int32_t)authId bytes:(NSData *)bytes;
- (MTRequestDatacenterAddressListParser)requestDatacenterAddressWithData:(__autoreleasing NSData **)data;
- (MTDatacenterVerificationDataParser)requestDatacenterVerificationData:(__autoreleasing NSData **)data;
- (MTRequestNoopParser)requestNoop:(__autoreleasing NSData **)data;
@end

16
MtProtoKit.xcodeproj/project.pbxproj
View File

@@ -46,6 +46,12 @@
D0B418791D7E04CB004562A4 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0B418781D7E04CB004562A4 /* Security.framework */; };
D0B4187B1D7E04CF004562A4 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D0B4187A1D7E04CF004562A4 /* libz.tbd */; };
D0B4187D1D7E04EB004562A4 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D0B4187C1D7E04EB004562A4 /* libcrypto.a */; };
D0BFAE6020AB504600793CF2 /* MTDatacenterVerificationData.h in Headers */ = {isa = PBXBuildFile; fileRef = D0BFAE5E20AB504600793CF2 /* MTDatacenterVerificationData.h */; settings = {ATTRIBUTES = (Public, ); }; };
D0BFAE6120AB504600793CF2 /* MTDatacenterVerificationData.m in Sources */ = {isa = PBXBuildFile; fileRef = D0BFAE5F20AB504600793CF2 /* MTDatacenterVerificationData.m */; };
D0BFAE6220AB505400793CF2 /* MTDatacenterVerificationData.h in Headers */ = {isa = PBXBuildFile; fileRef = D0BFAE5E20AB504600793CF2 /* MTDatacenterVerificationData.h */; settings = {ATTRIBUTES = (Public, ); }; };
D0BFAE6320AB505400793CF2 /* MTDatacenterVerificationData.h in Headers */ = {isa = PBXBuildFile; fileRef = D0BFAE5E20AB504600793CF2 /* MTDatacenterVerificationData.h */; settings = {ATTRIBUTES = (Public, ); }; };
D0BFAE6420AB505700793CF2 /* MTDatacenterVerificationData.m in Sources */ = {isa = PBXBuildFile; fileRef = D0BFAE5F20AB504600793CF2 /* MTDatacenterVerificationData.m */; };
D0BFAE6520AB505800793CF2 /* MTDatacenterVerificationData.m in Sources */ = {isa = PBXBuildFile; fileRef = D0BFAE5F20AB504600793CF2 /* MTDatacenterVerificationData.m */; };
D0C0EAE61FB5DBEA00DCF07C /* MTBindingTempAuthKeyContext.h in Headers */ = {isa = PBXBuildFile; fileRef = D0C0EAE41FB5DBEA00DCF07C /* MTBindingTempAuthKeyContext.h */; };
D0C0EAE71FB5DBEA00DCF07C /* MTBindingTempAuthKeyContext.m in Sources */ = {isa = PBXBuildFile; fileRef = D0C0EAE51FB5DBEA00DCF07C /* MTBindingTempAuthKeyContext.m */; };
D0C932231E095D6A0074F044 /* MTNetworkUsageCalculationInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = D0C932211E095D6A0074F044 /* MTNetworkUsageCalculationInfo.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -736,6 +742,8 @@
D0B418781D7E04CB004562A4 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; };
D0B4187A1D7E04CF004562A4 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/lib/libz.tbd; sourceTree = DEVELOPER_DIR; };
D0B4187C1D7E04EB004562A4 /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcrypto.a; path = openssl/OSX/libcrypto.a; sourceTree = "<group>"; };
D0BFAE5E20AB504600793CF2 /* MTDatacenterVerificationData.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MTDatacenterVerificationData.h; sourceTree = "<group>"; };
D0BFAE5F20AB504600793CF2 /* MTDatacenterVerificationData.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MTDatacenterVerificationData.m; sourceTree = "<group>"; };
D0C0EAE41FB5DBEA00DCF07C /* MTBindingTempAuthKeyContext.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MTBindingTempAuthKeyContext.h; sourceTree = "<group>"; };
D0C0EAE51FB5DBEA00DCF07C /* MTBindingTempAuthKeyContext.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MTBindingTempAuthKeyContext.m; sourceTree = "<group>"; };
D0C932211E095D6A0074F044 /* MTNetworkUsageCalculationInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MTNetworkUsageCalculationInfo.h; sourceTree = "<group>"; };
@@ -1413,6 +1421,8 @@
D0D1A00D1ADD983C007D9ED6 /* MTDropRpcResultMessage.m */,
D0D1A00E1ADD983C007D9ED6 /* MTExportedAuthorizationData.h */,
D0D1A00F1ADD983C007D9ED6 /* MTExportedAuthorizationData.m */,
D0BFAE5E20AB504600793CF2 /* MTDatacenterVerificationData.h */,
D0BFAE5F20AB504600793CF2 /* MTDatacenterVerificationData.m */,
D0D1A0101ADD983C007D9ED6 /* MTFutureSaltsMessage.h */,
D0D1A0111ADD983C007D9ED6 /* MTFutureSaltsMessage.m */,
D0D1A0121ADD983C007D9ED6 /* MTInternalMessageParser.h */,
@@ -1577,6 +1587,7 @@
D0CD98781D74BA4100F41187 /* MTDatacenterTransferAuthAction.h in Headers */,
D0CD990A1D75C0F300F41187 /* MTResendMessageService.h in Headers */,
D020FAFB1D994E3100F279AA /* MTHttpRequestOperation.h in Headers */,
D0BFAE6220AB505400793CF2 /* MTDatacenterVerificationData.h in Headers */,
D0CFBB8B1FD718C500B65C0D /* AFHTTPRequestOperation.h in Headers */,
D0CD98841D74BA5100F41187 /* MTDatacenterAddress.h in Headers */,
D0CD97EA1D74B94300F41187 /* MTInternalId.h in Headers */,
@@ -1668,6 +1679,7 @@
D0CB061B1ADC4541005E298F /* MTEncryption.h in Headers */,
D0D1A0661ADD983C007D9ED6 /* MTSetClientDhParamsResponseMessage.h in Headers */,
D0CB06471ADC45A2005E298F /* MTMessageTransaction.h in Headers */,
D0BFAE6020AB504600793CF2 /* MTDatacenterVerificationData.h in Headers */,
D0D1A0641ADD983C007D9ED6 /* MTServerDhParamsMessage.h in Headers */,
D0D1A0621ADD983C007D9ED6 /* MTServerDhInnerDataMessage.h in Headers */,
D0D1A04E1ADD983C007D9ED6 /* MTMsgResendReqMessage.h in Headers */,
@@ -1773,6 +1785,7 @@
D0CD987B1D74BA4100F41187 /* MTDatacenterTransferAuthAction.h in Headers */,
D0CD990B1D75C0F400F41187 /* MTResendMessageService.h in Headers */,
D020FAFC1D994E3100F279AA /* MTHttpRequestOperation.h in Headers */,
D0BFAE6320AB505400793CF2 /* MTDatacenterVerificationData.h in Headers */,
D0CFBB8C1FD718C600B65C0D /* AFHTTPRequestOperation.h in Headers */,
D0CD98891D74BA5200F41187 /* MTDatacenterAddress.h in Headers */,
D0CD97F01D74B94300F41187 /* MTInternalId.h in Headers */,
@@ -2024,6 +2037,7 @@
D0CD98391D74B9AA00F41187 /* MTNewSessionCreatedMessage.m in Sources */,
D0CD98381D74B9AA00F41187 /* MTMsgsStateReqMessage.m in Sources */,
D0C9322F1E095E280074F044 /* MTNetworkUsageManager.m in Sources */,
D0BFAE6420AB505700793CF2 /* MTDatacenterVerificationData.m in Sources */,
D0CD98801D74BA4900F41187 /* MTDatacenterAuthMessageService.m in Sources */,
D0CD98AA1D74BA6F00F41187 /* MTOutgoingMessage.m in Sources */,
D0CD98E41D74BAF400F41187 /* GCDAsyncSocket.m in Sources */,
@@ -2121,6 +2135,7 @@
D0CB062D1ADC457B005E298F /* MTDatacenterTransferAuthAction.m in Sources */,
D0D1A04F1ADD983C007D9ED6 /* MTMsgResendReqMessage.m in Sources */,
D0C9322E1E095E280074F044 /* MTNetworkUsageManager.m in Sources */,
D0BFAE6120AB504600793CF2 /* MTDatacenterVerificationData.m in Sources */,
D0D1A0371ADD983C007D9ED6 /* MTBadMsgNotificationMessage.m in Sources */,
D0CB06691ADC45DA005E298F /* MTHttpWorkerBehaviour.m in Sources */,
D0CB066E1ADC49FF005E298F /* AFHTTPClient.m in Sources */,
@@ -2218,6 +2233,7 @@
D0CD98481D74B9AA00F41187 /* MTNewSessionCreatedMessage.m in Sources */,
D0CD98471D74B9AA00F41187 /* MTMsgsStateReqMessage.m in Sources */,
D0C932301E095E280074F044 /* MTNetworkUsageManager.m in Sources */,
D0BFAE6520AB505800793CF2 /* MTDatacenterVerificationData.m in Sources */,
D0CD98831D74BA4900F41187 /* MTDatacenterAuthMessageService.m in Sources */,
D0CD98B11D74BA6F00F41187 /* MTOutgoingMessage.m in Sources */,
D0CD98E51D74BAF400F41187 /* GCDAsyncSocket.m in Sources */,