Merge pull request 'refs #2581 try several encodings on hivexregedit output' (#104) from hivexregedit-decode into main

Reviewed-on: #104

CHANGELOG.md

@@ -5,6 +5,30 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.1.2] - 2025-07-31
+
+### Changed
+
+- Try several encodings on hivexregedit output
+
+## [1.1.1] - 2025-07-29
+
+### Fixed
+
+- Correctly decode hivexregedit UTF-16LE output
+
+## [1.1.0] - 2025-07-24
+
+### Changed
+
+- Have CrearImagenGit not receive the "tag" parameter
+
+## [1.0.3] - 2025-07-24
+
+### Fixed
+
+- Have GetGitData deal with the fact that .git may be a regular file
+
 ## [1.0.2] - 2025-07-24
 
 ### Changed

ogclient/interfaceAdm/CrearImagenGit

@@ -4,7 +4,6 @@ import resource
 import logging
 
 
-import NetLib
 import ogGlobals
 import SystemLib
 import DiskLib
@@ -35,7 +34,7 @@ class OgLogger(logging.StreamHandler):
 
 
 
-def create_image(disk_num, partition_num, repo, image_name, tagName):
+def create_image(disk_num, partition_num, repo, image_name):
 
     ntfs_impl = NTFSImplementation.NTFS3G
     og_git = OpengnsysGitLibrary(ntfs_implementation = ntfs_impl)
@@ -44,8 +43,6 @@ def create_image(disk_num, partition_num, repo, image_name, tagName):
     device = DiskLib.ogDiskToDev(disk_num, partition_num)
     if og_git.initRepo(device, image_name):
         return 0
-        #if tagName:
-        #    og_git.tag(device = device, tagName = tagName, commit = "HEAD", message = "Image created")
     else:
         return 1
 
@@ -63,14 +60,13 @@ def main():
 
 
 
-    if len(sys.argv) != 6:
-        sys.exit(SystemLib.ogRaiseError([], ogGlobals.OG_ERR_FORMAT, "Incorrect number of arguments. Usage: CrearImagenGit disk_num partition_num image_name repo tag"))
+    if len(sys.argv) < 5:
+        sys.exit(SystemLib.ogRaiseError([], ogGlobals.OG_ERR_FORMAT, "Incorrect number of arguments. Usage: CrearImagenGit disk_num partition_num image_name repo"))
 
     # repo - repositorio, ip address. Opcional porque oglive lo recibe como parametro de kernel
-    # tag - tag a crear automaticamente. Opcional, no necesitamos crear un tag siempre.
 
 
-    disk_num, partition_num, image_name, repo, tag = sys.argv[1:6]
+    disk_num, partition_num, image_name, repo = sys.argv[1:5]
 
 
     opengnsys_log_dir = "/opt/opengnsys/log"
@@ -96,7 +92,7 @@ def main():
     logger.info("Starting CrearImagenGit")
 
 
-    retval = create_image(disk_num, partition_num, repo, image_name, tag)
+    retval = create_image(disk_num, partition_num, repo, image_name)
 
 
 

ogclient/interfaceAdm/GetGitData

@@ -23,8 +23,8 @@ ogEcho (['log', 'session'], None, f'{ogGlobals.lang.MSG_INTERFACE_START} {prog}
 mntpt = ogMount (dsk, par)
 git_dir = f'{mntpt}/.git'
 
-if not os.path.isdir (git_dir):
-    ogRaiseError (['log', 'session'], ogGlobals.OG_ERR_FORMAT, f'"{git_dir}" no existe o no es un directorio')
+if not os.path.exists (git_dir):
+    ogRaiseError (['log', 'session'], ogGlobals.OG_ERR_FORMAT, f'"{git_dir}" no existe')
     sys.exit (1)
 
 p = subprocess.run (['git', '--git-dir', git_dir, 'branch', '--show-current'], capture_output=True, text=True)

ogclient/lib/python3/InventoryLib.py

@@ -266,8 +266,16 @@ def ogListSoftware (disk, par):
         if shutil.which ('hivexregedit'):
             hive = RegistryLib.ogGetHivePath (mntdir, 'software')
             if hive:
-                cmd1_out  = subprocess.run (['hivexregedit', '--unsafe-printable-strings', '--export', hive, r'\Microsoft\Windows\CurrentVersion\Uninstall'], capture_output=True, text=True).stdout
-                cmd1_out += subprocess.run (['hivexregedit', '--unsafe-printable-strings', '--export', hive, r'\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall'], capture_output=True, text=True).stdout
+                cmd1_out_bytes  = subprocess.run (['hivexregedit', '--unsafe-printable-strings', '--export', hive, r'\Microsoft\Windows\CurrentVersion\Uninstall'],             capture_output=True).stdout
+                cmd1_out_bytes += subprocess.run (['hivexregedit', '--unsafe-printable-strings', '--export', hive, r'\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall'], capture_output=True).stdout
+                try:
+                    cmd1_out = cmd1_out_bytes.decode ('utf-16le')
+                except:
+                    try:
+                        cmd1_out = cmd1_out_bytes.decode ('utf-8')
+                    except:
+                        cmd1_out = cmd1_out_bytes.decode ('latin1')
+
                 out = name = ''
                 for l in cmd1_out.splitlines():
                     words = l.split ('"')