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

RelayOS: removed card observer (thread). a removed card is now handled by exceptions.

Browse Source 
git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@321 96b47cad-a561-4643-ad3b-153ac7d7599c
This commit is contained in:
frankmorgner
2010-10-11 17:30:35 +00:00
parent 690caf4060
commit aaffb4ad15
1 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
virtualsmartcard/src/vpicc/VirtualSmartcard.py
View File

@@ -367,21 +367,6 @@ class CryptoflexOS(Iso7816OS): # {{{
class RelayOS(SmartcardOS): # {{{ class RelayOS(SmartcardOS): # {{{
import smartcard
class RelayCardObserver(smartcard.CardMonitoring.CardObserver): # {{{
def __init__(self, relayos):
self.os = relayos
def update(self, observable, (addedcards, removedcards)):
for removed in removedcards:
if removed.reader == self.os.reader:
if removed.atr == self.os.atr:
print "Card removed from '%s'. Terminating." % self.os.reader
self.os.exit = True
# }}}
def __init__(self, readernum): def __init__(self, readernum):
import smartcard import smartcard
readers = smartcard.System.listReaders() readers = smartcard.System.listReaders()
@@ -397,49 +382,66 @@ class RelayOS(SmartcardOS): # {{{
try: try:
self.session = smartcard.Session(self.reader) self.session = smartcard.Session(self.reader)
except smartcard.Exceptions.CardConnectionException, e: except smartcard.Exceptions.CardConnectionException, e:
print "Could not connect to card: %s" % str(e) print "Error connecting to card: %s" % e.message
sys.exit() sys.exit()
self.atr = self.session.getATR()
self.cm = CardMonitor()
self.cm.addObserver(RelayOS.RelayCardObserver(self))
print "Connected to card in '%s'" % self.reader print "Connected to card in '%s'" % self.reader
atexit.register(self.session.close) atexit.register(self.cleanup)
def cleanup(self):
import smartcard
try:
self.session.close()
except smartcard.Exceptions.CardConnectionException, e:
print "Error disconnecting from card: %s" % e.message
def getATR(self): def getATR(self):
if self.exit: import smartcard
sys.exit() try:
atr = self.session.getATR()
except smartcard.Exceptions.CardConnectionException, e:
try:
self.session.close()
self.session = smartcard.Session(self.reader)
atr = self.session.getATR()
except smartcard.Exceptions.CardConnectionException, e:
print "Error getting ATR: %s" % e.message
sys.exit()
return "".join([chr(b) for b in self.atr]) return "".join([chr(b) for b in atr])
def powerUp(self): def powerUp(self):
if self.exit:
sys.exit()
import smartcard import smartcard
try: try:
self.session.getATR() self.session.getATR()
except smartcard.Exceptions.CardConnectionException: except smartcard.Exceptions.CardConnectionException, e:
self.session = smartcard.Session(self.reader) try:
self.atr = self.session.getATR() self.session = smartcard.Session(self.reader)
except smartcard.Exceptions.CardConnectionException, e:
print "Error connecting to card: %s" % e.message
sys.exit()
def powerDown(self): def powerDown(self):
if self.exit: import smartcard
try:
self.session.close()
except smartcard.Exceptions.CardConnectionException, e:
print "Error disconnecting from card: %s" % str(e)
sys.exit() sys.exit()
self.session.close()
def execute(self, msg): def execute(self, msg):
if self.exit:
sys.exit()
#apdu = [].append(ord(b) for b in msg) #apdu = [].append(ord(b) for b in msg)
apdu = [] apdu = []
for b in msg: for b in msg:
apdu.append(ord(b)) apdu.append(ord(b))
rapdu, sw1, sw2 = self.session.sendCommandAPDU(apdu) import smartcard
try:
rapdu, sw1, sw2 = self.session.sendCommandAPDU(apdu)
except smartcard.Exceptions.CardConnectionException, e:
print "Error transmitting APDU: %s" % str(e)
sys.exit()
# XXX this is a workaround, see on sourceforge bug #3083586 # XXX this is a workaround, see on sourceforge bug #3083586
# should better use # should better use