Commit 3e74ddeb authored by Matt Traudt's avatar Matt Traudt
Browse files

Add func to always make a requests.Session with the right params 

Add to that func the timeout parameter
parent 2c21c8a2

sbws/core/scanner.py

+2 −6
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ from ..lib.destination import DestinationList 
# from ..util.sockio import (make_socket, close_socket)

from sbws.globals import (fail_hard, is_initted)

import sbws.util.stem as stem_utils

import sbws.util.requests as requests_utils

from argparse import ArgumentDefaultsHelpFormatter

from multiprocessing.dummy import Pool

from threading import Event
@@ -126,12 +127,7 @@ def measure_bandwidth_to_server(session, conf, dest, content_length): 




def measure_relay(args, conf, destinations, cb, rl, relay):

    s = requests.Session()

    socks_info = stem_utils.get_socks_info(cb.controller)

    s.proxies = {

        'http': 'socks5h://{}:{}'.format(*socks_info),

        'https': 'socks5h://{}:{}'.format(*socks_info),

    }

    s = requests_utils.make_session(cb.controller)

    # Pick a destionation

    dest = destinations.next()

    if not dest:

sbws/lib/destination.py

+2 −1
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ import requests 
from urllib.parse import urlparse

from stem.control import EventType

import sbws.util.stem as stem_utils

import sbws.util.requests as requests_utils



log = logging.getLogger(__name__)
@@ -148,7 +149,7 @@ class DestinationList: 
        self._usability_lock.acquire()

        log.debug('Perform usability tests')

        cont = self._cont

        session = requests.Session()

        session = requests_utils.make_session(cont)

        usable_dests = []

        for dest in self._all_dests:

            possible_exits = self._rl.exits_can_exit_to(

sbws/util/requests.py

0 → 100644
+12 −0
Original line number Diff line number Diff line 
import requests

import sbws.util.stem as stem_utils



def make_session(controller):

    s = requests.Session()

    socks_info = stem_utils.get_socks_info(controller)

    s.proxies = {

        'http': 'socks5h://{}:{}'.format(*socks_info),

        'https': 'socks5h://{}:{}'.format(*socks_info),

    }

    s.timeout = 10

    return s