Index: talk/app/webrtc/dtlsidentitystore.h |
diff --git a/talk/app/webrtc/dtlsidentitystore.h b/talk/app/webrtc/dtlsidentitystore.h |
index b2a797462fbe43b747070db0223fca07775aae05..35e360bcb895c6fb084f724195736351ceaad271 100644 |
--- a/talk/app/webrtc/dtlsidentitystore.h |
+++ b/talk/app/webrtc/dtlsidentitystore.h |
@@ -28,66 +28,125 @@ |
#ifndef TALK_APP_WEBRTC_DTLSIDENTITYSTORE_H_ |
#define TALK_APP_WEBRTC_DTLSIDENTITYSTORE_H_ |
-#include <queue> |
+#include <list> |
#include <string> |
-#include "talk/app/webrtc/peerconnectioninterface.h" |
#include "webrtc/base/messagehandler.h" |
#include "webrtc/base/messagequeue.h" |
+#include "webrtc/base/refcount.h" |
#include "webrtc/base/scoped_ptr.h" |
#include "webrtc/base/scoped_ref_ptr.h" |
+#include "webrtc/base/sslidentity.h" |
+#include "webrtc/base/thread.h" |
namespace webrtc { |
-class DTLSIdentityRequestObserver; |
+ |
class SSLIdentity; |
class Thread; |
-// This class implements an in-memory DTLS identity store, which generates the |
-// DTLS identity on the worker thread. |
+// Used to receive callbacks of DTLS identity requests. |
+class DtlsIdentityRequestObserver : public rtc::RefCountInterface { |
+ public: |
+ virtual void OnFailure(int error) = 0; |
+ // TODO(jiayl): Unify the OnSuccess method once Chrome code is updated. |
tommi
2015/07/02 11:22:59
can you assign this todo to you?
hbos
2015/07/02 12:28:27
Sure
|
+ virtual void OnSuccess(const std::string& der_cert, |
+ const std::string& der_private_key) = 0; |
+ // |identity| is a scoped_ptr because rtc::SSLIdentity is not copyable and the |
+ // client has to get the ownership of the object to make use of it. |
+ virtual void OnSuccess(rtc::scoped_ptr<rtc::SSLIdentity> identity) = 0; |
+ |
+ protected: |
+ virtual ~DtlsIdentityRequestObserver() {} |
+}; |
+ |
+// This interface defines an in-memory DTLS identity store, which generates DTLS |
+// identities. |
// APIs calls must be made on the signaling thread and the callbacks are also |
// called on the signaling thread. |
-class DtlsIdentityStore : public rtc::MessageHandler { |
+class DtlsIdentityStoreInterface { |
public: |
- static const char kIdentityName[]; |
+ virtual ~DtlsIdentityStoreInterface() { } |
- DtlsIdentityStore(rtc::Thread* signaling_thread, |
- rtc::Thread* worker_thread); |
- virtual ~DtlsIdentityStore(); |
- |
- // Initialize will start generating the free identity in the background. |
- void Initialize(); |
+ // Initializes the store. |
+ virtual void Initialize() = 0; |
tommi
2015/07/02 11:23:00
can we initialize in the ctor or is there a reason
hbos
2015/07/02 12:28:28
No reason that I can tell, removing.
|
// The |observer| will be called when the requested identity is ready, or when |
// identity generation fails. |
- void RequestIdentity(webrtc::DTLSIdentityRequestObserver* observer); |
+ virtual void RequestIdentity( |
+ rtc::KeyType key_type, |
+ const rtc::scoped_refptr<webrtc::DtlsIdentityRequestObserver>& |
tommi
2015/07/02 11:22:59
we're already in the webrtc namespace, right?
hbos
2015/07/02 12:28:28
Acknowledged.
|
+ observer) = 0; |
tommi
2015/07/02 11:23:00
4 space indent?
hbos
2015/07/02 12:28:27
Acknowledged.
|
+}; |
+ |
+// The standard implementation of DtlsIdentityStoreInterface. |
+// Identity generation is performed on the worker thread. |
+class DtlsIdentityStoreImpl : public DtlsIdentityStoreInterface, |
+ public rtc::MessageHandler { |
+ public: |
+ DtlsIdentityStoreImpl(rtc::Thread* signaling_thread, |
+ rtc::Thread* worker_thread); |
+ ~DtlsIdentityStoreImpl() override; |
+ |
+ // webrtc::DtlsIdentityStoreInterface override; |
+ // Initialize will start to preemptively generating an RSA identity in the |
+ // background, if the worker thread is not the same as the signaling thread. |
+ void Initialize() override; |
+ // webrtc::DtlsIdentityStoreInterface override; |
+ void RequestIdentity( |
+ rtc::KeyType key_type, |
+ const rtc::scoped_refptr<webrtc::DtlsIdentityRequestObserver>& |
tommi
2015/07/02 11:23:00
already in webrtc
hbos
2015/07/02 12:28:28
Acknowledged.
|
+ observer) override; |
// rtc::MessageHandler override; |
void OnMessage(rtc::Message* msg) override; |
- // Returns true if there is a free identity, used for unit tests. |
- bool HasFreeIdentityForTesting() const; |
+ // Returns true if there is a free RSA identity, used for unit tests. |
+ bool HasFreeIdentityForTesting(rtc::KeyType key_type) const; |
private: |
- sigslot::signal0<> SignalDestroyed; |
+ void GenerateIdentity( |
+ rtc::KeyType key_type, |
+ const rtc::scoped_refptr<webrtc::DtlsIdentityRequestObserver>& observer); |
+ void OnIdentityGenerated(rtc::KeyType key_type, |
+ rtc::scoped_ptr<rtc::SSLIdentity> identity); |
+ |
class WorkerTask; |
- typedef rtc::ScopedMessageData<DtlsIdentityStore::WorkerTask> |
- IdentityTaskMessageData; |
+ typedef rtc::ScopedMessageData<DtlsIdentityStoreImpl::WorkerTask> |
+ WorkerTaskMessageData; |
- void GenerateIdentity(); |
- void OnIdentityGenerated(rtc::scoped_ptr<rtc::SSLIdentity> identity); |
- void ReturnIdentity(rtc::scoped_ptr<rtc::SSLIdentity> identity); |
+ // A key type-identity pair. |
+ struct IdentityResult { |
+ IdentityResult(rtc::KeyType key_type, |
+ rtc::scoped_ptr<rtc::SSLIdentity> identity) |
+ : key_type_(key_type), identity_(identity.Pass()) {} |
- void PostGenerateIdentityResult_w(rtc::scoped_ptr<rtc::SSLIdentity> identity); |
+ rtc::KeyType key_type_; |
+ rtc::scoped_ptr<rtc::SSLIdentity> identity_; |
+ }; |
+ |
+ typedef rtc::ScopedMessageData<IdentityResult> IdentityResultMessageData; |
+ |
+ sigslot::signal0<> SignalDestroyed; |
rtc::Thread* const signaling_thread_; |
+ // TODO(hbos): RSA generation is slow and would be VERY slow if we switch over |
+ // to 2048, DtlsIdentityStore should use a new thread and not the "general |
+ // purpose" worker thread. |
rtc::Thread* const worker_thread_; |
- // These members should be accessed on the signaling thread only. |
- int pending_jobs_; |
- rtc::scoped_ptr<rtc::SSLIdentity> free_identity_; |
- typedef std::queue<rtc::scoped_refptr<webrtc::DTLSIdentityRequestObserver>> |
- ObserverList; |
- ObserverList pending_observers_; |
+ struct RequestInfo { |
+ RequestInfo() : request_observers_(), |
tommi
2015/07/02 11:23:00
nit: could probably do this in two lines
RequestI
hbos
2015/07/02 12:28:27
Acknowledged.
|
+ gen_in_progress_counts_(0), |
+ free_identity_() { } |
+ |
+ std::list<rtc::scoped_refptr<webrtc::DtlsIdentityRequestObserver>> |
+ request_observers_; |
+ size_t gen_in_progress_counts_; |
+ rtc::scoped_ptr<rtc::SSLIdentity> free_identity_; |
+ }; |
+ |
+ // One RequestInfo per KeyType. Only touch on the |signaling_thread_|. |
+ RequestInfo request_info_[rtc::KT_LAST]; |
}; |
} // namespace webrtc |