Merge pull request #2847 from alexbruy/plugin-manager-auth

[pluginmanager] apply auth also when downloading plugin package
qgis · Mar 4, 2016 · b63461c · b63461c
2 parents 61b8896 + 4e904f7
commit b63461c
Showing 1 changed file with 23 additions and 7 deletions.
diff --git a/python/pyplugin_installer/qgsplugininstallerinstallingdialog.py b/python/pyplugin_installer/qgsplugininstallerinstallingdialog.py
@@ -29,10 +29,10 @@
 from PyQt4.QtNetwork import QNetworkRequest, QNetworkReply
 
 import qgis
-from qgis.core import QgsNetworkAccessManager
+from qgis.core import QgsNetworkAccessManager, QgsAuthManager
 
 from ui_qgsplugininstallerinstallingbase import Ui_QgsPluginInstallerInstallingDialogBase
-from installer_data import removeDir
+from installer_data import removeDir, repositories
 from unzip import unzip
 
 
@@ -57,11 +57,27 @@ def __init__(self, parent, plugin):
         self.file = QFile(tmpPath)
 
         self.request = QNetworkRequest(url)
-        self.reply = QgsNetworkAccessManager.instance().get(self.request)
-        self.reply.downloadProgress.connect(self.readProgress)
-        self.reply.finished.connect(self.requestFinished)
-
-        self.stateChanged(4)
+        authcfg = repositories.all()[plugin["zip_repository"]]["authcfg"]
+        if authcfg and isinstance(authcfg, basestring):
+            if not QgsAuthManager.instance().updateNetworkRequest(
+                    self.request, authcfg.strip()):
+                self.mResult = self.tr(
+                    "Update of network request with authentication "
+                    "credentials FAILED for configuration '{0}'").format(authcfg)
+                self.request = None
+
+        if self.request is not None:
+            self.reply = QgsNetworkAccessManager.instance().get(self.request)
+            self.reply.downloadProgress.connect(self.readProgress)
+            self.reply.finished.connect(self.requestFinished)
+
+            self.stateChanged(4)
+
+    def exec_(self):
+        if self.request is None:
+            return QDialog.Rejected
+
+        QDialog.exec_(self)
 
     # ----------------------------------------- #
     def result(self):