0483362377
Refactor "OPT_SSLTCP" renaming it to "OPT_TLS_FAKE", making it clear
that it's not actually some kind of SSL over TCP. Also making it clear
that it's mutually exclusive with OPT_TLS. Maintaining deprecated
backwards compatible support for "OPT_SSLTCP".
Add "OPT_TLS_INSECURE" that implements the new certificate-check
disabled TLS mode, which is also mutually exclusive with the other
TLS options.
PortAllocator: Add a new TLS policy enum TlsCertPolicy which defines
the new insecure mode and added it as a RelayCredentials member.
TurnPort: Add new TLS policy member with appropriate getter and setter
to avoid constructor bloat. Initialize it from the RelayCredentials
after the TurnPort is created.
Expose the new feature in the PeerConnection API via
IceServer.tls_certificate_policy as well as via the Android JNI
PeerConnection API.
For security reasons we ensure that:
1) The policy is always explicitly initialized to secure.
2) API users have to explicitly integrate with the feature to
use it, and will otherwise get no change in behavior.
3) The feature is not immediately exposed in non-native
contexts. For example, disabling of certificate validation
is not implemented via URI parsing since this would
immediately allow it to be used from a web page.
This is a second attempt of https://codereview.webrtc.org/2557803002/
which was rolled back in https://codereview.webrtc.org/2590153002/
BUG=webrtc:6840
Review-Url: https://codereview.webrtc.org/2594623002
Cr-Commit-Position: refs/heads/master@{#15967}
137 lines
5.6 KiB
C++
137 lines
5.6 KiB
C++
/*
|
|
* 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.
|
|
*/
|
|
#include "webrtc/sdk/android/src/jni/classreferenceholder.h"
|
|
|
|
#include "webrtc/sdk/android/src/jni/jni_helpers.h"
|
|
|
|
namespace webrtc_jni {
|
|
|
|
// ClassReferenceHolder holds global reference to Java classes in app/webrtc.
|
|
class ClassReferenceHolder {
|
|
public:
|
|
explicit ClassReferenceHolder(JNIEnv* jni);
|
|
~ClassReferenceHolder();
|
|
|
|
void FreeReferences(JNIEnv* jni);
|
|
jclass GetClass(const std::string& name);
|
|
|
|
private:
|
|
void LoadClass(JNIEnv* jni, const std::string& name);
|
|
|
|
std::map<std::string, jclass> classes_;
|
|
};
|
|
|
|
// Allocated in LoadGlobalClassReferenceHolder(),
|
|
// freed in FreeGlobalClassReferenceHolder().
|
|
static ClassReferenceHolder* g_class_reference_holder = nullptr;
|
|
|
|
void LoadGlobalClassReferenceHolder() {
|
|
RTC_CHECK(g_class_reference_holder == nullptr);
|
|
g_class_reference_holder = new ClassReferenceHolder(GetEnv());
|
|
}
|
|
|
|
void FreeGlobalClassReferenceHolder() {
|
|
g_class_reference_holder->FreeReferences(AttachCurrentThreadIfNeeded());
|
|
delete g_class_reference_holder;
|
|
g_class_reference_holder = nullptr;
|
|
}
|
|
|
|
ClassReferenceHolder::ClassReferenceHolder(JNIEnv* jni) {
|
|
LoadClass(jni, "android/graphics/SurfaceTexture");
|
|
LoadClass(jni, "java/nio/ByteBuffer");
|
|
LoadClass(jni, "java/util/ArrayList");
|
|
LoadClass(jni, "org/webrtc/AudioTrack");
|
|
LoadClass(jni, "org/webrtc/Camera1Enumerator");
|
|
LoadClass(jni, "org/webrtc/Camera2Enumerator");
|
|
LoadClass(jni, "org/webrtc/CameraEnumerationAndroid");
|
|
LoadClass(jni, "org/webrtc/DataChannel");
|
|
LoadClass(jni, "org/webrtc/DataChannel$Buffer");
|
|
LoadClass(jni, "org/webrtc/DataChannel$Init");
|
|
LoadClass(jni, "org/webrtc/DataChannel$State");
|
|
LoadClass(jni, "org/webrtc/EglBase");
|
|
LoadClass(jni, "org/webrtc/EglBase$Context");
|
|
LoadClass(jni, "org/webrtc/EglBase14$Context");
|
|
LoadClass(jni, "org/webrtc/IceCandidate");
|
|
LoadClass(jni, "org/webrtc/MediaCodecVideoEncoder");
|
|
LoadClass(jni, "org/webrtc/MediaCodecVideoEncoder$OutputBufferInfo");
|
|
LoadClass(jni, "org/webrtc/MediaCodecVideoEncoder$VideoCodecType");
|
|
LoadClass(jni, "org/webrtc/MediaCodecVideoDecoder");
|
|
LoadClass(jni, "org/webrtc/MediaCodecVideoDecoder$DecodedTextureBuffer");
|
|
LoadClass(jni, "org/webrtc/MediaCodecVideoDecoder$DecodedOutputBuffer");
|
|
LoadClass(jni, "org/webrtc/MediaCodecVideoDecoder$VideoCodecType");
|
|
LoadClass(jni, "org/webrtc/MediaSource$State");
|
|
LoadClass(jni, "org/webrtc/MediaStream");
|
|
LoadClass(jni, "org/webrtc/MediaStreamTrack$State");
|
|
LoadClass(jni, "org/webrtc/MediaStreamTrack$MediaType");
|
|
LoadClass(jni, "org/webrtc/NetworkMonitor");
|
|
LoadClass(jni, "org/webrtc/NetworkMonitorAutoDetect$ConnectionType");
|
|
LoadClass(jni, "org/webrtc/NetworkMonitorAutoDetect$IPAddress");
|
|
LoadClass(jni, "org/webrtc/NetworkMonitorAutoDetect$NetworkInformation");
|
|
LoadClass(jni, "org/webrtc/PeerConnectionFactory");
|
|
LoadClass(jni, "org/webrtc/PeerConnection$BundlePolicy");
|
|
LoadClass(jni, "org/webrtc/PeerConnection$ContinualGatheringPolicy");
|
|
LoadClass(jni, "org/webrtc/PeerConnection$RtcpMuxPolicy");
|
|
LoadClass(jni, "org/webrtc/PeerConnection$IceConnectionState");
|
|
LoadClass(jni, "org/webrtc/PeerConnection$IceGatheringState");
|
|
LoadClass(jni, "org/webrtc/PeerConnection$IceTransportsType");
|
|
LoadClass(jni, "org/webrtc/PeerConnection$TcpCandidatePolicy");
|
|
LoadClass(jni, "org/webrtc/PeerConnection$TlsCertPolicy");
|
|
LoadClass(jni, "org/webrtc/PeerConnection$CandidateNetworkPolicy");
|
|
LoadClass(jni, "org/webrtc/PeerConnection$KeyType");
|
|
LoadClass(jni, "org/webrtc/PeerConnection$SignalingState");
|
|
LoadClass(jni, "org/webrtc/RtpReceiver");
|
|
LoadClass(jni, "org/webrtc/RtpSender");
|
|
LoadClass(jni, "org/webrtc/SessionDescription");
|
|
LoadClass(jni, "org/webrtc/SessionDescription$Type");
|
|
LoadClass(jni, "org/webrtc/StatsReport");
|
|
LoadClass(jni, "org/webrtc/StatsReport$Value");
|
|
LoadClass(jni, "org/webrtc/SurfaceTextureHelper");
|
|
LoadClass(jni, "org/webrtc/VideoCapturer");
|
|
LoadClass(jni, "org/webrtc/VideoRenderer$I420Frame");
|
|
LoadClass(jni, "org/webrtc/VideoTrack");
|
|
}
|
|
|
|
ClassReferenceHolder::~ClassReferenceHolder() {
|
|
RTC_CHECK(classes_.empty()) << "Must call FreeReferences() before dtor!";
|
|
}
|
|
|
|
void ClassReferenceHolder::FreeReferences(JNIEnv* jni) {
|
|
for (std::map<std::string, jclass>::const_iterator it = classes_.begin();
|
|
it != classes_.end(); ++it) {
|
|
jni->DeleteGlobalRef(it->second);
|
|
}
|
|
classes_.clear();
|
|
}
|
|
|
|
jclass ClassReferenceHolder::GetClass(const std::string& name) {
|
|
std::map<std::string, jclass>::iterator it = classes_.find(name);
|
|
RTC_CHECK(it != classes_.end()) << "Unexpected GetClass() call for: " << name;
|
|
return it->second;
|
|
}
|
|
|
|
void ClassReferenceHolder::LoadClass(JNIEnv* jni, const std::string& name) {
|
|
jclass localRef = jni->FindClass(name.c_str());
|
|
CHECK_EXCEPTION(jni) << "error during FindClass: " << name;
|
|
RTC_CHECK(localRef) << name;
|
|
jclass globalRef = reinterpret_cast<jclass>(jni->NewGlobalRef(localRef));
|
|
CHECK_EXCEPTION(jni) << "error during NewGlobalRef: " << name;
|
|
RTC_CHECK(globalRef) << name;
|
|
bool inserted = classes_.insert(std::make_pair(name, globalRef)).second;
|
|
RTC_CHECK(inserted) << "Duplicate class name: " << name;
|
|
}
|
|
|
|
// Returns a global reference guaranteed to be valid for the lifetime of the
|
|
// process.
|
|
jclass FindClass(JNIEnv* jni, const char* name) {
|
|
return g_class_reference_holder->GetClass(name);
|
|
}
|
|
|
|
} // namespace webrtc_jni
|