Changeset 320 for trunk

Timestamp:

05/28/09 14:30:52 (3 years ago)

Author:

ocjhb

Message:

dont remember all I did

Location:

trunk/sandbox/jhb

Files:

• mobile/ocwallet.py (modified) (14 diffs)
• oc2/testissuer.py (modified) (1 diff)
• oc2/transports.py (modified) (2 diffs)
• oc2/wallet.py (modified) (4 diffs)

trunk/sandbox/jhb/mobile/ocwallet.py

@@ -1 +1 @@
 import appuifw,e32,os,sys
+
+def error_catched(f):
+    def error_handled(*args,**kwargs):
+        try:
+            f(*args,**kwargs)
+        except:
+            appuifw.note(u'cought error','error') 
+    return error_handled        
+
 
 class WalletClient:
@@ -131 +140 @@
         url = appuifw.query(u'url','text',u'http://baach.de:9090')
         self.todo['url'] = url
-        transport = self.getHTTPTransport(url) 
+        transport = self.getHTTPTransport(url)
+        if not transport:
+            self.displayActionMenu()
+            return
         self.wallet.addCurrency(transport)
         self.displayWalletMenu()
@@ -160 +172 @@
 
         transport = self.getHTTPTransport(url)
+        if not transport:
+            self.displayActionMenu()
+            return
+ 
         self.wallet.mintCoins(transport,amount,target)
         coinsound.play() 
@@ -178 +194 @@
 
         transport = self.getHTTPTransport(url)
+        if not transport:
+            self.displayActionMenu()
+            return
+ 
         self.wallet.redeemCoins(transport,amount,target)
         self.displayWalletMenu()
@@ -185 +205 @@
         cdd,alreadythere = self.getCurrentCurrency()
         transport = self.getHTTPTransport(cdd.issuerServiceLocation)
+        if not transport:
+            self.displayActionMenu()
+            return
+ 
         self.wallet.freshenUp(transport,cdd)
-        coinsound.play() 
+        #coinsound.play() 
         self.displayWalletMenu()
 
@@ -197 +221 @@
         if method ==0:
             transport = self.getHTTPTransport(cdd.issuerServiceLocation)
+            if not transport:
+                self.displayActionMenu()
+                return
+ 
             self.receiveCoinsBT(transport)
+ 
         else:
             transport = self.getHTTPTransport(cdd.issuerServiceLocation)
+            if not transport:
+                self.displayActionMenu()
+                return
+ 
             self.receiveCoinsHTTP(transport,walletport)
 
@@ -208 +241 @@
 
     def getHTTPTransport(self,url):
-        self.startInternet()
+        if not self.startInternet():
+            return 
         transport = transports.HTTPTransport(url)
         return transport
@@ -255 +289 @@
                     answer = self.wallet.listenSum(message)
                 if message.header == 'SpendRequest':
-                    answer = self.wallet.listenSpend(message,transport)
+                    answer = self.wallet.listenSpend(transport,message)
                 self.send_response(200)
                 self.send_header("Content-type", "text/plain")
@@ -265 +299 @@
 
         OCHandler.wallet = self.wallet
-        self.startInternet()
+        if not self.startInternet():
+            return
         
         self.httpd = StoppableHTTPServer(("",port),OCHandler)
@@ -380 +415 @@
                 url = 'http://%s:%s' % (url,walletport)
             transport = self.getHTTPTransport(url)
+            if not transport:
+                self.displayActionMenu()
+                return
             self.wallet.spendCoins(transport,cdd.currencyId,amount,target)
         else:
@@ -413 +451 @@
                 aps.sort()
                 apid = appuifw.popup_menu(aps,u'select access point')
+                if apid == None:
+                    return None
                 self.feedback(u'Preparing internet access:setting access point')
 
@@ -426 +466 @@
             s.connect(('www.google.com',80))
             self.ip = s.getsockname()[0]
-
+        return True
     
 
@@ -515 +555 @@
 #Try to use a password on the data file. Repeat till its sucessfully loaded
 password = ''
-while 1:
+while 0: #don't use the password protected storage, too slow atm.
     password = appuifw.query(u'password','text')
 
