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

[laurent at komite.net]

Author: laurent
Date: 2004-12-26 16:17:10 +0100 (Sun, 26 Dec 2004)
New Revision: 141

Modified:
   trunk/nym3/Client/Main.py
   trunk/nym3/Client/User.py
Log:
a user needs a "username".


Modified: trunk/nym3/Client/Main.py
===================================================================
--- trunk/nym3/Client/Main.py	2004-12-23 01:17:52 UTC (rev 140)
+++ trunk/nym3/Client/Main.py	2004-12-26 15:17:10 UTC (rev 141)
@@ -2,6 +2,7 @@
 
 import sys
 import os
+import string
 from optparse import OptionParser, make_option
 import nym3.Client.User as User
 import nym3.Client.Config as Config
@@ -105,6 +106,7 @@
         nymUser.generateKeys()
         nymUser.setServer(args[0])
         surbs = nymUser.generateSurbs(3)
+	surbs = string.join(surbs, '')
         comC = Message.Create()
         comC.fromData(args[1:])
         comN = Message.Newpk()

Modified: trunk/nym3/Client/User.py
===================================================================
--- trunk/nym3/Client/User.py	2004-12-23 01:17:52 UTC (rev 140)
+++ trunk/nym3/Client/User.py	2004-12-26 15:17:10 UTC (rev 141)
@@ -8,6 +8,7 @@
 import nym3.Common as Common
 import mixminion.Crypto as _cr
 import nym3.Message as Message
+import mixminion.ClientAPI as mapi
 
 class NoSuchUser(Exception): pass
 """Exception thrown when a user identified by her nym can't be found"""
@@ -82,7 +83,7 @@
 class User:
     """Hold user data"""
 
-    def __init__(self, idTag="", tag="", create = 0):
+    def __init__(self, idTag="", tag="", create = 0, username="bazounga"):
         #TODO what is the criteria determining which account we must load? For the time being we only have a user account
         """0 : load user data correspondig to idTag, throw an error if the account doesn't exist
         1 : create a new account (do not take into account idTag)
@@ -111,6 +112,7 @@
                 self.home = self.homeDir()
                 self.datafile = self.home + 'data'
                 self.data = Config.default_settings
+		self.data['username'] = username
                 if tag != "":
                     T = Tag()
                     T.store(tag, self.idTag)
@@ -232,7 +234,7 @@
 
     def addHeader(self, msg):
 	"""Generates a header for a message using the identification key"""
-        h = Header()
+        h = Message.Header()
         sig = _cr.pk_sign(_cr.sha1(msg), self.data['idKey'])
         h.fromData(self.data['username'], self.getSeqNo(), sig)
         return str(h) + msg
@@ -258,7 +260,7 @@
         
     def generateSurbs(self, n):
         """Generate surbs"""
-	capi = mixminion.ClientAPI(); # TODO: create it once and share it.
+	capi = mapi.ClientEnv(); # TODO: create it once and share it.
 	return capi.generateSURBs(n, messageDest = self.data['address'],
-				  identify = self.idTag);
+				  identity = self.idTag);