diff --git a/volatility3/framework/plugins/windows/bigpools.py b/volatility3/framework/plugins/windows/bigpools.py index a2c23a31c..5ffe8b7c7 100644 --- a/volatility3/framework/plugins/windows/bigpools.py +++ b/volatility3/framework/plugins/windows/bigpools.py @@ -3,6 +3,7 @@ # import logging +import os from typing import List, Optional, Tuple, Iterator from volatility3.framework import interfaces, renderers, exceptions, symbols @@ -83,7 +84,7 @@ class BigPools(interfaces.plugins.PluginInterface): new_table_name = intermed.IntermediateSymbolTable.create( context = context, config_path = configuration.path_join(context.symbol_space[symbol_table].config_path, "bigpools"), - sub_path = "windows", + sub_path = os.path.join("windows", "bigpools"), filename = big_pools_json_filename, table_mapping = {'nt_symbols': symbol_table}, class_types = {'_POOL_TRACKER_BIG_PAGES': extensions.pool.POOL_TRACKER_BIG_PAGES}) diff --git a/volatility3/framework/plugins/windows/netscan.py b/volatility3/framework/plugins/windows/netscan.py index 7c0bdef0b..1bd9165e6 100644 --- a/volatility3/framework/plugins/windows/netscan.py +++ b/volatility3/framework/plugins/windows/netscan.py @@ -4,6 +4,7 @@ import datetime import logging +import os from typing import Iterable, List, Optional, Tuple, Type from volatility3.framework import constants, exceptions, interfaces, renderers, symbols @@ -244,7 +245,7 @@ class NetScan(interfaces.plugins.PluginInterface, timeliner.TimeLinerInterface): return intermed.IntermediateSymbolTable.create(context, config_path, - "windows", + os.path.join("windows", "netscan"), symbol_filename, class_types = class_types, table_mapping = table_mapping) diff --git a/volatility3/framework/plugins/windows/svcscan.py b/volatility3/framework/plugins/windows/svcscan.py index 1a035901a..078445bb1 100644 --- a/volatility3/framework/plugins/windows/svcscan.py +++ b/volatility3/framework/plugins/windows/svcscan.py @@ -87,7 +87,7 @@ class SvcScan(interfaces.plugins.PluginInterface): return intermed.IntermediateSymbolTable.create(context, config_path, - "windows", + os.path.join("windows", "services"), symbol_filename, class_types = services.class_types, native_types = native_types) diff --git a/volatility3/framework/symbols/windows/bigpools-vista-x64.json b/volatility3/framework/symbols/windows/bigpools/bigpools-vista-x64.json similarity index 100% rename from volatility3/framework/symbols/windows/bigpools-vista-x64.json rename to volatility3/framework/symbols/windows/bigpools/bigpools-vista-x64.json diff --git a/volatility3/framework/symbols/windows/bigpools-vista-x86.json b/volatility3/framework/symbols/windows/bigpools/bigpools-vista-x86.json similarity index 100% rename from volatility3/framework/symbols/windows/bigpools-vista-x86.json rename to volatility3/framework/symbols/windows/bigpools/bigpools-vista-x86.json diff --git a/volatility3/framework/symbols/windows/bigpools-win10-x64.json b/volatility3/framework/symbols/windows/bigpools/bigpools-win10-x64.json similarity index 100% rename from volatility3/framework/symbols/windows/bigpools-win10-x64.json rename to volatility3/framework/symbols/windows/bigpools/bigpools-win10-x64.json diff --git a/volatility3/framework/symbols/windows/bigpools-win10-x86.json b/volatility3/framework/symbols/windows/bigpools/bigpools-win10-x86.json similarity index 100% rename from volatility3/framework/symbols/windows/bigpools-win10-x86.json rename to volatility3/framework/symbols/windows/bigpools/bigpools-win10-x86.json diff --git a/volatility3/framework/symbols/windows/bigpools-x64.json b/volatility3/framework/symbols/windows/bigpools/bigpools-x64.json similarity index 100% rename from volatility3/framework/symbols/windows/bigpools-x64.json rename to volatility3/framework/symbols/windows/bigpools/bigpools-x64.json diff --git a/volatility3/framework/symbols/windows/bigpools-x86.json b/volatility3/framework/symbols/windows/bigpools/bigpools-x86.json similarity index 100% rename from volatility3/framework/symbols/windows/bigpools-x86.json rename to volatility3/framework/symbols/windows/bigpools/bigpools-x86.json diff --git a/volatility3/framework/symbols/windows/netscan-vista-sp12-x64.json b/volatility3/framework/symbols/windows/netscan/netscan-vista-sp12-x64.json similarity index 100% rename from volatility3/framework/symbols/windows/netscan-vista-sp12-x64.json rename to volatility3/framework/symbols/windows/netscan/netscan-vista-sp12-x64.json diff --git a/volatility3/framework/symbols/windows/netscan-vista-x64.json b/volatility3/framework/symbols/windows/netscan/netscan-vista-x64.json similarity index 100% rename from volatility3/framework/symbols/windows/netscan-vista-x64.json rename to volatility3/framework/symbols/windows/netscan/netscan-vista-x64.json diff --git a/volatility3/framework/symbols/windows/netscan-vista-x86.json b/volatility3/framework/symbols/windows/netscan/netscan-vista-x86.json similarity index 100% rename from volatility3/framework/symbols/windows/netscan-vista-x86.json rename to volatility3/framework/symbols/windows/netscan/netscan-vista-x86.json diff --git a/volatility3/framework/symbols/windows/netscan-win10-10240-x86.json b/volatility3/framework/symbols/windows/netscan/netscan-win10-10240-x86.json similarity index 100% rename from volatility3/framework/symbols/windows/netscan-win10-10240-x86.json rename to volatility3/framework/symbols/windows/netscan/netscan-win10-10240-x86.json diff --git a/volatility3/framework/symbols/windows/netscan-win10-10586-x86.json b/volatility3/framework/symbols/windows/netscan/netscan-win10-10586-x86.json similarity index 100% rename from volatility3/framework/symbols/windows/netscan-win10-10586-x86.json rename to volatility3/framework/symbols/windows/netscan/netscan-win10-10586-x86.json diff --git a/volatility3/framework/symbols/windows/netscan-win10-14393-x86.json b/volatility3/framework/symbols/windows/netscan/netscan-win10-14393-x86.json similarity index 100% rename from volatility3/framework/symbols/windows/netscan-win10-14393-x86.json rename to volatility3/framework/symbols/windows/netscan/netscan-win10-14393-x86.json diff --git a/volatility3/framework/symbols/windows/netscan-win10-15063-x64.json b/volatility3/framework/symbols/windows/netscan/netscan-win10-15063-x64.json similarity index 100% rename from volatility3/framework/symbols/windows/netscan-win10-15063-x64.json rename to volatility3/framework/symbols/windows/netscan/netscan-win10-15063-x64.json diff --git a/volatility3/framework/symbols/windows/netscan-win10-15063-x86.json b/volatility3/framework/symbols/windows/netscan/netscan-win10-15063-x86.json similarity index 100% rename from volatility3/framework/symbols/windows/netscan-win10-15063-x86.json rename to volatility3/framework/symbols/windows/netscan/netscan-win10-15063-x86.json diff --git a/volatility3/framework/symbols/windows/netscan-win10-16299-x64.json b/volatility3/framework/symbols/windows/netscan/netscan-win10-16299-x64.json similarity index 100% rename from volatility3/framework/symbols/windows/netscan-win10-16299-x64.json rename to volatility3/framework/symbols/windows/netscan/netscan-win10-16299-x64.json diff --git a/volatility3/framework/symbols/windows/netscan-win10-17134-x64.json b/volatility3/framework/symbols/windows/netscan/netscan-win10-17134-x64.json similarity index 100% rename from volatility3/framework/symbols/windows/netscan-win10-17134-x64.json rename to volatility3/framework/symbols/windows/netscan/netscan-win10-17134-x64.json diff --git a/volatility3/framework/symbols/windows/netscan-win10-17134-x86.json b/volatility3/framework/symbols/windows/netscan/netscan-win10-17134-x86.json similarity index 100% rename from volatility3/framework/symbols/windows/netscan-win10-17134-x86.json rename to volatility3/framework/symbols/windows/netscan/netscan-win10-17134-x86.json diff --git a/volatility3/framework/symbols/windows/netscan-win10-17763-x64.json b/volatility3/framework/symbols/windows/netscan/netscan-win10-17763-x64.json similarity index 100% rename from volatility3/framework/symbols/windows/netscan-win10-17763-x64.json rename to volatility3/framework/symbols/windows/netscan/netscan-win10-17763-x64.json diff --git a/volatility3/framework/symbols/windows/netscan-win10-18362-x64.json b/volatility3/framework/symbols/windows/netscan/netscan-win10-18362-x64.json similarity index 100% rename from volatility3/framework/symbols/windows/netscan-win10-18362-x64.json rename to volatility3/framework/symbols/windows/netscan/netscan-win10-18362-x64.json diff --git a/volatility3/framework/symbols/windows/netscan-win10-18363-x64.json b/volatility3/framework/symbols/windows/netscan/netscan-win10-18363-x64.json similarity index 100% rename from volatility3/framework/symbols/windows/netscan-win10-18363-x64.json rename to volatility3/framework/symbols/windows/netscan/netscan-win10-18363-x64.json diff --git a/volatility3/framework/symbols/windows/netscan-win10-19041-x64.json b/volatility3/framework/symbols/windows/netscan/netscan-win10-19041-x64.json similarity index 100% rename from volatility3/framework/symbols/windows/netscan-win10-19041-x64.json rename to volatility3/framework/symbols/windows/netscan/netscan-win10-19041-x64.json diff --git a/volatility3/framework/symbols/windows/netscan-win10-19041-x86.json b/volatility3/framework/symbols/windows/netscan/netscan-win10-19041-x86.json similarity index 100% rename from volatility3/framework/symbols/windows/netscan-win10-19041-x86.json rename to volatility3/framework/symbols/windows/netscan/netscan-win10-19041-x86.json diff --git a/volatility3/framework/symbols/windows/netscan-win10-x64.json b/volatility3/framework/symbols/windows/netscan/netscan-win10-x64.json similarity index 100% rename from volatility3/framework/symbols/windows/netscan-win10-x64.json rename to volatility3/framework/symbols/windows/netscan/netscan-win10-x64.json diff --git a/volatility3/framework/symbols/windows/netscan-win7-x64.json b/volatility3/framework/symbols/windows/netscan/netscan-win7-x64.json similarity index 100% rename from volatility3/framework/symbols/windows/netscan-win7-x64.json rename to volatility3/framework/symbols/windows/netscan/netscan-win7-x64.json diff --git a/volatility3/framework/symbols/windows/netscan-win7-x86.json b/volatility3/framework/symbols/windows/netscan/netscan-win7-x86.json similarity index 100% rename from volatility3/framework/symbols/windows/netscan-win7-x86.json rename to volatility3/framework/symbols/windows/netscan/netscan-win7-x86.json diff --git a/volatility3/framework/symbols/windows/netscan-win8-x64.json b/volatility3/framework/symbols/windows/netscan/netscan-win8-x64.json similarity index 100% rename from volatility3/framework/symbols/windows/netscan-win8-x64.json rename to volatility3/framework/symbols/windows/netscan/netscan-win8-x64.json diff --git a/volatility3/framework/symbols/windows/netscan-win8-x86.json b/volatility3/framework/symbols/windows/netscan/netscan-win8-x86.json similarity index 100% rename from volatility3/framework/symbols/windows/netscan-win8-x86.json rename to volatility3/framework/symbols/windows/netscan/netscan-win8-x86.json diff --git a/volatility3/framework/symbols/windows/netscan-win81-x64.json b/volatility3/framework/symbols/windows/netscan/netscan-win81-x64.json similarity index 100% rename from volatility3/framework/symbols/windows/netscan-win81-x64.json rename to volatility3/framework/symbols/windows/netscan/netscan-win81-x64.json diff --git a/volatility3/framework/symbols/windows/netscan-win81-x86.json b/volatility3/framework/symbols/windows/netscan/netscan-win81-x86.json similarity index 100% rename from volatility3/framework/symbols/windows/netscan-win81-x86.json rename to volatility3/framework/symbols/windows/netscan/netscan-win81-x86.json diff --git a/volatility3/framework/symbols/windows/services-vista-x64.json b/volatility3/framework/symbols/windows/services/services-vista-x64.json similarity index 100% rename from volatility3/framework/symbols/windows/services-vista-x64.json rename to volatility3/framework/symbols/windows/services/services-vista-x64.json diff --git a/volatility3/framework/symbols/windows/services-vista-x86.json b/volatility3/framework/symbols/windows/services/services-vista-x86.json similarity index 100% rename from volatility3/framework/symbols/windows/services-vista-x86.json rename to volatility3/framework/symbols/windows/services/services-vista-x86.json diff --git a/volatility3/framework/symbols/windows/services-win10-15063-x64.json b/volatility3/framework/symbols/windows/services/services-win10-15063-x64.json similarity index 100% rename from volatility3/framework/symbols/windows/services-win10-15063-x64.json rename to volatility3/framework/symbols/windows/services/services-win10-15063-x64.json diff --git a/volatility3/framework/symbols/windows/services-win10-15063-x86.json b/volatility3/framework/symbols/windows/services/services-win10-15063-x86.json similarity index 100% rename from volatility3/framework/symbols/windows/services-win10-15063-x86.json rename to volatility3/framework/symbols/windows/services/services-win10-15063-x86.json diff --git a/volatility3/framework/symbols/windows/services-win10-16299-x64.json b/volatility3/framework/symbols/windows/services/services-win10-16299-x64.json similarity index 100% rename from volatility3/framework/symbols/windows/services-win10-16299-x64.json rename to volatility3/framework/symbols/windows/services/services-win10-16299-x64.json diff --git a/volatility3/framework/symbols/windows/services-win10-16299-x86.json b/volatility3/framework/symbols/windows/services/services-win10-16299-x86.json similarity index 100% rename from volatility3/framework/symbols/windows/services-win10-16299-x86.json rename to volatility3/framework/symbols/windows/services/services-win10-16299-x86.json diff --git a/volatility3/framework/symbols/windows/services-win8-x64.json b/volatility3/framework/symbols/windows/services/services-win8-x64.json similarity index 100% rename from volatility3/framework/symbols/windows/services-win8-x64.json rename to volatility3/framework/symbols/windows/services/services-win8-x64.json diff --git a/volatility3/framework/symbols/windows/services-win8-x86.json b/volatility3/framework/symbols/windows/services/services-win8-x86.json similarity index 100% rename from volatility3/framework/symbols/windows/services-win8-x86.json rename to volatility3/framework/symbols/windows/services/services-win8-x86.json diff --git a/volatility3/framework/symbols/windows/services-xp-2003-x64.json b/volatility3/framework/symbols/windows/services/services-xp-2003-x64.json similarity index 100% rename from volatility3/framework/symbols/windows/services-xp-2003-x64.json rename to volatility3/framework/symbols/windows/services/services-xp-2003-x64.json diff --git a/volatility3/framework/symbols/windows/services-xp-x86.json b/volatility3/framework/symbols/windows/services/services-xp-x86.json similarity index 100% rename from volatility3/framework/symbols/windows/services-xp-x86.json rename to volatility3/framework/symbols/windows/services/services-xp-x86.json