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

Fix jwt_regex to also work for JWTs starting with eyA #98

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

Fix jwt_regex to also work for JWTs starting with eyA #98

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
22 changes: 12 additions & 10 deletions jwt_tool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@
# import colorama
# colorama.init()

jwt_regex=r'ey[A-Za-z0-9_\/+-]*\.ey[A-Za-z0-9_\/+-]*\.[A-Za-z0-9._\/+-]*'

def cprintc(textval, colval):
if not args.bare:
cprint(textval, colval)
Expand Down Expand Up @@ -184,7 +186,7 @@ def parse_dict_cookies(value):
def strip_dict_cookies(value):
cookiestring = ""
for item in value.split(';'):
if re.search('eyJ[A-Za-z0-9_\/+-]*\.eyJ[A-Za-z0-9_\/+-]*\.[A-Za-z0-9._\/+-]*', item):
if re.search(jwt_regex, item):
continue
else:
cookiestring += "; "+item
Expand All @@ -197,7 +199,7 @@ def jwtOut(token, fromMod, desc=""):
logID = "jwttool_"+hashlib.md5(idFrag.encode()).hexdigest()
if config['argvals']['targetUrl'] != "":
curTargetUrl = config['argvals']['targetUrl']
p = re.compile('eyJ[A-Za-z0-9_\/+-]*\.eyJ[A-Za-z0-9_\/+-]*\.[A-Za-z0-9._\/+-]*')
p = re.compile(jwt_regex)

if config['argvals']['headerloc'] == "cookies":
cookietoken = p.subn(token, config['argvals']['cookies'], 0)
Expand Down Expand Up @@ -1350,7 +1352,7 @@ def searchLog(logID):
qOutput = re.sub(' - eyJ[A-Za-z0-9_\/+-]*\.eyJ[A-Za-z0-9_\/+-]*\.[A-Za-z0-9._\/+-]*', '', qResult)
qOutput = re.sub(logID+' - ', '', qOutput)
try:
jwt = re.findall('eyJ[A-Za-z0-9_\/+-]*\.eyJ[A-Za-z0-9_\/+-]*\.[A-Za-z0-9._\/+-]*', qResult)[-1]
jwt = re.findall(jwt_regex, qResult)[-1]
except:
cprintc("JWT not included in log", "red")
exit(1)
Expand Down Expand Up @@ -1911,15 +1913,15 @@ def printLogo():
jwt_count = 0
jwt_locations = []

if args.cookies and re.search('eyJ[A-Za-z0-9_\/+-]*\.eyJ[A-Za-z0-9_\/+-]*\.[A-Za-z0-9._\/+-]*', args.cookies):
if args.cookies and re.search(jwt_regex, args.cookies):
jwt_count += 1
jwt_locations.append("cookie")

if args.headers and re.search('eyJ[A-Za-z0-9_\/+-]*\.eyJ[A-Za-z0-9_\/+-]*\.[A-Za-z0-9._\/+-]*', str(args.headers)):
if args.headers and re.search(jwt_regex, str(args.headers)):
jwt_count += 1
jwt_locations.append("headers")

if args.postdata and re.search('eyJ[A-Za-z0-9_\/+-]*\.eyJ[A-Za-z0-9_\/+-]*\.[A-Za-z0-9._\/+-]*', str(args.postdata)):
if args.postdata and re.search(jwt_regex, str(args.postdata)):
jwt_count += 1
jwt_locations.append("post data")

Expand All @@ -1929,23 +1931,23 @@ def printLogo():

if args.cookies:
try:
if re.search('eyJ[A-Za-z0-9_\/+-]*\.eyJ[A-Za-z0-9_\/+-]*\.[A-Za-z0-9._\/+-]*', args.cookies):
if re.search(jwt_regex, args.cookies):
config['argvals']['headerloc'] = "cookies"
except:
cprintc("Invalid cookie formatting", "red")
exit(1)

if args.headers:
try:
if re.search('eyJ[A-Za-z0-9_\/+-]*\.eyJ[A-Za-z0-9_\/+-]*\.[A-Za-z0-9._\/+-]*', str(args.headers)):
if re.search(jwt_regex, str(args.headers)):
config['argvals']['headerloc'] = "headers"
except:
cprintc("Invalid header formatting", "red")
exit(1)

if args.postdata:
try:
if re.search('eyJ[A-Za-z0-9_\/+-]*\.eyJ[A-Za-z0-9_\/+-]*\.[A-Za-z0-9._\/+-]*', str(args.postdata)):
if re.search(jwt_regex, str(args.postdata)):
config['argvals']['headerloc'] = "postdata"
except:
cprintc("Invalid postdata formatting", "red")
Expand All @@ -1958,7 +1960,7 @@ def printLogo():
])

try:
findJWT = re.search('eyJ[A-Za-z0-9_\/+-]*\.eyJ[A-Za-z0-9_\/+-]*\.[A-Za-z0-9._\/+-]*', searchString)[0]
findJWT = re.search(jwt_regex, searchString)[0]
except:
cprintc("Cannot find a valid JWT", "red")
cprintc(searchString, "cyan")
Expand Down