Mercurial Repositories > eric / changeset

changeset

Started to extend the network proxy code to support exceptions and PAC.

Sun, 02 Aug 2015 19:48:22 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sun, 02 Aug 2015 19:48:22 +0200
changeset 4349
a99dcf04f6f5
parent 4348
fcb65da90a07
child 4350
686c79ffbcff

Started to extend the network proxy code to support exceptions and PAC.

Documentation/Help/source.qch file | annotate | diff | comparison | revisions
E5Network/E5NetworkProxyFactory.py file | annotate | diff | comparison | revisions
Preferences/ConfigurationPages/NetworkPage.py file | annotate | diff | comparison | revisions
Preferences/ConfigurationPages/NetworkPage.ui file | annotate | diff | comparison | revisions
Preferences/__init__.py file | annotate | diff | comparison | revisions 
Binary file Documentation/Help/source.qch has changed
--- a/E5Network/E5NetworkProxyFactory.py	Sun Aug 02 15:24:56 2015 +0200
+++ b/E5Network/E5NetworkProxyFactory.py	Sun Aug 02 19:48:22 2015 +0200
@@ -74,6 +74,8 @@
     """
     Class implementing a network proxy factory.
     """
+    _pacManager = None
+    
     def __init__(self):
         """
         Constructor
@@ -87,6 +89,7 @@
         @param query reference to the query object (QNetworkProxyQuery)
         @return list of proxies in order of preference (list of QNetworkProxy)
         """
+        # TODO: implement proxy exceptions
         if query.queryType() == QNetworkProxyQuery.UrlRequest and \
            query.protocolTag() in ["http", "https", "ftp"] and \
            Preferences.getUI("UseProxy"):
@@ -165,3 +168,18 @@
                     return [proxy, QNetworkProxy(QNetworkProxy.DefaultProxy)]
         else:
             return [QNetworkProxy(QNetworkProxy.NoProxy)]
+    
+    @classmethod
+    def pacManager(cls):
+        """
+        Class method to get a reference to the proxy auto-config manager.
+        
+        @return reference to the proxy auto-config manager (PacManager)
+        """
+        print("pacManager()")
+        # TODO: enable this once PacManager is implemented
+##        if cls._pacManager is None:
+##            from .Pac.PacManager import PacManager
+##            cls._pacManager = PacManager()
+##        
+##        return cls._pacManager
--- a/Preferences/ConfigurationPages/NetworkPage.py	Sun Aug 02 15:24:56 2015 +0200
+++ b/Preferences/ConfigurationPages/NetworkPage.py	Sun Aug 02 19:48:22 2015 +0200
@@ -104,12 +104,18 @@
         
         self.httpProxyForAllCheckBox.setChecked(
             Preferences.getUI("UseHttpProxyForAll"))
-        if Preferences.getUI("UseSystemProxy"):
+        if not Preferences.getUI("UseProxy"):
+            self.noProxyButton.setChecked(True)
+        elif Preferences.getUI("UseSystemProxy"):
             self.systemProxyButton.setChecked(True)
+        elif Preferences.getUI("UseProxyAutoConfiguration"):
+            self.pacButton.setChecked(True)
         else:
             self.manualProxyButton.setChecked(True)
-        self.proxyGroup.setChecked(
-            Preferences.getUI("UseProxy"))
+        
+        self.pacUrlEdit.setText(Preferences.getUI("ProxyPacUrl"))
+        self.exceptionsEdit.setText(
+            ", ".join(Preferences.getUI("ProxyExceptions").split(",")))
     
     def save(self):
         """
@@ -132,14 +138,25 @@
         
         Preferences.setUI(
             "UseProxy",
-            self.proxyGroup.isChecked())
+            not self.noProxyButton.isChecked())
         Preferences.setUI(
             "UseSystemProxy",
             self.systemProxyButton.isChecked())
         Preferences.setUI(
+            "UseProxyAutoConfiguration",
+            self.systemProxyButton.isChecked())
+        Preferences.setUI(
             "UseHttpProxyForAll",
             self.httpProxyForAllCheckBox.isChecked())
         
+        Preferences.setUI(
+            "ProxyPacUrl",
+            self.pacUrlEdit.text())
+        Preferences.setUI(
+            "ProxyExceptions",
+            ",".join(
+                [h.strip() for h in self.exceptionsEdit.text().split(",")]))
+        
         # HTTP proxy
         Preferences.setUI(
             "ProxyHost/Http",
@@ -222,6 +239,16 @@
             proxyType not in [E5FtpProxyType.NoProxy,
                               E5FtpProxyType.NonAuthorizing])
     
+    @pyqtSlot()
+    def on_pacReloadButton_clicked(self):
+        """
+        Private slot to reload the proxy auto-configuration file.
+        """
+        from E5Network.E5NetworkProxyFactory import E5NetworkProxyFactory
+        # TODO: switch lines once PacManager is implemented
+        E5NetworkProxyFactory.pacManager()
+#        E5NetworkProxyFactory.pacManager().downloadPacFile()
+    
 
 def create(dlg):
     """
