ladok3 4.9__py3-none-any.whl → 4.11__py3-none-any.whl

ladok3/cli.nw

@@ -504,7 +504,11 @@ If all fail, the function will return [[None]] for both.
 (This is due to how we handle the [[login]] command.)
 <<functions>>=
 def load_credentials(filename="config.json"):
-  """Load credentials from environment or file named filename"""
+  """
+  Loads credentials from environment or file named filename.
+  Returns the tuple (instituation, credential dictionary) that
+  can be passed to `LadokSession(instiution, credential dictionary)`.
+  """
 
   <<fetch vars from keyring>>
   <<fetch username and password from keyring>>
@@ -518,6 +522,9 @@ def load_credentials(filename="config.json"):
 
 First we try the newest format.
 We try to fetch the institution and vars from the keyring.
+
+Note that [[keyring]] returns [[None]] if the key doesn't exist, it doesn't 
+raise an exception.
 <<fetch vars from keyring>>=
 try:
   institution = keyring.get_password("ladok3", "institution")
@@ -525,7 +532,9 @@ try:
 
   vars = {}
   for key in vars_keys.split(";"):
-    vars[key] = keyring.get_password("ladok3", key)
+    value = keyring.get_password("ladok3", key)
+    if value:
+      vars[key] = value
 
   if institution and vars:
     return institution, vars
@@ -538,12 +547,10 @@ supported KTH.
 <<fetch username and password from keyring>>=
 try:
   institution = "KTH Royal Institute of Technology"
-  vars = {
-    "username": keyring.get_password("ladok3", "username"),
-    "password": keyring.get_password("ladok3", "password")
-  }
-  if vars:
-    return institution, vars
+  username = keyring.get_password("ladok3", "username")
+  password = keyring.get_password("ladok3", "password")
+  if username and password:
+    return institution, {"username": username, "password": password}
 except:
   pass
 @
@@ -577,7 +584,10 @@ try:
 
   vars = {}
   for key in vars_keys.split(":"):
-    vars[key] = os.environ[key]
+    try:
+      vars[key] = os.environ[key]
+    except KeyError:
+      <<print warning about missing variable in [[LADOK_VARS]]>>
 
   if institution and vars:
     return institution, vars
@@ -585,6 +595,14 @@ except:
   pass
 @
 
+Unlike in the other cases, we don't just ignore the exception of the key not 
+existing.
+Since the user has explicitly specified the variable, we should warn them that 
+it doesn't exist.
+<<print warning about missing variable in [[LADOK_VARS]]>>=
+warn(f"Variable {key} not set, ignoring.")
+@
+
 If none of the above worked, the last resort is to try to read the 
 configuration file.
 We pop the institution from the configuration file (a dictionary), because then 
@@ -595,7 +613,7 @@ try:
     config = json.load(conf_file)
 
   institution = config.pop("institution",
-                            "KTH Royal Institute of Technology")
+                           "KTH Royal Institute of Technology")
   return institution, config
 except:
   pass

ladok3/cli.py

@@ -26,92 +26,97 @@ import ladok3.student
 
 dirs = appdirs.AppDirs("ladok", "dbosk@kth.se")
 
+
 def err(rc, msg):
-  print(f"{sys.argv[0]}: error: {msg}", file=sys.stderr)
-  sys.exit(rc)
+    print(f"{sys.argv[0]}: error: {msg}", file=sys.stderr)
+    sys.exit(rc)
+
 
 def warn(msg):
-  print(f"{sys.argv[0]}: {msg}", file=sys.stderr)
-def store_ladok_session(ls, credentials):
-  if not os.path.isdir(dirs.user_cache_dir):
-    os.makedirs(dirs.user_cache_dir)
+    print(f"{sys.argv[0]}: {msg}", file=sys.stderr)
 
-  file_path = dirs.user_cache_dir + "/LadokSession"
 
-  pickled_ls = pickle.dumps(ls)
-  if not credentials or len(credentials) < 2:
-    raise ValueError(f"Missing credentials, see `ladok login -h`.")
+def store_ladok_session(ls, credentials):
+    if not os.path.isdir(dirs.user_cache_dir):
+        os.makedirs(dirs.user_cache_dir)
 
