fixup! fixup! fixup! fixup! add detection for custom libraries registered by ld.so.conf

Author: PeterMocary

repos/system_upgrade/common/actors/checkldsoconf/libraries/checkldsoconfiguration.py

@@ -10,7 +10,9 @@
 LD_SO_CONF_MAIN = '/etc/ld.so.conf'
 LD_SO_CONF_DEFAULT_INCLUDE = 'ld.so.conf.d/*.conf'
 LD_SO_CONF_COMMENT_PREFIX = '#'
-FMT_LIST_SEPARATOR = '\n    - '
+LD_LIBRARY_PATH_VAR = 'LD_LIBRARY_PATH'
+FMT_LIST_SEPARATOR_1 = '\n- '
+FMT_LIST_SEPARATOR_2 = '\n    - '
 
 
 def _read_file(file_path):
@@ -21,10 +23,10 @@ def _read_file(file_path):
 def _report_custom_ld_so_configuration(summary):
     reporting.create_report([
         reporting.Title(
-            'Third party libraries linked with ld.so.conf are not supported.'
+            'Detected customized configuration for dynamic linker.'
         ),
         reporting.Summary(summary),
-        reporting.Remediation(hint=('Remove the custom ld.so configuration and apply the changes '
+        reporting.Remediation(hint=('Remove or revert the custom ld.so configuration and apply the changes '
                                     'using the ldconfig command.')),
         reporting.RelatedResource('file', '/etc/ld.so.conf'),
         reporting.RelatedResource('directory', '/etc/ld.so.conf.d'),
@@ -36,13 +38,11 @@ def _report_custom_ld_so_configuration(summary):
 def _is_modified(config_path):
     """ Decide if the configuration file was modified based on the package it belongs to. """
     result = run(['rpm', '-Vf', config_path], checked=False)
-    if result['exit_code'] == 0:
+    if not result['exit_code']:
         return False
-    output = result['stdout']
-    # Note that the condition is relaxed so that files different only
-    # in the modification timestamp won't be considered as modified.
-    modification_flags = output.split(' ', 1)[0]
-    return modification_flags.strip('.') != 'T'
+    modification_flags = result['stdout'].split(' ', 1)[0]
+    # The file is considered modified only when the checksum does not match
+    return '5' in modification_flags
 
 
 def _is_included_ld_so_config_custom(config_path):
@@ -90,34 +90,44 @@ def _parse_main_ld_so_config():
 
 def check_ld_so_configuration():
     included_configs, other_lines = _parse_main_ld_so_config()
-    summary = ''
+    custom_configurations = ''
 
     if other_lines:
         # The main ld.so config file is expected to only include additional configs that are owned by a package
-        summary += ('The /etc/ld.so.conf file has unexpected contents:'
-                    '{}{}'.format(FMT_LIST_SEPARATOR,
-                                  FMT_LIST_SEPARATOR.join(other_lines)))
+        custom_configurations += ('{}The /etc/ld.so.conf file has unexpected contents:'
+                                  '{}{}').format(FMT_LIST_SEPARATOR_1,
+                                                 FMT_LIST_SEPARATOR_2, FMT_LIST_SEPARATOR_2.join(other_lines))
 
     is_default_include_present = '/etc/' + LD_SO_CONF_DEFAULT_INCLUDE in included_configs
     if not is_default_include_present:
-        api.current_logger().debug('The default include "' + LD_SO_CONF_DEFAULT_INCLUDE +
-                                   '" is not present in the ' + LD_SO_CONF_MAIN + ' file.')
+        api.current_logger().debug('The default include "{}" is not present in '
+                                   'the {} file.'.format(LD_SO_CONF_DEFAULT_INCLUDE, LD_SO_CONF_MAIN))
 
     if is_default_include_present and len(included_configs) != 1:
         # The additional included configs will most likely be created manually by the user
         # and therefore will get flagged as custom in the next part of this function
-        api.current_logger().debug('The default include "' + LD_SO_CONF_DEFAULT_INCLUDE +
-                                   '" is not the only include in the ' + LD_SO_CONF_MAIN + ' file.')
+        api.current_logger().debug('The default include "{}" is not the only include in '
+                                   'the {} file.'.format(LD_SO_CONF_DEFAULT_INCLUDE, LD_SO_CONF_MAIN))
 
     # Detect custom ld configs from the includes in the main ld.so.conf
     custom_ld_configs = set()
     for cfg_glob in included_configs:
         custom_ld_configs.update({cfg for cfg in glob.glob(cfg_glob) if _is_included_ld_so_config_custom(cfg)})
 
     if custom_ld_configs:
-        summary += ('\nThe following config files were marked as unsupported:'
-                    '{}{}'.format(FMT_LIST_SEPARATOR,
-                                  FMT_LIST_SEPARATOR.join(custom_ld_configs)))
-
-    if summary:
+        custom_configurations += ('{}The following drop in config files were marked as custom:'
+                                  '{}{}').format(FMT_LIST_SEPARATOR_1,
+                                                 FMT_LIST_SEPARATOR_2, FMT_LIST_SEPARATOR_2.join(custom_ld_configs))
+
+    if os.environ.get(LD_LIBRARY_PATH_VAR, None):
+        custom_configurations += ('{}The variable "{}" contains unexpected dynamic linker '
+                                  'configuration.').format(FMT_LIST_SEPARATOR_1, LD_LIBRARY_PATH_VAR)
+
+    if custom_configurations:
+        summary = ('Custom configurations to the dynamic linker could potentially impact the upgrade in a negative '
+                   'way. The custom configuration includes modifications to {}, custom or modified drop in config '
+                   'files in the {} directory and additional entries in the {} variable. These modifications '
+                   'configure the dynamic linker to use different libraries that might not be provided by Red Hat '
+                   'products. The following custom configurations were detected '
+                   'by leapp:{}').format(LD_SO_CONF_MAIN, LD_SO_CONF_DIR, LD_LIBRARY_PATH_VAR, custom_configurations)
         _report_custom_ld_so_configuration(summary)