Fix admin groups parsing

README.md

@@ -17,10 +17,10 @@ You can run the Flask application as any other Flask app, using `flask run` insi
 There are some settings that must/can be provided to the application:
 
 | Variable                   | Usage                                                          | Default |
-| -------------------------- | ---------------------------------------- | :-----: |
+| -------------------------- | -------------------------------------------------------------- | :-----: |
 | `APPLICATION_ROOT`         | Base URI path for the app                                      |   `/`   |
 | `HSMAN_SECRET_KEY`         | Flask app secret key                                           |         |
-| `HSMAN_ADMIN_GROUPS`       | User groups that are considered admins   |         |
+| `HSMAN_ADMIN_GROUPS`       | Comma separated list of user groups that are considered admins |         |
 | `HSMAN_OIDC_CLIENT_ID`     | OIDC client ID                                                 |         |
 | `HSMAN_OIDC_CLIENT_SECRET` | OIDC clietn secret                                             |         |
 | `HSMAN_OIDC_URL`           | OIDC server URL                                                |         |

app/__init__.py

@@ -29,6 +29,9 @@ def create_app(environment='development'):
     app.config.from_prefixed_env(prefix="HSMAN")
     config[env].configure(app)
     app.config['APP_TZ'] = os.environ.get('TZ', 'UTC')
+    app.config['ADMIN_GROUPS'] = list(
+        map(str.strip, app.config['ADMIN_GROUPS'].split(',')))
+    app.logger.debug(f"admin groups: {app.config['ADMIN_GROUPS']}")
 
     app.logger.info("middleware init: mobility")
     mobility.init_app(app)

app/templates/index.html

@@ -1,7 +1,9 @@
 {% extends "base.html" %}
 
 {% block content %}
-<h3>Welcome, {{ session.userinfo.name }}</h3>
+<h3>
+    Welcome, {{ session.userinfo.name }}
+</h3>
 <hr>
 <h4>authentication info</h4>
 <div class="row data">
@@ -27,7 +29,13 @@
     </div>
     <div class="col col-6">
         <i class="fas fa-angle-right"></i>
+       {% if session.userinfo.groups[0] in config['ADMIN_GROUPS'] %}
+        <span class="badge badge-pill badge-warning">
+        {% else %}
+        <span class="badge badge-pill badge-dark">
+        {% endif %}
         {{ session.userinfo.groups[0]}}
+        </span>
     </div>
 </div>
         {% for group in session.userinfo.groups[1:] |sort %}
@@ -36,7 +44,14 @@
         &nbsp;
     </div>
     <div class="col col-6">
-        <i class="fas fa-angle-right"></i> {{ group }}
+        <i class="fas fa-angle-right"></i>
+       {% if group in config['ADMIN_GROUPS'] %}
+        <span class="badge badge-pill badge-warning">
+        {% else %}
+        <span class="badge badge-pill badge-dark">
+        {% endif %}
+            {{ group }}
+        </span>
     </div>
 </div>
         {% endfor %}

app/views/main.py

@@ -71,7 +71,7 @@ def node(nodeId):
     node = Node().get(nodeId)
     routes = Node().routes(nodeId)
     isExitNode = any(
-        (r for r in routes.routes if r.prefix.endswith('/0') and r.enabled))
+        (r for r in routes.routes if r.prefix.endswith('0/0') and r.enabled))
     return render_template("node.html",
                            routes=routes.routes,
                            isExitNode=isExitNode,
@@ -118,11 +118,11 @@ def user(userName):
 def routes():
     routes = Route().list()
 
-    prefixes = set(
+    prefixes = sorted(set(
-        (r.prefix for r in routes.routes if not r.prefix.endswith('/0')))
+        (r.prefix for r in routes.routes if not r.prefix.endswith('/0'))))
 
     exitNodes = [r.node for r in routes.routes if r.prefix.endswith(
-        '/0') and r.enabled]
+        '0/0') and r.enabled]
 
     final = {}
     for prefix in prefixes:

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "hsman"
-version = "0.9.4"
+version = "0.9.7"
 description = "Flask Admin webui for Headscale"
 authors = ["Andrea Mistrali <andrea@mistrali.pw>"]
 license = "BSD"