[Nym3-commit] r194 - trunk/nym3/Server

[laurent at conuropsis.org]

Author: laurent
Date: 2005-04-11 22:35:48 +0200 (Mon, 11 Apr 2005)
New Revision: 194

Modified:
   trunk/nym3/Server/Main.py
Log:
Continue the account creation handshake serverwise

Modified: trunk/nym3/Server/Main.py
===================================================================
--- trunk/nym3/Server/Main.py	2005-04-11 19:57:28 UTC (rev 193)
+++ trunk/nym3/Server/Main.py	2005-04-11 20:35:48 UTC (rev 194)
@@ -86,8 +86,7 @@
                         for pnym in com.list:
                             try:
                                 nymUser = User.User(pnym,1)
-                            except User.AlreadySuchUser:
-                                pass
+                            except User.AlreadySuchUser: pass
                             if(nymUser != None):
                                 break
                         if (nymUser == None):
@@ -105,9 +104,9 @@
                         
 	        #phase 2 we look for the command surb
                 for idx, com in enumerate(comList):
-                    if(com.ct()==2):
+                    if(com.ct()==2): # TODO : evil numeric litteral
                         nymUser.addSurbs(com.surbs)
-                        del(comList[idx])
+                        del (comList[idx])
                         break
                 if(len(comList) != 1):
                     nymUser.abort()
@@ -121,12 +120,16 @@
                 if(not nymUser.checkMessageSign(msg[Message.sigLength:],h.sig)):
                    nymUser.abort()
                    raise MyException()
+		else: # Valid account creation request. Send CREATED
+		    created = Message.Created()
+		    created.fromData(nymUser.username, "")
+		    nymUser.send(Message.buildMessage([created]))
             except MyException:
                    #if you come here something went wrong during the account
                    #initialization
                    print "Bad formed account creation message"
                    sys.exit(2) #TODO smart error code
-        else:
+        else: # NYM is not empty
             try:
                 nymUser = User.User(h.nym)
             except User.NoSuchUser:
@@ -164,7 +167,7 @@
                         sendList = []
                         for m in com.l:
                             if nymUser.hasMail(m):
-                                msgCom = Msg()
+                                msgCom = Message.Msg()
                                 msgCom.fromData(m,nymUser.getMail(m))
                                 msgList.append(msgCom)
                                 sendList.append(m)
@@ -177,9 +180,7 @@
                         else:
                             print "mixminion exited abnormally with error code %d" % ec
                             sys.exit(2)
-                        
                                 
-                                
                     elif (com.ct() == Message.CToSCODE['Summarize']):
                         comList = []
                         sendList = nymUser.sendList(com.num, com.after)