X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsignalproxy.cpp;h=a9172fc2f6e8da5cc74e1f714539d7feffd3a225;hp=58b9eda21050b289d953ef95a7686ec6a29635b6;hb=0324c701d9cc8c656e6188b4e102e19e05c98201;hpb=ac21cc48d22f0cf58a98b74754fa94564a8e3f45

diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp
index 58b9eda2..a9172fc2 100644
--- a/src/common/signalproxy.cpp
+++ b/src/common/signalproxy.cpp
@@ -32,6 +32,7 @@
 #include <QMetaMethod>
 #include <QMetaProperty>
 #include <QRegExp>
+#include <QSslSocket>
 #include <QThread>
 #include <QTime>
 #include <QEvent>
@@ -212,6 +213,18 @@ void SignalProxy::IODevicePeer::dispatchSignal(const RequestType &requestType, c
   dispatchPackedFunc(QVariant(packedFunc));
 }
 
+bool SignalProxy::IODevicePeer::isSecure() const {
+  QSslSocket *sslSocket = qobject_cast<QSslSocket *>(_device);
+  if(sslSocket)
+    return sslSocket->isEncrypted() || sslSocket->localAddress() == QHostAddress::LocalHost || sslSocket->localAddress() == QHostAddress::LocalHostIPv6;
+
+  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 +304,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 +335,11 @@ bool SignalProxy::addPeer(QIODevice* iodev) {
   connect(iodev, SIGNAL(disconnected()), this, SLOT(removePeerBySender()));
   connect(iodev, SIGNAL(readyRead()), this, SLOT(dataAvailable()));
 
+  QSslSocket *sslSocket = qobject_cast<QSslSocket *>(iodev);
+  if(sslSocket) {
+    connect(iodev, SIGNAL(encrypted()), this, SLOT(updateSecureState()));
+  }
+
   if(!iodev->parent())
     iodev->setParent(this);
 
@@ -328,6 +348,7 @@ bool SignalProxy::addPeer(QIODevice* iodev) {
   if(_peers.count() == 1)
     emit connected();
 
+  updateSecureState();
   return true;
 }
 
@@ -355,6 +376,7 @@ bool SignalProxy::addPeer(SignalProxy* proxy) {
   if(_peers.count() == 1)
     emit connected();
 
+  updateSecureState();
   return true;
 }
 
@@ -397,6 +419,8 @@ void SignalProxy::removePeer(QObject* dev) {
 
   delete peer;
 
+  updateSecureState();
+
   if(_peers.isEmpty())
     emit disconnected();
 }
@@ -1122,7 +1146,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) {
@@ -1287,3 +1311,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);
+}