From c01a1d5493a090eeb4e0ce3b4dfffaf031af2cb4 Mon Sep 17 00:00:00 2001 From: Chad Furman Date: Mon, 8 Jul 2024 20:37:42 -0400 Subject: [PATCH] fixing cli commands --- management/cli.py | 11 +++++------ setup/migrate.py | 1 - 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/management/cli.py b/management/cli.py index 1c3fa4bd..4f7a273c 100755 --- a/management/cli.py +++ b/management/cli.py @@ -9,13 +9,13 @@ import sys, getpass, urllib.request, urllib.error, json, csv import contextlib -def mgmt(cmd, data=None, is_json=False): +def mgmt(cmd, data=None, is_json=False, method='GET'): # The base URL for the management daemon. (Listens on IPv4 only.) mgmt_uri = 'http://127.0.0.1:10222' setup_key_auth(mgmt_uri) - req = urllib.request.Request(mgmt_uri + cmd, urllib.parse.urlencode(data).encode("utf8") if data else None) + req = urllib.request.Request(mgmt_uri + cmd, urllib.parse.urlencode(data).encode("utf8") if data else None, method=method) try: response = urllib.request.urlopen(req) except urllib.error.HTTPError as e: @@ -66,7 +66,7 @@ if len(sys.argv) < 2: {cli} user password user@domain.com [password] {cli} user remove user@domain.com {cli} user make-admin user@domain.com - {cli} user quota user@domain [new-quota] + {cli} user quota user@domain [new-quota] (get or set user quota) {cli} user remove-admin user@domain.com {cli} user admins (lists admins) {cli} user mfa show user@domain.com (shows MFA devices for user, if any) @@ -124,12 +124,12 @@ elif sys.argv[1] == "user" and sys.argv[2] == "admins": print(user['email']) elif sys.argv[1] == "user" and sys.argv[2] == "quota" and len(sys.argv) == 4: - # Set a user's quota + # Get a user's quota print(mgmt("/mail/users/quota?text=1&email=%s" % sys.argv[3])) elif sys.argv[1] == "user" and sys.argv[2] == "quota" and len(sys.argv) == 5: # Set a user's quota - users = mgmt("/mail/users/quota", { "email": sys.argv[3], "quota": sys.argv[4] }) + users = mgmt("/mail/users/quota", { "email": sys.argv[3], "quota": sys.argv[4] }, method='POST') elif sys.argv[1] == "user" and len(sys.argv) == 5 and sys.argv[2:4] == ["mfa", "show"]: # Show MFA status for a user. @@ -161,4 +161,3 @@ elif sys.argv[1] == "system" and sys.argv[2] == "default-quota" and len(sys.argv else: print("Invalid command-line arguments.") sys.exit(1) - diff --git a/setup/migrate.py b/setup/migrate.py index 3d76aabc..fc0649dc 100755 --- a/setup/migrate.py +++ b/setup/migrate.py @@ -276,4 +276,3 @@ if __name__ == "__main__": elif sys.argv[-1] == "--migrate": # Perform migrations. run_migrations() -