ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2024-12-19 21:17:59 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

get pciids from code if not found on filesystem

Browse Source
This commit is contained in:
iadgovuser58 2024-09-26 13:34:07 -04:00
parent bc85403319
commit 3017c13413
1 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
HIRS_Utils/src/main/java/hirs/utils/PciIds.java
View File

@ -36,7 +36,7 @@ public final class PciIds {
/** /**
* Name of pciids file in code. * Name of pciids file in code.
*/ */
private static final String PCIIDS_FILENAME = "pci.ids"; private static final String PCIIDS_FILENAME = "/pci.ids";
/** /**
* This pci ids file can be in different places on different distributions. * This pci ids file can be in different places on different distributions.
@ -65,6 +65,8 @@ public final class PciIds {
//Configure the PCI IDs Database object. //Configure the PCI IDs Database object.
static { static {
if (!DB.isReady()) { if (!DB.isReady()) {
// if pciids file is found on the system, then process using this
String dbFile = null; String dbFile = null;
for (final String path : PCI_IDS_PATH) { for (final String path : PCI_IDS_PATH) {
if ((new File(path)).exists()) { if ((new File(path)).exists()) {
@ -73,21 +75,13 @@ public final class PciIds {
break; break;
} }
} }
// if pciids file is not found on the system, then attempt to grab it from code
if(dbFile != null) { if(dbFile != null) {
pciidsFileStatus = UefiConstants.FILESTATUS_FROM_FILESYSTEM;
}
else {
dbFile = PciIds.class.getResource(PCIIDS_FILENAME).getPath();
}
if (dbFile != null) {
if (!pciidsFileStatus.equals(UefiConstants.FILESTATUS_FROM_FILESYSTEM)) {
pciidsFileStatus = UefiConstants.FILESTATUS_FROM_CODE;
}
InputStream is = null; InputStream is = null;
try { try {
is = new FileInputStream(new File(dbFile)); is = new FileInputStream(new File(dbFile));
DB.loadStream(is); DB.loadStream(is);
pciidsFileStatus = UefiConstants.FILESTATUS_FROM_FILESYSTEM;
} catch (IOException e) { } catch (IOException e) {
// DB will not be ready, hardware IDs will not be translated // DB will not be ready, hardware IDs will not be translated
dbFile = null; dbFile = null;
@ -101,8 +95,28 @@ public final class PciIds {
} }
} }
} }
else {
log.info("PCI IDs file was NOT found"); // if pciids file is not found on the system or not accessible, then attempt to grab it from code
if(pciidsFileStatus == UefiConstants.FILESTATUS_NOT_ACCESSIBLE) {
InputStream istemp = PciIds.class.getResourceAsStream(PCIIDS_FILENAME);
try {
DB.loadStream(istemp);
pciidsFileStatus = UefiConstants.FILESTATUS_FROM_CODE;
} catch (IOException e) {
// DB will not be ready, hardware IDs will not be translated
} finally {
if (istemp != null) {
try {
istemp.close();
} catch (IOException e) {
}
}
}
}
// if pciids file is not accessible on system or from within code, then log error
if(pciidsFileStatus == UefiConstants.FILESTATUS_NOT_ACCESSIBLE) {
log.info("PCI IDs file was NOT accessible from within the system or within the code");
} }
} }
} }