--- a/Preferences/ConfigurationPages/NetworkPage.ui	Sun Aug 02 15:24:56 2015 +0200
+++ b/Preferences/ConfigurationPages/NetworkPage.ui	Sun Aug 02 19:48:22 2015 +0200
@@ -7,10 +7,10 @@
     <x>0</x>
     <y>0</y>
     <width>591</width>
-    <height>769</height>
+    <height>1013</height>
    </rect>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_4">
+  <layout class="QVBoxLayout" name="verticalLayout_5">
    <item>
     <widget class="QLabel" name="headerLabel">
      <property name="text">
@@ -120,15 +120,28 @@
       <string>Select to use a web proxy</string>
      </property>
      <property name="title">
-      <string>Use network proxy</string>
+      <string>Network Proxy</string>
      </property>
      <property name="checkable">
-      <bool>true</bool>
+      <bool>false</bool>
      </property>
      <property name="checked">
-      <bool>true</bool>
+      <bool>false</bool>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout">
+     <layout class="QVBoxLayout" name="verticalLayout_4">
+      <item>
+       <widget class="QRadioButton" name="noProxyButton">
+        <property name="toolTip">
+         <string>Select to not use a network proxy</string>
+        </property>
+        <property name="text">
+         <string>Do not use proxy</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
       <item>
        <widget class="QRadioButton" name="systemProxyButton">
         <property name="toolTip">
@@ -137,12 +150,65 @@
         <property name="text">
          <string>Use system proxy configuration</string>
         </property>
-        <property name="checked">
-         <bool>true</bool>
+       </widget>
+      </item>
+      <item>
+       <widget class="QRadioButton" name="pacButton">
+        <property name="toolTip">
+         <string>Select to use a proxy auto configuration script</string>
+        </property>
+        <property name="text">
+         <string>Use script for automatic proxy configuration:</string>
         </property>
        </widget>
       </item>
       <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_4">
+        <item>
+         <spacer name="horizontalSpacer">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Fixed</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QLineEdit" name="pacUrlEdit">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="toolTip">
+           <string>Enter the URL of the Proxy Auto-Config (.pac) file</string>
+          </property>
+          <property name="placeholderText">
+           <string>Proxy Auto-Config (.pac) file</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="pacReloadButton">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="toolTip">
+           <string>Press to reload the Proxy Auto-Config (.pac) file</string>
+          </property>
+          <property name="text">
+           <string>Reload</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
        <widget class="QRadioButton" name="manualProxyButton">
         <property name="toolTip">
          <string>Select to use an application specific proxy configuration</string>
@@ -166,125 +232,157 @@
         <property name="flat">
          <bool>false</bool>
         </property>
-        <layout class="QGridLayout" name="gridLayout_2">
-         <item row="0" column="0">
-          <widget class="QLabel" name="label">
-           <property name="text">
-            <string>HTTP-Proxy:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="1">
-          <widget class="QLineEdit" name="httpProxyHostEdit">
-           <property name="toolTip">
-            <string>Enter the name of the HTTP proxy host</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="2">
-          <widget class="QLabel" name="label_2">
-           <property name="text">
-            <string>Port:</string>
+        <layout class="QVBoxLayout" name="verticalLayout">
+         <item>
+          <widget class="QGroupBox" name="groupBox_6">
+           <property name="title">
+            <string>HTTP-Proxy</string>
            </property>
