summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuben Pollan <meskio@sindominio.net>2016-05-19 12:31:12 +0200
committerRuben Pollan <meskio@sindominio.net>2016-05-19 12:31:12 +0200
commit13963904a184834a6a2a20c9a6d59c5ad6ec37ff (patch)
tree66491482d109039f072ead00a2ad168950940dd6
parent8008e050a8c6392098f80d2b022a1c899bdea4a9 (diff)
[feat] remove password from logout
Logout doesn't need password.
-rwxr-xr-xsrc/leap/bitmask/cli/bitmask_cli.py2
-rw-r--r--src/leap/bitmask/core/dispatcher.py4
-rw-r--r--src/leap/bitmask/core/dummy.py2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/leap/bitmask/cli/bitmask_cli.py b/src/leap/bitmask/cli/bitmask_cli.py
index c2b1ba71..126577f5 100755
--- a/src/leap/bitmask/cli/bitmask_cli.py
+++ b/src/leap/bitmask/cli/bitmask_cli.py
@@ -252,7 +252,7 @@ def send_command(cli):
data += ['authenticate', username, passwd]
elif subargs.logout:
- data += ['logout', username, passwd]
+ data += ['logout', username]
else:
error('Use bitmask_cli user --help to see available subcommands')
diff --git a/src/leap/bitmask/core/dispatcher.py b/src/leap/bitmask/core/dispatcher.py
index e7c961fd..c07f5b95 100644
--- a/src/leap/bitmask/core/dispatcher.py
+++ b/src/leap/bitmask/core/dispatcher.py
@@ -56,8 +56,8 @@ class UserCmd(SubCommand):
@register_method("{'logout': 'ok'}")
def do_LOGOUT(self, bonafide, *parts):
- user, password = parts[2], parts[3]
- d = defer.maybeDeferred(bonafide.do_logout, user, password)
+ user = parts[2]
+ d = defer.maybeDeferred(bonafide.do_logout, user)
return d
@register_method('str')
diff --git a/src/leap/bitmask/core/dummy.py b/src/leap/bitmask/core/dummy.py
index 99dfafa5..7b6be397 100644
--- a/src/leap/bitmask/core/dummy.py
+++ b/src/leap/bitmask/core/dummy.py
@@ -73,7 +73,7 @@ class BonafideService(HookableService):
def do_signup(self, user, password):
return {'signup': 'ok', 'user': 'dummyuser@provider.example.org'}
- def do_logout(self, user, password):
+ def do_logout(self, user):
return {'logout': 'ok'}
def do_get_active_user(self):