-  if isinstance(credentials, dict):
-    try:
-      salt = credentials["username"]
-      passwd = credentials["password"]
-    except KeyError:
-      credentials = list(credentials.values())
-      salt = credentials[0]
-      passwd = credentials[1]
-  else:
-    salt = credentials[0]
-    passwd = credentials[1]
-
-  kdf = PBKDF2HMAC(
-    algorithm=hashes.SHA256(),
-    length=32,
-    salt=salt.encode("utf-8"),
-    iterations=100000
-  )
-  key = base64.urlsafe_b64encode(kdf.derive(passwd.encode("utf-8")))
-
-
-  fernet_protocol = Fernet(key)
-  encrypted_ls = fernet_protocol.encrypt(pickled_ls)
-
-
-  with open(file_path, "wb") as file:
-    file.write(encrypted_ls)
-  
-def restore_ladok_session(credentials):
-  file_path = dirs.user_cache_dir + "/LadokSession"
+    file_path = dirs.user_cache_dir + "/LadokSession"
 
-  if os.path.isfile(file_path):
-    with open(file_path, "rb") as file:
-      encrypted_ls = file.read()
-      if not credentials or len(credentials) < 2:
+    pickled_ls = pickle.dumps(ls)
+    if not credentials or len(credentials) < 2:
         raise ValueError(f"Missing credentials, see `ladok login -h`.")
 
-      if isinstance(credentials, dict):
+    if isinstance(credentials, dict):
         try:
-          salt = credentials["username"]
-          passwd = credentials["password"]
+            salt = credentials["username"]
+            passwd = credentials["password"]
         except KeyError:
-          credentials = list(credentials.values())
-          salt = credentials[0]
-          passwd = credentials[1]
-      else:
+            credentials = list(credentials.values())
+            salt = credentials[0]
+            passwd = credentials[1]
+    else:
         salt = credentials[0]
         passwd = credentials[1]
 
-      kdf = PBKDF2HMAC(
+    kdf = PBKDF2HMAC(
         algorithm=hashes.SHA256(),
         length=32,
         salt=salt.encode("utf-8"),
-        iterations=100000
-      )
-      key = base64.urlsafe_b64encode(kdf.derive(passwd.encode("utf-8")))
+        iterations=100000,
+    )
+    key = base64.urlsafe_b64encode(kdf.derive(passwd.encode("utf-8")))
+
+    fernet_protocol = Fernet(key)
+    encrypted_ls = fernet_protocol.encrypt(pickled_ls)
+
+    with open(file_path, "wb") as file:
+        file.write(encrypted_ls)
 
 
-      fernet_protocol = Fernet(key)
-      try:
-        pickled_ls = fernet_protocol.decrypt(encrypted_ls)
-      except Exception as err:
-        warn(f"cache was corrupted, cannot decrypt: {err}")
-        pickled_ls = None
-      if pickled_ls:
-        return pickle.loads(pickled_ls)
+def restore_ladok_session(credentials):
+    file_path = dirs.user_cache_dir + "/LadokSession"
+
+    if os.path.isfile(file_path):
+        with open(file_path, "rb") as file:
+            encrypted_ls = file.read()
+            if not credentials or len(credentials) < 2:
+                raise ValueError(f"Missing credentials, see `ladok login -h`.")
+
+            if isinstance(credentials, dict):
+                try:
+                    salt = credentials["username"]
+                    passwd = credentials["password"]
+                except KeyError:
+                    credentials = list(credentials.values())
+                    salt = credentials[0]
+                    passwd = credentials[1]
+            else:
+                salt = credentials[0]
+                passwd = credentials[1]
+
+            kdf = PBKDF2HMAC(
+                algorithm=hashes.SHA256(),
+                length=32,
+                salt=salt.encode("utf-8"),
+                iterations=100000,
+            )
+            key = base64.urlsafe_b64encode(kdf.derive(passwd.encode("utf-8")))
+
+            fernet_protocol = Fernet(key)
+            try:
+                pickled_ls = fernet_protocol.decrypt(encrypted_ls)
+            except Exception as err:
+                warn(f"cache was corrupted, cannot decrypt: {err}")
+                pickled_ls = None
+            if pickled_ls:
+                return pickle.loads(pickled_ls)
+
+    return None
+
 
-  return None
 def update_credentials_in_keyring(ls, args):
-  print("""
+    print(
+        """
 This login process is exactly the same as when you log in using
 the web browser. You need three things:
 
@@ -126,57 +131,66 @@ the web browser. You need three things:
 
   3) Your password at your institution.
 
-""")
-  while True:
-    institution = input("Institution: ")
-    matches = sa.find_entity_data_by_name(institution)
+"""
+    )
+    while True:
+        institution = input("Institution: ")
+        matches = sa.find_entity_data_by_name(institution)
 
-    if not matches:
-      print("No match, try again.")
-      continue
+        if not matches:
+            print("No match, try again.")
+            continue
 
-    if len(matches) > 1:
-      print("More than one match. Which one?")
-      for match in matches:
-        print(f"- {match['title']}")
-      continue
+        if len(matches) > 1:
+            print("More than one match. Which one?")
+            for match in matches:
+                print(f"- {match['title']}")
+            continue
 
-    match = matches[0]
+        match = matches[0]
 
-    print(f"Matched uniquely, using {match['title']}\n"
-          f"            with domain {match['domain']} and\n"
-          f"      unique identifier {match['id']}.")
+        print(
+            f"Matched uniquely, using {match['title']}\n"
+            f"            with domain {match['domain']} and\n"
+            f"      unique identifier {match['id']}."
+        )
 
-    institution = match['id']
-    break
+        institution = match["id"]
+        break
 
-  vars = {
-    "username": input("Institution username: "),
-    "password": getpass.getpass("Institution password: [input is hidden] ")
-  }
-  while True:
-    temp_ls = ladok3.LadokSession(institution, vars=vars)
+    vars = {
+        "username": input("Institution username: "),
+        "password": getpass.getpass("Institution password: [input is hidden] "),
+    }
+    while True:
+        temp_ls = ladok3.LadokSession(institution, vars=vars)
+
+        try:
+            temp_ls.user_info_JSON()
+        except weblogin.AuthenticationError as err:
+            adjust_vars(vars, err.variables)
+        else:
+            break
 
     try:
-      temp_ls.user_info_JSON()
-    except weblogin.AuthenticationError as err:
-      adjust_vars(vars, err.variables)
-    else:
-      break
-
-  try:
-    keyring.set_password("ladok3", "institution", institution)
-    keyring.set_password("ladok3", "vars", ";".join(vars.keys()))
-    for key, value in vars.items():
-      keyring.set_password("ladok3", key, value)
-  except Exception as err:
-    globals()["err"](-1, f"You don't seem to have a working keyring. "
-                          f"Use one of the other methods, see "
-                          f"`ladok login -h`: {err}.")
-
-  clear_cache(ls, args)
+        keyring.set_password("ladok3", "institution", institution)
+        keyring.set_password("ladok3", "vars", ";".join(vars.keys()))
+        for key, value in vars.items():
+            keyring.set_password("ladok3", key, value)
+    except Exception as err:
+        globals()["err"](
+            -1,
+            f"You don't seem to have a working keyring. "
+            f"Use one of the other methods, see "
+            f"`ladok login -h`: {err}.",
+        )
+
+    clear_cache(ls, args)
+
+
 def adjust_vars(vars, form_variables):
-  print("""
+    print(
+        """
 Some part of the authentication went wrong. Either you typed your username or 
 password incorrectly, or your institution requires some adjustments. We'll 
 guide you through it.
@@ -191,103 +205,115 @@ when it should be 'dbosk@ug.kth.se' --- or something similar. Use your
 institution's login page to figure this out.
 
 Note: Your password will be visible on screen during this process.
-""")
-  input("\nPress return to continue.\n")
-
-  for key, value in form_variables.items():
-    key = key.casefold()
-    new_val = input(f"{key} = '{value}' "
-                    f"[enter new value, blank to keep] ")
-    if new_val:
-      vars[key] = new_val
+"""
+    )
+    input("\nPress return to continue.\n")
+
+    for key, value in form_variables.items():
+        key = key.casefold()
+        new_val = input(f"{key} = '{value}' " f"[enter new value, blank to keep] ")
+        if new_val:
+            vars[key] = new_val
+
+
 def load_credentials(filename="config.json"):