-          </widget>
-         </item>
-         <item row="0" column="3">
-          <widget class="QSpinBox" name="httpProxyPortSpin">
-           <property name="toolTip">
-            <string>Enter the HTTP proxy port</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignRight</set>
-           </property>
-           <property name="minimum">
-            <number>1</number>
-           </property>
-           <property name="maximum">
-            <number>65535</number>
-           </property>
-           <property name="value">
-            <number>80</number>
-           </property>
+           <layout class="QGridLayout" name="gridLayout_2">
+            <item row="0" column="0">
+             <widget class="QLabel" name="label_13">
+              <property name="text">
+               <string>Hostname:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="1">
+             <widget class="QLineEdit" name="httpProxyHostEdit">
+              <property name="toolTip">
+               <string>Enter the name of the HTTP proxy host</string>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="2">
+             <widget class="QLabel" name="label_2">
+              <property name="text">
+               <string>Port:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="3">
+             <widget class="QSpinBox" name="httpProxyPortSpin">
+              <property name="toolTip">
+               <string>Enter the HTTP proxy port</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignRight</set>
+              </property>
+              <property name="minimum">
+               <number>1</number>
+              </property>
+              <property name="maximum">
+               <number>65535</number>
+              </property>
+              <property name="value">
+               <number>80</number>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="0" colspan="4">
+             <widget class="QCheckBox" name="httpProxyForAllCheckBox">
+              <property name="toolTip">
+               <string>Select to use the HTTP proxy for all</string>
+              </property>
+              <property name="text">
+               <string>Use this proxy for all protocols</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
           </widget>
          </item>
-         <item row="1" column="1" colspan="3">
-          <widget class="QCheckBox" name="httpProxyForAllCheckBox">
-           <property name="toolTip">
-            <string>Select to use the HTTP proxy for all</string>
-           </property>
-           <property name="text">
-            <string>Use this proxy for all protocols</string>
+         <item>
+          <widget class="QGroupBox" name="groupBox_5">
+           <property name="title">
+            <string>HTTPS-Proxy</string>
            </property>
-          </widget>
-         </item>
-         <item row="2" column="0">
-          <widget class="QLabel" name="label_4">
-           <property name="text">
-            <string>HTTPS-Proxy:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="2" column="1">
-          <widget class="QLineEdit" name="httpsProxyHostEdit">
-           <property name="toolTip">
-            <string>Enter the name of the HTTPS proxy host</string>
-           </property>
+           <layout class="QHBoxLayout" name="horizontalLayout_2">
+            <item>
+             <widget class="QLabel" name="label_12">
+              <property name="text">
+               <string>Hostname:</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLineEdit" name="httpsProxyHostEdit">
+              <property name="toolTip">
+               <string>Enter the name of the HTTPS proxy host</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLabel" name="label_5">
+              <property name="text">
+               <string>Port:</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QSpinBox" name="httpsProxyPortSpin">
+              <property name="toolTip">
+               <string>Enter the HTTPS proxy port</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignRight</set>
+              </property>
+              <property name="minimum">
+               <number>1</number>
+              </property>
+              <property name="maximum">
+               <number>65535</number>
+              </property>
+              <property name="value">
+               <number>443</number>
+              </property>
+             </widget>
+            </item>
+           </layout>
           </widget>
          </item>
-         <item row="2" column="2">
-          <widget class="QLabel" name="label_5">
-           <property name="text">
-            <string>Port:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="2" column="3">
-          <widget class="QSpinBox" name="httpsProxyPortSpin">
-           <property name="toolTip">
-            <string>Enter the HTTPS proxy port</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignRight</set>
-           </property>
-           <property name="minimum">
-            <number>1</number>
-           </property>
-           <property name="maximum">
-            <number>65535</number>
-           </property>
-           <property name="value">
-            <number>443</number>
-           </property>
-          </widget>
-         </item>
-         <item row="3" column="0" colspan="4">
+         <item>
           <widget class="QGroupBox" name="groupBox_4">
            <property name="title">
             <string>FTP-Proxy</string>
            </property>
            <layout class="QGridLayout" name="gridLayout">
             <item row="0" column="0">
