Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
py3 fixes, identity fields needs to be binary strings
  • Loading branch information
vesellov committed Sep 21, 2018
1 parent ae83573 commit 2ceb142
Show file tree
Hide file tree
Showing 11 changed files with 106 additions and 99 deletions.
3 changes: 2 additions & 1 deletion lib/misc.py
Expand Up @@ -75,6 +75,7 @@

from lib import net_misc
from lib import packetid
from lib import strng

#------------------------------------------------------------------------------

Expand Down Expand Up @@ -1080,7 +1081,7 @@ def ReadRepoLocation():
except:
lg.exc()
return 'sources', 'https://bitdust.io/download/'
src = bpio.ReadTextFile(settings.RepoFile()).strip()
src = strng.to_bin(bpio.ReadTextFile(settings.RepoFile())).strip()
if not src:
return settings.DefaultRepo(), settings.DefaultRepoURL(settings.DefaultRepo())
l = src.split('\n')
Expand Down
3 changes: 2 additions & 1 deletion p2p/network_connector.py
Expand Up @@ -98,6 +98,7 @@

from lib import net_misc
from lib import misc
from lib import strng

from services import driver

Expand Down Expand Up @@ -314,7 +315,7 @@ def isNetworkActive(self, arg):
def isCurrentInterfaceActive(self, arg):
# I am not sure about external IP,
# because if you have a white IP it should be the same with your local IP
return (misc.readLocalIP() in arg) or (misc.readExternalIP() in arg)
return (strng.to_bin(misc.readLocalIP()) in arg) or (strng.to_bin(misc.readExternalIP()) in arg)