@@ -530 +570 @@
         appuifw.note(u'wrong password','error')
         pass
+storage = oc2storage.Storage()
+storage.setFilename(storagepath+'wallet.bin')
+tmp = open(storagepath+'wallet.bin')
+tmpcontent = tmp.read()
+tmp.close()
+if tmpcontent.startswith('salt'):
+    os.remove(storagepath+'wallet.bin')
+storage.restore()    
+
+
+
+
+
 
 #Load the rest of the libs

trunk/sandbox/jhb/oc2/testissuer.py

@@ -52 +52 @@
     return host
 
-print 'Starting up server'
+print 'Starting up server on port %s ' % port
 Handler.issuer = issuer
 Handler.mint = mint

trunk/sandbox/jhb/oc2/transports.py

@@ -69 +69 @@
     def __init__(self, *args):
         self.results = list(args)
-
+        self.debug = 0
     def __call__(self,message):
+        if self.debug:
+            import pdb; pdb.set_trace()
         result = self.results.pop(0)
         
@@ -79 +81 @@
             return method(*args)
         
-        elif callable(result):
+        elif not isinstance(result,messages.Message) and callable(result):
             return result(message)        
         

trunk/sandbox/jhb/oc2/wallet.py

@@ -39 +39 @@
         self.feedback('Talking to issuer: fetching latest CDD')
         response = transport(messages.AskLatestCDD())
+        if not isinstance(response,messages.GiveLatestCDD):
+            raise Exception, 'Not a valid message'
+        if not response.cdd.masterPubKey.verifyContainerSignature(response.cdd):
+            raise Exception, 'Could not verify cdd'
         return response.cdd
 
 
-    def fetchMintKeys(self,transport,denominations=None,keyids=None):
+    def fetchMintKeys(self,transport,cdd,denominations=None,keyids=None):
         if denominations and keyids:
-            raise "you can't ask for denominations and keyids at the same time"
+            raise Exception, "you can't ask for denominations and keyids at the same time"
         if not (denominations or keyids):
-            raise "you need to ask at least for one"
+            raise Exception, "you need to ask at least for one"
         message = messages.FetchMintKeys()
-        message.denominations = [str(d) for d in denominations]
+        denominations = [str(d) for d in denominations]
+        message.denominations = denominations
         message.keyids = keyids
         self.feedback('Talking to issuer: fetching mintkeys')
         response = transport(message)
+        
         if response.header == 'MINTING_KEY_FAILURE':
             raise message
-        else:
-            return  response.keys
+        
+        if not isinstance(response,messages.GiveMintKeys):
+            raise Exception, 'Not a valid message'
+        
+        if set(denominations).difference(set([key.denomination for key in response.keys])):
+            raise Exception, 'Not all denominations met'
+
+        for key in response.keys:
+            if not cdd.masterPubKey.verifyContainerSignature(key):
+                raise Exception, 'Could not verify key'
+        return  response.keys
+            
        
 
@@ -119 +135 @@
 
 
-    def listenSpend(self,message,transport=None):
+    def listenSpend(self,transport,message):
         tid = message.transactionId
         amount = sum([int(m.denomination) for m in message.coins])
@@ -174 +190 @@
 
     def pickForSpending(self,amount,coins):
-        tmp = [(c.denomination,c) for c in coins]
+        tmp = [(int(c.denomination),c) for c in coins]
         tmp.sort()
         tmp.reverse()
-        coins = [t[1] for t in tmp]
+        mycoins = [t[1] for t in tmp]
         picked = []
-        for coin in coins:
+        for coin in mycoins:
             sumpicked = sum([int(c.denomination) for c in picked])
             if sumpicked < amount:
@@ -220 +236 @@
     def prepareBlanks(self,transport,cdd,values):        
         wanted = list(set(values)) #what mkcs do we want
-        keys = self.fetchMintKeys(transport,denominations=wanted)
+        keys = self.fetchMintKeys(transport,cdd,denominations=wanted)
         mkcs = {}
         for mkc in keys:
             if not cdd.masterPubKey.verifyContainerSignature(mkc):
-                raise 'Invalid signature on mkc'
+                raise Exception, 'Could not verify mkc'
             mkcs[mkc.denomination] = mkc