Make GetSecrets do what the spec says

seveas · seveas · commit e9ffa18ccec7 · 2013-03-09T12:21:23.000+01:00
The spec says that if the parameter to GetSecrets is empty,
NetworkManager returns all available secrets. Instead it throws an
exception. I find the intended behaviour more useful, so let's make that
happen.
diff --git a/NetworkManager.py b/NetworkManager.py
@@ -84,14 +84,17 @@ def  __getattr__(self, name):
         try:
             return super(NMDbusInterface, self).__getattribute__(name)
         except AttributeError:
-            def proxy_call(*args, **kwargs):
-                func = getattr(self.interface, name)
-                args = self.wrap(args)
-                kwargs = self.wrap(kwargs)
-                args, kwargs = self.preprocess(name, args, kwargs)
-                ret = self.unwrap(func(*args, **kwargs))
-                return self.postprocess(name, ret)
-            return proxy_call
+            return self.make_proxy_call(name)
+
+    def make_proxy_call(self, name):
+        def proxy_call(*args, **kwargs):
+            func = getattr(self.interface, name)
+            args = self.wrap(args)
+            kwargs = self.wrap(kwargs)
+            args, kwargs = self.preprocess(name, args, kwargs)
+            ret = self.unwrap(func(*args, **kwargs))
+            return self.postprocess(name, ret)
+        return proxy_call
 
     def connect_to_signal(self, signal, handler, *args, **kwargs):
         def helper(*args, **kwargs):
@@ -119,6 +122,19 @@ class Settings(NMDbusInterface):
 
 class Connection(NMDbusInterface):
     interface_name = 'org.freedesktop.NetworkManager.Settings.Connection'
+    has_secrets = ['802-1x', '802-11-wireless-security', 'cdma',
+        'gsm', 'pppoe', 'vpn']
+
+    def GetSecrets(self, name=None):
+        if name == None:
+            settings = self.GetSettings()
+            for key in self.has_secrets:
+                if key in settings:
+                    name = key
+                    break
+            else:
+                return {}
+        return self.make_proxy_call('GetSecrets')(name)
 
     def postprocess(self, name, val):
         # SSID is sent as bytes, make it a string
diff --git a/examples/connection_detail.py b/examples/connection_detail.py
@@ -7,10 +7,15 @@
 
 for conn in NetworkManager.NetworkManager.ActiveConnections:
     settings = conn.Connection.GetSettings()
+
     for s in list(settings.keys()):
         if 'data' in settings[s]:
             settings[s + '-data'] = settings[s].pop('data')
 
+    secrets = conn.Connection.GetSecrets()
+    for key in secrets:
+        settings[key].update(secrets[key])
+
     devices = ""
     if conn.Devices:
         devices = " (on %s)" % ", ".join([x.Interface for x in conn.Devices])
diff --git a/n-m b/n-m
@@ -198,8 +198,13 @@ def info(names):
 
 def dump(names):
     from pprint import pprint
-    connections = [x.GetSettings() for x in NetworkManager.Settings.ListConnections()]
-    connections = dict([(x['connection']['id'], x) for x in connections])
+    connections = {}
+    for conn in NetworkManager.Settings.ListConnections():
+        settings = conn.GetSettings()
+        secrets = conn.GetSecrets()
+        for key in secrets:
+            settings[key].update(secrets[key])
+        connections[settings['connection']['id']] = settings
 
     for n in names:
         if n not in connections:
