X-Git-Url: http://dolda2000.com/gitweb/?p=fulbank.git;a=blobdiff_plain;f=netbank;h=a1d35666c4ea8d0e7af9ad3eec76526a1b034920;hp=71292762413f2110f278642a17f6d3497b28d3a4;hb=HEAD;hpb=df34dfd3f8e6816ae8b8066e0c125e6aa2c8c561

diff --git a/netbank b/netbank
index 7129276..7f52628 100755
--- a/netbank
+++ b/netbank
@@ -1,26 +1,13 @@
 #!/usr/bin/python3
 
 import sys, os, getopt, pwd
-from fulbank import auth
+from fulbank import auth, data, util
 
-sesstype = None
+sessname = data.defaultsess()
 sess = None
 
-def find(seq, *, item=None, match=None, key=None, default=LookupError):
-    if key is None:
-        key = lambda o: o
-    if match is None and item is not None:
-        match = lambda o: o == item
-    for thing in seq:
-        if match(key(thing)):
-            return thing
-    if default is LookupError:
-        raise LookupError()
-    else:
-        return default
-
 def usage(out):
-    out.write("usage: netbank [-h] BANK-ID COMMAND [ARGS...]\n")
+    out.write("usage: netbank [-h] [-s SESSION-ID] COMMAND [ARGS...]\n")
 
 def requiresess(fn):
     def wrap(cmd, args):
@@ -34,19 +21,26 @@ commands = {}
 
 def cmd_login(cmd, args):
     global sess
-    if len(args) < 1:
-        sys.stderr.write("usage: login TYPE\n")
+    if len(args) < 2:
+        sys.stderr.write("usage: login BANK-ID TYPE [ARGS...]\n")
         sys.exit(1)
-    sess = sesstype.create()
-    if args[0] == "bankid":
-        if len(args) < 2:
-            sys.stderr.write("usage: login bankid USER-ID\n")
-            sys.exit(1)
-        with auth.ttyconv() as conv:
-            sess.auth_bankid(args[1], conv)
+    sess = data.getsessnam(args[0]).create()
+    if args[1] == "bankid":
+        authfun = sess.auth_bankid
+    elif args[1] == "token":
+        authfun = sess.auth_token
     else:
-        sys.stderr.write("netbank: %s: unknown authentication type\n" % (args[0]))
+        sys.stderr.write("netbank: %s: unknown authentication type\n" % (args[1]))
+        sys.exit(1)
+    if len(args) < 3:
+        sys.stderr.write("usage: login bankid USER-ID\n")
         sys.exit(1)
+    with auth.ttyconv() as conv:
+        try:
+            authfun(args[2], conv)
+        except auth.autherror as err:
+            sys.stderr.write("netbank: authentication failed: %s\n" % err)
+            sys.exit(1)
 commands["login"] = cmd_login
 
 @requiresess
@@ -79,7 +73,10 @@ def cmd_lstxn(cmd, args):
         sys.stderr.write("usage: lstxn [-n NUM] ACCOUNT\n")
         sys.exit(1)
     try:
-        acct = find(sess.accounts, item=args[0], key=lambda acct: acct.number)
+        acct = util.find(sess.accounts, item=args[0], key=lambda acct: acct.number, test=util.pfxmatch)
+    except util.ambiguous as exc:
+        sys.stderr.write("netbank: %s: ambiguous match between %s and %s\n" % (args[0], exc.a, exc.b))
+        sys.exit(1)
     except LookupError:
         sys.stderr.write("netbank: %s: no such account\n" % (args[0]))
         sys.exit(1)
@@ -88,44 +85,29 @@ def cmd_lstxn(cmd, args):
 commands["lstxn"] = cmd_lstxn
 
 def main():
-    global sess, sesstype
+    global sess, sessname
 
-    opts, args = getopt.getopt(sys.argv[1:], "h")
+    opts, args = getopt.getopt(sys.argv[1:], "hs:")
     for o, a in opts:
         if o == "-h":
             usage(sys.stdout)
             sys.exit(0)
-    if len(args) < 2:
+        if o == "-s":
+            sessname = a
+    if len(args) < 1:
         usage(sys.stderr)
         sys.exit(1)
 
-    if args[0] == "fsb":
-        import fulbank.fsb
-        sesstype = fulbank.fsb.session
-    else:
-        sys.stderr.write("netbank: %s: unknown bank id\n" % (args[0]))
-        sys.exit(1)
-    sesspath = os.path.join(pwd.getpwuid(os.getuid()).pw_dir, ".cache/fulbank", args[0])
-    cmd = args[1]
-    args = args[2:]
+    cmd = args[0]
+    args = args[1:]
 
-    if os.path.exists(sesspath):
-        sess = sesstype.load(sesspath)
-    else:
-        sess = None
+    sess = data.loadsess(sessname, None)
     if cmd in commands:
         commands[cmd](cmd, args)
     else:
         sys.stderr.write("netbank: %s: unknown command\n" % (cmd))
         sys.exit(1)
-    if sess is not None:
-        sessdir = os.path.dirname(sesspath)
-        if not os.path.isdir(sessdir):
-            os.makedirs(sessdir)
-        sess.save(sesspath)
-    else:
-        if os.path.exists(sesspath):
-            os.unlink(sesspath)
+    data.savesess(sess, sessname)
 
 try:
     if __name__ == "__main__":