Changeset 254 for trunk

Timestamp:

03/30/09 20:09:33 (3 years ago)

Author:

ocjhb

Message:

some issuer and mint stuff working

Location:

trunk/sandbox/jhb/oc2

Files:

• container.py (modified) (3 diffs)
• containerbase.py (added)
• entity.py (added)
• issuer.py (added)
• mint.py (added)
• occrypto_rsa.py (modified) (4 diffs)
• storage.py (added)
• test_issuer.py (added)
• test_playground.py (moved) (moved from trunk/sandbox/jhb/oc2/tests.py) (2 diffs, 1 prop)
• testserver.py (moved) (moved from trunk/sandbox/jhb/oc2/test.py) (1 diff, 1 prop)

trunk/sandbox/jhb/oc2/container.py

@@ -1 @@
-import simplejson, datetime, binascii
-
-################################### Fields ##################################
-
-class Field(object):
-    def __init__(self,name,signing=True,default=''):
-        self.name = name
-        self.signing = signing
-        self.default = default
-
-    def getencoded(self,object,allData=False):
-        value = getattr(object,self.name,self.default)
-        return value
-
-    def setdecoded(self,object,data):
-        setattr(object,self.name,data)
-
-class DateField(Field):
-
-    format = '%d.%m.%Y %H:%M:%S'
-
-    def getencoded(self,object,allData=False):
-        value = getattr(object,self.name,self.default)
-        if not value:
-            value = datetime.datetime.now()
-        return value.strftime(self.format)
-
-    def setdecoded(self,object,data):
-        dt = datetime.datetime.strptime(data,self.format)
-        setattr(object,self.name,dt)
-
-        
-
-class BinaryField(Field):
-    
-    def getencoded(self,object,allData=False):
-        value = getattr(object,self.name,self.default)
-        return binascii.b2a_base64(value).strip()
-
-    def setdecoded(self,object,data):
-        setattr(object,self.name,binascii.a2b_base64(data))
-     
-    
-class OneItemField(Field):
-    
-    def __init__(self,name,signing=True,default='',klass=dict):
-        Field.__init__(self,name=name,signing=signing,default=default)
-        self.klass = klass
-
-
-    def getencoded(self,object,allData=False):
-        value = getattr(object,self.name)
-        if value:
-            value = value.getData(allData=allData)
-        else:
-            value = self.default
-        return  value
-        
-    def setdecoded(self,object,data):
-        setattr(object,self.name,self.klass(data))
-
-
-
-
-class SubitemsField(Field):
-    
-    def __init__(self,name,signing=True,default='',klass=dict):
-        Field.__init__(self,name=name,signing=signing,default=default)
-        self.klass = klass
-
-
-    def getencoded(self,object,allData=False):
-        out = []
-        for item in getattr(object,self.name):
-            out.append(item.getData(allData=allData))
-        return out       
-        
-    def setdecoded(self,object,data):
-        value = []
-        for item in data:
-            value.append(self.klass(item))
-        setattr(object,self.name,value)     
-
-
-################################### Containers ##################################
-              
-
-class Container(object):   
-    
-    fields = []
-
-    def __init__(self,data={}):
-        self.fromData(data)
-
-    def __xrepr__(self):
-        return "<%s(%s)>" % (self.__class__.__name__,self.getData(True))
-
-    def __xstr__(self):
-        return self.toString()
-
-    def fromData(self,data):
-        if type(data) == type(''):
-            data = simplejson.loads(data)
-        if type(data) != type({}):
-            data = dict(data)
-        for field in self.fields:
-            if data.has_key(field.name):
-                field.setdecoded(self,data[field.name])
-            else:               
-                setattr(self,field.name,field.default)
-
-
-    def getData(self,allData=False):
-        certdata = []
-        for field in self.fields:
-            if not (allData or field.signing):
-                continue
-            certdata.append((field.name,field.getencoded(self,allData=allData)))
-        return certdata
-
-    def toString(self,allData=False):
-        return simplejson.dumps(self.getData(allData=allData))
-
+from containerbase import *
+import occrypto
 
 class CDD (Container):
