X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsignalproxy.cpp;h=7c43592c837e6b7daf01b5808eefce71abd2619d;hp=5d302030c06a0d89bf9d2c141b19042a354ae3e0;hb=558260f52de5a9b1364f5672ace17554efc10a74;hpb=d816b49993aa24d4d2e88975eb92a28cf329a381

diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp
index 5d302030..7c43592c 100644
--- a/src/common/signalproxy.cpp
+++ b/src/common/signalproxy.cpp
@@ -32,6 +32,9 @@
 #include <QMetaMethod>
 #include <QMetaProperty>
 #include <QRegExp>
+#ifdef HAVE_SSL
+#include <QSslSocket>
+#endif
 #include <QThread>
 #include <QTime>
 #include <QEvent>
@@ -212,6 +215,20 @@ void SignalProxy::IODevicePeer::dispatchSignal(const RequestType &requestType, c
   dispatchPackedFunc(QVariant(packedFunc));
 }
 
+bool SignalProxy::IODevicePeer::isSecure() const {
+#ifdef HAVE_SSL
+  QSslSocket *sslSocket = qobject_cast<QSslSocket *>(_device);
+  if(sslSocket)
+    return sslSocket->isEncrypted() || sslSocket->localAddress() == QHostAddress::LocalHost || sslSocket->localAddress() == QHostAddress::LocalHostIPv6;
+#endif
+
+  QAbstractSocket *socket = qobject_cast<QAbstractSocket *>(_device);
+  if(socket)
+    return socket->localAddress() == QHostAddress::LocalHost || socket->localAddress() == QHostAddress::LocalHostIPv6;
+
+  return false;
+}
+
 QString SignalProxy::IODevicePeer::address() const {
   QAbstractSocket *socket = qobject_cast<QAbstractSocket *>(_device);
   if(socket)
@@ -291,6 +308,8 @@ void SignalProxy::setProxyMode(ProxyMode mode) {
 void SignalProxy::init() {
   connect(&_heartBeatTimer, SIGNAL(timeout()), this, SLOT(sendHeartBeat()));
   _heartBeatTimer.start(30 * 1000);
+  _secure = false;
+  updateSecureState();
 }
 
 void SignalProxy::initServer() {
@@ -320,6 +339,13 @@ bool SignalProxy::addPeer(QIODevice* iodev) {
   connect(iodev, SIGNAL(disconnected()), this, SLOT(removePeerBySender()));
   connect(iodev, SIGNAL(readyRead()), this, SLOT(dataAvailable()));
 
+#ifdef HAVE_SSL
+  QSslSocket *sslSocket = qobject_cast<QSslSocket *>(iodev);
+  if(sslSocket) {
+    connect(iodev, SIGNAL(encrypted()), this, SLOT(updateSecureState()));
+  }
+#endif
+
   if(!iodev->parent())
     iodev->setParent(this);
 
@@ -328,6 +354,7 @@ bool SignalProxy::addPeer(QIODevice* iodev) {
   if(_peers.count() == 1)
     emit connected();
 
+  updateSecureState();
   return true;
 }
 
@@ -355,6 +382,7 @@ bool SignalProxy::addPeer(SignalProxy* proxy) {
   if(_peers.count() == 1)
     emit connected();
 
+  updateSecureState();
   return true;
 }
 
@@ -397,6 +425,8 @@ void SignalProxy::removePeer(QObject* dev) {
 
   delete peer;
 
+  updateSecureState();
+
   if(_peers.isEmpty())
     emit disconnected();
 }
@@ -407,7 +437,7 @@ void SignalProxy::removePeerBySender() {
 
 void SignalProxy::objectRenamed(const QString &newname, const QString &oldname) {
   SyncableObject *syncObject = qobject_cast<SyncableObject *>(sender());
-  const QMetaObject *meta = syncObject->metaObject();
+  const QMetaObject *meta = syncObject->syncMetaObject();
   const QByteArray className(meta->className());
   objectRenamed(className, newname, oldname);
 
@@ -440,8 +470,6 @@ void SignalProxy::setArgTypes(QObject* obj, int methodId) {
 
 const QList<int> &SignalProxy::argTypes(QObject *obj, int methodId) {
   const QMetaObject *meta = metaObject(obj);
-  if(!_classInfo.contains(meta))
-    qDebug() << obj << meta;
   Q_ASSERT(_classInfo.contains(meta));
   if(!_classInfo[meta]->argTypes.contains(methodId))
     setArgTypes(obj, methodId);
@@ -719,9 +747,9 @@ void SignalProxy::detachSender() {
 }
 
 void SignalProxy::detachObject(QObject* obj) {
+  stopSync(static_cast<SyncableObject *>(obj));
   detachSignals(obj);
   detachSlots(obj);
-  stopSync(static_cast<SyncableObject *>(obj));
 }
 
 void SignalProxy::detachSignals(QObject* sender) {
@@ -1124,7 +1152,7 @@ bool SignalProxy::methodsMatch(const QMetaMethod &signal, const QMetaMethod &slo
     signalsuffix = signalsuffix.mid(baseName.count()).toLower();
     slotprefix = slotprefix.left(slotprefix.count() - baseName.count()).toLower();
   }
-  
+
   uint sizediff = qAbs(slotprefix.size() - signalsuffix.size());
   int ratio = editingDistance(slotprefix, signalsuffix) - sizediff;
 //   if(ratio < 2) {
@@ -1289,3 +1317,16 @@ void SignalProxy::dumpSyncMap(SyncableObject *object) {
     iter++;
   }
 }
+
+void SignalProxy::updateSecureState() {
+  bool wasSecure = _secure;
+
+  _secure = !_peers.isEmpty();
+  PeerHash::const_iterator peerIter;
+  for(peerIter = _peers.constBegin(); peerIter != _peers.constEnd(); peerIter++) {
+    _secure &= (*peerIter)->isSecure();
+  }
+
+  if(wasSecure != _secure)
+    emit secureStateChanged(_secure);
+}