sysfs: always sanitize values

sasutils/cli/sas_discover.py

@@ -32,11 +32,7 @@
 def format_attrs(attrlist, attrs):
     """filter keys to avoid SysfsObject cache miss on all attrs"""
     attr_fmt = ('%s: {%s}' % t for t in attrlist)
-    # sanitize values for display
-    iargs = dict((k, attrs.get(k, 'N/A') \
-                        .strip('\x00') \
-                        .encode('ascii', errors='replace') \
-                        .decode()) for _, k in attrlist)
+    iargs = dict((k, attrs.get(k, 'N/A')) for _, k in attrlist)
     return ', '.join(attr_fmt).format(**iargs)
 
 
@@ -199,10 +195,7 @@ def __str__(self):
                  'version_fw')
 
         # sanitize values for display
-        iargs = dict((k, self.baseobj.scsi_host.attrs.get(k, 'N/A') \
-                            .strip('\x00') \
-                            .encode('ascii', errors='replace') \
-                            .decode())
+        iargs = dict((k, self.baseobj.scsi_host.attrs.get(k, 'N/A'))
                      for k in ikeys)
 
         return '%s %s' % (self.name, ', '.join(info_fmt).format(**iargs))

sasutils/sysfs.py

@@ -28,6 +28,10 @@
 
 SYSFS_ROOT = '/sys'
 
+# Some VPDs contain weird characters...
+def sanitize_sysfs_value(value):
+    return value.strip('\x00').encode('ascii', errors='replace').decode()
+
 
 class SysfsNode(object):
     def __init__(self, path=None):
@@ -121,7 +125,7 @@ def get(self, pathname, default=None, ignore_errors=False, printable=True,
                 raise KeyError('Not found: %s' % path)
             result = default
 
-        return result
+        return sanitize_sysfs_value(result)
 
     def readlink(self, pathname, default=None, absolute=False):
         if absolute:
@@ -177,7 +181,7 @@ def load(self):
     # The next five methods are requirements of the ABC.
 
     def __setitem__(self, key, value):
-        self.values[key] = value
+        self.values[key] = sanitize_sysfs_value(value)
 
     def get(self, key, default=None):
         if not self.values.__contains__(key):
@@ -189,6 +193,7 @@ def get(self, key, default=None):
                 else:
                     raise AttributeError("%r object has no attribute %r" %
                                          (self.__class__.__name__, key))
+
         return self.values[key]
 
     def __getitem__(self, key):