@@ -127 +6 @@
 
     fields = [
-        Field('standard_id'),
-        Field('currency_id'),
-        Field('short_currency_id'),
-        Field('issuer_service_location'),
+        Field('standardId'),
+        Field('currencyId'),
+        Field('shortCurrencyId'),
+        Field('issuerServiceLocation'),
         Field('denominations'),
-        Field('issuer_cipher_suite'),
+        Field('issuerCipherSuite'),
         Field('options'),
-        Field('issuer_public_master_key'),
+        OneItemField('masterPubKey',klass=occrypto.PubKey),
         Field('issuer'),
+        Field('version'),
         Field('signature',signing=False)
     ]
@@ -148 +28 @@
 
 
-class MintKey(Container):
-    "A mintkey, contains key + metadata"
+class MKC(Container):
+    "Mint Key Certificate"
 
     fields = [
-        Field('key_id'),
-        Field('currency_id'),
+        Field('keyId'),
+        Field('currencyId'),
         Field('denomination'),
-        DateField('not_before'),
-        DateField('key_not_after'),
-        DateField('coin_not_after'),
-        OneItemField('public_key',klass=PublicKey),
+        DateField('notBefore'),
+        DateField('keyNotAfter'),
+        DateField('coinNotAfter'),
+        OneItemField('publicKey',klass=PublicKey),
         Field('issuer'),
         Field('signature',signing=False)

trunk/sandbox/jhb/oc2/occrypto_rsa.py

@@ -1 +1 @@
 """This is a playground to develop the api for the pubkey and secret key.
 Don't take the crypto seriously"""
-from container import Container,Field
+from containerbase import *
 import hashlib
 import rsa
@@ -13 +13 @@
         self.isPrivate = isPrivate
 
-   
+    def getencoded(self,object,allData=False):
+        value = getattr(object,self.name,self.default)
+        items = value.items()
+        items.sort()
+        return items
+
+    def setdecoded(self,object,data):
+        setattr(object,self.name,dict(data))
 
 class PubKey(Container):
@@ -29 +36 @@
     def verifyContainerSignature(self,container):
         signature = container.signature
-        data = container.toString()
+        data = container.hash()
         return self.verifySignature(signature=signature,data=data)
 
@@ -61 +68 @@
 
     def signContainer(self,container):
-        signature =  self.sign(container.toString())
+        signature =  self.sign(container.hash())
         container.signature = signature
         return container
 
 def hash(data):
-    return hashlib.sha256(data).digest()
+    return hashlib.sha256(data).hexdigest()
 
+def hashContainer(container,allData=False):
+    return hash(container.toString(allData=allData))
+
+Container.hash = hashContainer
 def KeyFactory(bitlen):
     pub,priv = rsa.gen_pubpriv_keys(bitlen)

trunk/sandbox/jhb/oc2/test_playground.py

@@ -1 +1 @@
 r"""
+>>> import testserver
+>>> testserver.run_once()
+>>> import urllib2
+>>> urllib2.urlopen('http://localhost:8000').read()
+'foo'
 >>> import occrypto as occrypto
 >>> (priv,pub) = occrypto.KeyFactory(1024)
@@ -8 +13 @@
 >>> pub.verifySignature(signature,text)
 True
->>> sig2 = priv.sign('foobar')
->>> pub.verifySignature(sig2,'foobar')
+>>> p1 = pub.toString()
+>>> p2 = occrypto.PubKey(p1).toString()
+>>> p1 == p2
 True
+
+
+>>> from container import CDD
+>>> cdd = CDD()
+>>> cdd.issuer_public_master_key = pub
+>>> tmp = priv.signContainer(cdd)
+>>> pub.verifyContainerSignature(cdd)
+True
+
+
 """
 """

trunk/sandbox/jhb/oc2/testserver.py

@@ -14 +14 @@
 
 httpd = BaseHTTPServer.HTTPServer(("", PORT), Handler)
-print "serving at port", PORT
-t = threading.Thread(target=httpd.handle_request)
-t.start()
+import threading
+def run_once():
+    t = threading.Thread(target=httpd.handle_request)     
+    t.start()
+
+
+#print "serving at port", PORT
+#t = threading.Thread(target=httpd.handle_request)
+#t.start()
 #import time
 #for i in range(10):
 #    time.sleep(3)
-print 'foobar'
+#print 'foobar'
 
 #httpd.serve_forever()