Skip to content

Commit

Permalink
Revert "fixing cli commands"
Browse files Browse the repository at this point in the history
This reverts commit a4a0898.
  • Loading branch information
chadfurman committed Oct 2, 2024
1 parent 12c9512 commit 826ef37
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
11 changes: 6 additions & 5 deletions management/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
import sys, getpass, urllib.request, urllib.error, json, csv
import contextlib

def mgmt(cmd, data=None, is_json=False, method='GET'):
def mgmt(cmd, data=None, is_json=False):
# 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, method=method)
req = urllib.request.Request(mgmt_uri + cmd, urllib.parse.urlencode(data).encode("utf8") if data else None)
try:
response = urllib.request.urlopen(req)
except urllib.error.HTTPError as e:
Expand Down Expand Up @@ -65,7 +65,7 @@ def setup_key_auth(mgmt_uri):
{cli} user password [email protected] [password]
{cli} user remove [email protected]
{cli} user make-admin [email protected]
{cli} user quota user@domain [new-quota] (get or set user quota)
{cli} user quota user@domain [new-quota]
{cli} user remove-admin [email protected]
{cli} user admins (lists admins)
{cli} user mfa show [email protected] (shows MFA devices for user, if any)
Expand Down Expand Up @@ -123,12 +123,12 @@ def setup_key_auth(mgmt_uri):
print(user['email'])

elif sys.argv[1] == "user" and sys.argv[2] == "quota" and len(sys.argv) == 4:
# Get a user's quota
# Set 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] }, method='POST')
users = mgmt("/mail/users/quota", { "email": sys.argv[3], "quota": sys.argv[4] })

elif sys.argv[1] == "user" and len(sys.argv) == 5 and sys.argv[2:4] == ["mfa", "show"]:
# Show MFA status for a user.
Expand All @@ -154,3 +154,4 @@ def setup_key_auth(mgmt_uri):
else:
print("Invalid command-line arguments.")
sys.exit(1)

1 change: 1 addition & 0 deletions setup/migrate.py
Original file line number Diff line number Diff line change
Expand Up @@ -275,3 +275,4 @@ def run_migrations():
elif sys.argv[-1] == "--migrate":
# Perform migrations.
run_migrations()

0 comments on commit 826ef37

Please sign in to comment.