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

diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp
index 0357c962..7808ad10 100644
--- a/src/common/signalproxy.cpp
+++ b/src/common/signalproxy.cpp
@@ -45,12 +45,18 @@
 // ==================================================
 class PeerSignalEvent : public QEvent {
 public:
-  PeerSignalEvent(SignalProxy *sender, SignalProxy::RequestType requestType, const QVariantList &params) : QEvent(QEvent::User), sender(sender), requestType(requestType), params(params) {}
+  PeerSignalEvent(SignalProxy *sender, SignalProxy::RequestType requestType, const QVariantList &params) : QEvent(QEvent::Type(SignalProxy::PeerSignal)), sender(sender), requestType(requestType), params(params) {}
   SignalProxy *sender;
   SignalProxy::RequestType requestType;
   QVariantList params;
 };
 
+class RemovePeerEvent : public QEvent {
+public:
+  RemovePeerEvent(QObject *peer) : QEvent(QEvent::Type(SignalProxy::RemovePeer)), peer(peer) {}
+  QObject *peer;
+};
+
 // ==================================================
 //  SIGNALRELAY
 // ==================================================
@@ -306,19 +312,16 @@ bool SignalProxy::addPeer(QIODevice* iodev) {
     return false;
   }
 
-  if(!iodev->isOpen())
-    qWarning("SignalProxy::the device you passed is not open!");
+  if(!iodev->isOpen()) {
+    qWarning("SignalProxy::addPeer(QIODevice *iodev): iodev needs to be open!");
+    return false;
+  }
 
   connect(iodev, SIGNAL(disconnected()), this, SLOT(removePeerBySender()));
   connect(iodev, SIGNAL(readyRead()), this, SLOT(dataAvailable()));
 
-  QAbstractSocket* sock  = qobject_cast<QAbstractSocket*>(iodev);
-  if(sock) {
-    connect(sock, SIGNAL(disconnected()), this, SLOT(removePeerBySender()));
-  }
-
-  if(!sock->parent())
-    sock->setParent(this);
+  if(!iodev->parent())
+    iodev->setParent(this);
 
   _peers[iodev] = new IODevicePeer(iodev, iodev->property("UseCompression").toBool());
 
@@ -389,7 +392,6 @@ void SignalProxy::removePeer(QObject* dev) {
       proxy->removePeer(this);
   }
 
-
   if(dev->parent() == this)
     dev->deleteLater();
 
@@ -760,7 +762,10 @@ void SignalProxy::dispatchSignal(const RequestType &requestType, const QVariantL
     case AbstractPeer::IODevicePeer:
       {
 	IODevicePeer *ioPeer = static_cast<IODevicePeer *>(*peer);
-	ioPeer->dispatchPackedFunc(packedFunc);
+	if(ioPeer->isOpen())
+	  ioPeer->dispatchPackedFunc(packedFunc);
+	else
+	  QCoreApplication::postEvent(this, new RemovePeerEvent(peer.key()));
       }
       break;
     case AbstractPeer::SignalProxyPeer:
@@ -1056,28 +1061,33 @@ bool SignalProxy::readDataFromDevice(QIODevice *dev, quint32 &blockSize, QVarian
   }
 
   if(blockSize > 1 << 22) {
-    qWarning() << qPrintable(tr("Client tried to send package larger than max package size!"));
-    QAbstractSocket *sock  = qobject_cast<QAbstractSocket *>(dev);
-    qWarning() << qPrintable(tr("Disconnecting")) << (sock ? qPrintable(sock->peerAddress().toString()) : qPrintable(tr("local client")));
-    dev->close();
+    disconnectDevice(dev, tr("Client tried to send package larger than max package size!"));
+    return false;
+  }
+
+  if(blockSize == 0) {
+    disconnectDevice(dev, tr("Client tried to send 0 byte package!"));
     return false;
   }
 
   if(dev->bytesAvailable() < blockSize)
     return false;
 
+  blockSize = 0;
+
   if(compressed) {
     QByteArray rawItem;
     in >> rawItem;
-    // debug check
+
     int nbytes = rawItem.size();
-    if (nbytes <= 4) {
+    if(nbytes <= 4) {
       const char *data = rawItem.constData();
-      if (nbytes < 4 || (data[0]!=0 || data[1]!=0 || data[2]!=0 || data[3]!=0))
-	qWarning() << "receieved corrupted compressed data:"
-		   << blockSize << rawItem << rawItem.size() << dev;
+      if(nbytes < 4 || (data[0]!=0 || data[1]!=0 || data[2]!=0 || data[3]!=0)) {
+	disconnectDevice(dev, tr("Client sent corrupted compressed data!"));
+	return false;
+      }
     }
-    // end
+
     rawItem = qUncompress(rawItem);
 
     QDataStream itemStream(&rawItem, QIODevice::ReadOnly);
@@ -1087,7 +1097,10 @@ bool SignalProxy::readDataFromDevice(QIODevice *dev, quint32 &blockSize, QVarian
     in >> item;
   }
 
-  blockSize = 0;
+  if(!item.isValid()) {
+    disconnectDevice(dev, tr("Client sent corrupt data: unable to load QVariant!"));
+    return false;
+  }
 
   return true;
 }
@@ -1194,18 +1207,33 @@ void SignalProxy::receiveHeartBeatReply(AbstractPeer *peer, const QVariantList &
 
 void SignalProxy::customEvent(QEvent *event) {
   switch(event->type()) {
-  case QEvent::User:
+  case PeerSignal:
     {
-      PeerSignalEvent *sig = static_cast<PeerSignalEvent *>(event);
-      receivePeerSignal(sig->sender, sig->requestType, sig->params);
+      PeerSignalEvent *e = static_cast<PeerSignalEvent *>(event);
+      receivePeerSignal(e->sender, e->requestType, e->params);
     }
     event->accept();
     break;
+  case RemovePeer:
+    {
+      RemovePeerEvent *e = static_cast<RemovePeerEvent *>(event);
+      removePeer(e->peer);
+    }
+    event->accept();
   default:
     return;
   }
 }
 
+void SignalProxy::disconnectDevice(QIODevice *dev, const QString &reason) {
+  if(!reason.isEmpty())
+    qWarning() << qPrintable(reason);
+  QAbstractSocket *sock  = qobject_cast<QAbstractSocket *>(dev);
+  if(sock)
+    qWarning() << qPrintable(tr("Disconnecting")) << qPrintable(sock->peerAddress().toString());
+  dev->close();
+}
+
 void SignalProxy::updateLag(IODevicePeer *peer, int lag) {
   peer->lag = lag;
   if(proxyMode() == Client) {