-  """Load credentials from environment or file named filename"""
-
-  try:
-    institution = keyring.get_password("ladok3", "institution")
-    vars_keys = keyring.get_password("ladok3", "vars")
-
-    vars = {}
-    for key in vars_keys.split(";"):
-      vars[key] = keyring.get_password("ladok3", key)
-
-    if institution and vars:
-      return institution, vars
-  except:
-    pass
-  try:
-    institution = "KTH Royal Institute of Technology"
-    vars = {
-      "username": keyring.get_password("ladok3", "username"),
-      "password": keyring.get_password("ladok3", "password")
-    }
-    if vars:
-      return institution, vars
-  except:
-    pass
-  try:
-    institution = os.environ["LADOK_INST"]
-  except:
-    institution = "KTH Royal Institute of Technology"
-
-  try:
-    vars = {
-      "username": os.environ["LADOK_USER"],
-      "password": os.environ["LADOK_PASS"]
-    }
-    if institution and vars:
-      return institution, vars
-  except:
-    pass
-  try:
-    vars_keys = os.environ["LADOK_VARS"]
-
-    vars = {}
-    for key in vars_keys.split(":"):
-      vars[key] = os.environ[key]
-
-    if institution and vars:
-      return institution, vars
-  except:
-    pass
-  try:
-    with open(filename) as conf_file:
-      config = json.load(conf_file)
-
-    institution = config.pop("institution",
-                              "KTH Royal Institute of Technology")
-    return institution, config
-  except:
-    pass
-
-  return None, None
+    """
+    Loads credentials from environment or file named filename.
+    Returns the tuple (instituation, credential dictionary) that
+    can be passed to `LadokSession(instiution, credential dictionary)`.
+    """
+
+    try:
+        institution = keyring.get_password("ladok3", "institution")
+        vars_keys = keyring.get_password("ladok3", "vars")
+
+        vars = {}
+        for key in vars_keys.split(";"):
+            value = keyring.get_password("ladok3", key)
+            if value:
+                vars[key] = value
+
+        if institution and vars:
+            return institution, vars
+    except:
+        pass
+    try:
+        institution = "KTH Royal Institute of Technology"
+        username = keyring.get_password("ladok3", "username")
+        password = keyring.get_password("ladok3", "password")
+        if username and password:
+            return institution, {"username": username, "password": password}
+    except:
+        pass
+    try:
+        institution = os.environ["LADOK_INST"]
+    except:
+        institution = "KTH Royal Institute of Technology"
+
+    try:
+        vars = {
+            "username": os.environ["LADOK_USER"],
+            "password": os.environ["LADOK_PASS"],
+        }
+        if institution and vars:
+            return institution, vars
+    except:
+        pass
+    try:
+        vars_keys = os.environ["LADOK_VARS"]
+
+        vars = {}
+        for key in vars_keys.split(":"):
+            try:
+                vars[key] = os.environ[key]
+            except KeyError:
+                warn(f"Variable {key} not set, ignoring.")
+
+        if institution and vars:
+            return institution, vars
+    except:
+        pass
+    try:
+        with open(filename) as conf_file:
+            config = json.load(conf_file)
+
+        institution = config.pop("institution", "KTH Royal Institute of Technology")
+        return institution, config
+    except:
+        pass
+
+    return None, None
+
+
 def clear_cache(ls, args):
-  try:
-    os.remove(dirs.user_cache_dir + "/LadokSession")
-  except FileNotFoundError as err:
-    pass
+    try:
+        os.remove(dirs.user_cache_dir + "/LadokSession")
+    except FileNotFoundError as err:
+        pass
+
+    sys.exit(0)
+
 
-  sys.exit(0)
 def main():
