X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsignalproxy.cpp;h=7c43592c837e6b7daf01b5808eefce71abd2619d;hp=7808ad1087ca13fff4d98d6b2725fd49667c7d2c;hb=1adc00219ba072da57994764d086beed8ffb7bb4;hpb=aa7841638c6537034102da959cad8c36853bf280

diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp
index 7808ad10..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);
 
@@ -717,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) {
@@ -1107,7 +1137,8 @@ bool SignalProxy::readDataFromDevice(QIODevice *dev, quint32 &blockSize, QVarian
 
 bool SignalProxy::methodsMatch(const QMetaMethod &signal, const QMetaMethod &slot) const {
   // if we don't even have the same basename it's a sure NO
-  if(methodBaseName(signal) != methodBaseName(slot))
+  QString baseName = methodBaseName(signal);
+  if(baseName != methodBaseName(slot))
     return false;
 
   // are the signatures compatible?
@@ -1115,11 +1146,20 @@ bool SignalProxy::methodsMatch(const QMetaMethod &signal, const QMetaMethod &slo
     return false;
 
   // we take an educated guess if the signals and slots match
-  QString signalsuffix = ::methodName(signal).mid(QString(::methodName(signal)).lastIndexOf(QRegExp("[A-Z]"))).toLower();
-  QString slotprefix = ::methodName(slot).left(QString(::methodName(slot)).indexOf(QRegExp("[A-Z]"))).toLower();
+  QString signalsuffix = ::methodName(signal);
+  QString slotprefix = ::methodName(slot);
+  if(!baseName.isEmpty()) {
+    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) {
+//     qDebug() << Q_FUNC_INFO;
+//     qDebug() << methodBaseName(signal) << methodBaseName(slot);
+//     qDebug() << signalsuffix << slotprefix << sizediff << ratio;
+//   }
   return (ratio < 2);
 }
 
@@ -1273,13 +1313,20 @@ void SignalProxy::dumpSyncMap(SyncableObject *object) {
   QHash<QByteArray, int> syncMap_ = syncMap(object);
   QHash<QByteArray, int>::const_iterator iter = syncMap_.constBegin();
   while(iter != syncMap_.constEnd()) {
-    qDebug() << iter.key() << "-->" << iter.value() << meta->method(iter.value()).signature();
+    qDebug() << qPrintable(QString("%1 --> %2 %3").arg(QString(iter.key()), 40).arg(iter.value()).arg(QString(meta->method(iter.value()).signature())));
     iter++;
   }
-//   QHash<int, int> syncMap_ = syncMap(object);
-//   QHash<int, int>::const_iterator iter = syncMap_.constBegin();
-//   while(iter != syncMap_.constEnd()) {
-//     qDebug() << iter.key() << meta->method(iter.key()).signature() << "-->" << iter.value() << meta->method(iter.value()).signature();
-//     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);
 }