mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 22:00:47 +01:00

This reverts commit 4f085434b9
.
Reason for revert: breaks downstream projects.
Original change's description:
> Add SSLConfig object to IceServer.
>
> This is a rollforward of https://webrtc-review.googlesource.com/c/src/+/96020,
> with the addition of setting the old tlsCertPolicy, tlsAlpnProtocols and
> tlsEllipticCurves in the RTCIceServer initializer, for backwards compatibility.
>
> Bug: webrtc:9662
> Change-Id: I28706ed4ff5abe3f7f913f105779f0e5412aeac5
> Reviewed-on: https://webrtc-review.googlesource.com/98762
> Commit-Queue: Diogo Real <diogor@google.com>
> Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
> Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
> Reviewed-by: Steve Anton <steveanton@webrtc.org>
> Reviewed-by: Qingsi Wang <qingsi@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#24696}
TBR=steveanton@webrtc.org,sakal@webrtc.org,kwiberg@webrtc.org,kthelgason@webrtc.org,qingsi@webrtc.org,benwright@webrtc.org,diogor@google.com
Change-Id: I1cb64b63fec688b4ac90c2fa368eaf0bc11046af
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:9662
Reviewed-on: https://webrtc-review.googlesource.com/99880
Reviewed-by: Sergey Silkin <ssilkin@webrtc.org>
Commit-Queue: Sergey Silkin <ssilkin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24701}
196 lines
7.7 KiB
Text
196 lines
7.7 KiB
Text
/*
|
|
* Copyright 2015 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#import "RTCIceServer+Private.h"
|
|
|
|
#import "helpers/NSString+StdString.h"
|
|
|
|
@implementation RTCIceServer
|
|
|
|
@synthesize urlStrings = _urlStrings;
|
|
@synthesize username = _username;
|
|
@synthesize credential = _credential;
|
|
@synthesize tlsCertPolicy = _tlsCertPolicy;
|
|
@synthesize hostname = _hostname;
|
|
@synthesize tlsAlpnProtocols = _tlsAlpnProtocols;
|
|
@synthesize tlsEllipticCurves = _tlsEllipticCurves;
|
|
|
|
- (instancetype)initWithURLStrings:(NSArray<NSString *> *)urlStrings {
|
|
return [self initWithURLStrings:urlStrings
|
|
username:nil
|
|
credential:nil];
|
|
}
|
|
|
|
- (instancetype)initWithURLStrings:(NSArray<NSString *> *)urlStrings
|
|
username:(NSString *)username
|
|
credential:(NSString *)credential {
|
|
return [self initWithURLStrings:urlStrings
|
|
username:username
|
|
credential:credential
|
|
tlsCertPolicy:RTCTlsCertPolicySecure];
|
|
}
|
|
|
|
- (instancetype)initWithURLStrings:(NSArray<NSString *> *)urlStrings
|
|
username:(NSString *)username
|
|
credential:(NSString *)credential
|
|
tlsCertPolicy:(RTCTlsCertPolicy)tlsCertPolicy {
|
|
return [self initWithURLStrings:urlStrings
|
|
username:username
|
|
credential:credential
|
|
tlsCertPolicy:tlsCertPolicy
|
|
hostname:nil];
|
|
}
|
|
|
|
- (instancetype)initWithURLStrings:(NSArray<NSString *> *)urlStrings
|
|
username:(NSString *)username
|
|
credential:(NSString *)credential
|
|
tlsCertPolicy:(RTCTlsCertPolicy)tlsCertPolicy
|
|
hostname:(NSString *)hostname {
|
|
return [self initWithURLStrings:urlStrings
|
|
username:username
|
|
credential:credential
|
|
tlsCertPolicy:tlsCertPolicy
|
|
hostname:hostname
|
|
tlsAlpnProtocols:[NSArray array]];
|
|
}
|
|
|
|
- (instancetype)initWithURLStrings:(NSArray<NSString *> *)urlStrings
|
|
username:(NSString *)username
|
|
credential:(NSString *)credential
|
|
tlsCertPolicy:(RTCTlsCertPolicy)tlsCertPolicy
|
|
hostname:(NSString *)hostname
|
|
tlsAlpnProtocols:(NSArray<NSString *> *)tlsAlpnProtocols {
|
|
return [self initWithURLStrings:urlStrings
|
|
username:username
|
|
credential:credential
|
|
tlsCertPolicy:tlsCertPolicy
|
|
hostname:hostname
|
|
tlsAlpnProtocols:tlsAlpnProtocols
|
|
tlsEllipticCurves:[NSArray array]];
|
|
}
|
|
|
|
- (instancetype)initWithURLStrings:(NSArray<NSString *> *)urlStrings
|
|
username:(NSString *)username
|
|
credential:(NSString *)credential
|
|
tlsCertPolicy:(RTCTlsCertPolicy)tlsCertPolicy
|
|
hostname:(NSString *)hostname
|
|
tlsAlpnProtocols:(NSArray<NSString *> *)tlsAlpnProtocols
|
|
tlsEllipticCurves:(NSArray<NSString *> *)tlsEllipticCurves {
|
|
NSParameterAssert(urlStrings.count);
|
|
if (self = [super init]) {
|
|
_urlStrings = [[NSArray alloc] initWithArray:urlStrings copyItems:YES];
|
|
_username = [username copy];
|
|
_credential = [credential copy];
|
|
_tlsCertPolicy = tlsCertPolicy;
|
|
_hostname = [hostname copy];
|
|
_tlsAlpnProtocols = [[NSArray alloc] initWithArray:tlsAlpnProtocols copyItems:YES];
|
|
_tlsEllipticCurves = [[NSArray alloc] initWithArray:tlsEllipticCurves copyItems:YES];
|
|
}
|
|
return self;
|
|
}
|
|
|
|
- (NSString *)description {
|
|
return [NSString stringWithFormat:@"RTCIceServer:\n%@\n%@\n%@\n%@\n%@\n%@\n%@",
|
|
_urlStrings,
|
|
_username,
|
|
_credential,
|
|
[self stringForTlsCertPolicy:_tlsCertPolicy],
|
|
_hostname,
|
|
_tlsAlpnProtocols,
|
|
_tlsEllipticCurves];
|
|
}
|
|
|
|
#pragma mark - Private
|
|
|
|
- (NSString *)stringForTlsCertPolicy:(RTCTlsCertPolicy)tlsCertPolicy {
|
|
switch (tlsCertPolicy) {
|
|
case RTCTlsCertPolicySecure:
|
|
return @"RTCTlsCertPolicySecure";
|
|
case RTCTlsCertPolicyInsecureNoCheck:
|
|
return @"RTCTlsCertPolicyInsecureNoCheck";
|
|
}
|
|
}
|
|
|
|
- (webrtc::PeerConnectionInterface::IceServer)nativeServer {
|
|
__block webrtc::PeerConnectionInterface::IceServer iceServer;
|
|
|
|
iceServer.username = [NSString stdStringForString:_username];
|
|
iceServer.password = [NSString stdStringForString:_credential];
|
|
iceServer.hostname = [NSString stdStringForString:_hostname];
|
|
|
|
[_tlsAlpnProtocols enumerateObjectsUsingBlock:^(NSString *proto, NSUInteger idx, BOOL *stop) {
|
|
iceServer.tls_alpn_protocols.push_back(proto.stdString);
|
|
}];
|
|
|
|
[_tlsEllipticCurves enumerateObjectsUsingBlock:^(NSString *curve, NSUInteger idx, BOOL *stop) {
|
|
iceServer.tls_elliptic_curves.push_back(curve.stdString);
|
|
}];
|
|
|
|
[_urlStrings enumerateObjectsUsingBlock:^(NSString *url,
|
|
NSUInteger idx,
|
|
BOOL *stop) {
|
|
iceServer.urls.push_back(url.stdString);
|
|
}];
|
|
|
|
switch (_tlsCertPolicy) {
|
|
case RTCTlsCertPolicySecure:
|
|
iceServer.tls_cert_policy =
|
|
webrtc::PeerConnectionInterface::kTlsCertPolicySecure;
|
|
break;
|
|
case RTCTlsCertPolicyInsecureNoCheck:
|
|
iceServer.tls_cert_policy =
|
|
webrtc::PeerConnectionInterface::kTlsCertPolicyInsecureNoCheck;
|
|
break;
|
|
}
|
|
return iceServer;
|
|
}
|
|
|
|
- (instancetype)initWithNativeServer:
|
|
(webrtc::PeerConnectionInterface::IceServer)nativeServer {
|
|
NSMutableArray *urls =
|
|
[NSMutableArray arrayWithCapacity:nativeServer.urls.size()];
|
|
for (auto const &url : nativeServer.urls) {
|
|
[urls addObject:[NSString stringForStdString:url]];
|
|
}
|
|
NSString *username = [NSString stringForStdString:nativeServer.username];
|
|
NSString *credential = [NSString stringForStdString:nativeServer.password];
|
|
NSString *hostname = [NSString stringForStdString:nativeServer.hostname];
|
|
NSMutableArray *tlsAlpnProtocols =
|
|
[NSMutableArray arrayWithCapacity:nativeServer.tls_alpn_protocols.size()];
|
|
for (auto const &proto : nativeServer.tls_alpn_protocols) {
|
|
[tlsAlpnProtocols addObject:[NSString stringForStdString:proto]];
|
|
}
|
|
NSMutableArray *tlsEllipticCurves =
|
|
[NSMutableArray arrayWithCapacity:nativeServer.tls_elliptic_curves.size()];
|
|
for (auto const &curve : nativeServer.tls_elliptic_curves) {
|
|
[tlsEllipticCurves addObject:[NSString stringForStdString:curve]];
|
|
}
|
|
RTCTlsCertPolicy tlsCertPolicy;
|
|
|
|
switch (nativeServer.tls_cert_policy) {
|
|
case webrtc::PeerConnectionInterface::kTlsCertPolicySecure:
|
|
tlsCertPolicy = RTCTlsCertPolicySecure;
|
|
break;
|
|
case webrtc::PeerConnectionInterface::kTlsCertPolicyInsecureNoCheck:
|
|
tlsCertPolicy = RTCTlsCertPolicyInsecureNoCheck;
|
|
break;
|
|
}
|
|
|
|
self = [self initWithURLStrings:urls
|
|
username:username
|
|
credential:credential
|
|
tlsCertPolicy:tlsCertPolicy
|
|
hostname:hostname
|
|
tlsAlpnProtocols:tlsAlpnProtocols
|
|
tlsEllipticCurves:tlsEllipticCurves];
|
|
return self;
|
|
}
|
|
|
|
@end
|