Handle authentication errors better.

diff --git a/fulbank/auth.py b/fulbank/auth.py
index 10c1afe221f1d930e45e6dd65ace30b35bfe4e50..013b87399d7b0c9f6cf131eeadcc5a4d0749c241 100644 (file)
--- a/fulbank/auth.py
+++ b/fulbank/auth.py
@@ -1,5 +1,8 @@
 import sys, os, io, termios
 
+class autherror(Exception):
+    pass
+
 class conv(object):
     msg_notice = 0
     msg_info = 1

diff --git a/fulbank/fsb.py b/fulbank/fsb.py
index 4a91278962f28e7167eb2fba75b7dd1203391f58..834536af7e3e2b9f55863b165a33751f44076886 100644 (file)
--- a/fulbank/fsb.py
+++ b/fulbank/fsb.py
@@ -11,7 +11,7 @@ serviceid = "B7dZHQcY78VRVz9l"
 class fmterror(Exception):
     pass
 
-class autherror(Exception):
+class autherror(auth.autherror):
     pass
 
 class jsonerror(Exception):

diff --git a/netbank b/netbank
index 4215a3c651670b9ada3ac447b4a3606ac0e21e07..a1d35666c4ea8d0e7af9ad3eec76526a1b034920 100755 (executable)
--- a/netbank
+++ b/netbank
@@ -63,7 +63,11 @@ def cmd_login(cmd, args):
             sys.stderr.write("usage: login bankid USER-ID\n")
             sys.exit(1)
         with auth.ttyconv() as conv:
-            sess.auth_bankid(args[1], conv)
+            try:
+                sess.auth_bankid(args[1], conv)
+            except auth.autherror as err:
+                sys.stderr.write("netbank: authentication failed: %s\n" % err)
+                sys.exit(1)
     else:
         sys.stderr.write("netbank: %s: unknown authentication type\n" % (args[0]))
         sys.exit(1)