Skip to content

Regex octal #73

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

Open
b1gb1t wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Regex octal #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4964918
Possible octal conversion fix
b1gb1t May 8, 2018
2981c6e
Possible octal conversion fix
b1gb1t May 8, 2018
b7efbf7
Possible octal conversion fix and .pyc files deleted
b1gb1t May 8, 2018
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
2 changes: 1 addition & 1 deletion PDFConsole.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4196,7 +4196,7 @@ def checkInputContent(self, objectType, objectContent):
except:
return None
elif objectType == 'string':
octalNumbers = re.findall('\\\\(\d{1,3})', objectContent, re.DOTALL)
octalNumbers = re.findall('\\\\([0-7]{1,3})', objectContent, re.DOTALL)
for octal in octalNumbers:
try:
chr(int(octal, 8))
Expand Down
8 changes: 8 additions & 0 deletions PDFCore.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,6 +609,12 @@ def update(self, decrypt = False):
self.value = self.value.replace('\\\r','')
self.value = self.value.replace('\\\n','')
'''
smbAddr = []
pos = 1
for match in re.findall(r'\\\\((?:(?:25[0-5]\.)|(?:2[0-4][0-9]\.)|(?:[01]?[0-9]?[0-9]\.)|(?:[0-9]\.)){3}(?:(?:25[0-5])|(?:2[0-4][0-9])|(?:[01]?[0-9][0-9]?)|(?:[0-9])))', self.value):
smbAddr.append({'content': match, 'position': pos})
self.value = self.value.replace(match, '{{' + str(pos) + '}}')
pos += 1
octalNumbers = re.findall('\\\\([0-7]{1,3})', self.value, re.DOTALL)
try:
for octal in octalNumbers:
Expand All @@ -618,6 +624,8 @@ def update(self, decrypt = False):
errorMessage = 'Error in octal conversion'
self.addError(errorMessage)
return (-1,errorMessage)
for match in smbAddr:
self.value = self.value.replace('{{' + str(match['position']) + '}}', match['content'])
if isJavascript(self.value) or self.referencedJSObject:
self.containsJScode = True
self.JSCode, self.unescapedBytes, self.urlsFound, jsErrors, jsContexts['global'] = analyseJS(self.value, jsContexts['global'], isManualAnalysis)
Expand Down