+             <widget class="QLabel" name="label_8">
+              <property name="text">
+               <string>Proxy Type:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="1" colspan="3">
+             <widget class="QComboBox" name="ftpProxyTypeCombo">
+              <property name="toolTip">
+               <string>Select the type of the FTP proxy</string>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="0">
              <widget class="QLabel" name="label_3">
               <property name="text">
                <string>Hostname:</string>
               </property>
              </widget>
             </item>
-            <item row="0" column="1">
+            <item row="1" column="1">
              <widget class="QLineEdit" name="ftpProxyHostEdit">
               <property name="toolTip">
                <string>Enter the name of the FTP proxy host</string>
               </property>
              </widget>
             </item>
-            <item row="0" column="2">
+            <item row="1" column="2">
              <widget class="QLabel" name="label_7">
               <property name="text">
                <string>Port:</string>
               </property>
              </widget>
             </item>
-            <item row="0" column="3">
+            <item row="1" column="3">
              <widget class="QSpinBox" name="ftpProxyPortSpin">
               <property name="toolTip">
                <string>Enter the FTP proxy port</string>
@@ -303,20 +401,6 @@
               </property>
              </widget>
             </item>
-            <item row="1" column="0">
-             <widget class="QLabel" name="label_8">
-              <property name="text">
-               <string>Proxy Type:</string>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="1" colspan="3">
-             <widget class="QComboBox" name="ftpProxyTypeCombo">
-              <property name="toolTip">
-               <string>Select the type of the FTP proxy</string>
-              </property>
-             </widget>
-            </item>
             <item row="2" column="0">
              <widget class="QLabel" name="label_9">
               <property name="text">
@@ -369,6 +453,24 @@
        </widget>
       </item>
       <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_3">
+        <item>
+         <widget class="QLabel" name="label">
+          <property name="text">
+           <string>Exceptions:</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLineEdit" name="exceptionsEdit">
+          <property name="toolTip">
+           <string>Enter host names or IP-addresses for which the proxy is to be circumvented separated by ',' (wildcards * or ? may be used)</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
        <widget class="QPushButton" name="clearProxyPasswordsButton">
         <property name="toolTip">
          <string>Press to clear the saved passwords for the Http(s) proxy</string>
@@ -403,20 +505,24 @@
   <tabstop>cleanupNeverButton</tabstop>
   <tabstop>cleanupExitButton</tabstop>
   <tabstop>cleanupSuccessfulButton</tabstop>
-  <tabstop>proxyGroup</tabstop>
+  <tabstop>noProxyButton</tabstop>
   <tabstop>systemProxyButton</tabstop>
+  <tabstop>pacButton</tabstop>
+  <tabstop>pacUrlEdit</tabstop>
+  <tabstop>pacReloadButton</tabstop>
   <tabstop>manualProxyButton</tabstop>
   <tabstop>httpProxyHostEdit</tabstop>
   <tabstop>httpProxyPortSpin</tabstop>
   <tabstop>httpProxyForAllCheckBox</tabstop>
   <tabstop>httpsProxyHostEdit</tabstop>
   <tabstop>httpsProxyPortSpin</tabstop>
+  <tabstop>ftpProxyTypeCombo</tabstop>
   <tabstop>ftpProxyHostEdit</tabstop>
   <tabstop>ftpProxyPortSpin</tabstop>
-  <tabstop>ftpProxyTypeCombo</tabstop>
   <tabstop>ftpProxyUserEdit</tabstop>
   <tabstop>ftpProxyPasswordEdit</tabstop>
   <tabstop>ftpProxyAccountEdit</tabstop>
+  <tabstop>exceptionsEdit</tabstop>
   <tabstop>clearProxyPasswordsButton</tabstop>
  </tabstops>
  <resources/>
@@ -428,8 +534,8 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>77</x>
-     <y>310</y>
+     <x>100</x>
+     <y>405</y>
     </hint>
     <hint type="destinationlabel">
      <x>83</x>
@@ -440,128 +546,64 @@
   <connection>
    <sender>httpProxyForAllCheckBox</sender>
    <signal>toggled(bool)</signal>
