emdee/toxygen
1
0
Fork 0
Code Issues 1 Pull Requests Actions Wiki Activity

toxencryptsave bug fixes, tests update

Browse Source
This commit is contained in:
ingvar1995 2016-05-15 13:39:03 +03:00
parent f0875b0415
commit d0b767c779
2 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/toxencryptsave.py
View File

@ -1,6 +1,6 @@
import libtox import libtox
import util import util
from ctypes import c_void_p, c_size_t, create_string_buffer, byref, c_int, ArgumentError from ctypes import c_size_t, create_string_buffer, byref, c_int, ArgumentError, c_char_p
TOX_ERR_ENCRYPTION = { TOX_ERR_ENCRYPTION = {
@ -52,11 +52,15 @@ class LibToxEncryptSave(util.Singleton):
""" """
out = create_string_buffer(len(data) + TOX_PASS_ENCRYPTION_EXTRA_LENGTH) out = create_string_buffer(len(data) + TOX_PASS_ENCRYPTION_EXTRA_LENGTH)
tox_err_encryption = c_int() tox_err_encryption = c_int()
self.libtoxencryptsave.tox_pass_encrypt(c_void_p(data), c_size_t(len(data)), c_void_p(self._passphrase), self.libtoxencryptsave.tox_pass_encrypt(c_char_p(data),
c_size_t(len(self._passphrase)), out, byref(tox_err_encryption)) c_size_t(len(data)),
c_char_p(self._passphrase),
c_size_t(len(self._passphrase)),
out,
byref(tox_err_encryption))
tox_err_encryption = tox_err_encryption.value tox_err_encryption = tox_err_encryption.value
if tox_err_encryption == TOX_ERR_ENCRYPTION['OK']: if tox_err_encryption == TOX_ERR_ENCRYPTION['OK']:
return out return out[:]
elif tox_err_encryption == TOX_ERR_ENCRYPTION['NULL']: elif tox_err_encryption == TOX_ERR_ENCRYPTION['NULL']:
raise ArgumentError('Some input data, or maybe the output pointer, was null.') raise ArgumentError('Some input data, or maybe the output pointer, was null.')
elif tox_err_encryption == TOX_ERR_ENCRYPTION['KEY_DERIVATION_FAILED']: elif tox_err_encryption == TOX_ERR_ENCRYPTION['KEY_DERIVATION_FAILED']:
@ -73,11 +77,15 @@ class LibToxEncryptSave(util.Singleton):
""" """
out = create_string_buffer(len(data) - TOX_PASS_ENCRYPTION_EXTRA_LENGTH) out = create_string_buffer(len(data) - TOX_PASS_ENCRYPTION_EXTRA_LENGTH)
tox_err_decryption = c_int() tox_err_decryption = c_int()
self.libtoxencryptsave.tox_pass_encrypt(c_void_p(data), c_size_t(len(data)), c_void_p(self._passphrase), self.libtoxencryptsave.tox_pass_decrypt(c_char_p(data),
c_size_t(len(self._passphrase)), out, byref(tox_err_decryption)) c_size_t(len(data)),
c_char_p(self._passphrase),
c_size_t(len(self._passphrase)),
out,
byref(tox_err_decryption))
tox_err_decryption = tox_err_decryption.value tox_err_decryption = tox_err_decryption.value
if tox_err_decryption == TOX_ERR_DECRYPTION['OK']: if tox_err_decryption == TOX_ERR_DECRYPTION['OK']:
return out return out[:]
elif tox_err_decryption == TOX_ERR_DECRYPTION['NULL']: elif tox_err_decryption == TOX_ERR_DECRYPTION['NULL']:
raise ArgumentError('Some input data, or maybe the output pointer, was null.') raise ArgumentError('Some input data, or maybe the output pointer, was null.')
elif tox_err_decryption == TOX_ERR_DECRYPTION['INVALID_LENGTH']: elif tox_err_decryption == TOX_ERR_DECRYPTION['INVALID_LENGTH']:

29
tests/tests.py
View File

@ -2,6 +2,7 @@ from src.bootstrap import node_generator
from src.profile import * from src.profile import *
from src.settings import ProfileHelper from src.settings import ProfileHelper
from src.tox_dns import tox_dns from src.tox_dns import tox_dns
from src.toxencryptsave import LibToxEncryptSave
class TestProfile(): class TestProfile():
@ -12,13 +13,13 @@ class TestProfile():
assert len(arr) >= 2 assert len(arr) >= 2
def test_open(self): def test_open(self):
data = ProfileHelper.open_profile(Settings.get_default_path(), 'alice') data = ProfileHelper(Settings.get_default_path(), 'alice').open_profile()
assert data assert data
def test_open_save(self): def test_open_save(self):
data = ProfileHelper.open_profile(Settings.get_default_path(), 'alice') data = ProfileHelper(Settings.get_default_path(), 'alice').open_profile()
ProfileHelper.save_profile(data) ProfileHelper.get_instance().save_profile(data)
new_data = ProfileHelper.open_profile(Settings.get_default_path(), 'alice') new_data = ProfileHelper(Settings.get_default_path(), 'alice').open_profile()
assert new_data == data assert new_data == data
@ -36,7 +37,7 @@ class TestNodeGen():
class TestTox(): class TestTox():
def test_loading(self): def test_loading(self):
data = ProfileHelper.open_profile(Settings.get_default_path(), 'alice') data = ProfileHelper(Settings.get_default_path(), 'alice').open_profile()
settings = Settings.get_default_settings() settings = Settings.get_default_settings()
tox = tox_factory(data, settings) tox = tox_factory(data, settings)
for data in node_generator(): for data in node_generator():
@ -56,13 +57,13 @@ class TestTox():
assert tox.self_get_status_message() == status_message assert tox.self_get_status_message() == status_message
def test_friend_list(self): def test_friend_list(self):
data = ProfileHelper.open_profile(Settings.get_default_path(), 'bob') data = ProfileHelper(Settings.get_default_path(), 'bob').open_profile()
settings = Settings.get_default_settings() settings = Settings.get_default_settings()
tox = tox_factory(data, settings) tox = tox_factory(data, settings)
s = tox.self_get_friend_list() s = tox.self_get_friend_list()
size = tox.self_get_friend_list_size() size = tox.self_get_friend_list_size()
assert size == 2 assert size <= 2
assert len(s) == 2 assert len(s) <= 2
del tox del tox
@ -72,3 +73,15 @@ class TestDNS():
bot_id = '56A1ADE4B65B86BCD51CC73E2CD4E542179F47959FE3E0E21B4B0ACDADE51855D34D34D37CB5' bot_id = '56A1ADE4B65B86BCD51CC73E2CD4E542179F47959FE3E0E21B4B0ACDADE51855D34D34D37CB5'
tox_id = tox_dns('groupbot@toxme.io') tox_id = tox_dns('groupbot@toxme.io')
assert tox_id == bot_id assert tox_id == bot_id
class TestEncryption():
def test_encr_decr(self):
with open(settings.Settings.get_default_path() + '/alice.tox') as fl:
data = fl.read()
lib = LibToxEncryptSave('easypassword')
copy_data = data[:]
data = lib.pass_encrypt(data)
data = lib.pass_decrypt(data)
assert copy_data == data