def isTimePassed(self, arg):
return time.time() - self.last_reconnect_time < 15
Expand Down
3 changes: 2 additions & 1 deletion services/service_proxy_transport.py
Expand Up @@ -120,6 +120,7 @@ def _reset_my_original_identity(self, skip_transports=[]):
def _check_reset_original_identity(self):
from logs import lg
from lib import misc
from lib import strng
from main.config import conf
from userid import identity
from userid import my_id
Expand All @@ -143,7 +144,7 @@ def _check_reset_original_identity(self):
lg.warn('"my-original-identity" source is not equal to local identity source')
self._reset_my_original_identity()
return
externalIP = misc.readExternalIP()
externalIP = strng.to_bin(misc.readExternalIP())
if externalIP and orig_ident.getIP() != externalIP:
lg.warn('external IP was changed : reset "my-original-identity" config')
self._reset_my_original_identity()
Expand Down
2 changes: 1 addition & 1 deletion storage/backup_matrix.py
Expand Up @@ -510,7 +510,7 @@ def ReadLatestRawListFiles(customer_idurl=None):
filename = os.path.join(settings.SupplierPath(idurl, customer_idurl, 'listfiles'))
if os.path.isfile(filename):
listFileText = bpio.ReadTextFile(filename).strip()
if listFileText != '':
if listFileText:
ReadRawListFiles(
contactsdb.supplier_position(idurl),
listFileText,
Expand Down
5 changes: 3 additions & 2 deletions transport/http/http_interface.py
Expand Up @@ -60,6 +60,7 @@
from main import settings

from lib import misc
from lib import strng

from transport.http import http_node

Expand Down Expand Up @@ -132,7 +133,7 @@ def build_contacts(self, id_obj):
"""
"""
result = []
nowip = misc.readExternalIP()
nowip = strng.to_bin(misc.readExternalIP())
result.append('http://%s:%s' % (nowip, str(settings.getHTTPPort())))
if _Debug:
lg.out(4, 'http_interface.build_contacts : %s' % str(result))
Expand All @@ -141,7 +142,7 @@ def build_contacts(self, id_obj):
def verify_contacts(self, id_obj):
"""
"""
nowip = misc.readExternalIP()
nowip = strng.to_bin(misc.readExternalIP())
http_contact = 'http://%s:%s' % (nowip, str(settings.getHTTPPort()))
if id_obj.getContactIndex(contact=http_contact) < 0:
if _Debug:
Expand Down
5 changes: 3 additions & 2 deletions transport/network_transport.py
Expand Up @@ -67,6 +67,7 @@

from lib import misc
from lib import nameurl
from lib import strng

from userid import my_id

Expand Down Expand Up @@ -244,7 +245,7 @@ def doStart(self, arg):
# id_contact = id_contact.lstrip(self.proto + '://')
if self.proto == 'tcp':
if not id_contact:
default_host = misc.readExternalIP() + ':' + str(settings.getTCPPort())
default_host = strng.to_bin(misc.readExternalIP()) + ':' + str(settings.getTCPPort())
options['host'] = id_contact or default_host
options['tcp_port'] = settings.getTCPPort()
elif self.proto == 'udp':
Expand All @@ -257,7 +258,7 @@ def doStart(self, arg):
pass
elif self.proto == 'http':
if not id_contact:
default_host = misc.readExternalIP() + ':' + str(settings.getHTTPPort())
default_host = strng.to_bin(misc.readExternalIP()) + ':' + str(settings.getHTTPPort())
options['host'] = id_contact or default_host
options['http_port'] = settings.getHTTPPort()
if _Debug:
Expand Down
9 changes: 5 additions & 4 deletions transport/tcp/tcp_interface.py
Expand Up @@ -70,6 +70,7 @@

from lib import misc
from lib import net_misc
from lib import strng

from transport.tcp import tcp_node

Expand Down Expand Up @@ -139,8 +140,8 @@ def build_contacts(self, id_obj):
"""
"""
result = []
nowip = misc.readExternalIP()
result.append(u'tcp://%s:%d' % (nowip, settings.getTCPPort(), ))
nowip = strng.to_bin(misc.readExternalIP())
result.append('tcp://%s:%d' % (nowip, settings.getTCPPort(), ))
# TODO:
# # if IP is not external and upnp configuration was failed for some reasons
# # we may want to use another contact methods, NOT tcp
Expand All @@ -154,8 +155,8 @@ def build_contacts(self, id_obj):
def verify_contacts(self, id_obj):
"""
"""
nowip = misc.readExternalIP()
tcp_contact = u'tcp://%s:%d' % (nowip, settings.getTCPPort(), )
nowip = strng.to_bin(misc.readExternalIP())
tcp_contact = 'tcp://%s:%d' % (nowip, settings.getTCPPort(), )
if id_obj.getContactIndex(contact=tcp_contact) < 0:
if _Debug:
lg.out(4, 'tcp_interface.verify_contacts returning False: tcp contact not found or changed')
Expand Down
19 changes: 7 additions & 12 deletions userid/id_registrator.py
Expand Up @@ -111,6 +111,7 @@
from lib import nameurl
from lib import net_misc
from lib import misc
from lib import strng

from main import settings
from main import config
Expand Down Expand Up @@ -184,9 +185,9 @@ class IdRegistrator(automat.Automat):
def msg(self, msgid, arg=None):
msg = self.MESSAGES.get(msgid, ['', 'black'])
text = msg[0] % {
'login': bpio.ReadTextFile(settings.UserNameFilename()),
'externalip': misc.readExternalIP(),
'localip': bpio.ReadTextFile(settings.LocalIPFilename()),
'login': strng.to_bin(bpio.ReadTextFile(settings.UserNameFilename())),
'externalip': strng.to_bin(misc.readExternalIP()),
'localip': strng.to_bin(bpio.ReadTextFile(settings.LocalIPFilename())),
}
color = 'black'
if len(msg) == 2:
Expand Down Expand Up @@ -428,7 +429,7 @@ def doRequestServers(self, arg):
"""
Action method.
"""
login = bpio.ReadTextFile(settings.UserNameFilename())
login = strng.to_bin(bpio.ReadTextFile(settings.UserNameFilename()))

def _cb(xmlsrc, idurl, host):
if not xmlsrc:
Expand Down Expand Up @@ -583,18 +584,13 @@ def doPrint(self, arg):
def _create_new_identity(self):
"""
Generate new Private key and new identity file.
Reads some extra info from config files.
"""
login = bpio.ReadTextFile(settings.UserNameFilename())
externalIP = misc.readExternalIP() or '127.0.0.1'

login = strng.to_bin(bpio.ReadTextFile(settings.UserNameFilename()))
externalIP = strng.to_bin(misc.readExternalIP()) or '127.0.0.1'
lg.out(4, 'id_registrator._create_new_identity %s %s ' % (login, externalIP))

key.InitMyKey()

lg.out(4, ' my key is ready')

ident = my_id.buildDefaultIdentity(
name=login, ip=externalIP, idurls=self.free_idurls)
# localIP = bpio.ReadTextFile(settings.LocalIPFilename())
Expand All @@ -607,7 +603,6 @@ def _create_new_identity(self):
def _send_new_identity(self):
"""
Send created identity to the identity server to register it.
TODO: need to close transport and gateway after that
"""
lg.out(4, 'id_registrator._send_new_identity ')
Expand Down
2 changes: 1 addition & 1 deletion userid/id_server.py
Expand Up @@ -170,7 +170,7 @@ def doSetUp(self, arg):
"""
self.hostname = settings.getIdServerHost()
if self.hostname == '':
self.hostname = misc.readExternalIP() # bpio.ReadTextFile(settings.ExternalIPFilename())
self.hostname = strng.to_bin(misc.readExternalIP()) # bpio.ReadTextFile(settings.ExternalIPFilename())
if self.hostname == '':
self.hostname = net_misc.getLocalIp()
lg.out(4, 'id_server.doSetUp hostname=%s' % self.hostname)
Expand Down

0 comments on commit 2ceb142

Please sign in to comment.