-   <receiver>label_4</receiver>
-   <slot>setDisabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>229</x>
-     <y>386</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>109</x>
-     <y>412</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>httpProxyForAllCheckBox</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>label_3</receiver>
+   <receiver>groupBox_5</receiver>
    <slot>setDisabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>245</x>
-     <y>386</y>
+     <x>152</x>
+     <y>515</y>
     </hint>
     <hint type="destinationlabel">
-     <x>106</x>
-     <y>463</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>httpProxyForAllCheckBox</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>httpsProxyHostEdit</receiver>
-   <slot>setDisabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>311</x>
-     <y>386</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>269</x>
-     <y>412</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>httpProxyForAllCheckBox</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>ftpProxyHostEdit</receiver>
-   <slot>setDisabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>307</x>
-     <y>386</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>304</x>
-     <y>463</y>
+     <x>76</x>
+     <y>561</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>httpProxyForAllCheckBox</sender>
    <signal>toggled(bool)</signal>
-   <receiver>label_5</receiver>
+   <receiver>groupBox_4</receiver>
    <slot>setDisabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>517</x>
-     <y>386</y>
+     <x>170</x>
+     <y>517</y>
     </hint>
     <hint type="destinationlabel">
-     <x>485</x>
-     <y>412</y>
+     <x>116</x>
+     <y>631</y>
     </hint>
    </hints>
   </connection>
   <connection>
-   <sender>httpProxyForAllCheckBox</sender>
+   <sender>pacButton</sender>
    <signal>toggled(bool)</signal>
-   <receiver>label_7</receiver>
-   <slot>setDisabled(bool)</slot>
+   <receiver>pacUrlEdit</receiver>
+   <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>482</x>
-     <y>386</y>
+     <x>141</x>
+     <y>339</y>
     </hint>
     <hint type="destinationlabel">
-     <x>474</x>
-     <y>463</y>
+     <x>138</x>
+     <y>366</y>
     </hint>
    </hints>
   </connection>
   <connection>
-   <sender>httpProxyForAllCheckBox</sender>
+   <sender>pacButton</sender>
    <signal>toggled(bool)</signal>
-   <receiver>httpsProxyPortSpin</receiver>
-   <slot>setDisabled(bool)</slot>
+   <receiver>pacReloadButton</receiver>
+   <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>557</x>
-     <y>386</y>
+     <x>550</x>
+     <y>340</y>
     </hint>
     <hint type="destinationlabel">
-     <x>557</x>
-     <y>412</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>httpProxyForAllCheckBox</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>ftpProxyPortSpin</receiver>
-   <slot>setDisabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>554</x>
-     <y>386</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>546</x>
-     <y>463</y>
+     <x>549</x>
+     <y>365</y>
     </hint>
    </hints>
   </connection>
--- a/Preferences/__init__.py	Sun Aug 02 15:24:56 2015 +0200
+++ b/Preferences/__init__.py	Sun Aug 02 19:48:22 2015 +0200
@@ -187,6 +187,7 @@
         # 4 = monthly
         "UseProxy": False,
         "UseSystemProxy": True,
+        "UseProxyAutoConfiguration": False,
         "UseHttpProxyForAll": False,
         "ProxyHost/Http": "",
         "ProxyHost/Https": "",
@@ -202,6 +203,8 @@
         "ProxyPassword/Ftp": "",
         "ProxyType/Ftp": E5FtpProxyType.NoProxy,
         "ProxyAccount/Ftp": "",
+        "ProxyExceptions": "localhost,127.0.0.,::1",
+        "ProxyPacUrl": "",
         
         "PluginRepositoryUrl6":
         "http://eric-ide.python-projects.org/plugins6/repository.xml",
@@ -1584,6 +1587,7 @@
                "CaptionShowsFilename", "ShowSplash",
                "SingleCloseButton", "SplitOrientationVertical",
                "UseProxy", "UseSystemProxy", "UseHttpProxyForAll",
+               "UseProxyAutoConfiguration",
                "TopLeftByLeft", "BottomLeftByLeft",
                "TopRightByRight", "BottomRightByRight",
                "RequestDownloadFilename",

Mercurial Repository: eric

eric ide

mercurial