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

Jump to bottom

Drop python 3.6 string formatting syntax in rdp_web_login #14953

Merged
merged 1 commit into from
Apr 23, 2021
Merged

Drop python 3.6 string formatting syntax in rdp_web_login #14953

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
24 changes: 12 additions & 12 deletions modules/auxiliary/scanner/http/rdp_web_login.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@

def verify_service(rhost, rport, targeturi, timeout, user_agent):
"""Verify the service is up at the target URI within the specified timeout"""
url = f'https://{rhost}:{rport}/{targeturi}'
url = 'https://' + rhost + ':' + rport + '/' +targeturi
headers = {'Host':rhost,
'User-Agent': user_agent}
try:
Expand All @@ -88,7 +88,7 @@ def get_ad_domain(rhost, rport, user_agent):
'Host': rhost}
session = requests.Session()
for url in domain_urls:
target_url = f"https://{rhost}:{rport}/{url}"
target_url = 'https://' + rhost +':' + rport+ '/' +targeturi
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This string formatting should use + url instead of + targeturi, since we're using the local url variable to build the target_url

request = session.get(target_url, headers=headers, verify=False)
# Decode the provided NTLM Response to strip out the domain name
if request.status_code == 401 and 'WWW-Authenticate' in request.headers and \
Expand All @@ -97,7 +97,7 @@ def get_ad_domain(rhost, rport, user_agent):
domain = base64.b64decode(bytes(domain_hash,
'utf-8')).replace(b'\x00',b'').split(b'\n')[1]
domain = domain[domain.index(b'\x0f') + 1:domain.index(b'\x02')].decode('utf-8')
module.log(f'Found Domain: {domain}', level='good')
module.log('Found Domain: ' + domain, level='good')
return domain
module.log('Failed to find Domain', level='error')
return None
Expand All @@ -108,30 +108,30 @@ def check_login(rhost, rport, targeturi, domain, username, password, timeout, us
The timeout is used to specify the amount of milliseconds where a
response should consider the username invalid."""

url = f'https://{rhost}:{rport}/{targeturi}'
body = f'DomainUserName={domain}%5C{username}&UserPass={password}'
url = 'https://' + rhost + ':' + rport + '/' + targeturi
body = 'DomainUserName=' + 'domain' + '%5C' + username + '&UserPass=' + password
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be domain instead of 'domain' so that it uses the variable not the string 'domain'

headers = {'Host':rhost,
'User-Agent': user_agent,
'Content-Type': 'application/x-www-form-urlencoded',
'Content-Length': f'{len(body)}',
'Origin': f'https://{rhost}'}
'Content-Length': str(len(body)),
'Origin': 'https://' + rhost}
session = requests.Session()
report_data = {'domain':domain, 'address': rhost, 'port': rport,
'protocol': 'tcp', 'service_name':'RDWeb'}
try:
request = session.post(url, data=body, headers=headers,
timeout=(timeout / 1000), verify=False, allow_redirects=False)
if request.status_code == 302:
module.log(f'Login {domain}\\{username}:{password} is valid!', level='good')
module.log('Login ' + domain + '\\' + username + ':' + password + ' is valid!', level='good')
module.report_correct_password(username, password, **report_data)
elif request.status_code == 200:
module.log(f'Password {password} is invalid but {domain}\\{username} is valid! Response received in {request.elapsed.microseconds / 1000} milliseconds',
module.log('Password ' + password + ' is invalid but ' + domain + '\\' + username + ' is valid! Response received in ' + str(request.elapsed.microseconds / 1000) + ' milliseconds',
level='good')
module.report_valid_username(username, **report_data)
else:
module.log(f'Received unknown response with status code: {request.status_code}')
module.log('Received unknown response with status code: ' + request.status_code)
except requests.exceptions.Timeout:
module.log(f'Login {domain}\\{username}:{password} is invalid! No response received in {timeout} milliseconds',
module.log('Login ' + domain + '\\' + username + ':' + password + ' is invalid! No response received in ' + timeout + ' milliseconds',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this timeout needs a str() wrapper to get the concatenation to work. So replace with str(timeout)

level='error')
except requests.exceptions.RequestException as exc:
module.log('{}'.format(exc), level='error')
Expand Down Expand Up @@ -159,7 +159,7 @@ def run(args):
if service_verified:
module.log('Service is up, beginning scan...', level='good')
else:
module.log(f'Service appears to be down, no response in {args["timeout"]} milliseconds',
module.log('Service appears to be down, no response in ' + str(args["timeout"]) + ' milliseconds',
level='error')
return

Expand Down