[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=918bb82

The following commit has been merged in the master branch:
commit 918bb82ffa0cfdea796c64cc0011d588833a2e66
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Thu Dec 17 07:45:53 2015 -0800

    Do not store certificate and key in landevicelink
    
    The socket already stores the certificate, and the public key is only used
    in the sftp plugin, so it should be moved there or dropped.
---
 core/backends/lan/landevicelink.cpp     | 26 ++++----------------------
 core/backends/lan/landevicelink.h       |  7 -------
 core/backends/lan/lanlinkprovider.cpp   |  2 --
 core/backends/lan/lanpairinghandler.cpp | 13 -------------
 core/backends/lan/socketlinereader.h    |  1 +
 5 files changed, 5 insertions(+), 44 deletions(-)

diff --git a/core/backends/lan/landevicelink.cpp b/core/backends/lan/landevicelink.cpp
index 1d23cd8..bdc6e42 100644
--- a/core/backends/lan/landevicelink.cpp
+++ b/core/backends/lan/landevicelink.cpp
@@ -53,17 +53,8 @@ void LanDeviceLink::reset(QSslSocket* socket, DeviceLink::ConnectionStarted conn
 
     setConnectionSource(connectionSource);
 
-    if (m_certificate.isNull()) {
-
-        QString certString = KdeConnectConfig::instance()->getDeviceProperty(deviceId(), "certificate");
-        m_certificate = QSslCertificate(certString.toLatin1());
-
-        QString keyString = KdeConnectConfig::instance()->getDeviceProperty(deviceId(), "publicKey");
-        m_publicKey = QCA::PublicKey::fromPEM(keyString.toLatin1());
-
-        DeviceLink::setPairStatus(m_certificate.isNull()? PairStatus::NotPaired : PairStatus::Paired);
-    }
-
+    QString certString = KdeConnectConfig::instance()->getDeviceProperty(deviceId(), "certificate");
+    DeviceLink::setPairStatus(certString.isEmpty()? PairStatus::NotPaired : PairStatus::Paired);
 }
 
 QString LanDeviceLink::name()
@@ -145,19 +136,10 @@ void LanDeviceLink::setPairStatus(PairStatus status)
 {
     if (status == Paired) {
         Q_ASSERT(KdeConnectConfig::instance()->trustedDevices().contains(deviceId()));
-        Q_ASSERT(!m_certificate.isNull());
-        Q_ASSERT(!m_publicKey.isNull());
-        KdeConnectConfig::instance()->setDeviceProperty(deviceId(), "certificate", m_certificate.toPem());
-        KdeConnectConfig::instance()->setDeviceProperty(deviceId(), "publicKey", m_publicKey.toPEM());
+        Q_ASSERT(!mSocketLineReader->peerCertificate().isNull());
+        KdeConnectConfig::instance()->setDeviceProperty(deviceId(), "certificate", mSocketLineReader->peerCertificate().toPem());
     }
 
     DeviceLink::setPairStatus(status);
 }
 
-void LanDeviceLink::setCertificate(QSslCertificate certificate, QCA::PublicKey publicKey)
-{
-    Q_ASSERT(!m_certificate.isNull());
-    Q_ASSERT(!m_publicKey.isNull());
-    m_certificate = certificate;
-    m_publicKey = publicKey;
-}
diff --git a/core/backends/lan/landevicelink.h b/core/backends/lan/landevicelink.h
index 07b3959..28978c0 100644
--- a/core/backends/lan/landevicelink.h
+++ b/core/backends/lan/landevicelink.h
@@ -42,15 +42,11 @@ public:
 
     virtual QString name() Q_DECL_OVERRIDE;
     bool sendPackage(NetworkPackage& np) override;
-    bool sendPackageEncrypted(NetworkPackage& np) override;
     UploadJob* sendPayload(NetworkPackage& np);
 
     virtual void userRequestsPair() override;
     virtual void userRequestsUnpair() override;
 
-    void setCertificate(QSslCertificate certificate, QCA::PublicKey publicKey);
-    QSslCertificate certificate() { return m_certificate; }
-
     virtual void setPairStatus(PairStatus status) override;
 
 private Q_SLOTS:
@@ -58,9 +54,6 @@ private Q_SLOTS:
 
 private:
     SocketLineReader* mSocketLineReader;
-
-    QCA::PublicKey m_publicKey;
-    QSslCertificate m_certificate;
 };
 
 #endif
diff --git a/core/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp
index e16ce01..35a1d44 100644
--- a/core/backends/lan/lanlinkprovider.cpp
+++ b/core/backends/lan/lanlinkprovider.cpp
@@ -264,8 +264,6 @@ void LanLinkProvider::encrypted()
     const QString& deviceId = receivedPackage->get<QString>("deviceId");
     //qCDebug(KDECONNECT_CORE) << "Connected" << socket->isWritable();
 
-    receivedPackage->set("certificate", socket->peerCertificate().toPem());
-
     addLink(deviceId, socket, receivedPackage, DeviceLink::Remotely);
 
     // Copied from connected slot, now delete received package
diff --git a/core/backends/lan/lanpairinghandler.cpp b/core/backends/lan/lanpairinghandler.cpp
index 8ca0e2a..2a58829 100644
--- a/core/backends/lan/lanpairinghandler.cpp
+++ b/core/backends/lan/lanpairinghandler.cpp
@@ -59,19 +59,6 @@ void LanPairingHandler::packageReceived(const NetworkPackage& np)
 
     if (wantsPair) {
 
-        QString keyString = np.get<QString>("publicKey");
-        QString certificateString = np.get<QByteArray>("certificate");
-        QCA::PublicKey publicKey = QCA::PublicKey::fromPEM(keyString);
-        QSslCertificate certificate(keyString.toLatin1());
-        if (certificate.isNull()) {
-            if (isPairRequested()) {
-                setInternalPairStatus(NotPaired);
-            }
-            Q_EMIT pairingError(i18n("Received incorrect certificate"));
-            return;
-        }
-        qobject_cast<LanDeviceLink*>(deviceLink())->setCertificate(certificate, publicKey);
-
         if (isPairRequested())  { //We started pairing
 
             qCDebug(KDECONNECT_CORE) << "Pair answer";
diff --git a/core/backends/lan/socketlinereader.h b/core/backends/lan/socketlinereader.h
index 03f8a62..62daef9 100644
--- a/core/backends/lan/socketlinereader.h
+++ b/core/backends/lan/socketlinereader.h
@@ -42,6 +42,7 @@ public:
     QByteArray readLine() { return mPackages.dequeue(); }
     qint64 write(const QByteArray& data) { return mSocket->write(data); }
     QHostAddress peerAddress() const { return mSocket->peerAddress(); }
+    QSslCertificate peerCertificate() const { return mSocket->peerCertificate(); }
     qint64 bytesAvailable() const { return mPackages.size(); }
 
 Q_SIGNALS:

-- 
kdeconnect packaging