Changeset 264 for trunk

Timestamp:

04/06/09 19:08:32 (3 years ago)

Author:

ocjhb

Message:

now with authorizer

Location:

trunk/sandbox/jhb/oc2

Files:

• documentation.py (modified) (1 diff)
• messages.py (modified) (2 diffs)
• mint.py (modified) (3 diffs)
• protocols.py (modified) (2 diffs)
• testserver.py (modified) (2 diffs)

trunk/sandbox/jhb/oc2/documentation.py

@@ -443 +443 @@
 ###############################################################################
 
+>>> from authorizer import Authorizer
+>>> authorizer = Authorizer({})
+>>> authpub = authorizer.createKeys() 
+>>> mint.addAuthKey(authpub)
 >>> clientside = protocols.TransferRequest(transport,tid,'foo',[[mkc.keyId,blind]],[])
->>> testserver.run_once(port,issuer,mint)
+>>> testserver.run_once(port,mint=mint,authorizer=authorizer)
 >>> text,value =  clientside.run()
 >>> text

trunk/sandbox/jhb/oc2/messages.py

@@ -37 +37 @@
         Field('blinds'),
         SubitemsField('coins'),
-        Field('options')
+        Field('options'),
     ]
 
@@ -46 +46 @@
     ]
 
+class AuthorizedMessage(Message):
+    fields = Message.fields + [
+        OneItemField('message',klass=Message),
+        Field('keyId'),
+        Field('signature',signing=False)
+    ]
+
+

trunk/sandbox/jhb/oc2/mint.py

@@ -2 +2 @@
 
 class Mint(Entity):
+
 
     def setCDD(self,cdd):
@@ -39 +40 @@
         return int(denomination)
 
-    def validateTarget(self,target,amount):
-        return True
 
-    def mintBlinds(self,target,blinds):
+    def addAuthKey(self,key):
+        keyid = key.hash()
+        self.storage.setdefault('authkeys',{})[keyid] = key
+
+    def getAuthKey(self,keyid):
+        return self.storage['authkeys'][keyid]
+
+    def validateAuthorization(self,message):
+        keyid = message.keyId
+        key = self.getAuthKey(keyid)
+        return key.verifyContainerSignature(message)
+
+    def handleTransferRequest(self,authorizedMessage):
+        
+        if not self.validateAuthorization(authorizedMessage):
+            return ('nonvalid','')
+        else: 
+            message = authorizedMessage.message
+        
+        target = message.target
+        blinds = message.blinds
+        coins = message.coins
+
         amount = 0
         currentversion = len(self.storage['keys']) - 1
@@ -67 +88 @@
             return ('errors',result)
 
-        valid = self.validateTarget(target,amount)
-
-        if not valid:
-            return ('nonvalid','')
-
-        if valid and not errors:
+        else:
             i = 0
             for keyid,blind in blinds:

trunk/sandbox/jhb/oc2/protocols.py

@@ -109 +109 @@
             raise 'unknown thing'
 
-class TransferHandle(Protocol):
+class TransferHandling(Protocol):
 
-    def __init__(self,mint):
+    def __init__(self,mint,authorizer):
         self.mint = mint
+        self.authorizer = authorizer
 
     def run(self,message):
@@ -118 +119 @@
         type = options['type']
         if type == 'mint':
-            text,value = self.mint.mintBlinds(message.target,message.blinds)
+            authorizedMessage = self.authorizer.authorize(message)
+            if not authorizedMessage:
+                raise 'not authorized'
+            text,value = self.mint.handleTransferRequest(authorizedMessage)
             if text == 'minted':
                 answer = messages.TransferAccept()

trunk/sandbox/jhb/oc2/testserver.py

@@ -18 +18 @@
             protocol = protocols.GiveMintKeys(self.issuer)
         elif message.header == 'TransferRequest':
-            protocol = protocols.TransferHandle(self.mint)
+            protocol = protocols.TransferHandling(self.mint,self.authorizer)
         answer = protocol.run(message)
         self.send_response(200)
@@ -26 +26 @@
 
 
-def run_once(port,issuer=None,mint=None):
+def run_once(port,issuer=None,mint=None,authorizer=None):
     Handler.issuer = issuer
     Handler.mint = mint
+    Handler.authorizer = authorizer
     httpd = BaseHTTPServer.HTTPServer(("", port), Handler)
     import threading