From f9d5fc750c24f44d155ecb4116b38638f9971f09 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Tue, 28 May 2024 14:51:51 +0200 Subject: [PATCH] Add SOF-67: Returning total number of users by Dillon Ward --- debian/changelog | 6 ++++++ omr-admin.py | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/debian/changelog b/debian/changelog index 3d80169..70cdff0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +omr-vps-admin (0.9+20240528) unstable; urgency=medium + + * Add SOF-67: Returning total number of users by Dillon Ward + + -- OpenMPTCProuter Tue, 28 May 2024 14:50:19 +0200 + omr-vps-admin (0.9+20240516) unstable; urgency=medium * Fix Shadowsocks-Go user creation diff --git a/omr-admin.py b/omr-admin.py index eaf4768..fec8bc4 100755 --- a/omr-admin.py +++ b/omr-admin.py @@ -3284,6 +3284,15 @@ async def list_users(current_user: User = Depends(get_current_user)): content = json.load(f) return content['users'][0] +@app.get('/get-number-of-users', summary="Get the total number of users") +def get_number_of_users(current_user: User = Depends(get_current_user)): + if not current_user.permissions == "admin": + return {'result': 'permission', 'reason': 'Need admin user', 'route': 'get-number-of-users'} + with open('/etc/openmptcprouter-vps-admin/omr-admin-config.json') as f: + content = json.load(f) + users = len(content['users'][0]) - 1 + return {'users': users} + @app.get('/speedtest', summary="Test speed from the server") async def speedtest(current_user: User = Depends(get_current_user)): return FileResponse('/usr/share/omr-server/speedtest/test.img')