VivoKey/vsmartcard
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #35 from d0/master

Browse Source 
Minor improvements to CardGenerator and the corresponding unit test
This commit is contained in:
Frank Morgner
2015-01-08 12:12:02 +01:00
parent 3822b00c8a d90914edb0
commit a35f0295c6
2 changed files with 65 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
virtualsmartcard/src/vpicc/virtualsmartcard/CardGenerator.py
View File

@@ -380,19 +380,21 @@ class CardGenerator(object):
if sam != None: if sam != None:
self.sam = sam self.sam = sam
def loadCard(self, filename): def loadCard(self, filename):
"""Load a card from disk""" """Load a card from disk"""
db = anydbm.open(filename, 'r')
if self.password is None: if self.password is None:
self.password = getpass.getpass("Please enter your password:") self.password = getpass.getpass("Please enter your password:")
serializedMF = read_protected_string(db["mf"], self.password) db = anydbm.open(filename, 'r')
serializedSAM = read_protected_string(db["sam"], self.password) try:
serializedMF = read_protected_string(db["mf"], self.password)
serializedSAM = read_protected_string(db["sam"], self.password)
self.type = db["type"]
finally:
db.close()
self.sam = loads(serializedSAM) self.sam = loads(serializedSAM)
self.mf = loads(serializedMF) self.mf = loads(serializedMF)
self.type = db["type"]
def saveCard(self, filename): def saveCard(self, filename):
"""Save the currently running card to disk""" """Save the currently running card to disk"""
@@ -406,7 +408,7 @@ class CardGenerator(object):
if self.mf == None or self.sam == None: if self.mf == None or self.sam == None:
raise ValueError("Card Generator wasn't set up properly" +\ raise ValueError("Card Generator wasn't set up properly" +\
"(missing MF or SAM).") "(missing MF or SAM).")
mf_string = dumps(self.mf) mf_string = dumps(self.mf)
sam_string = dumps(self.sam) sam_string = dumps(self.sam)
@@ -414,23 +416,24 @@ class CardGenerator(object):
protectedSAM = protect_string(sam_string, self.password) protectedSAM = protect_string(sam_string, self.password)
db = anydbm.open(filename, 'c') db = anydbm.open(filename, 'c')
db["mf"] = protectedMF try:
db["sam"] = protectedSAM db["mf"] = protectedMF
db["type"] = self.type db["sam"] = protectedSAM
db["version"] = "0.1" db["type"] = self.type
db.close() db["version"] = "0.1"
finally:
db.close()
def readDatagroups(self, datasetfile): def readDatagroups(self, datasetfile):
"""Read Datagroups from file""" """Read Datagroups from file"""
with open(datasetfile, 'r') as f: with open(datasetfile, 'r') as f:
for line in f: for line in f:
if (not line.startswith("#")) and (not len(line.strip()) == 0): if (not line.startswith("#")) and (not len(line.strip()) == 0):
# spaces after equal sign are allowed to get strings with leading spaces! # spaces after equal sign are allowed to get strings with leading spaces!
line=line.replace(" =", "=") line=line.replace(" =", "=")
splitLine = line.split("=") splitLine = line.split("=")
# we don't want to have the newline char from dataset file as part of the value!! # we don't want to have the newline char from dataset file as part of the value!!
self.datagroups[splitLine[0]] = splitLine[1].rstrip("\n\r") self.datagroups[splitLine[0]] = splitLine[1].rstrip("\n\r")
f.close()
if __name__ == "__main__": if __name__ == "__main__":
from optparse import OptionParser from optparse import OptionParser

14
virtualsmartcard/src/vpicc/virtualsmartcard/tests/CardGenerator_test.py
View File

@@ -17,9 +17,10 @@
# virtualsmartcard. If not, see <http://www.gnu.org/licenses/>. # virtualsmartcard. If not, see <http://www.gnu.org/licenses/>.
# #
import unittest import anydbm
import tempfile
import os import os
import tempfile
import unittest
from virtualsmartcard.CardGenerator import CardGenerator from virtualsmartcard.CardGenerator import CardGenerator
class TestNPACardGenerator(unittest.TestCase): class TestNPACardGenerator(unittest.TestCase):
@@ -29,15 +30,13 @@ class TestNPACardGenerator(unittest.TestCase):
self.nPA_generator = CardGenerator('nPA') self.nPA_generator = CardGenerator('nPA')
self.nPA_generator.password = "TestPassword" self.nPA_generator.password = "TestPassword"
def tearDown(self):
os.unlink(self.filename)
def test_nPA_creation(self): def test_nPA_creation(self):
self.nPA_generator.generateCard() self.nPA_generator.generateCard()
self.nPA_generator.saveCard(self.filename) self.nPA_generator.saveCard(self.filename)
mf, sam = self.nPA_generator.getCard() mf, sam = self.nPA_generator.getCard()
self.assertIsNotNone(mf) self.assertIsNotNone(mf)
self.assertIsNotNone(sam) self.assertIsNotNone(sam)
os.unlink(self.filename)
def test_load_nPA_from_file_nPA_from_file(self): def test_load_nPA_from_file_nPA_from_file(self):
self.nPA_generator.generateCard() self.nPA_generator.generateCard()
@@ -48,6 +47,11 @@ class TestNPACardGenerator(unittest.TestCase):
mf, sam = local_generator.getCard() mf, sam = local_generator.getCard()
self.assertIsNotNone(mf) self.assertIsNotNone(mf)
self.assertIsNotNone(sam) self.assertIsNotNone(sam)
os.unlink(self.filename)
def test_load_nonexistent_file(self):
with self.assertRaises(anydbm.error):
self.nPA_generator.loadCard(self.filename)
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()