github/metasploit-payloads
1
Fork 0
mirror of https://github.com/rapid7/metasploit-payloads synced 2025-04-24 10:09:49 +02:00
Code Releases Activity

Land , Use the proper bytes type when building search response TLVs

Browse Source
This commit is contained in:
Grant Willcox 2020-11-05 18:09:04 -06:00
commit 491ec7e4eb
No known key found for this signature in database
GPG Key ID: D35E05C0F2B81E83
1 changed files with 2 additions and 2 deletions

4
python/meterpreter/ext_server_stdapi.py

@ -1383,14 +1383,14 @@ def stdapi_fs_search(request, response):
if recurse: if recurse:
for root, dirs, files in os.walk(search_root): for root, dirs, files in os.walk(search_root):
for f in filter(lambda f: fnmatch.fnmatch(f, glob), files): for f in filter(lambda f: fnmatch.fnmatch(f, glob), files):
file_tlv = '' file_tlv = bytes()
file_tlv += tlv_pack(TLV_TYPE_FILE_PATH, root) file_tlv += tlv_pack(TLV_TYPE_FILE_PATH, root)
file_tlv += tlv_pack(TLV_TYPE_FILE_NAME, f) file_tlv += tlv_pack(TLV_TYPE_FILE_NAME, f)
file_tlv += tlv_pack(TLV_TYPE_FILE_SIZE, os.stat(os.path.join(root, f)).st_size) file_tlv += tlv_pack(TLV_TYPE_FILE_SIZE, os.stat(os.path.join(root, f)).st_size)
response += tlv_pack(TLV_TYPE_SEARCH_RESULTS, file_tlv) response += tlv_pack(TLV_TYPE_SEARCH_RESULTS, file_tlv)
else: else:
for f in filter(lambda f: fnmatch.fnmatch(f, glob), os.listdir(search_root)): for f in filter(lambda f: fnmatch.fnmatch(f, glob), os.listdir(search_root)):
file_tlv = '' file_tlv = bytes()
file_tlv += tlv_pack(TLV_TYPE_FILE_PATH, search_root) file_tlv += tlv_pack(TLV_TYPE_FILE_PATH, search_root)
file_tlv += tlv_pack(TLV_TYPE_FILE_NAME, f) file_tlv += tlv_pack(TLV_TYPE_FILE_NAME, f)
file_tlv += tlv_pack(TLV_TYPE_FILE_SIZE, os.stat(os.path.join(search_root, f)).st_size) file_tlv += tlv_pack(TLV_TYPE_FILE_SIZE, os.stat(os.path.join(search_root, f)).st_size)