[Nym3-commit] r130 - trunk/nym3/Client

[nym3-devel@lists.noreply.org]

Author: jr
Date: 2004-08-25 02:18:33 +0200 (Wed, 25 Aug 2004)
New Revision: 130

Modified:
   trunk/nym3/Client/Main.py
   trunk/nym3/Client/User.py
Log:
processing of setup almost done


Modified: trunk/nym3/Client/Main.py
===================================================================
--- trunk/nym3/Client/Main.py	2004-08-25 00:06:01 UTC (rev 129)
+++ trunk/nym3/Client/Main.py	2004-08-25 00:18:33 UTC (rev 130)
@@ -90,13 +90,23 @@
 				   user account to be used from a tag")
     
     if sys.argv[1] == 'setup':
-        parser.usage = "%prog setup [options] nym1 [nym2 [...]]"
+        parser.usage = "%prog setup [options] server nym1 [nym2 [...]]"
         parser.add_option("-t", "--tag", dest = "tag", default = "", 
 	    help = "the tag that the user wish to associate with \
 	    the new account")
         (options, args) = parser.parse_args(sys.argv[2:])
         nymUser = User.User(tag = options.tag, create = 1)
-        #generate message to send            
+        nymUser.generateKeys()
+        nymUser.setServer(args[0])
+        #remplir surbs
+        comC = Message.Create()
+        comC.fromData(args[1:])
+        comN = Message.Newpk()
+        comN.fromData(_cr.pk_get_modulus(nymUser.data["idKey"]), _cr.pk_get_modulus(nymUser.data["encKey"]))
+        comS = Message.Surb()
+        comS.fromData(surbs)
+        nymUser.sendControl([comC, comN, comS])
+        
     #if sys.argv[1] == 'control': #handling of fragments (pipe to mixminion ...
     #    pass
     if sys.argv[1] == 'send-surb':
@@ -129,5 +139,9 @@
         parser.usage = "%prog policy [options]"
         parser.add_option(userOption)
         (options, args) = myParseArgs(parser, sys.argv[2:])
+    if sys.argv[1] == 'tag':
+        parser.usage = "%prog tag [options] idTag tag"
+        (options, args) = myParseArgs(parser, sys.argv[2:])
+        T = User.Tag()
+        T.store(tag,idTag)
         
-    

Modified: trunk/nym3/Client/User.py
===================================================================
--- trunk/nym3/Client/User.py	2004-08-25 00:06:01 UTC (rev 129)
+++ trunk/nym3/Client/User.py	2004-08-25 00:18:33 UTC (rev 130)
@@ -4,6 +4,8 @@
 import mixminion.Common
 import nym3.Common as Common
 import mixminion.Crypto as _cr
+import nym3.Message as Message
+
 class NoSuchUser(Exception): pass
 
 class AlreadySuchUser(Exception): pass
@@ -198,7 +200,7 @@
     def _save_data(self):
         pass
 
-    def generate_keys(self):
+    def generateKeys(self):
         pass
 
     def getSeqNo(self):
@@ -209,3 +211,15 @@
         sig = _cr.pk_sign(_cr.sha1(msg), self.data['idKey'])
         h.fromData(self.data['username'], self.getSeqNo(), sig)
         return str(h) + msg
+
+    def setServer(self, serv):
+        pass
+    
+    def send(self, msg):
+        pass
+
+    def sendControl(self, l):
+        msg = Message.buildMessage(l)
+        msg = self.addHeader(msg)
+        nymUser.send(msg)
+