Revert D30371791
Summary: Revert D30371791 (cac09d14aa) to address undefined symbols for a few sandcastle jobs
Reviewed By: fabiomassimo
Differential Revision: D30606610
fbshipit-source-id: 24a5c08bcf5456a96469650a4207b05970399181
This commit is contained in:
Lorenzo Blasa
committed by
Facebook GitHub Bot
Facebook GitHub Bot
parent
6383c0c15f
commit
fe23ea038c
@@ -1,219 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) Facebook, Inc. and its affiliates.
|
||||
*
|
||||
* This source code is licensed under the MIT license found in the
|
||||
* LICENSE file in the root directory of this source tree.
|
||||
*/
|
||||
|
||||
#ifdef FB_SONARKIT_ENABLED
|
||||
|
||||
#import "FlipperPlatformWebSocket.h"
|
||||
#import <Flipper/Log.h>
|
||||
#import <SocketRocket/SocketRocket.h>
|
||||
|
||||
static constexpr int connectionKeepaliveSeconds = 10;
|
||||
|
||||
#pragma mark - FlipperClientCertificateSecurityPolicy
|
||||
|
||||
@interface FlipperClientCertificateSecurityPolicy : SRSecurityPolicy
|
||||
|
||||
@property(nonatomic)
|
||||
facebook::flipper::SocketCertificateProvider certificateProvider;
|
||||
|
||||
- (id)initWithCertificateProvider:
|
||||
(facebook::flipper::SocketCertificateProvider)certificateProvider;
|
||||
|
||||
@end
|
||||
|
||||
@implementation FlipperClientCertificateSecurityPolicy
|
||||
|
||||
- (id)initWithCertificateProvider:
|
||||
(facebook::flipper::SocketCertificateProvider)certificateProvider {
|
||||
self = [super init];
|
||||
|
||||
if (self) {
|
||||
_certificateProvider = certificateProvider;
|
||||
}
|
||||
|
||||
return self;
|
||||
}
|
||||
|
||||
/**
|
||||
Updates all the security options for output streams, used for client
|
||||
certificate authentication.
|
||||
|
||||
@param stream Stream to update the options in.
|
||||
*/
|
||||
- (void)updateSecurityOptionsInStream:(NSStream*)stream {
|
||||
if (!_certificateProvider || ![stream isKindOfClass:[NSOutputStream class]]) {
|
||||
return;
|
||||
}
|
||||
|
||||
NSMutableDictionary* SSLOptions = [[NSMutableDictionary alloc] init];
|
||||
[stream setProperty:(__bridge id)kCFStreamSocketSecurityLevelNegotiatedSSL
|
||||
forKey:(__bridge id)kCFStreamPropertySocketSecurityLevel];
|
||||
|
||||
char PASSWORD[512] = {};
|
||||
auto certificatePath = _certificateProvider(&PASSWORD[0], 512);
|
||||
|
||||
NSString* certificatePathObjC =
|
||||
[NSString stringWithUTF8String:certificatePath.c_str()];
|
||||
NSData* certificateData = [NSData dataWithContentsOfFile:certificatePathObjC];
|
||||
|
||||
NSString* password = [NSString stringWithUTF8String:PASSWORD];
|
||||
NSDictionary* optionsDictionary = [NSDictionary
|
||||
dictionaryWithObject:password
|
||||
forKey:(__bridge id)kSecImportExportPassphrase];
|
||||
|
||||
CFArrayRef items = NULL;
|
||||
OSStatus status = SecPKCS12Import(
|
||||
(__bridge CFDataRef)certificateData,
|
||||
(__bridge CFDictionaryRef)optionsDictionary,
|
||||
&items);
|
||||
if (status != noErr) {
|
||||
return;
|
||||
}
|
||||
|
||||
CFDictionaryRef identityDictionary =
|
||||
(CFDictionaryRef)CFArrayGetValueAtIndex(items, 0);
|
||||
SecIdentityRef identity = (SecIdentityRef)CFDictionaryGetValue(
|
||||
identityDictionary, kSecImportItemIdentity);
|
||||
|
||||
SecCertificateRef certificate = NULL;
|
||||
status = SecIdentityCopyCertificate(identity, &certificate);
|
||||
|
||||
if (status != noErr) {
|
||||
return;
|
||||
}
|
||||
|
||||
NSArray* certificates = [[NSArray alloc]
|
||||
initWithObjects:(__bridge id)identity, (__bridge id)certificate, nil];
|
||||
|
||||
[SSLOptions setObject:[NSNumber numberWithBool:NO]
|
||||
forKey:(NSString*)kCFStreamSSLValidatesCertificateChain];
|
||||
[SSLOptions setObject:(NSString*)kCFStreamSocketSecurityLevelNegotiatedSSL
|
||||
forKey:(NSString*)kCFStreamSSLLevel];
|
||||
[SSLOptions setObject:(NSString*)kCFStreamSocketSecurityLevelNegotiatedSSL
|
||||
forKey:(NSString*)kCFStreamPropertySocketSecurityLevel];
|
||||
[SSLOptions setObject:certificates
|
||||
forKey:(NSString*)kCFStreamSSLCertificates];
|
||||
[SSLOptions setObject:[NSNumber numberWithBool:NO]
|
||||
forKey:(NSString*)kCFStreamSSLIsServer];
|
||||
|
||||
[stream setProperty:SSLOptions
|
||||
forKey:(__bridge id)kCFStreamPropertySSLSettings];
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
#pragma mark - FlipperPlatformWebSocket
|
||||
|
||||
@interface FlipperPlatformWebSocket ()<SRWebSocketDelegate> {
|
||||
NSURL* _url;
|
||||
NSTimer* _keepAlive;
|
||||
|
||||
FlipperClientCertificateSecurityPolicy* _policy;
|
||||
}
|
||||
|
||||
@property(nonatomic, strong) SRWebSocket* socket;
|
||||
|
||||
@end
|
||||
|
||||
@implementation FlipperPlatformWebSocket
|
||||
|
||||
- (instancetype)initWithURL:(NSURL* _Nonnull)url {
|
||||
self = [super init];
|
||||
if (self) {
|
||||
_url = url;
|
||||
_policy = [FlipperClientCertificateSecurityPolicy new];
|
||||
}
|
||||
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void)dealloc {
|
||||
[self disconnect];
|
||||
}
|
||||
|
||||
- (void)connect {
|
||||
if (_socket) {
|
||||
return;
|
||||
}
|
||||
|
||||
self.socket = [[SRWebSocket alloc] initWithURL:_url securityPolicy:_policy];
|
||||
[_socket setDelegate:self];
|
||||
[_socket open];
|
||||
}
|
||||
|
||||
- (void)disconnect {
|
||||
if ([_keepAlive isValid]) {
|
||||
[_keepAlive invalidate];
|
||||
}
|
||||
_keepAlive = nil;
|
||||
|
||||
if (_socket) {
|
||||
// Manually trigger a 'close' event as SocketRocket close method will
|
||||
// not notify the delegate. SocketRocket only triggers the close event
|
||||
// when the connection is closed from the server.
|
||||
_eventHandler(facebook::flipper::SocketEvent::CLOSE);
|
||||
|
||||
[_socket close];
|
||||
_socket = nil;
|
||||
}
|
||||
}
|
||||
|
||||
- (void)send:(NSString*)message error:(NSError**)error {
|
||||
[_socket sendString:message error:error];
|
||||
if (error != nil && *error) {
|
||||
facebook::flipper::log("Unable to send message.");
|
||||
}
|
||||
}
|
||||
|
||||
- (void)setCertificateProvider:
|
||||
(facebook::flipper::SocketCertificateProvider)certificateProvider {
|
||||
_certificateProvider = certificateProvider;
|
||||
_policy.certificateProvider = certificateProvider;
|
||||
}
|
||||
|
||||
- (void)sendScheduledKeepAlive:(NSTimer*)timer {
|
||||
[_socket sendPing:nil error:nil];
|
||||
}
|
||||
|
||||
- (void)webSocketDidOpen:(SRWebSocket*)webSocket {
|
||||
_eventHandler(facebook::flipper::SocketEvent::OPEN);
|
||||
|
||||
if (!_keepAlive) {
|
||||
__weak auto weakSocket = _socket;
|
||||
_keepAlive =
|
||||
[NSTimer scheduledTimerWithTimeInterval:connectionKeepaliveSeconds
|
||||
repeats:YES
|
||||
block:^(NSTimer* timer) {
|
||||
auto _Nullable socket = weakSocket;
|
||||
[socket sendPing:nil error:nil];
|
||||
}];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)webSocket:(SRWebSocket*)webSocket didFailWithError:(NSError*)error {
|
||||
_eventHandler(facebook::flipper::SocketEvent::ERROR);
|
||||
_socket = nil;
|
||||
}
|
||||
|
||||
- (void)webSocket:(SRWebSocket*)webSocket
|
||||
didCloseWithCode:(NSInteger)code
|
||||
reason:(NSString*)reason
|
||||
wasClean:(BOOL)wasClean {
|
||||
_eventHandler(facebook::flipper::SocketEvent::CLOSE);
|
||||
_socket = nil;
|
||||
}
|
||||
|
||||
- (void)webSocket:(SRWebSocket*)webSocket didReceiveMessage:(id)message {
|
||||
if (message && _messageHandler) {
|
||||
NSString* response = message;
|
||||
_messageHandler([response UTF8String]);
|
||||
}
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user