en l'absence de secrets.py, on demande le mot de passe avec getpass

[NK2015_Client_Python_Alpha.git] / client.py

diff --git a/client.py b/client.py
index 610d1239a79ec115da6bbd5a60b4f5e00de14e92..f015762698b8d587ec7084d8917d229ccb2e563c 100755 (executable)
--- a/client.py
+++ b/client.py
@@ -72,7 +72,7 @@ def hello(socket,version):
     return lit(a)
 
 def login(socket,user,mdp="",typ="bdd"):
-    if user in ["20-100","moibdd","#1"]:
+    if user in ["#1", "test"]:
         a.write('["login", ["#1","plop","bdd",[[],[],false]]]')
     elif user in ["vincent","moi"]:
         a.write('["login", ["vincent","plop","special",[]]]')
@@ -80,6 +80,9 @@ def login(socket,user,mdp="",typ="bdd"):
         a.write('["login", ["toto","plop","bdd",[[],[],false]]]')
     else:
         a.write('["login", ["%s","%s","%s",[[],[],false]]]'%(user,mdp,typ))
+    if mdp == "":
+        import getpass
+        mdp = getpass.getpass()
     return lit(a)
     
 def search(socket,term):
@@ -97,6 +100,11 @@ def lit(socket):
     except ssl.SSLError:
         print "Rien à lire"
 
+def do(stuff):
+    """Dirty, 'cause I'm lazy."""
+    global a
+    a.write(json.dumps(stuff))
+
 if __name__=="__main__":
     where=raw_input("quel serveur ?")
     #port=int(raw_input("port ? "))
@@ -105,6 +113,15 @@ if __name__=="__main__":
     a.settimeout(2)
     #checkidentity(a)
     print hello(a,"Python Client alpha")
-    print login(a,"20-100","plop")
+    try:
+        import secrets
+        user = secrets.user
+        password = secrets.password
+    except ImportError:
+        print "Vous pouvez enregistrer votre mot de passe dans la variable password dans secrets.py !"
+        user = raw_input("username:")
+        import getpass
+        password = getpass.getpass("password:")
+    print login(a, user, password)
     print "Socket créée dans la variable \"a\""