Peter M. Groen / oletools

Commit ef78a3ecd15377f02aee79ff1f508a9648d53638

Authored by Christian Herdtweck
1 parent 98bf5c36

pylint-ify 2b: make lower-case variables more legible again (_size, _sizeof, _unicode)

Inline Side-by-side
Showing 1 changed file with 59 additions and 59 deletions
oletools/olevba.py
  View file @ef78a3e
... ... @@ -1218,40 +1218,40 @@ def _extract_vba(ole, vba_root, project_path, dir_path):
1218 1218 # PROJECTNAME Record
1219 1219 projectname_id = struct.unpack("<H", dir_stream.read(2))[0]
1220 1220 check_value('PROJECTNAME_Id', 0x0004, projectname_id)
1221   - projectname_sizeofprojectname = struct.unpack("<L", dir_stream.read(4))[0]
1222   - if projectname_sizeofprojectname < 1 or projectname_sizeofprojectname > 128:
1223   - log.error("PROJECTNAME_SizeOfProjectName value not in range: {0}".format(projectname_sizeofprojectname))
1224   - projectname_projectname = dir_stream.read(projectname_sizeofprojectname)
  1221 + projectname_sizeof_projectname = struct.unpack("<L", dir_stream.read(4))[0]
  1222 + if projectname_sizeof_projectname < 1 or projectname_sizeof_projectname > 128:
  1223 + log.error("PROJECTNAME_SizeOfProjectName value not in range: {0}".format(projectname_sizeof_projectname))
  1224 + projectname_projectname = dir_stream.read(projectname_sizeof_projectname)
1225 1225  
1226 1226 # PROJECTDOCSTRING Record
1227 1227 projectdocstring_id = struct.unpack("<H", dir_stream.read(2))[0]
1228 1228 check_value('PROJECTDOCSTRING_Id', 0x0005, projectdocstring_id)
1229   - projectdocstring_sizeofdocstring = struct.unpack("<L", dir_stream.read(4))[0]
1230   - if projectname_sizeofprojectname > 2000:
  1229 + projectdocstring_sizeof_docstring = struct.unpack("<L", dir_stream.read(4))[0]
  1230 + if projectname_sizeof_projectname > 2000:
1231 1231 log.error(
1232   - "PROJECTDOCSTRING_SizeOfDocString value not in range: {0}".format(projectdocstring_sizeofdocstring))
1233   - projectdocstring_docstring = dir_stream.read(projectdocstring_sizeofdocstring)
  1232 + "PROJECTDOCSTRING_SizeOfDocString value not in range: {0}".format(projectdocstring_sizeof_docstring))
  1233 + projectdocstring_docstring = dir_stream.read(projectdocstring_sizeof_docstring)
1234 1234 projectdocstring_reserved = struct.unpack("<H", dir_stream.read(2))[0]
1235 1235 check_value('PROJECTDOCSTRING_Reserved', 0x0040, projectdocstring_reserved)
1236   - projectdocstring_sizeofdocstringunicode = struct.unpack("<L", dir_stream.read(4))[0]
1237   - if projectdocstring_sizeofdocstringunicode % 2 != 0:
  1236 + projectdocstring_sizeof_docstring_unicode = struct.unpack("<L", dir_stream.read(4))[0]
  1237 + if projectdocstring_sizeof_docstring_unicode % 2 != 0:
1238 1238 log.error("PROJECTDOCSTRING_SizeOfDocStringUnicode is not even")
1239   - projectdocstring_docstringunicode = dir_stream.read(projectdocstring_sizeofdocstringunicode)
  1239 + projectdocstring_docstring_unicode = dir_stream.read(projectdocstring_sizeof_docstring_unicode)
1240 1240  
1241 1241 # PROJECTHELPFILEPATH Record - MS-OVBA 2.3.4.2.1.7
1242 1242 projecthelpfilepath_id = struct.unpack("<H", dir_stream.read(2))[0]
1243 1243 check_value('PROJECTHELPFILEPATH_Id', 0x0006, projecthelpfilepath_id)
1244   - projecthelpfilepath_sizeofhelpfile1 = struct.unpack("<L", dir_stream.read(4))[0]
1245   - if projecthelpfilepath_sizeofhelpfile1 > 260:
  1244 + projecthelpfilepath_sizeof_helpfile1 = struct.unpack("<L", dir_stream.read(4))[0]
  1245 + if projecthelpfilepath_sizeof_helpfile1 > 260:
1246 1246 log.error(
1247   - "PROJECTHELPFILEPATH_SizeOfHelpFile1 value not in range: {0}".format(projecthelpfilepath_sizeofhelpfile1))
1248   - projecthelpfilepath_helpfile1 = dir_stream.read(projecthelpfilepath_sizeofhelpfile1)
  1247 + "PROJECTHELPFILEPATH_SizeOfHelpFile1 value not in range: {0}".format(projecthelpfilepath_sizeof_helpfile1))
  1248 + projecthelpfilepath_helpfile1 = dir_stream.read(projecthelpfilepath_sizeof_helpfile1)
1249 1249 projecthelpfilepath_reserved = struct.unpack("<H", dir_stream.read(2))[0]
1250 1250 check_value('PROJECTHELPFILEPATH_Reserved', 0x003D, projecthelpfilepath_reserved)
1251   - projecthelpfilepath_sizeofhelpfile2 = struct.unpack("<L", dir_stream.read(4))[0]
1252   - if projecthelpfilepath_sizeofhelpfile2 != projecthelpfilepath_sizeofhelpfile1:
  1251 + projecthelpfilepath_sizeof_helpfile2 = struct.unpack("<L", dir_stream.read(4))[0]
  1252 + if projecthelpfilepath_sizeof_helpfile2 != projecthelpfilepath_sizeof_helpfile1:
1253 1253 log.error("PROJECTHELPFILEPATH_SizeOfHelpFile1 does not equal PROJECTHELPFILEPATH_SizeOfHelpFile2")
1254   - projecthelpfilepath_helpfile2 = dir_stream.read(projecthelpfilepath_sizeofhelpfile2)
  1254 + projecthelpfilepath_helpfile2 = dir_stream.read(projecthelpfilepath_sizeof_helpfile2)
1255 1255 if projecthelpfilepath_helpfile2 != projecthelpfilepath_helpfile1:
1256 1256 log.error("PROJECTHELPFILEPATH_HelpFile1 does not equal PROJECTHELPFILEPATH_HelpFile2")
1257 1257  
... ... @@ -1281,17 +1281,17 @@ def _extract_vba(ole, vba_root, project_path, dir_path):
1281 1281 # PROJECTCONSTANTS Record
1282 1282 projectconstants_id = struct.unpack("<H", dir_stream.read(2))[0]
1283 1283 check_value('PROJECTCONSTANTS_Id', 0x000C, projectconstants_id)
1284   - projectconstants_sizeofconstants = struct.unpack("<L", dir_stream.read(4))[0]
1285   - if projectconstants_sizeofconstants > 1015:
  1284 + projectconstants_sizeof_constants = struct.unpack("<L", dir_stream.read(4))[0]
  1285 + if projectconstants_sizeof_constants > 1015:
1286 1286 log.error(
1287   - "PROJECTCONSTANTS_SizeOfConstants value not in range: {0}".format(projectconstants_sizeofconstants))
1288   - projectconstants_constants = dir_stream.read(projectconstants_sizeofconstants)
  1287 + "PROJECTCONSTANTS_SizeOfConstants value not in range: {0}".format(projectconstants_sizeof_constants))
  1288 + projectconstants_constants = dir_stream.read(projectconstants_sizeof_constants)
1289 1289 projectconstants_reserved = struct.unpack("<H", dir_stream.read(2))[0]
1290 1290 check_value('PROJECTCONSTANTS_Reserved', 0x003C, projectconstants_reserved)
1291   - projectconstants_sizeofconstantsunicode = struct.unpack("<L", dir_stream.read(4))[0]
1292   - if projectconstants_sizeofconstantsunicode % 2 != 0:
  1291 + projectconstants_sizeof_constants_unicode = struct.unpack("<L", dir_stream.read(4))[0]
  1292 + if projectconstants_sizeof_constants_unicode % 2 != 0:
1293 1293 log.error("PROJECTCONSTANTS_SizeOfConstantsUnicode is not even")
1294   - projectconstants_constantsunicode = dir_stream.read(projectconstants_sizeofconstantsunicode)
  1294 + projectconstants_constants_unicode = dir_stream.read(projectconstants_sizeof_constants_unicode)