-  """Run the command-line interface for the ladok command"""
-  argp = argparse.ArgumentParser(
-    description="This is a CLI-ification of LADOK3's web GUI.",
-    epilog="Web: https://github.com/dbosk/ladok3"
-  )
-  argp.add_argument("-f", "--config-file",
-    default=f"{dirs.user_config_dir}/config.json",
-    help="Path to configuration file "
-      f"(default: {dirs.user_config_dir}/config.json) "
-      "or set LADOK_USER and LADOK_PASS environment variables.")
-  subp = argp.add_subparsers(
-    title="commands",
-    dest="command",
-    required=True
-  )
-  login_parser = subp.add_parser("login",
-    help="Manage login credentials",
-    formatter_class=argparse.RawDescriptionHelpFormatter,
-    description=f"""
+    """Run the command-line interface for the ladok command"""
+    argp = argparse.ArgumentParser(
+        description="This is a CLI-ification of LADOK3's web GUI.",
+        epilog="Web: https://github.com/dbosk/ladok3",
+    )
+    argp.add_argument(
+        "-f",
+        "--config-file",
+        default=f"{dirs.user_config_dir}/config.json",
+        help="Path to configuration file "
+        f"(default: {dirs.user_config_dir}/config.json) "
+        "or set LADOK_USER and LADOK_PASS environment variables.",
+    )
+    subp = argp.add_subparsers(title="commands", dest="command", required=True)
+    login_parser = subp.add_parser(
+        "login",
+        help="Manage login credentials",
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+        description=f"""
   Manages the user's LADOK login credentials. There are three ways to supply the 
   login credentials, in order of priority:
 
@@ -317,42 +343,40 @@ def main():
      option). (The keys 'username' and 'password' can be renamed to correspond to 
      the necessary values if the university login system uses other names.)
 
-  """)
-
-  login_parser.set_defaults(func=update_credentials_in_keyring)
-  cache_parser = subp.add_parser("cache",
-    help="Manage cache",
-    description="Manages the cache of LADOK data"
-  )
-  cache_subp = cache_parser.add_subparsers(
-    title="subcommands",
-    dest="subcommand",
-    required=True
-  )
-  cache_clear = cache_subp.add_parser("clear",
-    help="Clear the cache",
-    description="Clears everything from the cache"
-  )
-  cache_clear.set_defaults(func=clear_cache)
-  ladok3.data.add_command_options(subp)
-  ladok3.report.add_command_options(subp)
-  ladok3.student.add_command_options(subp)
-  argcomplete.autocomplete(argp)
-  args = argp.parse_args()
-  LADOK_INST, LADOK_VARS = load_credentials(args.config_file)
-  try:
-    ls = restore_ladok_session(LADOK_VARS)
-  except ValueError as error:
-    err(-1, f"Couldn't restore LADOK session: {error}")
-  if not ls:
-    ls = ladok3.LadokSession(LADOK_INST, vars=LADOK_VARS)
-  if "func" in args:
-    args.func(ls, args)
-  store_ladok_session(ls, LADOK_VARS)
+  """,
+    )
+
+    login_parser.set_defaults(func=update_credentials_in_keyring)
+    cache_parser = subp.add_parser(
+        "cache", help="Manage cache", description="Manages the cache of LADOK data"
+    )
+    cache_subp = cache_parser.add_subparsers(
+        title="subcommands", dest="subcommand", required=True
+    )
+    cache_clear = cache_subp.add_parser(
+        "clear", help="Clear the cache", description="Clears everything from the cache"
+    )
+    cache_clear.set_defaults(func=clear_cache)
+    ladok3.data.add_command_options(subp)
+    ladok3.report.add_command_options(subp)
+    ladok3.student.add_command_options(subp)
+    argcomplete.autocomplete(argp)
+    args = argp.parse_args()
+    LADOK_INST, LADOK_VARS = load_credentials(args.config_file)
+    try:
+        ls = restore_ladok_session(LADOK_VARS)
+    except ValueError as error:
+        err(-1, f"Couldn't restore LADOK session: {error}")
+    if not ls:
+        ls = ladok3.LadokSession(LADOK_INST, vars=LADOK_VARS)
+    if "func" in args:
+        args.func(ls, args)
+    store_ladok_session(ls, LADOK_VARS)
+
 
 if __name__ == "__main__":
-  try:
-    main()
-    sys.exit(0)
-  except Exception as e:
-    err(-1, e)
+    try:
+        main()
+        sys.exit(0)
+    except Exception as e:
+        err(-1, e)