fix resolverdns

specials/resolverdns.py

@@ -77,7 +77,6 @@ class CipherSuiteAdapter(host_header_ssl.HostHeaderSSLAdapter):
                 logger.error('Failed to resolve hostname, fallback to normal dns')
                 import traceback
                 logger.error(traceback.print_exc())
-                ip = domain
         return ip
 
     def writeToCache(self, domain, ip):
@@ -108,39 +107,41 @@ class CipherSuiteAdapter(host_header_ssl.HostHeaderSSLAdapter):
             domain = parse.netloc
         else:
             raise requests.exceptions.URLRequired
-        self.ssl_context = CustomContext(protocol, domain)
-        if self.CF:
-            self.ssl_context.options |= (ssl.OP_NO_SSLv2 | ssl.OP_NO_SSLv3 | ssl.OP_NO_TLSv1 | ssl.OP_NO_TLSv1_1)
-        self.ssl_context.set_ciphers(self.cipherSuite)
-        self.init_poolmanager(self._pool_connections, self._pool_maxsize, block=self._pool_block)
         ip = self.getIp(domain)
+        if ip:
+            self.ssl_context = CustomContext(protocol, domain)
+            if self.CF:
+                self.ssl_context.options |= (ssl.OP_NO_SSLv2 | ssl.OP_NO_SSLv3 | ssl.OP_NO_TLSv1 | ssl.OP_NO_TLSv1_1)
+            self.ssl_context.set_ciphers(self.cipherSuite)
+            self.init_poolmanager(self._pool_connections, self._pool_maxsize, block=self._pool_block)
+            realUrl = request.url
 
-        realUrl = request.url
+            if request.headers:
+                request.headers["Host"] = domain
+            else:
+                request.headers = {"Host": domain}
+            ret = None
+            tryFlush = False
 
-        if request.headers:
-            request.headers["Host"] = domain
+            parse = list(parse)
+            parse[1] = ip
+            request.url = urlparse.urlunparse(parse)
+            try:
+                ret = super(CipherSuiteAdapter, self).send(request, **kwargs)
+            except Exception as e:
+                logger.info('Request for ' + domain + ' with ip ' + ip + ' failed')
+                logger.info(e)
+                # if 'SSLError' in str(e):
+                #     # disabilito
+                #     config.set_setting("resolver_dns", False)
+                #     request.url = realUrl
+                #     ret = super(CipherSuiteAdapter, self).send(request, **kwargs)
+                # else:
+                tryFlush = True
+            if tryFlush and not flushedDns:  # re-request ips and update cache
+                logger.info('Flushing dns cache for ' + domain)
+                return self.flushDns(request, domain, **kwargs)
+            ret.url = realUrl
         else:
-            request.headers = {"Host": domain}
-        ret = None
-        tryFlush = False
-
-        parse = list(parse)
-        parse[1] = ip
-        request.url = urlparse.urlunparse(parse)
-        try:
-            ret = super(CipherSuiteAdapter, self).send(request, **kwargs)
-        except Exception as e:
-            logger.info('Request for ' + domain + ' with ip ' + ip + ' failed')
-            logger.info(e)
-            # if 'SSLError' in str(e):
-            #     # disabilito
-            #     config.set_setting("resolver_dns", False)
-            #     request.url = realUrl
-            #     ret = super(CipherSuiteAdapter, self).send(request, **kwargs)
-            # else:
-            tryFlush = True
-        if tryFlush and not flushedDns:  # re-request ips and update cache
-            logger.info('Flushing dns cache for ' + domain)
-            return self.flushDns(request, domain, **kwargs)
-        ret.url = realUrl
+            ret = super(host_header_ssl.HostHeaderSSLAdapter, self).send(request, **kwargs)
         return ret

specials/search.py

@@ -189,9 +189,6 @@ def channel_search(item):
 
     channel_list, channel_titles = get_channels(item)
 
-    import requests
-    session = requests.Session()
-
     searching += channel_list
     searching_titles += channel_titles
     cnt = 0
@@ -201,7 +198,7 @@ def channel_search(item):
     config.set_setting('tmdb_active', False)
 
     with futures.ThreadPoolExecutor(max_workers=set_workers()) as executor:
-        c_results = [executor.submit(get_channel_results, ch, item, session) for ch in channel_list]
+        c_results = [executor.submit(get_channel_results, ch, item) for ch in channel_list]
 
         for res in futures.as_completed(c_results):
             cnt += 1
@@ -294,7 +291,7 @@ def channel_search(item):
     return valid + results
 
 
-def get_channel_results(ch, item, session):
+def get_channel_results(ch, item):
     max_results = 10
     results = list()
 
@@ -306,7 +303,6 @@ def get_channel_results(ch, item, session):
 
     if search_action:
         for search_ in search_action:
-            search_.session = session
             try:
                 results.extend(module.search(search_, item.text))
             except: