Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modified RegistryHive.__init__ to handle a bytes variable. #269

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Modified RegistryHive.__init__ to handle a bytes variable. #269

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions regipy/registry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
StreamError, ConstError
from io import BytesIO


from regipy.exceptions import NoRegistrySubkeysException, RegistryKeyNotFoundException, NoRegistryValuesException, \
RegistryValueNotFoundException, RegipyGeneralException, UnidentifiedHiveException, RegistryParsingException
from regipy.hive_types import SUPPORTED_HIVE_TYPES
Expand Down Expand Up @@ -82,10 +81,10 @@ def __init__(self, stream):
class RegistryHive:
CONTROL_SETS = [r'\ControlSet001', r'\ControlSet002']

def __init__(self, hive_path, hive_type=None, partial_hive_path=None):
def __init__(self, hive: Union[str, bytes], hive_type=None, partial_hive_path=None):
"""
Represents a registry hive
:param hive_path: Path to the registry hive
:param hive: Path to the registry hive or raw data of the registry hive
:param hive_type: The hive type can be specified if this is a partial hive,
or for some other reason regipy cannot identify the hive type
:param partial_hive_path: The path from which the partial hive actually starts, for example:
Expand All @@ -96,8 +95,11 @@ def __init__(self, hive_path, hive_type=None, partial_hive_path=None):
self.partial_hive_path = None
self.hive_type = None

with open(hive_path, 'rb') as f:
self._stream = BytesIO(f.read())
if type(hive) == str:
with open(hive, 'rb') as f:
self._stream = BytesIO(f.read())
if type(hive) == bytes:
self._stream = BytesIO(hive)

with boomerang_stream(self._stream) as s:
self.header = REGF_HEADER.parse_stream(s)
Expand All @@ -118,7 +120,10 @@ def __init__(self, hive_path, hive_type=None, partial_hive_path=None):
try:
self.hive_type = identify_hive_type(self.name)
except UnidentifiedHiveException:
logger.info(f'Hive type for {hive_path} was not identified: {self.name}')
if type(hive) == str:
logger.info(f'Hive type for {hive} was not identified: {self.name}')
if type(hive) == bytes:
logger.info(f'Hive type was not identified: {self.name}')

if partial_hive_path:
self.partial_hive_path = partial_hive_path
Expand Down