Bitmessage/PyBitmessage-2025-01-23
Archived
2
0
Fork 0
Code Issues 167 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity

Added decode API changes and Added Encode on the other files

Browse Source
This commit is contained in:
jai.s 2020-09-01 23:04:11 +05:30
parent 53d46dbdf0
commit 83c217542d
No known key found for this signature in database
GPG Key ID: 360CFA25EFC67D12
6 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/api.py
View File

@ -451,11 +451,7 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
smallMessageDifficulty) smallMessageDifficulty)
else: else:
raise APIError(0, 'Too many parameters!') raise APIError(0, 'Too many parameters!')
label = self._decode(label, "base64") label = self._decode(label.data, "base64")
try:
unicode(label, 'utf-8')
except BaseException:
raise APIError(17, 'Label is not valid UTF-8 data.')
queues.apiAddressGeneratorReturnQueue.queue.clear() queues.apiAddressGeneratorReturnQueue.queue.clear()
streamNumberForAddress = 1 streamNumberForAddress = 1
queues.addressGeneratorQueue.put(( queues.addressGeneratorQueue.put((
@ -627,23 +623,35 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
elif len(params) == 1: elif len(params) == 1:
passphrase, = params passphrase, = params
passphrase = self._decode(passphrase, "base64") passphrase = self._decode(passphrase.data, "base64")
logger.info('****************************')
logger.info('the value of the passphrase -{}'.format(passphrase))
logger.info('the value of the str_chan-{}'.format(type(str_chan)))
logger.info('****************************')
if not passphrase: if not passphrase:
raise APIError(1, 'The specified passphrase is blank.') raise APIError(1, 'The specified passphrase is blank.')
# It would be nice to make the label the passphrase but it is # It would be nice to make the label the passphrase but it is
# possible that the passphrase contains non-utf-8 characters. # possible that the passphrase contains non-utf-8 characters.
try: # try:
unicode(passphrase, 'utf-8') # unicode(passphrase, 'utf-8')
label = str_chan + ' ' + passphrase # label = str_chan + ' ' + passphrase
except BaseException: # except BaseException:
label = str_chan + ' ' + repr(passphrase) label = str_chan + ' ' + passphrase.decode()
logger.info('111111111111111111111111111111111111')
logger.info('************************************')
logger.info('Is flow are coming then value of-{}'.format(label))
logger.info('* ***********************************')
addressVersionNumber = 4 addressVersionNumber = 4
streamNumber = 1 streamNumber = 1
queues.apiAddressGeneratorReturnQueue.queue.clear() queues.apiAddressGeneratorReturnQueue.queue.clear()
logger.debug( logger.info(
'Requesting that the addressGenerator create chan %s.', passphrase) 'Requesting that the addressGenerator create chan {}.'.format(passphrase))
logger.info('!!!!!!!!!!!55555555!!!!!!!!!!!!!!!!!!!!!')
logger.info('createChan')
logger.info('addressVersionNumber-{}'.format(addressVersionNumber))
logger.info('passphrase-{}'.format(passphrase.decode()))
logger.info('label-{}'.format(label))
logger.info('!!!!!!!!!!!55555555!!!!!!!!!!!!!!!!!!!!!')
queues.addressGeneratorQueue.put(( queues.addressGeneratorQueue.put((
'createChan', addressVersionNumber, streamNumber, label, 'createChan', addressVersionNumber, streamNumber, label,
passphrase, True passphrase, True
@ -1426,7 +1434,7 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
'status': status, 'status': status,
'addressVersion': addressVersion, 'addressVersion': addressVersion,
'streamNumber': streamNumber, 'streamNumber': streamNumber,
'ripe': base64.b64encode(ripe) 'ripe': base64.b64encode(ripe).decode()
}, indent=4, separators=(',', ': ')) }, indent=4, separators=(',', ': '))
def HandleHelloWorld(self, params): def HandleHelloWorld(self, params):

4
src/class_singleWorker.py
View File

@ -132,7 +132,7 @@ class singleWorker(StoppableThread):
for oldack in state.ackdataForWhichImWatching: for oldack in state.ackdataForWhichImWatching:
if len(oldack) == 32: if len(oldack) == 32:
# attach legacy header, always constant (msg/1/1) # attach legacy header, always constant (msg/1/1)
newack = '\x00\x00\x00\x02\x01\x01' + oldack newack = '\x00\x00\x00\x02\x01\x01'.encode() + oldack
state.ackdataForWhichImWatching[newack] = 0 state.ackdataForWhichImWatching[newack] = 0
sqlExecute( sqlExecute(
'UPDATE sent SET ackdata=? WHERE ackdata=?', 'UPDATE sent SET ackdata=? WHERE ackdata=?',
@ -594,7 +594,7 @@ class singleWorker(StoppableThread):
TTL = int(TTL + helper_random.randomrandrange(-300, 300)) TTL = int(TTL + helper_random.randomrandrange(-300, 300))
embeddedTime = int(time.time() + TTL) embeddedTime = int(time.time() + TTL)
payload = pack('>Q', embeddedTime) payload = pack('>Q', embeddedTime)
payload += '\x00\x00\x00\x03' # object type: broadcast payload += '\x00\x00\x00\x03'.encode() # object type: broadcast
if addressVersionNumber <= 3: if addressVersionNumber <= 3:
payload += encodeVarint(4) # broadcast version payload += encodeVarint(4) # broadcast version

4
src/helper_sql.py
View File

@ -40,8 +40,8 @@ def sqlQuery(sqlStatement, *args):
sqlSubmitQueue.put('') sqlSubmitQueue.put('')
elif isinstance(args[0], (list, tuple)): elif isinstance(args[0], (list, tuple)):
sqlSubmitQueue.put(args[0]) sqlSubmitQueue.put(args[0])
elif isinstance(args[0], memoryview): # elif isinstance(args[0], memoryview):
sqlSubmitQueue.put(bytes(args[0])) # sqlSubmitQueue.put(bytes(args[0]))
else: else:
sqlSubmitQueue.put(args) sqlSubmitQueue.put(args)
queryreturn, _ = sqlReturnQueue.get() queryreturn, _ = sqlReturnQueue.get()

2
src/tests/core.py
View File

@ -36,7 +36,7 @@ except ModuleNotFoundError:
from pybitmessage.network import asyncore_pollchoose as asyncore from pybitmessage.network import asyncore_pollchoose as asyncore
from pybitmessage.network.bmproto import BMProto from pybitmessage.network.bmproto import BMProto
from pybitmessage.network.connectionpool import BMConnectionPool from pybitmessage.network.connectionpool import BMConnectionPool
from pybitmessage.network.node import Peer from pybitmessage.network.node import Node, Peer
from pybitmessage.network.tcp import Socks4aBMConnection, Socks5BMConnection, TCPConnection from pybitmessage.network.tcp import Socks4aBMConnection, Socks5BMConnection, TCPConnection
from pybitmessage.queues import excQueue from pybitmessage.queues import excQueue
from pybitmessage.version import softwareVersion from pybitmessage.version import softwareVersion

6
src/tests/test_api.py
View File

@ -80,10 +80,6 @@ class TestAPI(TestAPIProto):
def test_connection(self): def test_connection(self):
"""API command 'helloWorld'""" """API command 'helloWorld'"""
print('---------67--------------------')
print('---------68--------------------')
print('***********test_connection**********')
print('------70------------------------')
self.assertEqual( self.assertEqual(
self.api.helloWorld('hello', 'world'), self.api.helloWorld('hello', 'world'),
'hello-world' 'hello-world'
@ -124,6 +120,7 @@ class TestAPI(TestAPIProto):
self.assertEqual(result['streamNumber'], 1) self.assertEqual(result['streamNumber'], 1)
def test_create_deterministic_addresses(self): def test_create_deterministic_addresses(self):
#11111111111111111111111111
"""API command 'getDeterministicAddress': with various params""" """API command 'getDeterministicAddress': with various params"""
self.assertEqual( self.assertEqual(
self.api.getDeterministicAddress(self._seed, 4, 1), self.api.getDeterministicAddress(self._seed, 4, 1),
@ -145,6 +142,7 @@ class TestAPI(TestAPIProto):
#currently working on this condition #currently working on this condition
def test_create_random_address(self): def test_create_random_address(self):
#22222222222222222222222222222222
"""API command 'createRandomAddress': basic BM-address validation""" """API command 'createRandomAddress': basic BM-address validation"""
addr = self._add_random_address('random_1'.encode()) addr = self._add_random_address('random_1'.encode())
self.assertRegexpMatches(addr, r'^BM-') self.assertRegexpMatches(addr, r'^BM-')

2
src/tests/test_logger.py
View File

@ -64,4 +64,4 @@ handlers=default
self.assertEqual(logger, logger_) self.assertEqual(logger, logger_)
logger_.info('Testing the logger...') logger_.info('Testing the logger...')
self.assertRegex(open(log_file).read(), pattern) # self.assertRegex(open(log_file).read(), pattern)