dxs
/
onionr
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* do not fail localCommand if host file does not exist 

* disabled plugin tests
master
Kevin Froman 2018-07-02 16:15:59 -05:00
parent 75bb8a11bd
commit 3a7cefbf53
No known key found for this signature in database
GPG Key ID: 0D414D0FE405B63B
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
onionr/onionrutils.py
View File

@ -176,8 +176,11 @@ class OnionrUtils:
config.reload() config.reload()
self.getTimeBypassToken() self.getTimeBypassToken()
# TODO: URL encode parameters, just as an extra measure. May not be needed, but should be added regardless. # TODO: URL encode parameters, just as an extra measure. May not be needed, but should be added regardless.
with open('data/host.txt', 'r') as host: try:
hostname = host.read() with open('data/host.txt', 'r') as host:
hostname = host.read()
except FileNotFoundError:
return False
payload = 'http://%s:%s/client/?action=%s&token=%s&timingToken=%s' % (hostname, config.get('client.port'), command, config.get('client.hmac'), self.timingToken) payload = 'http://%s:%s/client/?action=%s&token=%s&timingToken=%s' % (hostname, config.get('client.port'), command, config.get('client.hmac'), self.timingToken)
try: try:
retData = requests.get(payload).text retData = requests.get(payload).text

5
onionr/tests.py
View File

@ -116,9 +116,8 @@ class OnionrTests(unittest.TestCase):
self.assertTrue(False) self.assertTrue(False)
self.assertTrue(True) self.assertTrue(True)
'''
def testBlockAPI(self): def testBlockAPI(self):
self.assertTrue(True); return
logger.debug('-'*26 + '\n') logger.debug('-'*26 + '\n')
logger.info('Running BlockAPI test #1...') logger.info('Running BlockAPI test #1...')
@ -216,7 +215,7 @@ class OnionrTests(unittest.TestCase):
logger.debug('thread finished.', timestamp = False) logger.debug('thread finished.', timestamp = False)
self.assertTrue(True) self.assertTrue(True)
'''
def testQueue(self): def testQueue(self):
logger.debug('-'*26 + '\n') logger.debug('-'*26 + '\n')
logger.info('Running daemon queue test...') logger.info('Running daemon queue test...')