1295 1295  
1296 1296 # array of REFERENCE records
1297 1297 check = None
... ... @@ -1304,27 +1304,27 @@ def _extract_vba(ole, vba_root, project_path, dir_path):
1304 1304 if check == 0x0016:
1305 1305 # REFERENCENAME
1306 1306 reference_id = check
1307   - reference_sizeofname = struct.unpack("<L", dir_stream.read(4))[0]
1308   - reference_name = dir_stream.read(reference_sizeofname)
  1307 + reference_sizeof_name = struct.unpack("<L", dir_stream.read(4))[0]
  1308 + reference_name = dir_stream.read(reference_sizeof_name)
1309 1309 reference_reserved = struct.unpack("<H", dir_stream.read(2))[0]
1310 1310 check_value('REFERENCE_Reserved', 0x003E, reference_reserved)
1311   - reference_sizeofnameunicode = struct.unpack("<L", dir_stream.read(4))[0]
1312   - reference_nameunicode = dir_stream.read(reference_sizeofnameunicode)
  1311 + reference_sizeof_name_unicode = struct.unpack("<L", dir_stream.read(4))[0]
  1312 + reference_name_unicode = dir_stream.read(reference_sizeof_name_unicode)
1313 1313 continue
1314 1314  
1315 1315 if check == 0x0033:
1316 1316 # REFERENCEORIGINAL (followed by REFERENCECONTROL)
1317 1317 referenceoriginal_id = check
1318   - referenceoriginal_sizeoflibidoriginal = struct.unpack("<L", dir_stream.read(4))[0]
1319   - referenceoriginal_libidoriginal = dir_stream.read(referenceoriginal_sizeoflibidoriginal)
  1318 + referenceoriginal_sizeof_libidoriginal = struct.unpack("<L", dir_stream.read(4))[0]
  1319 + referenceoriginal_libidoriginal = dir_stream.read(referenceoriginal_sizeof_libidoriginal)
1320 1320 continue
1321 1321  
1322 1322 if check == 0x002F:
1323 1323 # REFERENCECONTROL
1324 1324 referencecontrol_id = check
1325 1325 referencecontrol_sizetwiddled = struct.unpack("<L", dir_stream.read(4))[0] # ignore
1326   - referencecontrol_sizeoflibidtwiddled = struct.unpack("<L", dir_stream.read(4))[0]
1327   - referencecontrol_libidtwiddled = dir_stream.read(referencecontrol_sizeoflibidtwiddled)
  1326 + referencecontrol_sizeof_libidtwiddled = struct.unpack("<L", dir_stream.read(4))[0]
  1327 + referencecontrol_libidtwiddled = dir_stream.read(referencecontrol_sizeof_libidtwiddled)
1328 1328 referencecontrol_reserved1 = struct.unpack("<L", dir_stream.read(4))[0] # ignore
1329 1329 check_value('REFERENCECONTROL_Reserved1', 0x0000, referencecontrol_reserved1)
1330 1330 referencecontrol_reserved2 = struct.unpack("<H", dir_stream.read(2))[0] # ignore
... ... @@ -1333,23 +1333,23 @@ def _extract_vba(ole, vba_root, project_path, dir_path):
1333 1333 check2 = struct.unpack("<H", dir_stream.read(2))[0]
1334 1334 if check2 == 0x0016:
1335 1335 referencecontrol_namerecordextended_id = check
1336   - referencecontrol_namerecordextended_sizeofname = struct.unpack("<L", dir_stream.read(4))[0]
  1336 + referencecontrol_namerecordextended_sizeof_name = struct.unpack("<L", dir_stream.read(4))[0]
1337 1337 referencecontrol_namerecordextended_name = dir_stream.read(
1338   - referencecontrol_namerecordextended_sizeofname)
  1338 + referencecontrol_namerecordextended_sizeof_name)
