Skip to content

Tarun Lalwani/Martijn Pieters supplied fix for SNI #81

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

Merged
merged 3 commits into from
Oct 27, 2017
Merged

Tarun Lalwani/Martijn Pieters supplied fix for SNI #81

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
962dd0e
Tarun Lalwani/Martijn Pieters supplied fix for SNI
timkent Oct 27, 2017
36ddf58
PEP-8 fixes
timkent Oct 27, 2017
ee920ec
Update __version__.py
codingo Oct 27, 2017
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 lib/core/__version__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# |V|H|o|s|t|S|c|a|n| Developed by @codingo_ & @__timk
# +-+-+-+-+-+-+-+-+-+ https://github.com/codingo/VHostScan

__version__ = '1.8'
__version__ = '1.8.1'
31 changes: 19 additions & 12 deletions lib/core/virtual_host_scanner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,39 @@
import pandas as pd
import time
from lib.core.discovered_host import *

import urllib3
urllib3.disable_warnings()

DEFAULT_USER_AGENT = 'Mozilla/5.0 (Windows NT 6.1; Win64; x64) '\
'AppleWebKit/537.36 (KHTML, like Gecko) '\
'Chrome/61.0.3163.100 Safari/537.36'

urllib3.disable_warnings()
try:
assert requests.__version__ != "2.18.0"
import requests.packages.urllib3.util.ssl_ as ssl_
import requests.packages.urllib3.connection as connection
except (ImportError, AssertionError, AttributeError):
import urllib3.util.ssl_ as ssl_
import urllib3.connection as connection

'''
from urllib3.util import ssl_
# print("Using requests " + requests.__version__)

_target_host = None
_orig_wrap_socket = ssl_.ssl_wrap_socket


def _ssl_wrap_socket(sock, keyfile=None, certfile=None, cert_reqs=None,
ca_certs=None, server_hostname=None,
ssl_version=None, ciphers=None, ssl_context=None,
ca_cert_dir=None):
_orig_wrap_socket(sock, keyfile=keyfile, certfile=certfile,
cert_reqs=cert_reqs, ca_certs=ca_certs,
server_hostname=_target_host, ssl_version=ssl_version,
ciphers=ciphers, ssl_context=ssl_context,
ca_cert_dir=ca_cert_dir)

ssl_.ssl_wrap_socket = _ssl_wrap_socket
'''
return ssl_.ssl_wrap_socket(sock, keyfile=keyfile, certfile=certfile,
cert_reqs=cert_reqs, ca_certs=ca_certs,
server_hostname=_target_host,
ssl_version=ssl_version, ciphers=ciphers,
ssl_context=ssl_context,
ca_cert_dir=ca_cert_dir)

connection.ssl_wrap_socket = _ssl_wrap_socket


class virtual_host_scanner(object):
Expand Down