oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1240 from imachug/issue-1239

Browse source 
Don't handle `open` or `success` in error message as a sign of port being opened
This commit is contained in:
ZeroNet 2018-01-14 10:24:21 +01:00 committed by GitHub
commit 9b3a50c124
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/File/FileServer.py
View file

@ -90,7 +90,7 @@ class FileServer(ConnectionServer):
if not port: if not port:
port = self.port port = self.port
back = self.testOpenportPortchecker(port) back = self.testOpenportPortchecker(port)
if back["result"] is not True and use_alternative: # If no success try alternative checker if (back["result"] is not True and use_alternative) or back["result"] is None: # If no success try alternative checker
back = self.testOpenportCanyouseeme(port) back = self.testOpenportCanyouseeme(port)
if self.ui_server: if self.ui_server:
@ -143,8 +143,7 @@ class FileServer(ConnectionServer):
message = re.match('.*<div id="results-wrapper">(.*?)</div>', data, re.DOTALL).group(1) message = re.match('.*<div id="results-wrapper">(.*?)</div>', data, re.DOTALL).group(1)
message = re.sub("<.*?>", "", message.replace("<br>", " ").replace("&nbsp;", " ").strip()) # Strip http tags message = re.sub("<.*?>", "", message.replace("<br>", " ").replace("&nbsp;", " ").strip()) # Strip http tags
except Exception, err: except Exception, err:
message = "Error: %s" % Debug.formatException(err) return {"result": None, "message": Debug.formatException(err)}
data = ""
if "open" not in message: if "open" not in message:
if config.tor != "always": if config.tor != "always":
@ -177,7 +176,7 @@ class FileServer(ConnectionServer):
message = re.match('.*<p style="padding-left:15px">(.*?)</p>', data, re.DOTALL).group(1) message = re.match('.*<p style="padding-left:15px">(.*?)</p>', data, re.DOTALL).group(1)
message = re.sub("<.*?>", "", message.replace("<br>", " ").replace("&nbsp;", " ")) # Strip http tags message = re.sub("<.*?>", "", message.replace("<br>", " ").replace("&nbsp;", " ")) # Strip http tags
except Exception, err: except Exception, err:
message = "Error: %s" % Debug.formatException(err) return {"result": None, "message": Debug.formatException(err)}
if "Success" not in message: if "Success" not in message:
if config.tor != "always": if config.tor != "always":