X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsignalproxy.cpp;h=7c43592c837e6b7daf01b5808eefce71abd2619d;hp=4308d8a8fce9ba5a081b4da22b79830e0c60ad08;hb=1adc00219ba072da57994764d086beed8ffb7bb4;hpb=1eb21546673535f5707aa6346e8c749b928cd772 diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp index 4308d8a8..7c43592c 100644 --- a/src/common/signalproxy.cpp +++ b/src/common/signalproxy.cpp @@ -32,6 +32,9 @@ #include #include #include +#ifdef HAVE_SSL +#include +#endif #include #include #include @@ -45,12 +48,18 @@ // ================================================== class PeerSignalEvent : public QEvent { public: - PeerSignalEvent(SignalProxy *sender, SignalProxy::RequestType requestType, const QVariantList ¶ms) : QEvent(QEvent::User), sender(sender), requestType(requestType), params(params) {} + PeerSignalEvent(SignalProxy *sender, SignalProxy::RequestType requestType, const QVariantList ¶ms) : 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 // ================================================== @@ -206,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(_device); + if(sslSocket) + return sslSocket->isEncrypted() || sslSocket->localAddress() == QHostAddress::LocalHost || sslSocket->localAddress() == QHostAddress::LocalHostIPv6; +#endif + + QAbstractSocket *socket = qobject_cast(_device); + if(socket) + return socket->localAddress() == QHostAddress::LocalHost || socket->localAddress() == QHostAddress::LocalHostIPv6; + + return false; +} + QString SignalProxy::IODevicePeer::address() const { QAbstractSocket *socket = qobject_cast(_device); if(socket) @@ -285,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() { @@ -306,25 +331,30 @@ 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(iodev); - if(sock) { - connect(sock, SIGNAL(disconnected()), this, SLOT(removePeerBySender())); +#ifdef HAVE_SSL + QSslSocket *sslSocket = qobject_cast(iodev); + if(sslSocket) { + connect(iodev, SIGNAL(encrypted()), this, SLOT(updateSecureState())); } +#endif - if(!sock->parent()) - sock->setParent(this); + if(!iodev->parent()) + iodev->setParent(this); _peers[iodev] = new IODevicePeer(iodev, iodev->property("UseCompression").toBool()); if(_peers.count() == 1) emit connected(); + updateSecureState(); return true; } @@ -352,6 +382,7 @@ bool SignalProxy::addPeer(SignalProxy* proxy) { if(_peers.count() == 1) emit connected(); + updateSecureState(); return true; } @@ -394,6 +425,8 @@ void SignalProxy::removePeer(QObject* dev) { delete peer; + updateSecureState(); + if(_peers.isEmpty()) emit disconnected(); } @@ -404,7 +437,7 @@ void SignalProxy::removePeerBySender() { void SignalProxy::objectRenamed(const QString &newname, const QString &oldname) { SyncableObject *syncObject = qobject_cast(sender()); - const QMetaObject *meta = syncObject->metaObject(); + const QMetaObject *meta = syncObject->syncMetaObject(); const QByteArray className(meta->className()); objectRenamed(className, newname, oldname); @@ -714,9 +747,9 @@ void SignalProxy::detachSender() { } void SignalProxy::detachObject(QObject* obj) { + stopSync(static_cast(obj)); detachSignals(obj); detachSlots(obj); - stopSync(static_cast(obj)); } void SignalProxy::detachSignals(QObject* sender) { @@ -759,7 +792,10 @@ void SignalProxy::dispatchSignal(const RequestType &requestType, const QVariantL case AbstractPeer::IODevicePeer: { IODevicePeer *ioPeer = static_cast(*peer); - ioPeer->dispatchPackedFunc(packedFunc); + if(ioPeer->isOpen()) + ioPeer->dispatchPackedFunc(packedFunc); + else + QCoreApplication::postEvent(this, new RemovePeerEvent(peer.key())); } break; case AbstractPeer::SignalProxyPeer: @@ -1055,28 +1091,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(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); @@ -1086,14 +1127,18 @@ 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; } 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? @@ -1101,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); } @@ -1193,18 +1247,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(event); - receivePeerSignal(sig->sender, sig->requestType, sig->params); + PeerSignalEvent *e = static_cast(event); + receivePeerSignal(e->sender, e->requestType, e->params); } event->accept(); break; + case RemovePeer: + { + RemovePeerEvent *e = static_cast(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(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) { @@ -1244,13 +1313,20 @@ void SignalProxy::dumpSyncMap(SyncableObject *object) { QHash syncMap_ = syncMap(object); QHash::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 syncMap_ = syncMap(object); -// QHash::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); }