1339 1339 referencecontrol_namerecordextended_reserved = struct.unpack("<H", dir_stream.read(2))[0]
1340 1340 check_value('REFERENCECONTROL_NameRecordExtended_Reserved', 0x003E,
1341 1341 referencecontrol_namerecordextended_reserved)
1342   - referencecontrol_namerecordextended_sizeofnameunicode = struct.unpack("<L", dir_stream.read(4))[0]
1343   - referencecontrol_namerecordextended_nameunicode = dir_stream.read(
1344   - referencecontrol_namerecordextended_sizeofnameunicode)
  1342 + referencecontrol_namerecordextended_sizeof_name_unicode = struct.unpack("<L", dir_stream.read(4))[0]
  1343 + referencecontrol_namerecordextended_name_unicode = dir_stream.read(
  1344 + referencecontrol_namerecordextended_sizeof_name_unicode)
1345 1345 referencecontrol_reserved3 = struct.unpack("<H", dir_stream.read(2))[0]
1346 1346 else:
1347 1347 referencecontrol_reserved3 = check2
1348 1348  
1349 1349 check_value('REFERENCECONTROL_Reserved3', 0x0030, referencecontrol_reserved3)
1350 1350 referencecontrol_sizeextended = struct.unpack("<L", dir_stream.read(4))[0]
1351   - referencecontrol_sizeoflibidextended = struct.unpack("<L", dir_stream.read(4))[0]
1352   - referencecontrol_libidextended = dir_stream.read(referencecontrol_sizeoflibidextended)
  1351 + referencecontrol_sizeof_libidextended = struct.unpack("<L", dir_stream.read(4))[0]
  1352 + referencecontrol_libidextended = dir_stream.read(referencecontrol_sizeof_libidextended)
1353 1353 referencecontrol_reserved4 = struct.unpack("<L", dir_stream.read(4))[0]
1354 1354 referencecontrol_reserved5 = struct.unpack("<H", dir_stream.read(2))[0]
1355 1355 referencecontrol_originaltypelib = dir_stream.read(16)
... ... @@ -1360,8 +1360,8 @@ def _extract_vba(ole, vba_root, project_path, dir_path):
1360 1360 # REFERENCEREGISTERED
1361 1361 referenceregistered_id = check
1362 1362 referenceregistered_size = struct.unpack("<L", dir_stream.read(4))[0]
1363   - referenceregistered_sizeoflibid = struct.unpack("<L", dir_stream.read(4))[0]
1364   - referenceregistered_libid = dir_stream.read(referenceregistered_sizeoflibid)
  1363 + referenceregistered_sizeof_libid = struct.unpack("<L", dir_stream.read(4))[0]
  1364 + referenceregistered_libid = dir_stream.read(referenceregistered_sizeof_libid)
1365 1365 referenceregistered_reserved1 = struct.unpack("<L", dir_stream.read(4))[0]
1366 1366 check_value('REFERENCEREGISTERED_Reserved1', 0x0000, referenceregistered_reserved1)
1367 1367 referenceregistered_reserved2 = struct.unpack("<H", dir_stream.read(2))[0]
... ... @@ -1372,10 +1372,10 @@ def _extract_vba(ole, vba_root, project_path, dir_path):
1372 1372 # REFERENCEPROJECT
1373 1373 referenceproject_id = check
1374 1374 referenceproject_size = struct.unpack("<L", dir_stream.read(4))[0]
1375   - referenceproject_sizeoflibidabsolute = struct.unpack("<L", dir_stream.read(4))[0]
1376   - referenceproject_libidabsolute = dir_stream.read(referenceproject_sizeoflibidabsolute)
1377   - referenceproject_sizeoflibidrelative = struct.unpack("<L", dir_stream.read(4))[0]
1378   - referenceproject_libidrelative = dir_stream.read(referenceproject_sizeoflibidrelative)
  1375 + referenceproject_sizeof_libidabsolute = struct.unpack("<L", dir_stream.read(4))[0]
  1376 + referenceproject_libidabsolute = dir_stream.read(referenceproject_sizeof_libidabsolute)
  1377 + referenceproject_sizeof_libidrelative = struct.unpack("<L", dir_stream.read(4))[0]
  1378 + referenceproject_libidrelative = dir_stream.read(referenceproject_sizeof_libidrelative)
1379 1379 referenceproject_majorversion = struct.unpack("<L", dir_stream.read(4))[0]
1380 1380 referenceproject_minorversion = struct.unpack("<H", dir_stream.read(2))[0]
1381 1381 continue
... ... @@ -1398,33 +1398,33 @@ def _extract_vba(ole, vba_root, project_path, dir_path):
1398 1398 for x in xrange(0, projectmodules_count):
1399 1399 modulename_id = struct.unpack("<H", dir_stream.read(2))[0]
1400 1400 check_value('MODULENAME_Id', 0x0019, modulename_id)
1401   - modulename_sizeofmodulename = struct.unpack("<L", dir_stream.read(4))[0]
1402   - modulename_modulename = dir_stream.read(modulename_sizeofmodulename)
  1401 + modulename_sizeof_modulename = struct.unpack("<L", dir_stream.read(4))[0]
  1402 + modulename_modulename = dir_stream.read(modulename_sizeof_modulename)
1403 1403 # account for optional sections
1404 1404 section_id = struct.unpack("<H", dir_stream.read(2))[0]
1405 1405 if section_id == 0x0047:
1406   - modulenameunicode_id = section_id
1407   - modulenameunicode_sizeofmodulenameunicode = struct.unpack("<L", dir_stream.read(4))[0]
1408   - modulenameunicode_modulenameunicode = dir_stream.read(modulenameunicode_sizeofmodulenameunicode)
  1406 + modulename_unicode_id = section_id
  1407 + modulename_unicode_sizeof_modulename_unicode = struct.unpack("<L", dir_stream.read(4))[0]
  1408 + modulename_unicode_modulename_unicode = dir_stream.read(modulename_unicode_sizeof_modulename_unicode)
1409 1409 section_id = struct.unpack("<H", dir_stream.read(2))[0]
1410 1410 if section_id == 0x001A:
1411 1411 modulestreamname_id = section_id
1412   - modulestreamname_sizeofstreamname = struct.unpack("<L", dir_stream.read(4))[0]
1413   - modulestreamname_streamname = dir_stream.read(modulestreamname_sizeofstreamname)
  1412 + modulestreamname_sizeof_streamname = struct.unpack("<L", dir_stream.read(4))[0]
  1413 + modulestreamname_streamname = dir_stream.read(modulestreamname_sizeof_streamname)
1414 1414 modulestreamname_reserved = struct.unpack("<H", dir_stream.read(2))[0]
1415 1415 check_value('MODULESTREAMNAME_Reserved', 0x0032, modulestreamname_reserved)
1416   - modulestreamname_sizeofstreamnameunicode = struct.unpack("<L", dir_stream.read(4))[0]
1417   - modulestreamname_streamnameunicode = dir_stream.read(modulestreamname_sizeofstreamnameunicode)
  1416 + modulestreamname_sizeof_streamname_unicode = struct.unpack("<L", dir_stream.read(4))[0]
  1417 + modulestreamname_streamname_unicode = dir_stream.read(modulestreamname_sizeof_streamname_unicode)
1418 1418 section_id = struct.unpack("<H", dir_stream.read(2))[0]
1419 1419 if section_id == 0x001C:
1420 1420 moduledocstring_id = section_id
1421 1421 check_value('MODULEDOCSTRING_Id', 0x001C, moduledocstring_id)
1422   - moduledocstring_sizeofdocstring = struct.unpack("<L", dir_stream.read(4))[0]
1423   - moduledocstring_docstring = dir_stream.read(moduledocstring_sizeofdocstring)
  1422 + moduledocstring_sizeof_docstring = struct.unpack("<L", dir_stream.read(4))[0]
  1423 + moduledocstring_docstring = dir_stream.read(moduledocstring_sizeof_docstring)
1424 1424 moduledocstring_reserved = struct.unpack("<H", dir_stream.read(2))[0]
1425 1425 check_value('MODULEDOCSTRING_Reserved', 0x0048, moduledocstring_reserved)
1426   - moduledocstring_sizeofdocstringunicode = struct.unpack("<L", dir_stream.read(4))[0]
1427   - moduledocstring_docstringunicode = dir_stream.read(moduledocstring_sizeofdocstringunicode)
  1426 + moduledocstring_sizeof_docstring_unicode = struct.unpack("<L", dir_stream.read(4))[0]
  1427 + moduledocstring_docstring_unicode = dir_stream.read(moduledocstring_sizeof_docstring_unicode)
1428 1428 section_id = struct.unpack("<H", dir_stream.read(2))[0]
1429 1429 if section_id == 0x0031:
1430 1430 moduleoffset_id = section_id
... ...