fixes

[ADD] `js_type` parameter to allow JS modules to be loaded

See merge request allianceauth/allianceauth!1664

.gitlab-ci.yml

@@ -25,7 +25,7 @@ before_script:
 pre-commit-check:
   <<: *only-default
   stage: pre-commit
-  image: python:3.11-bullseye
+  image: python:3.11-bookworm
   # variables:
   #   PRE_COMMIT_HOME: ${CI_PROJECT_DIR}/.cache/pre-commit
   # cache:
@@ -53,7 +53,7 @@ secret_detection:
 
 test-3.8-core:
   <<: *only-default
-  image: python:3.8-bullseye
+  image: python:3.8-bookworm
   script:
     - tox -e py38-core
   artifacts:
@@ -65,7 +65,7 @@ test-3.8-core:
 
 test-3.9-core:
   <<: *only-default
-  image: python:3.9-bullseye
+  image: python:3.9-bookworm
   script:
     - tox -e py39-core
   artifacts:
@@ -77,7 +77,7 @@ test-3.9-core:
 
 test-3.10-core:
   <<: *only-default
-  image: python:3.10-bullseye
+  image: python:3.10-bookworm
   script:
     - tox -e py310-core
   artifacts:
@@ -89,7 +89,7 @@ test-3.10-core:
 
 test-3.11-core:
   <<: *only-default
-  image: python:3.11-bullseye
+  image: python:3.11-bookworm
   script:
     - tox -e py311-core
   artifacts:
@@ -101,7 +101,7 @@ test-3.11-core:
 
 test-3.12-core:
   <<: *only-default
-  image: python:3.12-rc-bullseye
+  image: python:3.12-bookworm
   script:
     - tox -e py312-core
   artifacts:
@@ -113,7 +113,7 @@ test-3.12-core:
 
 test-3.8-all:
   <<: *only-default
-  image: python:3.8-bullseye
+  image: python:3.8-bookworm
   script:
     - tox -e py38-all
   artifacts:
@@ -125,7 +125,7 @@ test-3.8-all:
 
 test-3.9-all:
   <<: *only-default
-  image: python:3.9-bullseye
+  image: python:3.9-bookworm
   script:
     - tox -e py39-all
   artifacts:
@@ -137,7 +137,7 @@ test-3.9-all:
 
 test-3.10-all:
   <<: *only-default
-  image: python:3.10-bullseye
+  image: python:3.10-bookworm
   script:
     - tox -e py310-all
   artifacts:
@@ -149,7 +149,7 @@ test-3.10-all:
 
 test-3.11-all:
   <<: *only-default
-  image: python:3.11-bullseye
+  image: python:3.11-bookworm
   script:
     - tox -e py311-all
   artifacts:
@@ -162,7 +162,7 @@ test-3.11-all:
 
 test-3.12-all:
   <<: *only-default
-  image: python:3.12-rc-bullseye
+  image: python:3.12-bookworm
   script:
     - tox -e py312-all
   artifacts:
@@ -174,7 +174,7 @@ test-3.12-all:
 
 build-test:
   stage: test
-  image: python:3.11-bullseye
+  image: python:3.11-bookworm
 
   before_script:
     - python -m pip install --upgrade pip
@@ -193,13 +193,13 @@ build-test:
 
 test-docs:
   <<: *only-default
-  image: python:3.11-bullseye
+  image: python:3.11-bookworm
   script:
     - tox -e docs
 
 deploy_production:
   stage: deploy
-  image: python:3.11-bullseye
+  image: python:3.11-bookworm
 
   before_script:
     - python -m pip install --upgrade pip

.pre-commit-config.yaml

@@ -4,8 +4,21 @@
 #   pre-commit autoupdate
 
 repos:
+  # Code Upgrades
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v3.15.2
+    hooks:
+      - id: pyupgrade
+        args: [--py38-plus]
+  - repo: https://github.com/adamchainz/django-upgrade
+    rev: 1.17.0
+    hooks:
+      - id: django-upgrade
+        args: [--target-version=4.2]
+
+  # Formatting
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.6.0
     hooks:
       # Identify invalid files
       - id: check-ast
@@ -13,27 +26,24 @@ repos:
       - id: check-json
       - id: check-toml
       - id: check-xml
-
       # git checks
       - id: check-merge-conflict
       - id: check-added-large-files
-        args: [ --maxkb=1000 ]
+        args: [--maxkb=1000]
       - id: detect-private-key
       - id: check-case-conflict
-
       # Python checks
-#      - id: check-docstring-first
+      #      - id: check-docstring-first
       - id: debug-statements
-#      - id: requirements-txt-fixer
+      #      - id: requirements-txt-fixer
       - id: fix-encoding-pragma
-        args: [ --remove ]
+        args: [--remove]
       - id: fix-byte-order-marker
-
       # General quality checks
       - id: mixed-line-ending
-        args: [ --fix=lf ]
+        args: [--fix=lf]
       - id: trailing-whitespace
-        args: [ --markdown-linebreak-ext=md ]
+        args: [--markdown-linebreak-ext=md]
         exclude: |
           (?x)(
             \.min\.css|
@@ -52,9 +62,8 @@ repos:
             \.mo|
             swagger\.json
           )
-
   - repo: https://github.com/editorconfig-checker/editorconfig-checker.python
-    rev: 2.7.2
+    rev: 2.7.3
     hooks:
       - id: editorconfig-checker
         exclude: |
@@ -63,23 +72,29 @@ repos:
             allianceauth\/static\/allianceauth\/css\/themes\/bootstrap-locals.less|
             \.po|
             \.mo|
-            swagger\.json
+            swagger\.json|
+            \.ice
           )
-
-  - repo: https://github.com/asottile/pyupgrade
-    rev: v3.10.1
+  - repo: https://github.com/igorshubovych/markdownlint-cli
+    rev: v0.41.0
     hooks:
-      - id: pyupgrade
-        args: [ --py38-plus ]
-
-  - repo: https://github.com/adamchainz/django-upgrade
-    rev: 1.14.0
+      - id: markdownlint
+        args:
+          - --disable=MD013
+  # Infrastructure
+  - repo: https://github.com/tox-dev/pyproject-fmt
+    rev: 2.1.3
     hooks:
-      - id: django-upgrade
-        args: [--target-version=4.2]
-
-  - repo: https://github.com/asottile/setup-cfg-fmt
-    rev: v2.3.0
+      - id: pyproject-fmt
+        name: pyproject.toml formatter
+        description: "Format the pyproject.toml file."
+        args:
+          - --indent=4
+        additional_dependencies:
+          - tox==4.15.0 # https://github.com/tox-dev/tox/releases/latest
+  - repo: https://github.com/abravalheri/validate-pyproject
+    rev: v0.18
     hooks:
-      - id: setup-cfg-fmt
-        args: [ --include-version-classifiers ]
+      - id: validate-pyproject
+        name: Validate pyproject.toml
+        description: "Validate the pyproject.toml file."

.tx/config

@@ -1,10 +0,0 @@
-[main]
-host     = https://app.transifex.com
-lang_map = zh-Hans: zh_Hans
-
-[o:alliance-auth:p:alliance-auth:r:django-po]
-file_filter  = allianceauth/locale/<lang>/LC_MESSAGES/django.po
-source_file  = allianceauth/locale/en/LC_MESSAGES/django.po
-source_lang  = en
-type         = PO
-minimum_perc = 0

README.md

@@ -5,7 +5,7 @@
 [![django](https://img.shields.io/pypi/djversions/allianceauth?label=django)](https://pypi.org/project/allianceauth/)
 [![version](https://img.shields.io/pypi/v/allianceauth?label=release)](https://pypi.org/project/allianceauth/)
 [![pipeline status](https://gitlab.com/allianceauth/allianceauth/badges/master/pipeline.svg)](https://gitlab.com/allianceauth/allianceauth/commits/master)
-[![Documentation Status](https://readthedocs.org/projects/allianceauth/badge/?version=latest)](http://allianceauth.readthedocs.io/?badge=latest)
+[![Documentation Status](https://readthedocs.org/projects/allianceauth/badge/?version=latest)](https://allianceauth.readthedocs.io/?badge=latest)
 [![coverage report](https://gitlab.com/allianceauth/allianceauth/badges/master/coverage.svg)](https://gitlab.com/allianceauth/allianceauth/commits/master)
 [![Chat on Discord](https://img.shields.io/discord/399006117012832262.svg)](https://discord.gg/fjnHAmk)
 
@@ -14,7 +14,7 @@ An auth system for EVE Online to help in-game organizations manage online servic
 ## Content
 
 - [Overview](#overview)
-- [Documentation](http://allianceauth.rtfd.io)
+- [Documentation](https://allianceauth.rtfd.io)
 - [Support](#support)
 - [Release Notes](https://gitlab.com/allianceauth/allianceauth/-/releases)
 - [Developer Team](#development-team)
@@ -38,7 +38,7 @@ Main features:
 
 - English :flag_gb:, Chinese :flag_cn:, German :flag_de:, Spanish :flag_es:, Korean :flag_kr:, Russian :flag_ru:, Italian :flag_it:, French :flag_fr:, Japanese :flag_jp: and Ukrainian :flag_ua: Localization
 
-For further details about AA - including an installation guide and a full list of included services and plugin apps - please see the [official documentation](http://allianceauth.rtfd.io).
+For further details about AA - including an installation guide and a full list of included services and plugin apps - please see the [official documentation](https://allianceauth.rtfd.io).
 
 ## Screenshot
 

allianceauth/__init__.py

@@ -5,7 +5,7 @@ manage online service access.
 # This will make sure the app is always imported when
 # Django starts so that shared_task will use this app.
 
-__version__ = '4.0.0b2'
+__version__ = '4.4.2'
 __title__ = 'Alliance Auth'
 __url__ = 'https://gitlab.com/allianceauth/allianceauth'
 NAME = f'{__title__} v{__version__}'

allianceauth/analytics/tasks.py

@@ -9,6 +9,8 @@ from .utils import (
     install_stat_tokens,
     install_stat_users)
 
+from allianceauth import __version__
+
 logger = logging.getLogger(__name__)
 
 BASE_URL = "https://www.google-analytics.com"
@@ -99,11 +101,38 @@ def analytics_daily_stats():
                     event_type='Stats')
 
     for appconfig in apps.get_app_configs():
-        analytics_event(namespace='allianceauth.analytics',
-                        task='send_extension_stats',
-                        label=appconfig.label,
-                        value=1,
-                        event_type='Stats')
+        if appconfig.label in [
+            "django_celery_beat",
+            "bootstrapform",
+            "messages",
+            "sessions",
+            "auth",
+            "staticfiles",
+            "users",
+            "addons",
+            "admin",
+            "humanize",
+            "contenttypes",
+            "sortedm2m",
+            "django_bootstrap5",
+            "tokens",
+            "authentication",
+            "services",
+            "framework",
+            "notifications"
+            "eveonline",
+            "navhelper",
+            "analytics",
+            "menu",
+            "theme"
+        ]:
+            pass
+        else:
+            analytics_event(namespace='allianceauth.analytics',
+                            task='send_extension_stats',
+                            label=appconfig.label,
+                            value=1,
+                            event_type='Stats')
 
 
 @shared_task()
@@ -139,7 +168,7 @@ def send_ga_tracking_celery_event(
         'client_id': AnalyticsIdentifier.objects.get(id=1).identifier.hex,
         "user_properties": {
             "allianceauth_version": {
-                "value": "allianceauth_version"
+                "value": __version__
             }
         },
         'non_personalized_ads': True,

allianceauth/apps.py

@@ -5,26 +5,5 @@ from django.core.checks import Warning, Error, register
 class AllianceAuthConfig(AppConfig):
     name = 'allianceauth'
 
-
-@register()
-def check_settings(app_configs, **kwargs):
-    from django.conf import settings
-
-    errors = []
-    if hasattr(settings, "SITE_URL"):
-        if settings.SITE_URL[-1] == "/":
-            errors.append(Warning(
-                "'SITE_URL' Has a trailing slash. This may lead to incorrect links being generated by Auth."))
-    else:
-        errors.append(Error(
-            "No 'SITE_URL' found is settings. This may lead to incorrect links being generated by Auth or Errors in 3rd party modules."))
-    if hasattr(settings, "CSRF_TRUSTED_ORIGINS"):
-        if hasattr(settings, "SITE_URL"):
-            if settings.SITE_URL not in settings.CSRF_TRUSTED_ORIGINS:
-                errors.append(Warning(
-                    "'SITE_URL' not found in 'CSRF_TRUSTED_ORIGINS'. Auth may not load pages correctly until this is rectified."))
-    else:
-        errors.append(Error(
-            "No 'CSRF_TRUSTED_ORIGINS' found is settings, Auth may not load pages correctly until this is rectified"))
-
-    return errors
+    def ready(self) -> None:
+        import allianceauth.checks # noqa

allianceauth/authentication/migrations/0023_alter_userprofile_language.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.13 on 2024-05-12 09:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('authentication', '0022_userprofile_theme'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='userprofile',
+            name='language',
+            field=models.CharField(blank=True, choices=[('en', 'English'), ('de', 'German'), ('es', 'Spanish'), ('zh-hans', 'Chinese Simplified'), ('ru', 'Russian'), ('ko', 'Korean'), ('fr', 'French'), ('ja', 'Japanese'), ('it', 'Italian'), ('uk', 'Ukrainian'), ('pl', 'Polish')], default='', max_length=10, verbose_name='Language'),
+        ),
+    ]

allianceauth/authentication/migrations/0024_alter_userprofile_language.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2 on 2024-09-13 09:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('authentication', '0023_alter_userprofile_language'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='userprofile',
+            name='language',
+            field=models.CharField(blank=True, choices=[('en', 'English'), ('cs-cz', 'Czech'), ('de', 'German'), ('es', 'Spanish'), ('it-it', 'Italian'), ('ja', 'Japanese'), ('ko-kr', 'Korean'), ('fr-fr', 'French'), ('ru', 'Russian'), ('nl-nl', 'Dutch'), ('pl-pl', 'Polish'), ('uk', 'Ukrainian'), ('zh-hans', 'Simplified Chinese')], default='', max_length=10, verbose_name='Language'),
+        ),
+    ]

allianceauth/authentication/models.py

@@ -67,17 +67,20 @@ class UserProfile(models.Model):
         """
         Choices for UserProfile.language
         """
-
+        # Sorted by Language Code alphabetical order + English at top
         ENGLISH = 'en', _('English')
+        CZECH = 'cs-cz', _("Czech")  # Not yet at 50% translated
         GERMAN = 'de', _('German')
         SPANISH = 'es', _('Spanish')
-        CHINESE = 'zh-hans', _('Chinese Simplified')
-        RUSSIAN = 'ru', _('Russian')
-        KOREAN = 'ko', _('Korean')
-        FRENCH = 'fr', _('French')
+        ITALIAN = 'it-it', _('Italian')
         JAPANESE = 'ja', _('Japanese')
-        ITALIAN = 'it', _('Italian')
+        KOREAN = 'ko-kr', _('Korean')
+        FRENCH = 'fr-fr', _('French')
+        RUSSIAN = 'ru', _('Russian')
+        DUTCH = 'nl-nl', _("Dutch")
+        POLISH = 'pl-pl', _("Polish")
         UKRAINIAN = 'uk', _('Ukrainian')
+        CHINESE = 'zh-hans', _('Simplified Chinese')
 
     user = models.OneToOneField(
         User,

allianceauth/authentication/templates/authentication/dashboard.html

@@ -7,7 +7,7 @@
     {% translate "Dashboard" %}
 {% endblock %}
 {% block content %}
-    <div class="d-flex justify-content-around align-self-center flex-wrap">
+    <div class="row">
         {% for dash in views %}
             {{ dash | safe }}
         {% endfor %}

allianceauth/authentication/templates/authentication/dashboard_characters.html

@@ -1,13 +1,11 @@
 {% load i18n %}
-<div id="aa-dashboard-panel-characters" class="col-12 col-xl-8 align-self-stretch p-2 ps-0 pe-0 ps-xl-0 pe-xl-2">
-    <div class="card">
+<div id="aa-dashboard-panel-characters" class="col-12 col-xl-8 mb-3">
+    <div class="card h-100">
         <div class="card-body">
-            <div class="d-flex align-items-center">
-                <h4 class="ms-auto me-auto">
-                    {% translate "Characters" %}
-                </h4>
-            </div>
-            <div class="card-body">
+            {% translate "Characters" as widget_title %}
+            {% include "framework/dashboard/widget-title.html" with title=widget_title %}
+
+            <div>
                 <div style="height: 300px; overflow-y:auto;">
                     <div class="d-flex">
                         <a href="{% url 'authentication:add_character' %}" class="btn btn-primary flex-fill m-1" title="{% translate 'Add Character' %}">

allianceauth/authentication/templates/authentication/dashboard_groups.html

@@ -1,9 +1,11 @@
 {% load i18n %}
-<div id="aa-dashboard-panel-membership" class="col-12 col-xl-4 align-self-stretch py-2 ps-xl-2">
+<div id="aa-dashboard-panel-membership" class="col-12 col-xl-4 mb-3">
     <div class="card h-100">
         <div class="card-body">
-            <h4 class="card-title text-center">{% translate "Membership" %}</h4>
-            <div class="card-body">
+            {% translate "Membership" as widget_title %}
+            {% include "framework/dashboard/widget-title.html" with title=widget_title %}
+
+            <div>
                 <div style="height: 300px; overflow-y:auto;">
                     <h5 class="text-center">{% translate "State:" %} {{ request.user.profile.state }}</h5>
                     <table class="table">

allianceauth/authentication/templates/public/base.html

@@ -1,3 +1,4 @@
+{% load theme_tags %}
 {% load static %}
 <!DOCTYPE html>
 <html lang="en">
@@ -16,7 +17,7 @@
 
         <title>{% block title %}{% block page_title %}{% endblock page_title %} - {{ SITE_NAME }}{% endblock title %}</title>
 
-        {% include 'bundles/bootstrap-css-bs5.html' %}
+        {% theme_css %}
         {% include 'bundles/fontawesome.html' %}
 
         {% block extra_include %}

allianceauth/authentication/templates/public/lang_select.html

@@ -5,11 +5,11 @@
         {% csrf_token %}
 
         <select class="form-select" onchange="this.form.submit()" class="form-control" id="lang-select" name="language">
-            {% get_language_info_list for LANGUAGES as languages %}
+            {% get_available_languages as LANGUAGES %}
 
-            {% for language in languages %}
-                <option lang="{{ language.code }}" value="{{ language.code }}"{% if language.code == LANGUAGE_CODE %} selected="selected"{% endif %}>
-                    {{ language.name_local|capfirst }} ({{ language.code }})
+            {% for lang_code, lang_name in LANGUAGES %}
+                <option lang="{{ lang_code }}" value="{{ lang_code }}"{% if lang_code == LANGUAGE_CODE %} selected{% endif %}>
+                    {{ lang_code|language_name_local|capfirst }} ({{ lang_code }})
                 </option>
             {% endfor %}
         </select>

allianceauth/authentication/templates/public/middle_box.html

@@ -4,7 +4,7 @@
 
 {% block content %}
     <div class="row justify-content-center">
-        <div class="col-md-4">
+        <div class="col-md-6">
             {% if messages %}
                 {% for message in messages %}
                     <div class="alert alert-{{ message.level_tag}}">{{ message }}</div>

allianceauth/authentication/templates/public/register.html

@@ -13,7 +13,7 @@
 
 {% block content %}
     <div class="row justify-content-center">
-        <div class="col-md-4">
+        <div class="col-md-6">
             <div class="card card-login border-secondary p-3">
                 <div class="card-body">
                     <form method="POST">

allianceauth/checks.py

@@ -0,0 +1,187 @@
+from typing import List
+from django import db
+from django.core.checks import CheckMessage, Error, register, Warning
+from allianceauth.utils.cache import get_redis_client
+from django.utils import timezone
+from packaging.version import InvalidVersion, Version as Pep440Version
+from celery import current_app
+from django.conf import settings
+from sqlite3.dbapi2 import sqlite_version_info
+
+"""
+A = System Packages
+B = Configuration
+"""
+
+
+@register()
+def django_settings(app_configs, **kwargs) -> List[CheckMessage]:
+    errors: List[CheckMessage] = []
+    if hasattr(settings, "SITE_URL"):
+        if settings.SITE_URL[-1] == "/":
+            errors.append(Warning("'SITE_URL' Has a trailing slash. This may lead to incorrect links being generated by Auth.", hint="", id="allianceauth.checks.B005"))
+    else:
+        errors.append(Error("No 'SITE_URL' found is settings. This may lead to incorrect links being generated by Auth or Errors in 3rd party modules.", hint="", id="allianceauth.checks.B006"))
+
+    if hasattr(settings, "CSRF_TRUSTED_ORIGINS") and hasattr(settings, "SITE_URL"):
+        if settings.SITE_URL not in settings.CSRF_TRUSTED_ORIGINS:
+            errors.append(Warning("'SITE_URL' not found in 'CSRF_TRUSTED_ORIGINS'. Auth may not load pages correctly until this is rectified.", hint="", id="allianceauth.checks.B007"))
+    else:
+        errors.append(Error("No 'CSRF_TRUSTED_ORIGINS' found is settings, Auth may not load pages correctly until this is rectified", hint="", id="allianceauth.checks.B008"))
+
+    return errors
+
+
+@register()
+def system_package_redis(app_configs, **kwargs) -> List[CheckMessage]:
+    errors: List[CheckMessage] = []
+    try:
+        redis_version = Pep440Version(get_redis_client().info()['redis_version'])
+    except InvalidVersion:
+        errors.append(Warning("Unable to confirm Redis Version"))
+        return errors
+
+    if redis_version.major == 7 and redis_version.minor == 2 and timezone.now() > timezone.datetime(year=2025, month=8, day=31, tzinfo=timezone.utc):
+        errors.append(Error(f"Redis {redis_version.public} in Security Support only, Updating Suggested", hint="https://allianceauth.readthedocs.io/en/latest/installation/allianceauth.html#redis-and-other-tools", id="allianceauth.checks.A001"))
+    elif redis_version.major == 7 and redis_version.minor == 0:
+        errors.append(Warning(f"Redis {redis_version.public} in Security Support only, Updating Suggested", hint="https://allianceauth.readthedocs.io/en/latest/installation/allianceauth.html#redis-and-other-tools", id="allianceauth.checks.A002"))
+    elif redis_version.major == 6 and redis_version.minor == 2:
+        errors.append(Warning(f"Redis {redis_version.public} in Security Support only, Updating Suggested", hint="https://allianceauth.readthedocs.io/en/latest/installation/allianceauth.html#redis-and-other-tools", id="allianceauth.checks.A018"))
+    elif redis_version.major in [6, 5]:
+        errors.append(Error(f"Redis {redis_version.public} EOL", hint="https://allianceauth.readthedocs.io/en/latest/installation/allianceauth.html#redis-and-other-tools", id="allianceauth.checks.A003"))
+
+    return errors
+
+
+@register()
+def system_package_mysql(app_configs, **kwargs) -> List[CheckMessage]:
+    errors: List[CheckMessage] = []
+
+    for connection in db.connections.all():
+        if connection.vendor == "mysql":
+            try:
+                mysql_version = Pep440Version(".".join(str(i) for i in connection.mysql_version))
+            except InvalidVersion:
+                errors.append(Warning("Unable to confirm MySQL Version"))
+                return errors
+
+            # MySQL 8
+            if mysql_version.major == 8 and mysql_version.minor == 4 and timezone.now() > timezone.datetime(year=2032, month=4, day=30, tzinfo=timezone.utc):
+                errors.append(Error(f"MySQL {mysql_version.public} EOL", hint="https://dev.mysql.com/doc/mysql-apt-repo-quick-guide/en/", id="allianceauth.checks.A004"))
+            elif mysql_version.major == 8 and mysql_version.minor == 3:
+                errors.append(Warning(f"MySQL {mysql_version.public} Non LTS", hint="https://dev.mysql.com/doc/mysql-apt-repo-quick-guide/en/", id="allianceauth.checks.A005"))
+            elif mysql_version.major == 8 and mysql_version.minor == 2:
+                errors.append(Warning(f"MySQL {mysql_version.public} Non LTS", hint="https://dev.mysql.com/doc/mysql-apt-repo-quick-guide/en/", id="allianceauth.checks.A006"))
+            elif mysql_version.major == 8 and mysql_version.minor == 1:
+                errors.append(Error(f"MySQL {mysql_version.public} EOL", hint="https://dev.mysql.com/doc/mysql-apt-repo-quick-guide/en/", id="allianceauth.checks.A007"))
+            elif mysql_version.major == 8 and mysql_version.minor == 0 and timezone.now() > timezone.datetime(year=2026, month=4, day=30, tzinfo=timezone.utc):
+                errors.append(Error(f"MySQL {mysql_version.public} EOL", hint="https://dev.mysql.com/doc/mysql-apt-repo-quick-guide/en/", id="allianceauth.checks.A008"))
+            elif mysql_version.major < 8:  # This will also catch Mariadb 5.x
+                errors.append(Error(f"MySQL or MariaDB {mysql_version.public} EOL", hint="https://dev.mysql.com/doc/mysql-apt-repo-quick-guide/en/", id="allianceauth.checks.A009"))
+    return errors
+
+
+@register()
+def system_package_mariadb(app_configs, **kwargs) -> List[CheckMessage]:
+    errors: List[CheckMessage] = []
+
+    for connection in db.connections.all():
+        if connection.vendor == "mysql":  # Still to find a way to determine MySQL vs MariaDB
+            try:
+                mariadb_version = Pep440Version(".".join(str(i) for i in connection.mysql_version))
+            except InvalidVersion:
+                errors.append(Warning("Unable to confirm MariaDB Version"))
+                return errors
+
+            # MariaDB 11
+            if mariadb_version.major == 11 and mariadb_version.minor == 4 and timezone.now() > timezone.datetime(year=2029, month=5, day=19, tzinfo=timezone.utc):
+                errors.append(Error(f"MariaDB {mariadb_version.public} EOL", hint="https://mariadb.org/download/?t=repo-config", id="allianceauth.checks.A010"))
+            elif mariadb_version.major == 11 and mariadb_version.minor == 2:
+                errors.append(Warning(f"MariaDB {mariadb_version.public} Non LTS", hint="https://mariadb.org/download/?t=repo-config", id="allianceauth.checks.A018"))
+                if timezone.now() > timezone.datetime(year=2024, month=11, day=21, tzinfo=timezone.utc):
+                    errors.append(Error(f"MariaDB {mariadb_version.public}  EOL", hint="https://mariadb.org/download/?t=repo-config", id="allianceauth.checks.A011"))
+            elif mariadb_version.major == 11 and mariadb_version.minor == 1:
+                errors.append(Warning(f"MariaDB {mariadb_version.public} Non LTS", hint="https://mariadb.org/download/?t=repo-config", id="allianceauth.checks.A019"))
+                if timezone.now() > timezone.datetime(year=2024, month=8, day=21, tzinfo=timezone.utc):
+                    errors.append(Error(f"MariaDB {mariadb_version.public} EOL", hint="https://mariadb.org/download/?t=repo-config", id="allianceauth.checks.A012"))
+            elif mariadb_version.major == 11 and mariadb_version.minor in [0, 3]:  # Demote versions down here once EOL
+                errors.append(Error(f"MariaDB {mariadb_version.public} EOL", hint="https://mariadb.org/download/?t=repo-config.", id="allianceauth.checks.A013"))
+
+            # MariaDB 10
+            elif mariadb_version.major == 10 and mariadb_version.minor == 11 and timezone.now() > timezone.datetime(year=2028, month=2, day=10, tzinfo=timezone.utc):
+                errors.append(Error(f"MariaDB {mariadb_version.public} EOL", hint="https://mariadb.org/download/?t=repo-config.", id="allianceauth.checks.A014"))
+            elif mariadb_version.major == 10 and mariadb_version.minor == 6 and timezone.now() > timezone.datetime(year=2026, month=7, day=6, tzinfo=timezone.utc):
+                errors.append(Error(f"MariaDB {mariadb_version.public} EOL", hint="https://mariadb.org/download/?t=repo-config", id="allianceauth.checks.A0015"))
+            elif mariadb_version.major == 10 and mariadb_version.minor == 5 and timezone.now() > timezone.datetime(year=2025, month=6, day=24, tzinfo=timezone.utc):
+                errors.append(Error(f"MariaDB {mariadb_version.public} EOL", hint="https://mariadb.org/download/?t=repo-config", id="allianceauth.checks.A016"))
+            elif mariadb_version.major == 10 and mariadb_version.minor in [0, 1, 2, 3, 4, 7, 9, 10]:  # Demote versions down here once EOL
+                errors.append(Error(f"MariaDB {mariadb_version.public} EOL", hint="https://mariadb.org/download/?t=repo-config", id="allianceauth.checks.A017"))
+
+    return errors
+
+
+@register()
+def system_package_sqlite(app_configs, **kwargs) -> List[CheckMessage]:
+    errors: List[CheckMessage] = []
+    for connection in db.connections.all():
+        if connection.vendor == "sqlite":
+            try:
+                sqlite_version = Pep440Version(".".join(str(i) for i in sqlite_version_info))
+            except InvalidVersion:
+                errors.append(Warning("Unable to confirm SQLite Version"))
+                return errors
+            if sqlite_version.major == 3 and sqlite_version.minor < 27:
+                errors.append(Error(f"SQLite {sqlite_version.public} Unsupported by Django", hint="https://pkgs.org/download/sqlite3", id="allianceauth.checks.A020"))
+    return errors
+
+
+@register()
+def sql_settings(app_configs, **kwargs) -> List[CheckMessage]:
+    errors: List[CheckMessage] = []
+    for connection in db.connections.all():
+        if connection.vendor == "mysql":
+            try:
+                if connection.settings_dict["OPTIONS"]["charset"] != "utf8mb4":
+                    errors.append(Error(f"SQL Charset is not set to utf8mb4 DB:{connection.alias}", hint="https://gitlab.com/allianceauth/allianceauth/-/commit/89be2456fb2d741b86417e889da9b6129525bec8", id="allianceauth.checks.B001"))
+            except KeyError:
+                errors.append(Error(f"SQL Charset is not set to utf8mb4 DB:{connection.alias}", hint="https://gitlab.com/allianceauth/allianceauth/-/commit/89be2456fb2d741b86417e889da9b6129525bec8", id="allianceauth.checks.B001"))
+
+            # This hasn't actually been set on AA yet
+            # try:
+            #     if connection.settings_dict["OPTIONS"]["collation"] != "utf8mb4_unicode_ci":
+            #         errors.append(Error(f"SQL Collation is not set to utf8mb4_unicode_ci DB:{connection.alias}", hint="https://gitlab.com/allianceauth/allianceauth/-/commit/89be2456fb2d741b86417e889da9b6129525bec8", id="allianceauth.checks.B001"))
+            # except KeyError:
+            #     errors.append(Error(f"SQL Collation is not set to utf8mb4_unicode_ci DB:{connection.alias}", hint="https://gitlab.com/allianceauth/allianceauth/-/commit/89be2456fb2d741b86417e889da9b6129525bec8", id="allianceauth.checks.B001"))
+
+        # if connection.vendor == "sqlite":
+
+    return errors
+
+
+@register()
+def celery_settings(app_configs, **kwargs) -> List[CheckMessage]:
+    errors: List[CheckMessage] = []
+
+    try:
+        if current_app.conf.broker_transport_options != {'priority_steps': [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], 'queue_order_strategy': 'priority'}:
+            errors.append(Error("Celery Priorities are not set correctly", hint="https://gitlab.com/allianceauth/allianceauth/-/commit/8861ec0a61790eca0261f1adc1cc04ca5f243cbc", id="allianceauth.checks.B003"))
+    except KeyError:
+        errors.append(Error("Celery Priorities are not set", hint="https://gitlab.com/allianceauth/allianceauth/-/commit/8861ec0a61790eca0261f1adc1cc04ca5f243cbc", id="allianceauth.checks.B003"))
+
+    try:
+        if current_app.conf.broker_connection_retry_on_startup != True:
+            errors.append(Error("Celery broker_connection_retry_on_startup not set correctly", hint="https://gitlab.com/allianceauth/allianceauth/-/commit/380c41400b535447839e5552df2410af35a75280", id="allianceauth.checks.B004"))
+    except KeyError:
+        errors.append(Error("Celery broker_connection_retry_on_startup not set", hint="https://gitlab.com/allianceauth/allianceauth/-/commit/380c41400b535447839e5552df2410af35a75280", id="allianceauth.checks.B004"))
+
+    return errors
+
+
+# IDEAS
+
+# Any other celery things weve manually changed over the years
+# I'd be happy to add Community App checks, old versions the owners dont want to support etc.
+
+
+# Check Default Collation on DB
+# Check Charset Collation on all tables

allianceauth/custom_css/__init__.py

@@ -0,0 +1,3 @@
+"""
+Initializes the custom_css module.
+"""

allianceauth/custom_css/admin.py

@@ -0,0 +1,25 @@
+"""
+Admin classes for custom_css app
+"""
+
+# Django
+from django.contrib import admin
+
+# Django Solos
+from solo.admin import SingletonModelAdmin
+
+# Alliance Auth Custom CSS
+from allianceauth.custom_css.models import CustomCSS
+from allianceauth.custom_css.forms import CustomCSSAdminForm
+
+
+@admin.register(CustomCSS)
+class CustomCSSAdmin(SingletonModelAdmin):
+    """
+    Custom CSS Admin
+    """
+
+    form = CustomCSSAdminForm
+
+    # Leave this here for when we decide to add syntax highlighting to the CSS editor
+    # change_form_template = 'custom_css/admin/change_form.html'

allianceauth/custom_css/apps.py

@@ -0,0 +1,13 @@
+"""
+Django app configuration for custom_css
+"""
+
+# Django
+from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _
+
+
+class CustomCSSConfig(AppConfig):
+    name = "allianceauth.custom_css"
+    label = "custom_css"
+    verbose_name = _("Custom CSS")

allianceauth/custom_css/forms.py

@@ -0,0 +1,29 @@
+"""
+Forms for custom_css app
+"""
+
+# Alliance Auth Custom CSS
+from allianceauth.custom_css.models import CustomCSS
+from allianceauth.custom_css.widgets import CssEditorWidget
+
+# Django
+from django import forms
+
+
+class CustomCSSAdminForm(forms.ModelForm):
+    """
+    Form for editing custom CSS
+    """
+
+    class Meta:
+        model = CustomCSS
+        fields = ("css",)
+        widgets = {
+            "css": CssEditorWidget(
+                attrs={
+                    "style": "width: 90%; height: 100%;",
+                    "data-editor": "code-highlight",
+                    "data-language": "css",
+                }
+            )
+        }

allianceauth/custom_css/migrations/0001_initial.py

@@ -0,0 +1,42 @@
+# Generated by Django 4.2.15 on 2024-08-14 11:25
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = []
+
+    operations = [
+        migrations.CreateModel(
+            name="CustomCSS",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "css",
+                    models.TextField(
+                        blank=True,
+                        help_text="This CSS will be added to the site after the default CSS.",
+                        null=True,
+                        verbose_name="Your custom CSS",
+                    ),
+                ),
+                ("timestamp", models.DateTimeField(auto_now=True)),
+            ],
+            options={
+                "verbose_name": "Custom CSS",
+                "verbose_name_plural": "Custom CSS",
+                "default_permissions": (),
+            },
+        ),
+    ]

allianceauth/custom_css/models.py

@@ -0,0 +1,143 @@
+"""
+Models for the custom_css app
+"""
+
+import os
+import re
+
+# Django Solo
+from solo.models import SingletonModel
+
+# Django
+from django.conf import settings
+from django.db import models
+from django.utils.translation import gettext_lazy as _
+
+
+class CustomCSS(SingletonModel):
+    """
+    Model for storing custom CSS for the site
+    """
+
+    css = models.TextField(
+        blank=True,
+        null=True,
+        verbose_name=_("Your custom CSS"),
+        help_text=_("This CSS will be added to the site after the default CSS."),
+    )
+    timestamp = models.DateTimeField(auto_now=True)
+
+    class Meta:
+        """
+        Meta for CustomCSS
+        """
+
+        default_permissions = ()
+        verbose_name = _("Custom CSS")
+        verbose_name_plural = _("Custom CSS")
+
+    def __str__(self) -> str:
+        """
+        String representation of CustomCSS
+
+        :return:
+        :rtype:
+        """
+
+        return str(_("Custom CSS"))
+
+    def save(self, *args, **kwargs):
+        """
+        Save method for CustomCSS
+
+        :param args:
+        :type args:
+        :param kwargs:
+        :type kwargs:
+        :return:
+        :rtype:
+        """
+
+        self.pk = 1
+
+        if self.css and len(self.css.replace(" ", "")) > 0:
+            # Write the custom CSS to a file
+            custom_css_file = open(
+                f"{settings.STATIC_ROOT}allianceauth/custom-styles.css", "w+"
+            )
+            custom_css_file.write(self.compress_css())
+            custom_css_file.close()
+        else:
+            # Remove the custom CSS file
+            try:
+                os.remove(f"{settings.STATIC_ROOT}allianceauth/custom-styles.css")
+            except FileNotFoundError:
+                pass
+
+        super().save(*args, **kwargs)
+
+    def compress_css(self) -> str:
+        """
+        Compress CSS
+
+        :return:
+        :rtype:
+        """
+
+        css = self.css
+        new_css = ""
+
+        # Remove comments
+        css = re.sub(pattern=r"\s*/\*\s*\*/", repl="$$HACK1$$", string=css)
+        css = re.sub(pattern=r"/\*[\s\S]*?\*/", repl="", string=css)
+        css = css.replace("$$HACK1$$", "/**/")
+
+        # url() doesn't need quotes
+        css = re.sub(pattern=r'url\((["\'])([^)]*)\1\)', repl=r"url(\2)", string=css)
+
+        # Spaces may be safely collapsed as generated content will collapse them anyway.
+        css = re.sub(pattern=r"\s+", repl=" ", string=css)
+
+        # Shorten collapsable colors: #aabbcc to #abc
+        css = re.sub(
+            pattern=r"#([0-9a-f])\1([0-9a-f])\2([0-9a-f])\3(\s|;)",
+            repl=r"#\1\2\3\4",
+            string=css,
+        )
+
+        # Fragment values can loose zeros
+        css = re.sub(
+            pattern=r":\s*0(\.\d+([cm]m|e[mx]|in|p[ctx]))\s*;", repl=r":\1;", string=css
+        )
+
+        for rule in re.findall(pattern=r"([^{]+){([^}]*)}", string=css):
+            # We don't need spaces around operators
+            selectors = [
+                re.sub(
+                    pattern=r"(?<=[\[\(>+=])\s+|\s+(?=[=~^$*|>+\]\)])",
+                    repl=r"",
+                    string=selector.strip(),
+                )
+                for selector in rule[0].split(",")
+            ]
+
+            # Order is important, but we still want to discard repetitions
+            properties = {}
+            porder = []
+
+            for prop in re.findall(pattern="(.*?):(.*?)(;|$)", string=rule[1]):
+                key = prop[0].strip().lower()
+
+                if key not in porder:
+                    porder.append(key)
+
+                properties[key] = prop[1].strip()
+
+            # output rule if it contains any declarations
+            if properties:
+                new_css += "{}{{{}}}".format(
+                    ",".join(selectors),
+                    "".join([f"{key}:{properties[key]};" for key in porder])[:-1],
+                )
+
+        return new_css

allianceauth/custom_css/templates/custom_css/admin/change_form.html

@@ -0,0 +1,48 @@
+{% extends "admin/change_form.html" %}
+
+{% block field_sets %}
+    {% for fieldset in adminform %}
+        <fieldset class="module aligned {{ fieldset.classes }}">
+            {% if fieldset.name %}<h2>{{ fieldset.name }}</h2>{% endif %}
+
+            {% if fieldset.description %}
+                <div class="description">{{ fieldset.description|safe }}</div>
+            {% endif %}
+
+            {% for line in fieldset %}
+                <div class="form-row{% if line.fields|length == 1 and line.errors %} errors{% endif %}{% if not line.has_visible_field %} hidden{% endif %}{% for field in line %}{% if field.field.name %} field-{{ field.field.name }}{% endif %}{% endfor %}">
+                    {% if line.fields|length == 1 %}{{ line.errors }}{% else %}<div class="flex-container form-multiline">{% endif %}
+
+                    {% for field in line %}
+                        <div>
+                            {% if not line.fields|length == 1 and not field.is_readonly %}{{ field.errors }}{% endif %}
+
+                            <div class="flex-container{% if not line.fields|length == 1 %} fieldBox{% if field.field.name %} field-{{ field.field.name }}{% endif %}{% if not field.is_readonly and field.errors %} errors{% endif %}{% if field.field.is_hidden %} hidden{% endif %}{% elif field.is_checkbox %} checkbox-row{% endif %}">
+                                {% if field.is_checkbox %}
+                                    {{ field.field }}{{ field.label_tag }}
+                                {% else %}
+                                    {{ field.label_tag }}
+                                    {% if field.is_readonly %}
+                                        <div class="readonly">{{ field.contents }}</div>
+                                    {% else %}
+                                        {{ field.field }}
+                                    {% endif %}
+                                {% endif %}
+                            </div>
+
+                            {% if field.field.help_text %}
+                                <div class="help"{% if field.field.id_for_label %} id="{{ field.field.id_for_label }}_helptext"{% endif %}>
+                                    <div>{{ field.field.help_text|safe }}</div>
+                                </div>
+                            {% endif %}
+                        </div>
+                    {% endfor %}
+
+                    {% if not line.fields|length == 1 %}</div>{% endif %}
+                </div>
+            {% endfor %}
+        </fieldset>
+    {% endfor %}
+{% endblock %}
+
+{% block after_field_sets %}{% endblock %}

allianceauth/custom_css/templates/custom_css/bundles/custom-css.html

@@ -0,0 +1,3 @@
+{% load custom_css %}
+
+{% custom_css_static 'allianceauth/custom-styles.css' %}

allianceauth/custom_css/templatetags/__init__.py

@@ -0,0 +1,3 @@
+"""
+Init file for custom_css templatetags
+"""

allianceauth/custom_css/templatetags/custom_css.py

@@ -0,0 +1,48 @@
+"""
+Custom template tags for custom_css app
+"""
+
+# Alliance Auth Custom CSS
+from allianceauth.custom_css.models import CustomCSS
+
+# Django
+from django.conf import settings
+from django.template.defaulttags import register
+from django.templatetags.static import static
+from django.utils.safestring import mark_safe
+
+from pathlib import Path
+
+
+@register.simple_tag
+def custom_css_static(path: str) -> str:
+    """
+    Versioned static URL
+    This is to make sure to break the browser cache on CSS updates.
+
+    Example: /static/allianceauth/custom-styles.css?v=1234567890
+
+    :param path:
+    :type path:
+    :return:
+    :rtype:
+    """
+
+    try:
+        Path(f"{settings.STATIC_ROOT}{path}").resolve(strict=True)
+    except FileNotFoundError:
+        return ""
+    else:
+        try:
+            custom_css = CustomCSS.objects.get(pk=1)
+        except CustomCSS.DoesNotExist:
+            return ""
+        else:
+            custom_css_changed = custom_css.timestamp.timestamp()
+            custom_css_version = (
+                str(custom_css_changed).replace(" ", "").replace(":", "").replace("-", "")
+            )  # remove spaces, colons, and dashes
+            static_url = static(path)
+            versioned_url = static_url + "?v=" + custom_css_version
+
+            return mark_safe(f'<link rel="stylesheet" href="{versioned_url}">')

allianceauth/custom_css/widgets.py

@@ -0,0 +1,38 @@
+"""
+Form widgets for custom_css app
+"""
+
+# Django
+from django import forms
+
+# Alliance Auth
+from allianceauth.custom_css.models import CustomCSS
+
+
+class CssEditorWidget(forms.Textarea):
+    """
+    Widget for editing CSS
+    """
+
+    def __init__(self, attrs=None):
+        default_attrs = {"class": "custom-css-editor"}
+
+        if attrs:
+            default_attrs.update(attrs)
+
+        super().__init__(default_attrs)
+
+    # For when we want to add some sort of syntax highlight to it, which is not that
+    # easy to do on a textarea field though.
+    # `highlight.js` is just used as an example here, and doesn't work on a textarea field.
+    # class Media:
+    #     css = {
+    #         "all": (
+    #             "/static/custom_css/libs/highlight.js/11.10.0/styles/github.min.css",
+    #         )
+    #     }
+    #     js = (
+    #         "/static/custom_css/libs/highlight.js/11.10.0/highlight.min.js",
+    #         "/static/custom_css/libs/highlight.js/11.10.0/languages/css.min.js",
+    #         "/static/custom_css/javascript/custom-css.min.js",
+    #     )

allianceauth/eveonline/evelinks/dotlan.py

@@ -10,7 +10,7 @@ from . import (
 )
 
 
-_BASE_URL = 'http://evemaps.dotlan.net'
+_BASE_URL = 'https://evemaps.dotlan.net'
 
 
 def _build_url(category: str, name: str) -> str:

allianceauth/eveonline/evelinks/tests/test_evelinks.py

@@ -31,29 +31,29 @@ class TestDotlan(TestCase):
     def test_alliance_url(self):
         self.assertEqual(
             dotlan.alliance_url('Wayne Enterprices'),
-            'http://evemaps.dotlan.net/alliance/Wayne_Enterprices'
+            'https://evemaps.dotlan.net/alliance/Wayne_Enterprices'
         )
 
     def test_corporation_url(self):
         self.assertEqual(
             dotlan.corporation_url('Wayne Technology'),
-            'http://evemaps.dotlan.net/corp/Wayne_Technology'
+            'https://evemaps.dotlan.net/corp/Wayne_Technology'
         )
         self.assertEqual(
             dotlan.corporation_url('Crédit Agricole'),
-            'http://evemaps.dotlan.net/corp/Cr%C3%A9dit_Agricole'
+            'https://evemaps.dotlan.net/corp/Cr%C3%A9dit_Agricole'
         )
 
     def test_region_url(self):
         self.assertEqual(
             dotlan.region_url('Black Rise'),
-            'http://evemaps.dotlan.net/map/Black_Rise'
+            'https://evemaps.dotlan.net/map/Black_Rise'
         )
 
     def test_solar_system_url(self):
         self.assertEqual(
             dotlan.solar_system_url('Jita'),
-            'http://evemaps.dotlan.net/system/Jita'
+            'https://evemaps.dotlan.net/system/Jita'
         )
 
 

allianceauth/framework/static/allianceauth/framework/css/auth-framework.css

@@ -13,6 +13,15 @@
     }
 }
 
+/* Image overflow fix
+------------------------------------------------------------------------------------- */
+@media all {
+    img {
+        max-width: 100%;
+        height: auto;
+    }
+}
+
 /* Side Navigation
 ------------------------------------------------------------------------------------- */
 @media all {

allianceauth/framework/templates/framework/dashboard/widget-title.html

@@ -0,0 +1,8 @@
+{#Usage:#}
+{#    {% include "framework/dashboard/widget-title.html" with title="Foobar" %}#}
+
+<div class="text-center">
+    <h4 class="ms-auto me-auto mb-3">
+        {{ title }}
+    </h4>
+</div>

allianceauth/framework/templates/framework/header/page-header.html

@@ -7,7 +7,7 @@
 
         {% if subtitle %}
             <br>
-            <small>{{ subtitle }}</small>
+            <small class="text-muted">{{ subtitle }}</small>
         {% endif %}
     </h1>
 {% endif %}

allianceauth/groupmanagement/auth_hooks.py

@@ -49,7 +49,7 @@ class GroupsMenuItem(MenuItemHook):
         MenuItemHook.__init__(
             self,
             text=_("Groups"),
-            classes="fa-solid fa-user",
+            classes="fa-solid fa-users",
             url_name="groupmanagement:groups",
             order=25,
             navactive=[

allianceauth/groupmanagement/templates/groupmanagement/index.html

@@ -92,6 +92,9 @@
                                         <a href="{% url 'groupmanagement:accept_request' acceptrequest.id %}" class="btn btn-success">
                                             {% translate "Accept" %}
                                         </a>
+                                        <a href="{% url 'groupmanagement:reject_request' acceptrequest.id %}" class="btn btn-danger">
+                                            {% translate "Reject" %}
+                                        </a>
                                     </td>
                                 </tr>
                             {% endfor %}

allianceauth/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-17 20:02+1000\n"
+"POT-Creation-Date: 2024-10-21 12:59+1000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,6 +26,15 @@ msgstr ""
 msgid "Google Analytics V4"
 msgstr ""
 
+#: allianceauth/authentication/constants.py:6
+msgid ""
+"This software has exceeded the error limit for ESI. If you are a user, "
+"please contact the maintainer of this software. If you are a developer/"
+"maintainer, please make a greater effort in the future to receive valid "
+"responses. For tips on how, come have a chat with us in ##3rd-party-dev-and-"
+"esi on the EVE Online Discord. https://www.eveonline.com/discord"
+msgstr ""
+
 #: allianceauth/authentication/decorators.py:52
 msgid "A main character is required to perform that action. Add one below."
 msgstr ""
@@ -40,91 +49,122 @@ msgid "You are not allowed to add or remove these restricted groups: %s"
 msgstr ""
 
 #: allianceauth/authentication/models.py:71
+#: allianceauth/project_template/project_name/settings/base.py:99
 msgid "English"
 msgstr ""
 
 #: allianceauth/authentication/models.py:72
-msgid "German"
+msgid "Czech"
 msgstr ""
 
 #: allianceauth/authentication/models.py:73
-msgid "Spanish"
+#: allianceauth/project_template/project_name/settings/base.py:101
+msgid "German"
 msgstr ""
 
 #: allianceauth/authentication/models.py:74
-msgid "Chinese Simplified"
+#: allianceauth/project_template/project_name/settings/base.py:102
+msgid "Spanish"
 msgstr ""
 
 #: allianceauth/authentication/models.py:75
-msgid "Russian"
-msgstr ""
-
-#: allianceauth/authentication/models.py:76
-msgid "Korean"
-msgstr ""
-
-#: allianceauth/authentication/models.py:77
-msgid "French"
-msgstr ""
-
-#: allianceauth/authentication/models.py:78
-msgid "Japanese"
-msgstr ""
-
-#: allianceauth/authentication/models.py:79
+#: allianceauth/project_template/project_name/settings/base.py:103
 msgid "Italian"
 msgstr ""
 
+#: allianceauth/authentication/models.py:76
+#: allianceauth/project_template/project_name/settings/base.py:104
+msgid "Japanese"
+msgstr ""
+
+#: allianceauth/authentication/models.py:77
+#: allianceauth/project_template/project_name/settings/base.py:105
+msgid "Korean"
+msgstr ""
+
+#: allianceauth/authentication/models.py:78
+#: allianceauth/project_template/project_name/settings/base.py:106
+msgid "French"
+msgstr ""
+
+#: allianceauth/authentication/models.py:79
+#: allianceauth/project_template/project_name/settings/base.py:109
+msgid "Russian"
+msgstr ""
+
 #: allianceauth/authentication/models.py:80
+#: allianceauth/project_template/project_name/settings/base.py:107
+msgid "Dutch"
+msgstr ""
+
+#: allianceauth/authentication/models.py:81
+#: allianceauth/project_template/project_name/settings/base.py:108
+msgid "Polish"
+msgstr ""
+
+#: allianceauth/authentication/models.py:82
+#: allianceauth/project_template/project_name/settings/base.py:110
 msgid "Ukrainian"
 msgstr ""
 
-#: allianceauth/authentication/models.py:96
+#: allianceauth/authentication/models.py:83
+#: allianceauth/project_template/project_name/settings/base.py:111
+msgid "Simplified Chinese"
+msgstr ""
+
+#: allianceauth/authentication/models.py:99
 #: allianceauth/menu/templates/menu/menu-user.html:42
 msgid "Language"
 msgstr ""
 
-#: allianceauth/authentication/models.py:101
+#: allianceauth/authentication/models.py:104
 #: allianceauth/templates/allianceauth/night-toggle.html:6
 msgid "Night Mode"
 msgstr ""
 
-#: allianceauth/authentication/models.py:105
+#: allianceauth/authentication/models.py:108
 #: allianceauth/menu/templates/menu/menu-user.html:46
 msgid "Theme"
 msgstr ""
 
-#: allianceauth/authentication/models.py:122
+#: allianceauth/authentication/models.py:125
 #, python-format
 msgid "State changed to: %s"
 msgstr ""
 
-#: allianceauth/authentication/models.py:123
+#: allianceauth/authentication/models.py:126
 #, python-format
 msgid "Your user's state is now: %(state)s"
 msgstr ""
 
-#: allianceauth/authentication/templates/authentication/dashboard.characters.html:7
+#: allianceauth/authentication/templates/authentication/dashboard.html:5
+#: allianceauth/authentication/templates/authentication/dashboard.html:7
+#: allianceauth/menu/templates/menu/sortable-side-menu.html:14
+#: allianceauth/templates/allianceauth/side-menu.html:10
+msgid "Dashboard"
+msgstr ""
+
+#: allianceauth/authentication/templates/authentication/dashboard_characters.html:5
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html:33
 #: allianceauth/hrapplications/templates/hrapplications/view.html:54
 msgid "Characters"
 msgstr ""
 
-#: allianceauth/authentication/templates/authentication/dashboard.characters.html:13
-#: allianceauth/authentication/templates/authentication/dashboard.characters.html:14
+#: allianceauth/authentication/templates/authentication/dashboard_characters.html:11
+#: allianceauth/authentication/templates/authentication/dashboard_characters.html:12
 #: allianceauth/templates/allianceauth/top-menu-rh-default.html:4
 #: allianceauth/templates/allianceauth/top-menu-rh-default.html:6
 msgid "Add Character"
 msgstr ""
 
-#: allianceauth/authentication/templates/authentication/dashboard.characters.html:16
-#: allianceauth/authentication/templates/authentication/dashboard.characters.html:17
+#: allianceauth/authentication/templates/authentication/dashboard_characters.html:14
+#: allianceauth/authentication/templates/authentication/dashboard_characters.html:15
 #: allianceauth/templates/allianceauth/top-menu-rh-default.html:10
 #: allianceauth/templates/allianceauth/top-menu-rh-default.html:12
 msgid "Change Main"
 msgstr ""
 
-#: allianceauth/authentication/templates/authentication/dashboard.characters.html:24
+#: allianceauth/authentication/templates/authentication/dashboard_characters.html:22
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html:89
 #: allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html:23
 #: allianceauth/groupmanagement/templates/groupmanagement/groups.html:31
@@ -133,32 +173,25 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: allianceauth/authentication/templates/authentication/dashboard.characters.html:25
+#: allianceauth/authentication/templates/authentication/dashboard_characters.html:23
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html:33
 msgid "Corp"
 msgstr ""
 
-#: allianceauth/authentication/templates/authentication/dashboard.characters.html:26
+#: allianceauth/authentication/templates/authentication/dashboard_characters.html:24
 #: allianceauth/corputils/templates/corputils/corpstats.html:125
 #: allianceauth/hrapplications/templates/hrapplications/view.html:63
 msgid "Alliance"
 msgstr ""
 
-#: allianceauth/authentication/templates/authentication/dashboard.groups.html:5
+#: allianceauth/authentication/templates/authentication/dashboard_groups.html:5
 msgid "Membership"
 msgstr ""
 
-#: allianceauth/authentication/templates/authentication/dashboard.groups.html:8
+#: allianceauth/authentication/templates/authentication/dashboard_groups.html:10
 msgid "State:"
 msgstr ""
 
-#: allianceauth/authentication/templates/authentication/dashboard.html:5
-#: allianceauth/authentication/templates/authentication/dashboard.html:7
-#: allianceauth/menu/templates/menu/sortable-side-menu.html:14
-#: allianceauth/templates/allianceauth/side-menu.html:10
-msgid "Dashboard"
-msgstr ""
-
 #: allianceauth/authentication/templates/authentication/tokens.html:6
 #: allianceauth/authentication/templates/authentication/tokens.html:10
 #: allianceauth/templates/allianceauth/top-menu-user-dropdown.html:62
@@ -197,7 +230,7 @@ msgstr ""
 #: allianceauth/groupmanagement/templates/groupmanagement/audit.html:29
 #: allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html:28
 #: allianceauth/groupmanagement/templates/groupmanagement/index.html:55
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:115
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:118
 msgid "Character"
 msgstr ""
 
@@ -234,49 +267,49 @@ msgstr ""
 msgid "Invalid or expired activation link."
 msgstr ""
 
-#: allianceauth/authentication/views.py:147
+#: allianceauth/authentication/views.py:158
 #, python-format
 msgid ""
 "Cannot change main character to %(char)s: character owned by a different "
 "account."
 msgstr ""
 
-#: allianceauth/authentication/views.py:153
+#: allianceauth/authentication/views.py:165
 #, python-format
-msgid "Changed main character to %(char)s"
+msgid "Changed main character to %s"
 msgstr ""
 
-#: allianceauth/authentication/views.py:162
+#: allianceauth/authentication/views.py:179
 #, python-format
 msgid "Added %(name)s to your account."
 msgstr ""
 
-#: allianceauth/authentication/views.py:164
+#: allianceauth/authentication/views.py:181
 #, python-format
 msgid "Failed to add %(name)s to your account: they already have an account."
 msgstr ""
 
-#: allianceauth/authentication/views.py:207
+#: allianceauth/authentication/views.py:226
 msgid ""
 "Unable to authenticate as the selected character. Please log in with the "
 "main character associated with this account."
 msgstr ""
 
-#: allianceauth/authentication/views.py:273
+#: allianceauth/authentication/views.py:293
 msgid "Registration token has expired."
 msgstr ""
 
-#: allianceauth/authentication/views.py:331
+#: allianceauth/authentication/views.py:354
 msgid ""
 "Sent confirmation email. Please follow the link to confirm your email "
 "address."
 msgstr ""
 
-#: allianceauth/authentication/views.py:336
+#: allianceauth/authentication/views.py:360
 msgid "Confirmed your email address. Please login to continue."
 msgstr ""
 
-#: allianceauth/authentication/views.py:341
+#: allianceauth/authentication/views.py:366
 msgid "Registration of new accounts is not allowed at this time."
 msgstr ""
 
@@ -386,6 +419,19 @@ msgstr ""
 msgid "Failed to gather corporation statistics with selected token."
 msgstr ""
 
+#: allianceauth/custom_css/apps.py:13 allianceauth/custom_css/models.py:36
+#: allianceauth/custom_css/models.py:37 allianceauth/custom_css/models.py:47
+msgid "Custom CSS"
+msgstr ""
+
+#: allianceauth/custom_css/models.py:25
+msgid "Your custom CSS"
+msgstr ""
+
+#: allianceauth/custom_css/models.py:26
+msgid "This CSS will be added to the site after the default CSS."
+msgstr ""
+
 #: allianceauth/fleetactivitytracking/auth_hooks.py:10
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/characternotexisting.html:10
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkcreate.html:11
@@ -473,13 +519,14 @@ msgstr ""
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html:35
 #: allianceauth/groupmanagement/templates/groupmanagement/groups.html:35
 #: allianceauth/hrapplications/templates/hrapplications/view.html:41
+#: allianceauth/services/modules/mumble/templates/services/mumble/mumble_connection_history.html:30
 msgid "User"
 msgstr ""
 
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html:37
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html:42
-#: allianceauth/optimer/form.py:13 allianceauth/timerboard/form.py:59
-#: allianceauth/timerboard/templates/timerboard/dashboard.timers.html:16
+#: allianceauth/optimer/form.py:13 allianceauth/timerboard/form.py:37
+#: allianceauth/timerboard/templates/timerboard/dashboard.timers.html:17
 #: allianceauth/timerboard/templates/timerboard/timertable.html:9
 msgid "System"
 msgstr ""
@@ -495,7 +542,6 @@ msgstr ""
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html:44
 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html:92
 #: allianceauth/templates/allianceauth/top-menu.html:23
-#: allianceauth/timerboard/templates/timerboard/dashboard.timers.html:17
 #: allianceauth/timerboard/templates/timerboard/timertable.html:11
 msgid "Eve Time"
 msgstr ""
@@ -669,7 +715,6 @@ msgstr ""
 
 #: allianceauth/groupmanagement/auth_hooks.py:51
 #: allianceauth/permissions_tool/templates/permissions_tool/overview.html:34
-#: allianceauth/templates/allianceauth/side-menu.html:15
 msgid "Groups"
 msgstr ""
 
@@ -799,7 +844,7 @@ msgstr ""
 
 #: allianceauth/groupmanagement/templates/groupmanagement/audit.html:31
 #: allianceauth/optimer/templates/optimer/dashboard.ops.html:15
-#: allianceauth/timerboard/templates/timerboard/dashboard.timers.html:15
+#: allianceauth/timerboard/templates/timerboard/dashboard.timers.html:16
 msgid "Type"
 msgstr ""
 
@@ -833,7 +878,7 @@ msgstr ""
 
 #: allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html:29
 #: allianceauth/groupmanagement/templates/groupmanagement/index.html:56
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:116
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:119
 #: allianceauth/permissions_tool/templates/permissions_tool/audit.html:32
 msgid "Organization"
 msgstr ""
@@ -845,7 +890,7 @@ msgstr ""
 
 #: allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html:60
 #: allianceauth/groupmanagement/templates/groupmanagement/index.html:85
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:145
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:148
 #: allianceauth/permissions_tool/templates/permissions_tool/audit_row.html:18
 msgid "(unknown)"
 msgstr ""
@@ -891,7 +936,7 @@ msgid "Hidden"
 msgstr ""
 
 #: allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html:45
-#: allianceauth/templates/allianceauth/admin-status/overview.html:19
+#: allianceauth/templates/allianceauth/admin-status/overview.html:16
 msgid "Open"
 msgstr ""
 
@@ -926,7 +971,7 @@ msgstr ""
 
 #: allianceauth/groupmanagement/templates/groupmanagement/groups.html:36
 #: allianceauth/groupmanagement/templates/groupmanagement/index.html:57
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:117
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:120
 #: allianceauth/permissions_tool/templates/permissions_tool/audit.html:29
 #: allianceauth/services/modules/openfire/forms.py:6
 msgid "Group"
@@ -980,20 +1025,21 @@ msgid "Group Membership"
 msgstr ""
 
 #: allianceauth/groupmanagement/templates/groupmanagement/index.html:93
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:153
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:156
 msgid "Accept"
 msgstr ""
 
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:103
-msgid "No group add requests."
-msgstr ""
-
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:157
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:96
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:160
 #: allianceauth/hrapplications/templates/hrapplications/view.html:104
 msgid "Reject"
 msgstr ""
 
-#: allianceauth/groupmanagement/templates/groupmanagement/index.html:166
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:106
+msgid "No group add requests."
+msgstr ""
+
+#: allianceauth/groupmanagement/templates/groupmanagement/index.html:169
 msgid "No group leave requests."
 msgstr ""
 
@@ -1366,16 +1412,18 @@ msgstr ""
 msgid "Super User"
 msgstr ""
 
-#: allianceauth/menu/templates/menu/menu-user.html:68
+#: allianceauth/menu/templates/menu/menu-user.html:70
 #: allianceauth/templates/allianceauth/top-menu-admin.html:9
 msgid "Admin"
 msgstr ""
 
-#: allianceauth/menu/templates/menu/menu-user.html:80
+#: allianceauth/menu/templates/menu/menu-user.html:82
 msgid "Sign Out"
 msgstr ""
 
-#: allianceauth/menu/templates/menu/menu-user.html:84
+#: allianceauth/menu/templates/menu/menu-user.html:86
+#: allianceauth/templates/allianceauth/top-menu-rh-default.html:17
+#: allianceauth/templates/allianceauth/top-menu-rh-default.html:18
 msgid "Sign In"
 msgstr ""
 
@@ -1458,7 +1506,6 @@ msgid "Doctrine"
 msgstr ""
 
 #: allianceauth/optimer/form.py:14
-#: allianceauth/optimer/templates/optimer/dashboard.ops.html:17
 #: allianceauth/optimer/templates/optimer/fleetoptable.html:13
 msgid "Start Time"
 msgstr ""
@@ -1523,6 +1570,11 @@ msgstr ""
 msgid "Form Up System"
 msgstr ""
 
+#: allianceauth/optimer/templates/optimer/dashboard.ops.html:17
+#: allianceauth/timerboard/templates/timerboard/dashboard.timers.html:18
+msgid "EVE Time"
+msgstr ""
+
 #: allianceauth/optimer/templates/optimer/fleetoptable.html:14
 #: allianceauth/timerboard/templates/timerboard/timertable.html:12
 msgid "Local Time"
@@ -1568,17 +1620,17 @@ msgstr ""
 msgid "Update fleet operation"
 msgstr ""
 
-#: allianceauth/optimer/views.py:89
+#: allianceauth/optimer/views.py:91
 #, python-format
 msgid "Created operation timer for %(opname)s."
 msgstr ""
 
-#: allianceauth/optimer/views.py:118
+#: allianceauth/optimer/views.py:120
 #, python-format
 msgid "Removed operation timer for %(opname)s."
 msgstr ""
 
-#: allianceauth/optimer/views.py:169
+#: allianceauth/optimer/views.py:171
 #, python-format
 msgid "Saved changes to operation timer for %(opname)s."
 msgstr ""
@@ -1714,17 +1766,17 @@ msgid ""
 msgstr ""
 
 #: allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html:26
-#: allianceauth/services/modules/mumble/templates/services/mumble/mumble_service_ctrl.html:20
+#: allianceauth/services/modules/mumble/templates/services/mumble/mumble_service_ctrl.html:22
 msgid "Activate"
 msgstr ""
 
 #: allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html:32
-#: allianceauth/services/modules/mumble/templates/services/mumble/mumble_service_ctrl.html:32
+#: allianceauth/services/modules/mumble/templates/services/mumble/mumble_service_ctrl.html:34
 msgid "Reset Password"
 msgstr ""
 
 #: allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html:38
-#: allianceauth/services/modules/mumble/templates/services/mumble/mumble_service_ctrl.html:38
+#: allianceauth/services/modules/mumble/templates/services/mumble/mumble_service_ctrl.html:40
 msgid "Deactivate"
 msgstr ""
 
@@ -1804,15 +1856,61 @@ msgstr ""
 msgid "Deactivated IPSuite4 account."
 msgstr ""
 
-#: allianceauth/services/modules/mumble/templates/services/mumble/mumble_service_ctrl.html:26
+#: allianceauth/services/modules/mumble/templates/services/mumble/mumble_connection_history.html:6
+msgid "Mumble"
+msgstr ""
+
+#: allianceauth/services/modules/mumble/templates/services/mumble/mumble_connection_history.html:10
+msgid "Mumble History"
+msgstr ""
+
+#: allianceauth/services/modules/mumble/templates/services/mumble/mumble_connection_history.html:22
+msgid "Server Connection History"
+msgstr ""
+
+#: allianceauth/services/modules/mumble/templates/services/mumble/mumble_connection_history.html:31
+msgid "Displayed Name"
+msgstr ""
+
+#: allianceauth/services/modules/mumble/templates/services/mumble/mumble_connection_history.html:32
+msgid "Release"
+msgstr ""
+
+#: allianceauth/services/modules/mumble/templates/services/mumble/mumble_connection_history.html:33
+#: allianceauth/services/modules/mumble/templates/services/mumble/mumble_connection_history.html:67
+msgid "Version"
+msgstr ""
+
+#: allianceauth/services/modules/mumble/templates/services/mumble/mumble_connection_history.html:34
+msgid "Last Connect"
+msgstr ""
+
+#: allianceauth/services/modules/mumble/templates/services/mumble/mumble_connection_history.html:35
+msgid "Last Disconnect"
+msgstr ""
+
+#: allianceauth/services/modules/mumble/templates/services/mumble/mumble_connection_history.html:47
+#: allianceauth/services/modules/mumble/templates/services/mumble/mumble_connection_history.html:59
+msgid "Server Connection Breakdown"
+msgstr ""
+
+#: allianceauth/services/modules/mumble/templates/services/mumble/mumble_connection_history.html:68
+msgid "Number"
+msgstr ""
+
+#: allianceauth/services/modules/mumble/templates/services/mumble/mumble_service_ctrl.html:28
 #: allianceauth/services/templates/services/service_password.html:26
 msgid "Set Password"
 msgstr ""
 
-#: allianceauth/services/modules/mumble/templates/services/mumble/mumble_service_ctrl.html:44
+#: allianceauth/services/modules/mumble/templates/services/mumble/mumble_service_ctrl.html:46
 msgid "Connect"
 msgstr ""
 
+#: allianceauth/services/modules/mumble/templates/services/mumble/mumble_service_ctrl.html:52
+msgid "Mumble Connection History"
+msgstr ""
+
 #: allianceauth/services/modules/openfire/auth_hooks.py:27
 msgid "Jabber"
 msgstr ""
@@ -2367,56 +2465,60 @@ msgstr ""
 msgid "Saved changes to SRP fleet %(fleetname)s"
 msgstr ""
 
-#: allianceauth/templates/allianceauth/admin-status/overview.html:11
+#: allianceauth/templates/allianceauth/admin-status/esi_check.html:4
+msgid "Your Server received an ESI error response code of "
+msgstr ""
+
+#: allianceauth/templates/allianceauth/admin-status/overview.html:8
 msgid "Alliance Auth Notifications"
 msgstr ""
 
-#: allianceauth/templates/allianceauth/admin-status/overview.html:21
+#: allianceauth/templates/allianceauth/admin-status/overview.html:18
 msgid "Closed"
 msgstr ""
 
-#: allianceauth/templates/allianceauth/admin-status/overview.html:27
+#: allianceauth/templates/allianceauth/admin-status/overview.html:24
 msgid "No notifications at this time"
 msgstr ""
 
-#: allianceauth/templates/allianceauth/admin-status/overview.html:36
+#: allianceauth/templates/allianceauth/admin-status/overview.html:33
 msgid "Powered by GitLab"
 msgstr ""
 
-#: allianceauth/templates/allianceauth/admin-status/overview.html:42
+#: allianceauth/templates/allianceauth/admin-status/overview.html:39
 msgid "Support Discord"
 msgstr ""
 
-#: allianceauth/templates/allianceauth/admin-status/overview.html:59
-#: allianceauth/templates/allianceauth/admin-status/overview.html:63
+#: allianceauth/templates/allianceauth/admin-status/overview.html:53
+#: allianceauth/templates/allianceauth/admin-status/overview.html:57
 msgid "Software Version"
 msgstr ""
 
-#: allianceauth/templates/allianceauth/admin-status/overview.html:66
+#: allianceauth/templates/allianceauth/admin-status/overview.html:60
 msgid "Current"
 msgstr ""
 
-#: allianceauth/templates/allianceauth/admin-status/overview.html:73
+#: allianceauth/templates/allianceauth/admin-status/overview.html:67
 msgid "Latest Stable"
 msgstr ""
 
-#: allianceauth/templates/allianceauth/admin-status/overview.html:78
+#: allianceauth/templates/allianceauth/admin-status/overview.html:72
 msgid "Update available"
 msgstr ""
 
-#: allianceauth/templates/allianceauth/admin-status/overview.html:86
+#: allianceauth/templates/allianceauth/admin-status/overview.html:80
 msgid "Latest Pre-Release"
 msgstr ""
 
-#: allianceauth/templates/allianceauth/admin-status/overview.html:91
+#: allianceauth/templates/allianceauth/admin-status/overview.html:85
 msgid "Pre-Release available"
 msgstr ""
 
-#: allianceauth/templates/allianceauth/admin-status/overview.html:102
+#: allianceauth/templates/allianceauth/admin-status/overview.html:95
 msgid "Task Queue"
 msgstr ""
 
-#: allianceauth/templates/allianceauth/admin-status/overview.html:107
+#: allianceauth/templates/allianceauth/admin-status/overview.html:100
 #, python-format
 msgid ""
 "\n"
@@ -2425,11 +2527,11 @@ msgid ""
 "                        "
 msgstr ""
 
-#: allianceauth/templates/allianceauth/admin-status/overview.html:123
+#: allianceauth/templates/allianceauth/admin-status/overview.html:116
 msgid "running"
 msgstr ""
 
-#: allianceauth/templates/allianceauth/admin-status/overview.html:124
+#: allianceauth/templates/allianceauth/admin-status/overview.html:117
 msgid "queued"
 msgstr ""
 
@@ -2458,114 +2560,216 @@ msgstr ""
 msgid "Select Theme"
 msgstr ""
 
-#: allianceauth/timerboard/form.py:53
-#: allianceauth/timerboard/templates/timerboard/timertable.html:172
-msgid "Other"
-msgstr ""
-
-#: allianceauth/timerboard/form.py:54
-#: allianceauth/timerboard/templates/timerboard/dashboard.timers.html:38
-#: allianceauth/timerboard/templates/timerboard/timertable.html:44
-msgid "Friendly"
-msgstr ""
-
-#: allianceauth/timerboard/form.py:55
-#: allianceauth/timerboard/templates/timerboard/dashboard.timers.html:33
-#: allianceauth/timerboard/templates/timerboard/timertable.html:38
-msgid "Hostile"
-msgstr ""
-
-#: allianceauth/timerboard/form.py:56
-#: allianceauth/timerboard/templates/timerboard/dashboard.timers.html:43
-#: allianceauth/timerboard/templates/timerboard/timertable.html:50
-msgid "Neutral"
-msgstr ""
-
-#: allianceauth/timerboard/form.py:58
-#: allianceauth/timerboard/templates/timerboard/dashboard.timers.html:13
+#: allianceauth/timerboard/form.py:36
+#: allianceauth/timerboard/templates/timerboard/dashboard.timers.html:14
 #: allianceauth/timerboard/templates/timerboard/timertable.html:7
 msgid "Details"
 msgstr ""
 
-#: allianceauth/timerboard/form.py:60
+#: allianceauth/timerboard/form.py:38
 msgid "Planet/Moon"
 msgstr ""
 
-#: allianceauth/timerboard/form.py:61
+#: allianceauth/timerboard/form.py:39
 msgid "Structure Type"
 msgstr ""
 
-#: allianceauth/timerboard/form.py:62
+#: allianceauth/timerboard/form.py:40
 msgid "Timer Type"
 msgstr ""
 
-#: allianceauth/timerboard/form.py:63
+#: allianceauth/timerboard/form.py:41
 #: allianceauth/timerboard/templates/timerboard/timertable.html:8
 msgid "Objective"
 msgstr ""
 
-#: allianceauth/timerboard/form.py:64
+#: allianceauth/timerboard/form.py:42
 msgid "Absolute Timer"
 msgstr ""
 
-#: allianceauth/timerboard/form.py:65
+#: allianceauth/timerboard/form.py:43
 msgid "Date and Time"
 msgstr ""
 
-#: allianceauth/timerboard/form.py:66
+#: allianceauth/timerboard/form.py:44
 msgid "Days Remaining"
 msgstr ""
 
-#: allianceauth/timerboard/form.py:67
+#: allianceauth/timerboard/form.py:45
 msgid "Hours Remaining"
 msgstr ""
 
-#: allianceauth/timerboard/form.py:69
+#: allianceauth/timerboard/form.py:47
 msgid "Minutes Remaining"
 msgstr ""
 
-#: allianceauth/timerboard/form.py:71
+#: allianceauth/timerboard/form.py:48
 msgid "Important"
 msgstr ""
 
-#: allianceauth/timerboard/form.py:72
+#: allianceauth/timerboard/form.py:49
 msgid "Corp-Restricted"
 msgstr ""
 
-#: allianceauth/timerboard/models.py:14
-msgid "Not Specified"
-msgstr ""
-
 #: allianceauth/timerboard/models.py:15
-msgid "Shield"
+#: allianceauth/timerboard/templates/timerboard/dashboard.timers.html:39
+#: allianceauth/timerboard/templates/timerboard/timertable.html:36
+msgid "Friendly"
 msgstr ""
 
 #: allianceauth/timerboard/models.py:16
-msgid "Armor"
+#: allianceauth/timerboard/templates/timerboard/dashboard.timers.html:34
+#: allianceauth/timerboard/templates/timerboard/timertable.html:34
+msgid "Hostile"
 msgstr ""
 
 #: allianceauth/timerboard/models.py:17
+#: allianceauth/timerboard/templates/timerboard/dashboard.timers.html:44
+#: allianceauth/timerboard/templates/timerboard/timertable.html:38
+msgid "Neutral"
+msgstr ""
+
+#: allianceauth/timerboard/models.py:24
+#: allianceauth/timerboard/templates/timerboard/timertable.html:48
+msgid "POCO"
+msgstr ""
+
+#: allianceauth/timerboard/models.py:25
+#: allianceauth/timerboard/templates/timerboard/timertable.html:50
+msgid "Orbital Skyhook"
+msgstr ""
+
+#: allianceauth/timerboard/models.py:26
+#: allianceauth/timerboard/templates/timerboard/timertable.html:52
+msgid "I-HUB"
+msgstr ""
+
+#: allianceauth/timerboard/models.py:27
+#: allianceauth/timerboard/templates/timerboard/timertable.html:55
+msgid "TCU"
+msgstr ""
+
+#: allianceauth/timerboard/models.py:28
+#: allianceauth/timerboard/templates/timerboard/timertable.html:57
+msgid "POS [S]"
+msgstr ""
+
+#: allianceauth/timerboard/models.py:29
+#: allianceauth/timerboard/templates/timerboard/timertable.html:59
+msgid "POS [M]"
+msgstr ""
+
+#: allianceauth/timerboard/models.py:30
+#: allianceauth/timerboard/templates/timerboard/timertable.html:61
+msgid "POS [L]"
+msgstr ""
+
+#: allianceauth/timerboard/models.py:31
+#: allianceauth/timerboard/templates/timerboard/timertable.html:63
+msgid "Astrahus"
+msgstr ""
+
+#: allianceauth/timerboard/models.py:32
+#: allianceauth/timerboard/templates/timerboard/timertable.html:65
+msgid "Fortizar"
+msgstr ""
+
+#: allianceauth/timerboard/models.py:33
+#: allianceauth/timerboard/templates/timerboard/timertable.html:67
+msgid "Keepstar"
+msgstr ""
+
+#: allianceauth/timerboard/models.py:34
+#: allianceauth/timerboard/templates/timerboard/timertable.html:69
+msgid "Raitaru"
+msgstr ""
+
+#: allianceauth/timerboard/models.py:35
+#: allianceauth/timerboard/templates/timerboard/timertable.html:71
+msgid "Azbel"
+msgstr ""
+
+#: allianceauth/timerboard/models.py:36
+#: allianceauth/timerboard/templates/timerboard/timertable.html:73
+msgid "Sotiyo"
+msgstr ""
+
+#: allianceauth/timerboard/models.py:37
+#: allianceauth/timerboard/templates/timerboard/timertable.html:75
+msgid "Athanor"
+msgstr ""
+
+#: allianceauth/timerboard/models.py:38
+#: allianceauth/timerboard/templates/timerboard/timertable.html:77
+msgid "Tatara"
+msgstr ""
+
+#: allianceauth/timerboard/models.py:39
+msgid "Pharolux Cyno Beacon"
+msgstr ""
+
+#: allianceauth/timerboard/models.py:40
+msgid "Tenebrex Cyno Jammer"
+msgstr ""
+
+#: allianceauth/timerboard/models.py:41
+#: allianceauth/timerboard/templates/timerboard/timertable.html:83
+msgid "Ansiblex Jump Gate"
+msgstr ""
+
+#: allianceauth/timerboard/models.py:42
+#: allianceauth/timerboard/templates/timerboard/timertable.html:85
+msgid "Moon Mining Cycle"
+msgstr ""
+
+#: allianceauth/timerboard/models.py:43
+#: allianceauth/timerboard/templates/timerboard/timertable.html:87
+msgid "Metenox Moon Drill"
+msgstr ""
+
+#: allianceauth/timerboard/models.py:44
+#: allianceauth/timerboard/templates/timerboard/timertable.html:89
+msgid "Other"
+msgstr ""
+
+#: allianceauth/timerboard/models.py:51
+msgid "Not Specified"
+msgstr ""
+
+#: allianceauth/timerboard/models.py:52
+msgid "Shield"
+msgstr ""
+
+#: allianceauth/timerboard/models.py:53
+msgid "Armor"
+msgstr ""
+
+#: allianceauth/timerboard/models.py:54
 msgid "Hull"
 msgstr ""
 
-#: allianceauth/timerboard/models.py:18
+#: allianceauth/timerboard/models.py:55
 msgid "Final"
 msgstr ""
 
-#: allianceauth/timerboard/models.py:19
+#: allianceauth/timerboard/models.py:56
 msgid "Anchoring"
 msgstr ""
 
-#: allianceauth/timerboard/models.py:20
+#: allianceauth/timerboard/models.py:57
 msgid "Unanchoring"
 msgstr ""
 
+#: allianceauth/timerboard/models.py:58
+msgid "Abandoned"
+msgstr ""
+
 #: allianceauth/timerboard/templates/timerboard/dashboard.timers.html:7
 #: allianceauth/timerboard/templates/timerboard/view.html:53
 msgid "Upcoming Timers"
 msgstr ""
 
-#: allianceauth/timerboard/templates/timerboard/dashboard.timers.html:14
+#: allianceauth/timerboard/templates/timerboard/dashboard.timers.html:15
 msgid "Timer"
 msgstr ""
 
@@ -2609,78 +2813,14 @@ msgstr ""
 msgid "Structure"
 msgstr ""
 
-#: allianceauth/timerboard/templates/timerboard/timertable.html:64
-msgid "POCO"
-msgstr ""
-
-#: allianceauth/timerboard/templates/timerboard/timertable.html:70
-msgid "I-HUB"
-msgstr ""
-
-#: allianceauth/timerboard/templates/timerboard/timertable.html:76
-msgid "TCU"
-msgstr ""
-
-#: allianceauth/timerboard/templates/timerboard/timertable.html:82
-msgid "POS [S]"
-msgstr ""
-
-#: allianceauth/timerboard/templates/timerboard/timertable.html:88
-msgid "POS [M]"
-msgstr ""
-
-#: allianceauth/timerboard/templates/timerboard/timertable.html:94
-msgid "POS [L]"
-msgstr ""
-
-#: allianceauth/timerboard/templates/timerboard/timertable.html:100
-msgid "Astrahus"
-msgstr ""
-
-#: allianceauth/timerboard/templates/timerboard/timertable.html:106
-msgid "Fortizar"
-msgstr ""
-
-#: allianceauth/timerboard/templates/timerboard/timertable.html:112
-msgid "Keepstar"
-msgstr ""
-
-#: allianceauth/timerboard/templates/timerboard/timertable.html:118
-msgid "Raitaru"
-msgstr ""
-
-#: allianceauth/timerboard/templates/timerboard/timertable.html:124
-msgid "Azbel"
-msgstr ""
-
-#: allianceauth/timerboard/templates/timerboard/timertable.html:130
-msgid "Sotiyo"
-msgstr ""
-
-#: allianceauth/timerboard/templates/timerboard/timertable.html:136
-msgid "Athanor"
-msgstr ""
-
-#: allianceauth/timerboard/templates/timerboard/timertable.html:142
-msgid "Tatara"
-msgstr ""
-
-#: allianceauth/timerboard/templates/timerboard/timertable.html:148
+#: allianceauth/timerboard/templates/timerboard/timertable.html:79
 msgid "Cyno Beacon"
 msgstr ""
 
-#: allianceauth/timerboard/templates/timerboard/timertable.html:154
+#: allianceauth/timerboard/templates/timerboard/timertable.html:81
 msgid "Cyno Jammer"
 msgstr ""
 
-#: allianceauth/timerboard/templates/timerboard/timertable.html:160
-msgid "Ansiblex Jump Gate"
-msgstr ""
-
-#: allianceauth/timerboard/templates/timerboard/timertable.html:166
-msgid "Moon Mining Cycle"
-msgstr ""
-
 #: allianceauth/timerboard/templates/timerboard/view.html:9
 msgid "Structure Timer Management"
 msgstr ""
@@ -2693,12 +2833,12 @@ msgstr ""
 msgid "Past Timers"
 msgstr ""
 
-#: allianceauth/timerboard/views.py:78
+#: allianceauth/timerboard/views.py:85
 #, python-format
 msgid "Added new timer in %(system)s at %(time)s."
 msgstr ""
 
-#: allianceauth/timerboard/views.py:87
+#: allianceauth/timerboard/views.py:95
 msgid "Saved changes to the timer."
 msgstr ""
 

allianceauth/menu/templates/menu/menu-item-bs5.html

@@ -14,7 +14,7 @@
         {% endif %}>
     </i>
     <a
-        class="nav-link flex-fill align-self-center me-auto"
+        class="nav-link flex-fill align-self-center me-auto {% if item.navactive %}{% navactive request item.navactive|join:' ' %}{% endif %}"
         {% if item.is_folder %}
             type="button"
             data-bs-toggle="collapse"

allianceauth/menu/templates/menu/menu-user.html

@@ -60,15 +60,17 @@
                     <li>
                         <a class="dropdown-item"  href="https://discord.gg/fjnHAmk" title="Alliance Auth Discord"><i class="fa-brands fa-discord fa-fw"></i> Alliance Auth Discord</a>
                     </li>
-                        <li>
-                            <a class="dropdown-item" href="https://gitlab.com/allianceauth/allianceauth" title="Alliance Auth Git"><i class="fa-brands fa-gitlab fa-fw"></i> Alliance Auth Git</a>
-                        </li>
                     <li>
-                        <a class="dropdown-item" href="{% url 'admin:index' %}">
-                            <i class="fa-solid fa-gear fa-fw"></i> {% translate "Admin" %}
-                        </a>
+                        <a class="dropdown-item" href="https://gitlab.com/allianceauth/allianceauth" title="Alliance Auth Git"><i class="fa-brands fa-gitlab fa-fw"></i> Alliance Auth Git</a>
                     </li>
                 {% endif %}
+                {% if user.is_staff %}
+                <li>
+                    <a class="dropdown-item" href="{% url 'admin:index' %}">
+                        <i class="fa-solid fa-gear fa-fw"></i> {% translate "Admin" %}
+                    </a>
+                </li>
+                {% endif %}
                 <li><hr class="dropdown-divider"></li>
                 {% if user.is_authenticated %}
                     <li>

allianceauth/menu/templates/menu/sortable-side-menu.html

@@ -10,7 +10,7 @@
                     <ul id="sidebar-menu" class="navbar-nav flex-column mb-auto overflow-auto pt-2">
                         <li class="d-flex flex-wrap m-2 p-2 pt-0 pb-0 mt-0 mb-0 me-0 pe-0">
                             <i class="nav-link fas fa-tachometer-alt fa-fw align-self-center me-3 {% navactive request 'authentication:dashboard' %}"></i>
-                            <a class="nav-link flex-fill align-self-center" href="{% url 'authentication:dashboard' %}">
+                            <a class="nav-link flex-fill align-self-center {% navactive request 'authentication:dashboard' %}" href="{% url 'authentication:dashboard' %}">
                                 {% translate "Dashboard" %}
                             </a>
                         </li>

allianceauth/menu/templatetags/menu_menu_items.py

@@ -98,6 +98,10 @@ def render_menu(request: HttpRequest) -> List[RenderedMenuItem]:
 
         if item.is_app_item:
             rendered_item = _render_app_item(request, hook_items, item, bs5_template)
+            if rendered_item.html == "":
+                # If there is no content dont render it.
+                # This item has probably been hidden by permissions
+                continue
         elif item.is_link_item:
             rendered_item = _render_link_item(request, item, bs5_template)
         elif item.is_folder:

allianceauth/menu/tests/factories.py

@@ -19,6 +19,11 @@ def create_user(permissions=None, **kwargs) -> User:
     return user
 
 
+def create_menu_item_hook_class(**kwargs) -> MenuItemHook:
+    num = next(counter_menu_item_hook)
+    return type(f"GeneratedMenuItem{num}", (MenuItemHook,), {})
+
+
 def create_menu_item_hook(**kwargs) -> MenuItemHook:
     num = next(counter_menu_item_hook)
     new_class = type(f"GeneratedMenuItem{num}", (MenuItemHook,), {})

allianceauth/menu/tests/templatetags/test_menu_menu_items.py

@@ -14,6 +14,7 @@ from allianceauth.menu.tests.factories import (
     create_folder_menu_item,
     create_link_menu_item,
     create_menu_item_from_hook,
+    create_menu_item_hook_class,
     create_menu_item_hook_function,
     create_rendered_menu_item,
 )
@@ -177,6 +178,44 @@ class TestRenderDefaultMenu(TestCase):
         self.assertEqual(menu[0].menu_item.text, "Alpha")
         self.assertEqual(menu[1].menu_item.text, "Bravo")
 
+    def test_should_remove_empty_folders_with_items_hidden(self, mock_get_hooks):
+        # given
+
+        class TestHook(create_menu_item_hook_class()):
+            text = "Dummy App No Data"
+            classes = "fa-solid fa-users-gear"
+            url_name = "groupmanagement:management"
+
+            def render(Self, request):
+                # simulate no perms
+                return ""
+
+        params = {
+            "text": "Alpha",
+            "classes": "fa-solid fa-users-gear",
+            "url_name": "groupmanagement:management",
+        }
+
+        alpha = TestHook(**params)
+
+        hooks = [lambda: alpha]
+
+        mock_get_hooks.return_value = hooks
+
+        folder = create_folder_menu_item(text="Folder", order=2)
+        create_menu_item_from_hook(hooks[0], parent=folder)
+        create_link_menu_item(text="Bravo", order=3)  # this is all that should show
+
+        request = self.factory.get("/")
+
+        # when
+        result = render_menu(request)
+
+        # then
+        menu = list(result)
+        self.assertEqual(len(menu), 1)
+        self.assertEqual(menu[0].menu_item.text, "Bravo")
+
     def test_should_not_include_hidden_items(self, mock_get_hooks):
         # given
         mock_get_hooks.return_value = []
@@ -196,7 +235,6 @@ class TestRenderDefaultMenu(TestCase):
         self.assertEqual(menu[1].menu_item.text, "Charlie")
 
     def test_should_not_render_hidden_folders(self, mock_get_hooks):
-        # given
         # given
         menu = [
             create_menu_item_hook_function(text="Charlie", count=42),

allianceauth/notifications/__init__.py

@@ -1 +1,21 @@
+"""
+Example
+=======
+
+.. code-block:: python
+
+    from allianceauth.notifications.models import Notification
+
+
+    def notify_user_view(request):
+        '''Simple view sending a notification to the user'''
+
+        Notification.objects.notify_user(
+                user=request.user,
+                title="Some title",
+                message="Some message",
+                level=Notification.Level.INFO,
+            )
+
+"""
 from .core import notify  # noqa: F401

allianceauth/optimer/form.py

@@ -15,7 +15,7 @@ class OpForm(forms.Form):
     operation_name = forms.CharField(max_length=254, required=True, label=_("Operation Name"))
     type = forms.CharField(required=False, label=_("Operation Type"))
     fc = forms.CharField(max_length=254, required=True, label=_("Fleet Commander"))
-    duration = forms.CharField(max_length=254, required=True, label=_("Duration"))
+    duration = forms.CharField(max_length=25, required=True, label=_("Duration"))
     description = forms.CharField(
         widget=forms.Textarea(attrs={"rows": 10, "cols": 20, "input_type": "textarea"}),
         required=False,

allianceauth/optimer/templates/optimer/dashboard.ops.html

@@ -1,41 +1,40 @@
 {% load i18n %}
 {% load evelinks %}
 
-<div class="col-12 align-self-stretch py-2">
+<div class="col-12 mb-3">
     <div class="card h-100">
         <div class="card-body">
-            <h4 class="card-title text-center">{% translate "Upcoming Fleets" %}</h4>
+            {% translate "Upcoming Fleets" as widget_title %}
+            {% include "framework/dashboard/widget-title.html" with title=widget_title %}
 
-            <div class="card-body">
-                <div style="height: 300px; overflow-y:auto;">
-                    <table class="table">
-                        <thead>
+            <div>
+                <table class="table">
+                    <thead>
+                        <tr>
+                            <th class="text-center">{% translate "Operation" %}</th>
+                            <th class="text-center">{% translate "Type" %}</th>
+                            <th class="text-center">{% translate "Form Up System" %}</th>
+                            <th class="text-center">{% translate "EVE Time" %}</th>
+                        </tr>
+                    </thead>
+
+                    <tbody>
+                        {% for ops in timers %}
                             <tr>
-                                <th class="text-center">{% translate "Operation" %}</th>
-                                <th class="text-center">{% translate "Type" %}</th>
-                                <th class="text-center">{% translate "Form Up System" %}</th>
-                                <th class="text-center">{% translate "Start Time" %}</th>
+                                <td class="text-center">
+                                    {{ ops.operation_name }}
+                                </td>
+                                <td class="text-center">
+                                    {{ ops.type }}
+                                </td>
+                                <td class="text-center">
+                                    <a href="{{ ops.system|dotlan_solar_system_url }}">{{ ops.system }}</a>
+                                </td>
+                                <td class="text-center" nowrap>{{ ops.start | date:"Y-m-d H:i" }}</td>
                             </tr>
-                        </thead>
-
-                        <tbody>
-                            {% for ops in timers %}
-                                <tr>
-                                    <td class="text-center">
-                                        {{ ops.operation_name }}
-                                    </td>
-                                    <td class="text-center">
-                                        {{ ops.type }}
-                                    </td>
-                                    <td class="text-center">
-                                        <a href="{{ ops.system|dotlan_solar_system_url }}">{{ ops.system }}</a>
-                                    </td>
-                                    <td class="text-center" nowrap>{{ ops.start | date:"Y-m-d H:i" }}</td>
-                                </tr>
-                            {% endfor %}
-                        </tbody>
-                    </table>
-                </div>
+                        {% endfor %}
+                    </tbody>
+                </table>
             </div>
         </div>
     </div>

allianceauth/optimer/views.py

@@ -14,9 +14,11 @@ from .models import OpTimer, OpTimerType
 
 logger = logging.getLogger(__name__)
 
+OPS_VIEW_PERMISSION = 'auth.optimer_view'
+OPS_MANAGE_PERMISSION = 'auth.optimer_management'
 
 @login_required
-@permission_required('auth.optimer_view')
+@permission_required(OPS_VIEW_PERMISSION)
 def optimer_view(request):
     """
     View for the optimer management page
@@ -39,7 +41,7 @@ def optimer_view(request):
 
 
 @login_required
-@permission_required('auth.optimer_management')
+@permission_required(OPS_MANAGE_PERMISSION)
 def add_optimer_view(request):
     """
     View for the add optimer page
@@ -98,7 +100,7 @@ def add_optimer_view(request):
 
 
 @login_required
-@permission_required('auth.optimer_management')
+@permission_required(OPS_MANAGE_PERMISSION)
 def remove_optimer(request, optimer_id):
     """
     Remove optimer
@@ -121,7 +123,7 @@ def remove_optimer(request, optimer_id):
 
 
 @login_required
-@permission_required('auth.optimer_management')
+@permission_required(OPS_MANAGE_PERMISSION)
 def edit_optimer(request, optimer_id):
     """
     Edit optimer
@@ -192,14 +194,22 @@ def dashboard_ops(request):
     :return:
     :rtype:
     """
+    if request.user.has_perm(OPS_VIEW_PERMISSION):
+        base_query = OpTimer.objects.select_related('eve_character', 'type')
+        timers = base_query.filter(
+            start__gte=timezone.now()
+        )[:5]
 
-    base_query = OpTimer.objects.select_related('eve_character', 'type')
-    timers = base_query.filter(start__gte=timezone.now())[:5]
-
-    if timers.count():
-        context = {
-            'timers': timers,
-        }
-        return render_to_string('optimer/dashboard.ops.html', context=context, request=request)
+        if timers.count():
+            context = {
+                'timers': timers,
+            }
+            return render_to_string(
+                'optimer/dashboard.ops.html',
+                context=context,
+                request=request
+            )
+        else:
+            return ""
     else:
         return ""

allianceauth/project_template/project_name/settings/base.py

@@ -12,6 +12,8 @@ from celery.schedules import crontab
 
 from django.contrib import messages
 
+from django.utils.translation import gettext_lazy as _
+
 INSTALLED_APPS = [
     'allianceauth',  # needs to be on top of this list to support favicons in Django admin (see https://gitlab.com/allianceauth/allianceauth/-/issues/1301)
     'django.contrib.admin',
@@ -22,6 +24,7 @@ INSTALLED_APPS = [
     'django.contrib.staticfiles',
     'django.contrib.humanize',
     'django_celery_beat',
+    'solo',
     'bootstrapform',
     'django_bootstrap5',  # https://github.com/zostera/django-bootstrap5
     'sortedm2m',
@@ -39,6 +42,7 @@ INSTALLED_APPS = [
     'allianceauth.theme.darkly',
     'allianceauth.theme.flatly',
     'allianceauth.theme.materia',
+    "allianceauth.custom_css",
 ]
 
 SECRET_KEY = "wow I'm a really bad default secret key"
@@ -91,17 +95,20 @@ LOCALE_PATHS = (
     os.path.join(BASE_DIR, 'locale/'),
 )
 
-LANGUAGES = (
-    ("en", "English"),
-    ("de", "German"),
-    ("es", "Spanish"),
-    ("zh-hans", "Chinese Simplified"),
-    ("ru", "Russian"),
-    ("ko", "Korean"),
-    ("fr", "French"),
-    ("ja", "Japanese"),
-    ("it", "Italian"),
-    ("uk", "Ukrainian"),
+LANGUAGES = (  # Sorted by Language Code alphabetical order + English at top
+    ("en", _("English")),
+    # ("cs-cz", _("Czech")), #Not yet at 50% translated
+    ("de", _("German")),
+    ("es", _("Spanish")),
+    ("it-it", _("Italian")),
+    ("ja", _("Japanese")),
+    ("ko-kr", _("Korean")),
+    ("fr-fr", _("French")),
+    ("nl-nl", _("Dutch")),
+    ("pl-pl", _("Polish")),
+    ("ru", _("Russian")),
+    ("uk", _("Ukrainian")),
+    ("zh-hans", _("Simplified Chinese")),
 )
 
 TEMPLATES = [

allianceauth/services/modules/mumble/MumbleServer.ice

@@ -0,0 +1,941 @@
+// Copyright 2022-2023 The Mumble Developers. All rights reserved.
+// Use of this source code is governed by a BSD-style license
+// that can be found in the LICENSE file at the root of the
+// Mumble source tree or at <https://www.mumble.info/LICENSE>.
+
+/**
+ *
+ * Information and control of the murmur server. Each server has
+ * one {@link Meta} interface that controls global information, and
+ * each virtual server has a {@link Server} interface.
+ *
+ **/
+
+#include <Ice/SliceChecksumDict.ice>
+
+module MumbleServer
+{
+
+	/** A network address in IPv6 format.
+	 **/
+	["python:seq:tuple"] sequence<byte> NetAddress;
+
+	/** A connected user.
+	 **/
+	struct User {
+		/** Session ID. This identifies the connection to the server. */
+		int session;
+		/** User ID. -1 if the user is anonymous. */
+		int userid;
+		/** Is user muted by the server? */
+		bool mute;
+		/** Is user deafened by the server? If true, this implies mute. */
+		bool deaf;
+		/** Is the user suppressed by the server? This means the user is not muted, but does not have speech privileges in the current channel. */
+		bool suppress;
+		/** Is the user a priority speaker? */
+		bool prioritySpeaker;
+		/** Is the user self-muted? */
+		bool selfMute;
+		/** Is the user self-deafened? If true, this implies mute. */
+		bool selfDeaf;
+		/** Is the User recording? (This flag is read-only and cannot be changed using setState().) **/
+		bool recording;
+		/** Channel ID the user is in. Matches {@link Channel.id}. */
+		int channel;
+		/** The name of the user. */
+		string name;
+		/** Seconds user has been online. */
+		int onlinesecs;
+		/** Average transmission rate in bytes per second over the last few seconds. */
+		int bytespersec;
+		/** Legacy client version. */
+		int version;
+		/** New client version. (See https://github.com/mumble-voip/mumble/issues/5827) */
+		long version2;
+		/** Client release. For official releases, this equals the version. For snapshots and git compiles, this will be something else. */
+		string release;
+		/** Client OS. */
+		string os;
+		/** Client OS Version. */
+		string osversion;
+		/** Plugin Identity. This will be the user's unique ID inside the current game. */
+		string identity;
+		/**
+		   Base64-encoded Plugin context. This is a binary blob identifying the game and team the user is on.
+
+		   The used Base64 alphabet is the one specified in RFC 2045.
+
+		   Before Mumble 1.3.0, this string was not Base64-encoded. This could cause problems for some Ice
+		   implementations, such as the .NET implementation.
+
+		   If you need the exact string that is used by Mumble, you can get it by Base64-decoding this string.
+
+		   If you simply need to detect whether two users are in the same game world, string comparisons will
+		   continue to work as before.
+		 */
+		string context;
+		/** User comment. Shown as tooltip for this user. */
+		string comment;
+		/** Client address. */
+		NetAddress address;
+		/** TCP only. True until UDP connectivity is established. */
+		bool tcponly;
+		/** Idle time. This is how many seconds it is since the user last spoke. Other activity is not counted. */
+		int idlesecs;
+		/** UDP Ping Average. This is the average ping for the user via UDP over the duration of the connection. */
+		float udpPing;
+		/** TCP Ping Average. This is the average ping for the user via TCP over the duration of the connection. */
+		float tcpPing;
+	};
+
+	sequence<int> IntList;
+
+	/** A text message between users.
+	 **/
+	struct TextMessage {
+		/** Sessions (connected users) who were sent this message. */
+		IntList sessions;
+		/** Channels who were sent this message. */
+		IntList channels;
+		/** Trees of channels who were sent this message. */
+		IntList trees;
+		/** The contents of the message. */
+		string text;
+	};
+
+	/** A channel.
+	 **/
+	struct Channel {
+		/** Channel ID. This is unique per channel, and the root channel is always id 0. */
+		int id;
+		/** Name of the channel. There can not be two channels with the same parent that has the same name. */
+		string name;
+		/** ID of parent channel, or -1 if this is the root channel. */
+		int parent;
+		/** List of id of linked channels. */
+		IntList links;
+		/** Description of channel. Shown as tooltip for this channel. */
+		string description;
+		/** Channel is temporary, and will be removed when the last user leaves it. */
+		bool temporary;
+		/** Position of the channel which is used in Client for sorting. */
+		int position;
+	};
+
+	/** A group. Groups are defined per channel, and can inherit members from parent channels.
+	 **/
+	struct Group {
+		/** Group name */
+		string name;
+		/** Is this group inherited from a parent channel? Read-only. */
+		bool inherited;
+		/** Does this group inherit members from parent channels? */
+		bool inherit;
+		/** Can subchannels inherit members from this group? */
+		bool inheritable;
+		/** List of users to add to the group. */
+		IntList add;
+		/** List of inherited users to remove from the group. */
+		IntList remove;
+		/** Current members of the group, including inherited members. Read-only. */
+		IntList members;
+	};
+
+	/** Write access to channel control. Implies all other permissions (except Speak). */
+	const int PermissionWrite = 0x01;
+	/** Traverse channel. Without this, a client cannot reach subchannels, no matter which privileges he has there. */
+	const int PermissionTraverse = 0x02;
+	/** Enter channel. */
+	const int PermissionEnter = 0x04;
+	/** Speak in channel. */
+	const int PermissionSpeak = 0x08;
+	/** Whisper to channel. This is different from Speak, so you can set up different permissions. */
+	const int PermissionWhisper = 0x100;
+	/** Mute and deafen other users in this channel. */
+	const int PermissionMuteDeafen = 0x10;
+	/** Move users from channel. You need this permission in both the source and destination channel to move another user. */
+	const int PermissionMove = 0x20;
+	/** Make new channel as a subchannel of this channel. */
+	const int PermissionMakeChannel = 0x40;
+	/** Make new temporary channel as a subchannel of this channel. */
+	const int PermissionMakeTempChannel = 0x400;
+	/** Link this channel. You need this permission in both the source and destination channel to link channels, or in either channel to unlink them. */
+	const int PermissionLinkChannel = 0x80;
+	/** Send text message to channel. */
+	const int PermissionTextMessage = 0x200;
+	/** Kick user from server. Only valid on root channel. */
+	const int PermissionKick = 0x10000;
+	/** Ban user from server. Only valid on root channel. */
+	const int PermissionBan = 0x20000;
+	/** Register and unregister users. Only valid on root channel. */
+	const int PermissionRegister = 0x40000;
+	/** Register and unregister users. Only valid on root channel. */
+	const int PermissionRegisterSelf = 0x80000;
+	/** Reset the comment or avatar of a user. Only valid on root channel. */
+	const int ResetUserContent = 0x100000;
+
+
+	/** Access Control List for a channel. ACLs are defined per channel, and can be inherited from parent channels.
+	 **/
+	struct ACL {
+		/** Does the ACL apply to this channel? */
+		bool applyHere;
+		/** Does the ACL apply to subchannels? */
+		bool applySubs;
+		/** Is this ACL inherited from a parent channel? Read-only. */
+		bool inherited;
+		/** ID of user this ACL applies to. -1 if using a group name. */
+		int userid;
+		/** Group this ACL applies to. Blank if using userid. */
+		string group;
+		/** Binary mask of privileges to allow. */
+		int allow;
+		/** Binary mask of privileges to deny. */
+		int deny;
+	};
+
+	/** A single ip mask for a ban.
+	 **/
+	struct Ban {
+		/** Address to ban. */
+		NetAddress address;
+		/** Number of bits in ban to apply. */
+		int bits;
+		/** Username associated with ban. */
+		string name;
+		/** Hash of banned user. */
+		string hash;
+		/** Reason for ban. */
+		string reason;
+		/** Date ban was applied in unix time format. */
+		int start;
+		/** Duration of ban. */
+		int duration;
+	};
+
+	/** A entry in the log.
+	 **/
+	struct LogEntry {
+		/** Timestamp in UNIX time_t */
+		int timestamp;
+		/** The log message. */
+		string txt;
+	};
+
+	class Tree;
+	sequence<Tree> TreeList;
+
+	enum ChannelInfo { ChannelDescription, ChannelPosition };
+	enum UserInfo { UserName, UserEmail, UserComment, UserHash, UserPassword, UserLastActive, UserKDFIterations };
+
+	dictionary<int, User> UserMap;
+	dictionary<int, Channel> ChannelMap;
+	sequence<Channel> ChannelList;
+	sequence<User> UserList;
+	sequence<Group> GroupList;
+	sequence<ACL> ACLList;
+	sequence<LogEntry> LogList;
+	sequence<Ban> BanList;
+	sequence<int> IdList;
+	sequence<string> NameList;
+	dictionary<int, string> NameMap;
+	dictionary<string, int> IdMap;
+	sequence<byte> Texture;
+	dictionary<string, string> ConfigMap;
+	sequence<string> GroupNameList;
+	sequence<byte> CertificateDer;
+	sequence<CertificateDer> CertificateList;
+
+	/** User information map.
+	 * Older versions of ice-php can't handle enums as keys. If you are using one of these, replace 'UserInfo' with 'byte'.
+	 */
+
+	dictionary<UserInfo, string> UserInfoMap;
+
+	/** User and subchannel state. Read-only.
+	 **/
+	class Tree {
+		/** Channel definition of current channel. */
+		Channel c;
+		/** List of subchannels. */
+		TreeList children;
+		/** Users in this channel. */
+		UserList users;
+	};
+
+	exception MurmurException {};
+	/** This is thrown when you specify an invalid session. This may happen if the user has disconnected since your last call to {@link Server.getUsers}. See {@link User.session} */
+	exception InvalidSessionException extends MurmurException {};
+	/** This is thrown when you specify an invalid channel id. This may happen if the channel was removed by another provess. It can also be thrown if you try to add an invalid channel. */
+	exception InvalidChannelException extends MurmurException {};
+	/** This is thrown when you try to do an operation on a server that does not exist. This may happen if someone has removed the server. */
+	exception InvalidServerException extends MurmurException {};
+	/** This happens if you try to fetch user or channel state on a stopped server, if you try to stop an already stopped server or start an already started server. */
+	exception ServerBootedException extends MurmurException {};
+	/** This is thrown if {@link Server.start} fails, and should generally be the cause for some concern. */
+	exception ServerFailureException extends MurmurException {};
+	/** This is thrown when you specify an invalid userid. */
+	exception InvalidUserException extends MurmurException {};
+	/** This is thrown when you try to set an invalid texture. */
+	exception InvalidTextureException extends MurmurException {};
+	/** This is thrown when you supply an invalid callback. */
+	exception InvalidCallbackException extends MurmurException {};
+	/**  This is thrown when you supply the wrong secret in the calling context. */
+	exception InvalidSecretException extends MurmurException {};
+	/** This is thrown when the channel operation would exceed the channel nesting limit */
+	exception NestingLimitException extends MurmurException {};
+	/**  This is thrown when you ask the server to disclose something that should be secret. */
+	exception WriteOnlyException extends MurmurException {};
+	/** This is thrown when invalid input data was specified. */
+	exception InvalidInputDataException extends MurmurException {};
+
+	/** Callback interface for servers. You can supply an implementation of this to receive notification
+	 *  messages from the server.
+	 *  If an added callback ever throws an exception or goes away, it will be automatically removed.
+	 *  Please note that all callbacks are done asynchronously; murmur does not wait for the callback to
+	 *  complete before continuing processing.
+	 *  Note that callbacks are removed when a server is stopped, so you should have a callback for
+	 *  {@link MetaCallback.started} which calls {@link Server.addCallback}.
+	 *  @see MetaCallback
+	 *  @see Server.addCallback
+	 */
+	interface ServerCallback {
+		/** Called when a user connects to the server.
+		 *  @param state State of connected user.
+		 */
+		idempotent void userConnected(User state);
+		/** Called when a user disconnects from the server. The user has already been removed, so you can no longer use methods like {@link Server.getState}
+		 *  to retrieve the user's state.
+		 *  @param state State of disconnected user.
+		 */
+		idempotent void userDisconnected(User state);
+		/** Called when a user state changes. This is called if the user moves, is renamed, is muted, deafened etc.
+		 *  @param state New state of user.
+		 */
+		idempotent void userStateChanged(User state);
+		/** Called when user writes a text message
+		 *  @param state the User sending the message
+		 *  @param message the TextMessage the user has sent
+		 */
+		idempotent void userTextMessage(User state, TextMessage message);
+		/** Called when a new channel is created.
+		 *  @param state State of new channel.
+		 */
+		idempotent void channelCreated(Channel state);
+		/** Called when a channel is removed. The channel has already been removed, you can no longer use methods like {@link Server.getChannelState}
+		 *  @param state State of removed channel.
+		 */
+		idempotent void channelRemoved(Channel state);
+		/** Called when a new channel state changes. This is called if the channel is moved, renamed or if new links are added.
+		 *  @param state New state of channel.
+		 */
+		idempotent void channelStateChanged(Channel state);
+	};
+
+	/** Context for actions in the Server menu. */
+	const int ContextServer = 0x01;
+	/** Context for actions in the Channel menu. */
+	const int ContextChannel = 0x02;
+	/** Context for actions in the User menu. */
+	const int ContextUser = 0x04;
+
+	/** Callback interface for context actions. You need to supply one of these for {@link Server.addContext}.
+	 *  If an added callback ever throws an exception or goes away, it will be automatically removed.
+	 *  Please note that all callbacks are done asynchronously; murmur does not wait for the callback to
+	 *  complete before continuing processing.
+	 */
+	interface ServerContextCallback {
+		/** Called when a context action is performed.
+		 *  @param action Action to be performed.
+		 *  @param usr User which initiated the action.
+		 *  @param session If nonzero, session of target user.
+		 *  @param channelid If not -1, id of target channel.
+		 */
+		idempotent void contextAction(string action, User usr, int session, int channelid);
+	};
+
+	/** Callback interface for server authentication. You need to supply one of these for {@link Server.setAuthenticator}.
+	 *  If an added callback ever throws an exception or goes away, it will be automatically removed.
+	 *  Please note that unlike {@link ServerCallback} and {@link ServerContextCallback}, these methods are called
+	 *  synchronously. If the response lags, the entire murmur server will lag.
+	 *  Also note that, as the method calls are synchronous, making a call to {@link Server} or {@link Meta} will
+	 *  deadlock the server.
+	 */
+	interface ServerAuthenticator {
+		/** Called to authenticate a user. If you do not know the username in question, always return -2 from this
+		 *  method to fall through to normal database authentication.
+		 *  Note that if authentication succeeds, murmur will create a record of the user in it's database, reserving
+		 *  the username and id so it cannot be used for normal database authentication.
+		 *  The data in the certificate (name, email addresses etc), as well as the list of signing certificates,
+		 *  should only be trusted if certstrong is true.
+		 *
+		 *  Internally, Murmur treats usernames as case-insensitive. It is recommended
+		 *  that authenticators do the same. Murmur checks if a username is in use when
+		 *  a user connects. If the connecting user is registered, the other username is
+		 *  kicked. If the connecting user is not registered, the connecting user is not
+		 *  allowed to join the server.
+		 *
+		 *  @param name Username to authenticate.
+		 *  @param pw Password to authenticate with.
+		 *  @param certificates List of der encoded certificates the user connected with.
+		 *  @param certhash Hash of user certificate, as used by murmur internally when matching.
+		 *  @param certstrong True if certificate was valid and signed by a trusted CA.
+		 *  @param newname Set this to change the username from the supplied one.
+		 *  @param groups List of groups on the root channel that the user will be added to for the duration of the connection.
+		 *  @return UserID of authenticated user, -1 for authentication failures, -2 for unknown user (fallthrough),
+		 *          -3 for authentication failures where the data could (temporarily) not be verified.
+		 */
+		idempotent int authenticate(string name, string pw, CertificateList certificates, string certhash, bool certstrong, out string newname, out GroupNameList groups);
+
+		/** Fetch information about a user. This is used to retrieve information like email address, keyhash etc. If you
+		 *  want murmur to take care of this information itself, simply return false to fall through.
+		 *  @param id User id.
+		 *  @param info Information about user. This needs to include at least "name".
+		 *  @return true if information is present, false to fall through.
+		 */
+		idempotent bool getInfo(int id, out UserInfoMap info);
+
+		/** Map a name to a user id.
+		 *  @param name Username to map.
+		 *  @return User id or -2 for unknown name.
+		 */
+		idempotent int nameToId(string name);
+
+		/** Map a user id to a username.
+		 *  @param id User id to map.
+		 *  @return Name of user or empty string for unknown id.
+		 */
+		idempotent string idToName(int id);
+
+		/** Map a user to a custom Texture.
+		 *  @param id User id to map.
+		 *  @return User texture or an empty texture for unknown users or users without textures.
+		 */
+		idempotent Texture idToTexture(int id);
+	};
+
+	/** Callback interface for server authentication and registration. This allows you to support both authentication
+	 *  and account updating.
+	 *  You do not need to implement this if all you want is authentication, you only need this if other scripts
+	 *  connected to the same server calls e.g. {@link Server.setTexture}.
+	 *  Almost all of these methods support fall through, meaning murmur should continue the operation against its
+	 *  own database.
+	 */
+	interface ServerUpdatingAuthenticator extends ServerAuthenticator {
+		/** Register a new user.
+		 *  @param info Information about user to register.
+		 *  @return User id of new user, -1 for registration failure, or -2 to fall through.
+		 */
+		int registerUser(UserInfoMap info);
+
+		/** Unregister a user.
+		 *  @param id Userid to unregister.
+		 *  @return 1 for successful unregistration, 0 for unsuccessful unregistration, -1 to fall through.
+		 */
+		int unregisterUser(int id);
+
+		/** Get a list of registered users matching filter.
+		 *  @param filter Substring usernames must contain. If empty, return all registered users.
+		 *  @return List of matching registered users.
+		 */
+		idempotent NameMap getRegisteredUsers(string filter);
+
+		/** Set additional information for user registration.
+		 *  @param id Userid of registered user.
+		 *  @param info Information to set about user. This should be merged with existing information.
+		 *  @return 1 for successful update, 0 for unsuccessful update, -1 to fall through.
+		 */
+		idempotent int setInfo(int id, UserInfoMap info);
+
+		/** Set texture (now called avatar) of user registration.
+		 *  @param id registrationId of registered user.
+		 *  @param tex New texture.
+		 *  @return 1 for successful update, 0 for unsuccessful update, -1 to fall through.
+		 */
+		idempotent int setTexture(int id, Texture tex);
+	};
+
+	/** Per-server interface. This includes all methods for configuring and altering
+	 * the state of a single virtual server. You can retrieve a pointer to this interface
+	 * from one of the methods in {@link Meta}.
+	 **/
+	["amd"] interface Server {
+		/** Shows if the server currently running (accepting users).
+		 *
+		 * @return Run-state of server.
+		 */
+		idempotent bool isRunning() throws InvalidSecretException;
+
+		/** Start server. */
+		void start() throws ServerBootedException, ServerFailureException, InvalidSecretException;
+
+		/** Stop server.
+		 * Note: Server will be restarted on Murmur restart unless explicitly disabled
+		 *       with setConf("boot", false)
+		 */
+		void stop() throws ServerBootedException, InvalidSecretException;
+
+		/** Delete server and all it's configuration. */
+		void delete() throws ServerBootedException, InvalidSecretException;
+
+		/** Fetch the server id.
+		 *
+		 * @return Unique server id.
+		 */
+		idempotent int id() throws InvalidSecretException;
+
+		/** Add a callback. The callback will receive notifications about changes to users and channels.
+		 *
+		 * @param cb Callback interface which will receive notifications.
+		 * @see removeCallback
+		 */
+		void addCallback(ServerCallback *cb) throws ServerBootedException, InvalidCallbackException, InvalidSecretException;
+
+		/** Remove a callback.
+		 *
+		 * @param cb Callback interface to be removed.
+		 * @see addCallback
+		 */
+		void removeCallback(ServerCallback *cb) throws ServerBootedException, InvalidCallbackException, InvalidSecretException;
+
+		/** Set external authenticator. If set, all authentications from clients are forwarded to this
+		 *  proxy.
+		 *
+		 * @param auth Authenticator object to perform subsequent authentications.
+		 */
+		void setAuthenticator(ServerAuthenticator *auth) throws ServerBootedException, InvalidCallbackException, InvalidSecretException;
+
+		/** Retrieve configuration item.
+		 * @param key Configuration key.
+		 * @return Configuration value. If this is empty, see {@link Meta.getDefaultConf}
+		 */
+		idempotent string getConf(string key) throws InvalidSecretException, WriteOnlyException;
+
+		/** Retrieve all configuration items.
+		 * @return All configured values. If a value isn't set here, the value from {@link Meta.getDefaultConf} is used.
+		 */
+		idempotent ConfigMap getAllConf() throws InvalidSecretException;
+
+		/** Set a configuration item.
+		 * @param key Configuration key.
+		 * @param value Configuration value.
+		 */
+		idempotent void setConf(string key, string value) throws InvalidSecretException;
+
+		/** Set superuser password. This is just a convenience for using {@link updateRegistration} on user id 0.
+		 * @param pw Password.
+		 */
+		idempotent void setSuperuserPassword(string pw) throws InvalidSecretException;
+
+		/** Fetch log entries.
+		 * @param first Lowest numbered entry to fetch. 0 is the most recent item.
+		 * @param last Last entry to fetch.
+		 * @return List of log entries.
+		 */
+		idempotent LogList getLog(int first, int last) throws InvalidSecretException;
+
+		/** Fetch length of log
+		 * @return Number of entries in log
+		 */
+		idempotent int getLogLen() throws InvalidSecretException;
+
+		/** Fetch all users. This returns all currently connected users on the server.
+		 * @return List of connected users.
+		 * @see getState
+		 */
+		idempotent UserMap getUsers() throws ServerBootedException, InvalidSecretException;
+
+		/** Fetch all channels. This returns all defined channels on the server. The root channel is always channel 0.
+		 * @return List of defined channels.
+		 * @see getChannelState
+		 */
+		idempotent ChannelMap getChannels() throws ServerBootedException, InvalidSecretException;
+
+		/** Fetch certificate of user. This returns the complete certificate chain of a user.
+		 * @param session Connection ID of user. See {@link User.session}.
+		 * @return Certificate list of user.
+		 */
+		idempotent CertificateList getCertificateList(int session) throws ServerBootedException, InvalidSessionException, InvalidSecretException;
+
+		/** Fetch all channels and connected users as a tree. This retrieves an easy-to-use representation of the server
+		 *  as a tree. This is primarily used for viewing the state of the server on a webpage.
+		 * @return Recursive tree of all channels and connected users.
+		 */
+		idempotent Tree getTree() throws ServerBootedException, InvalidSecretException;
+
+		/** Fetch all current IP bans on the server.
+		 * @return List of bans.
+		 */
+		idempotent BanList getBans() throws ServerBootedException, InvalidSecretException;
+
+		/** Set all current IP bans on the server. This will replace any bans already present, so if you want to add a ban, be sure to call {@link getBans} and then
+		 *  append to the returned list before calling this method.
+		 * @param bans List of bans.
+		 */
+		idempotent void setBans(BanList bans) throws ServerBootedException, InvalidSecretException;
+
+		/** Kick a user. The user is not banned, and is free to rejoin the server.
+		 * @param session Connection ID of user. See {@link User.session}.
+		 * @param reason Text message to show when user is kicked.
+		 */
+		void kickUser(int session, string reason) throws ServerBootedException, InvalidSessionException, InvalidSecretException;
+
+		/** Get state of a single connected user.
+		 * @param session Connection ID of user. See {@link User.session}.
+		 * @return State of connected user.
+		 * @see setState
+		 * @see getUsers
+		 */
+		idempotent User getState(int session) throws ServerBootedException, InvalidSessionException, InvalidSecretException;
+
+		/** Set user state. You can use this to move, mute and deafen users.
+		 * @param state User state to set.
+		 * @see getState
+		 */
+		idempotent void setState(User state) throws ServerBootedException, InvalidSessionException, InvalidChannelException, InvalidSecretException;
+
+		/** Send text message to a single user.
+		 * @param session Connection ID of user. See {@link User.session}.
+		 * @param text Message to send.
+		 * @see sendMessageChannel
+		 */
+		void sendMessage(int session, string text) throws ServerBootedException, InvalidSessionException, InvalidSecretException;
+
+		/** Check if user is permitted to perform action.
+		 * @param session Connection ID of user. See {@link User.session}.
+		 * @param channelid ID of Channel. See {@link Channel.id}.
+		 * @param perm Permission bits to check.
+		 * @return true if any of the permissions in perm were set for the user.
+		 */
+		bool hasPermission(int session, int channelid, int perm) throws ServerBootedException, InvalidSessionException, InvalidChannelException, InvalidSecretException;
+
+		/** Return users effective permissions
+		 * @param session Connection ID of user. See {@link User.session}.
+		 * @param channelid ID of Channel. See {@link Channel.id}.
+		 * @return bitfield of allowed actions
+		 */
+		idempotent int effectivePermissions(int session, int channelid) throws ServerBootedException, InvalidSessionException, InvalidChannelException, InvalidSecretException;
+
+		/** Add a context callback. This is done per user, and will add a context menu action for the user.
+		 *
+		 * @param session Session of user which should receive context entry.
+		 * @param action Action string, a unique name to associate with the action.
+		 * @param text Name of action shown to user.
+		 * @param cb Callback interface which will receive notifications.
+		 * @param ctx Context this should be used in. Needs to be one or a combination of {@link ContextServer}, {@link ContextChannel} and {@link ContextUser}.
+		 * @see removeContextCallback
+		 */
+		void addContextCallback(int session, string action, string text, ServerContextCallback *cb, int ctx) throws ServerBootedException, InvalidCallbackException, InvalidSecretException;
+
+		/** Remove a callback.
+		 *
+		 * @param cb Callback interface to be removed. This callback will be removed from all from all users.
+		 * @see addContextCallback
+		 */
+		void removeContextCallback(ServerContextCallback *cb) throws ServerBootedException, InvalidCallbackException, InvalidSecretException;
+
+		/** Get state of single channel.
+		 * @param channelid ID of Channel. See {@link Channel.id}.
+		 * @return State of channel.
+		 * @see setChannelState
+		 * @see getChannels
+		 */
+		idempotent Channel getChannelState(int channelid) throws ServerBootedException, InvalidChannelException, InvalidSecretException;
+
+		/** Set state of a single channel. You can use this to move or relink channels.
+		 * @param state Channel state to set.
+		 * @see getChannelState
+		 */
+		idempotent void setChannelState(Channel state) throws ServerBootedException, InvalidChannelException, InvalidSecretException, NestingLimitException;
+
+		/** Remove a channel and all its subchannels.
+		 * @param channelid ID of Channel. See {@link Channel.id}.
+		 */
+		void removeChannel(int channelid) throws ServerBootedException, InvalidChannelException, InvalidSecretException;
+
+		/** Add a new channel.
+		 * @param name Name of new channel.
+		 * @param parent Channel ID of parent channel. See {@link Channel.id}.
+		 * @return ID of newly created channel.
+		 */
+		int addChannel(string name, int parent) throws ServerBootedException, InvalidChannelException, InvalidSecretException, NestingLimitException;
+
+		/** Send text message to channel or a tree of channels.
+		 * @param channelid Channel ID of channel to send to. See {@link Channel.id}.
+		 * @param tree If true, the message will be sent to the channel and all its subchannels.
+		 * @param text Message to send.
+		 * @see sendMessage
+		 */
+		void sendMessageChannel(int channelid, bool tree, string text) throws ServerBootedException, InvalidChannelException, InvalidSecretException;
+
+		/** Retrieve ACLs and Groups on a channel.
+		 * @param channelid Channel ID of channel to fetch from. See {@link Channel.id}.
+		 * @param acls List of ACLs on the channel. This will include inherited ACLs.
+		 * @param groups List of groups on the channel. This will include inherited groups.
+		 * @param inherit Does this channel inherit ACLs from the parent channel?
+		 */
+		idempotent void getACL(int channelid, out ACLList acls, out GroupList groups, out bool inherit) throws ServerBootedException, InvalidChannelException, InvalidSecretException;
+
+		/** Set ACLs and Groups on a channel. Note that this will replace all existing ACLs and groups on the channel.
+		 * @param channelid Channel ID of channel to fetch from. See {@link Channel.id}.
+		 * @param acls List of ACLs on the channel.
+		 * @param groups List of groups on the channel.
+		 * @param inherit Should this channel inherit ACLs from the parent channel?
+		 */
+		idempotent void setACL(int channelid, ACLList acls, GroupList groups, bool inherit) throws ServerBootedException, InvalidChannelException, InvalidSecretException;
+
+		/** Temporarily add a user to a group on a channel. This state is not saved, and is intended for temporary memberships.
+		 * @param channelid Channel ID of channel to add to. See {@link Channel.id}.
+		 * @param session Connection ID of user. See {@link User.session}.
+		 * @param group Group name to add to.
+		 */
+		idempotent void addUserToGroup(int channelid, int session, string group) throws ServerBootedException, InvalidChannelException, InvalidSessionException, InvalidSecretException;
+
+		/** Remove a user from a temporary group membership on a channel. This state is not saved, and is intended for temporary memberships.
+		 * @param channelid Channel ID of channel to add to. See {@link Channel.id}.
+		 * @param session Connection ID of user. See {@link User.session}.
+		 * @param group Group name to remove from.
+		 */
+		idempotent void removeUserFromGroup(int channelid, int session, string group) throws ServerBootedException, InvalidChannelException, InvalidSessionException, InvalidSecretException;
+
+		/** Redirect whisper targets for user. If set, whenever a user tries to whisper to group "source", the whisper will be redirected to group "target".
+		 * To remove a redirect pass an empty target string. This is intended for context groups.
+		 * @param session Connection ID of user. See {@link User.session}.
+		 * @param source Group name to redirect from.
+		 * @param target Group name to redirect to.
+		 */
+		idempotent void redirectWhisperGroup(int session, string source, string target) throws ServerBootedException, InvalidSessionException, InvalidSecretException;
+
+		/** Map a list of {@link User.userid} to a matching name.
+		 * @param List of ids.
+		 * @return Matching list of names, with an empty string representing invalid or unknown ids.
+		 */
+		idempotent NameMap getUserNames(IdList ids) throws ServerBootedException, InvalidSecretException;
+
+		/** Map a list of user names to a matching id.
+		 * @param List of names.
+		 * @reuturn List of matching ids, with -1 representing invalid or unknown user names.
+		 */
+		idempotent IdMap getUserIds(NameList names) throws ServerBootedException, InvalidSecretException;
+
+		/** Register a new user.
+		 * @param info Information about new user. Must include at least "name".
+		 * @return The ID of the user. See {@link RegisteredUser.userid}.
+		 */
+		int registerUser(UserInfoMap info) throws ServerBootedException, InvalidUserException, InvalidSecretException;
+
+		/** Remove a user registration.
+		 * @param userid ID of registered user. See {@link RegisteredUser.userid}.
+		 */
+		void unregisterUser(int userid) throws ServerBootedException, InvalidUserException, InvalidSecretException;
+
+		/** Update the registration for a user. You can use this to set the email or password of a user,
+		 * and can also use it to change the user's name.
+		 * @param registration Updated registration record.
+		 */
+		idempotent void updateRegistration(int userid, UserInfoMap info) throws ServerBootedException, InvalidUserException, InvalidSecretException;
+
+		/** Fetch registration for a single user.
+		 * @param userid ID of registered user. See {@link RegisteredUser.userid}.
+		 * @return Registration record.
+		 */
+		idempotent UserInfoMap getRegistration(int userid) throws ServerBootedException, InvalidUserException, InvalidSecretException;
+
+		/** Fetch a group of registered users.
+		 * @param filter Substring of user name. If blank, will retrieve all registered users.
+		 * @return List of registration records.
+		 */
+		idempotent NameMap getRegisteredUsers(string filter) throws ServerBootedException, InvalidSecretException;
+
+		/** Verify the password of a user. You can use this to verify a user's credentials.
+		 * @param name User name. See {@link RegisteredUser.name}.
+		 * @param pw User password.
+		 * @return User ID of registered user (See {@link RegisteredUser.userid}), -1 for failed authentication or -2 for unknown usernames.
+		 */
+		idempotent int verifyPassword(string name, string pw) throws ServerBootedException, InvalidSecretException;
+
+		/** Fetch user texture. Textures are stored as zlib compress()ed 600x60 32-bit BGRA data.
+		 * @param userid ID of registered user. See {@link RegisteredUser.userid}.
+		 * @return Custom texture associated with user or an empty texture.
+		 */
+		idempotent Texture getTexture(int userid) throws ServerBootedException, InvalidUserException, InvalidSecretException;
+
+		/** Set a user texture (now called avatar).
+		 * @param userid ID of registered user. See {@link RegisteredUser.userid}.
+		 * @param tex Texture (as a Byte-Array) to set for the user, or an empty texture to remove the existing texture.
+		 */
+		idempotent void setTexture(int userid, Texture tex) throws ServerBootedException, InvalidUserException, InvalidTextureException, InvalidSecretException;
+
+		/** Get virtual server uptime.
+		 * @return Uptime of the virtual server in seconds
+		 */
+		idempotent int getUptime() throws ServerBootedException, InvalidSecretException;
+
+		/**
+		 * Update the server's certificate information.
+		 *
+		 * Reconfigure the running server's TLS socket with the given
+		 * certificate and private key.
+		 *
+		 * The certificate and and private key must be PEM formatted.
+		 *
+		 * New clients will see the new certificate.
+		 * Existing clients will continue to see the certificate the server
+		 * was using when they connected to it.
+		 *
+		 * This method throws InvalidInputDataException if any of the
+		 * following errors happen:
+		 *  - Unable to decode the PEM certificate and/or private key.
+		 *  - Unable to decrypt the private key with the given passphrase.
+		 *  - The certificate and/or private key do not contain RSA keys.
+		 *  - The certificate is not usable with the given private key.
+		 */
+		 idempotent void updateCertificate(string certificate, string privateKey, string passphrase) throws ServerBootedException, InvalidSecretException, InvalidInputDataException;
+
+		 /**
+		  * Makes the given user start listening to the given channel.
+		  * @param userid The ID of the user
+		  * @param channelid The ID of the channel
+		  */
+		 idempotent void startListening(int userid, int channelid);
+
+		 /**
+		  * Makes the given user stop listening to the given channel.
+		  * @param userid The ID of the user
+		  * @param channelid The ID of the channel
+		  */
+		 idempotent void stopListening(int userid, int channelid);
+
+		 /**
+		  * @param userid The ID of the user
+		  * @param channelid The ID of the channel
+		  * @returns Whether the given user is currently listening to the given channel
+		  */
+		 idempotent bool isListening(int userid, int channelid);
+
+		 /**
+		  * @param userid The ID of the user
+		  * @returns An ID-list of channels the given user is listening to
+		  */
+		 idempotent IntList getListeningChannels(int userid);
+
+		 /**
+		  * @param channelid The ID of the channel
+		  * @returns An ID-list of users listening to the given channel
+		  */
+		 idempotent IntList getListeningUsers(int channelid);
+
+		 /**
+		  * @param channelid The ID of the channel
+		  * @param userid The ID of the user
+		  * @returns The volume adjustment set for a listener of the given user in the given channel
+		  */
+		 idempotent float getListenerVolumeAdjustment(int channelid, int userid);
+
+		 /**
+		  * Sets the volume adjustment set for a listener of the given user in the given channel
+		  * @param channelid The ID of the channel
+		  * @param userid The ID of the user
+		  */
+		 idempotent void setListenerVolumeAdjustment(int channelid, int userid, float volumeAdjustment);
+
+		 /**
+		  * @param receiverUserIDs list of IDs of the users the message shall be sent to
+		  */
+		 idempotent void sendWelcomeMessage(IdList receiverUserIDs);
+	};
+
+	/** Callback interface for Meta. You can supply an implementation of this to receive notifications
+	 *  when servers are stopped or started.
+	 *  If an added callback ever throws an exception or goes away, it will be automatically removed.
+	 *  Please note that all callbacks are done asynchronously; murmur does not wait for the callback to
+	 *  complete before continuing processing.
+	 *  @see ServerCallback
+	 *  @see Meta.addCallback
+	 */
+	interface MetaCallback {
+		/** Called when a server is started. The server is up and running when this event is sent, so all methods that
+		 *  need a running server will work.
+		 *  @param srv Interface for started server.
+		 */
+		void started(Server *srv);
+
+		/** Called when a server is stopped. The server is already stopped when this event is sent, so no methods that
+		 *  need a running server will work.
+		 *  @param srv Interface for started server.
+		 */
+		void stopped(Server *srv);
+	};
+
+	sequence<Server *> ServerList;
+
+	/** This is the meta interface. It is primarily used for retrieving the {@link Server} interfaces for each individual server.
+	 **/
+	["amd"] interface Meta {
+		/** Fetch interface to specific server.
+		 * @param id Server ID. See {@link Server.getId}.
+		 * @return Interface for specified server, or a null proxy if id is invalid.
+		 */
+		idempotent Server *getServer(int id) throws InvalidSecretException;
+
+		/** Create a new server. Call {@link Server.getId} on the returned interface to find it's ID.
+		 * @return Interface for new server.
+		 */
+		Server *newServer() throws InvalidSecretException;
+
+		/** Fetch list of all currently running servers.
+		 * @return List of interfaces for running servers.
+		 */
+		idempotent ServerList getBootedServers() throws InvalidSecretException;
+
+		/** Fetch list of all defined servers.
+		 * @return List of interfaces for all servers.
+		 */
+		idempotent ServerList getAllServers() throws InvalidSecretException;
+
+		/** Fetch default configuration. This returns the configuration items that were set in the configuration file, or
+		 * the built-in default. The individual servers will use these values unless they have been overridden in the
+		 * server specific configuration. The only special case is the port, which defaults to the value defined here +
+		 * the servers ID - 1 (so that virtual server #1 uses the defined port, server #2 uses port+1 etc).
+		 * @return Default configuration of the servers.
+		 */
+		idempotent ConfigMap getDefaultConf() throws InvalidSecretException;
+
+		/** Fetch version of Murmur.
+		 * @param major Major version.
+		 * @param minor Minor version.
+		 * @param patch Patchlevel.
+		 * @param text Textual representation of version. Note that this may not match the {@link major}, {@link minor} and {@link patch} levels, as it
+		 *   may be simply the compile date or the SVN revision. This is usually the text you want to present to users.
+		 */
+		idempotent void getVersion(out int major, out int minor, out int patch, out string text);
+
+		/** Add a callback. The callback will receive notifications when servers are started or stopped.
+		 *
+		 * @param cb Callback interface which will receive notifications.
+		 */
+		void addCallback(MetaCallback *cb) throws InvalidCallbackException, InvalidSecretException;
+
+		/** Remove a callback.
+		 *
+		 * @param cb Callback interface to be removed.
+		 */
+		void removeCallback(MetaCallback *cb) throws InvalidCallbackException, InvalidSecretException;
+
+		/** Get murmur uptime.
+		 * @return Uptime of murmur in seconds
+		 */
+		idempotent int getUptime();
+
+		/** Get slice file.
+		 * @return Contents of the slice file server compiled with.
+		 */
+		idempotent string getSlice();
+
+		/** Returns a checksum dict for the slice file.
+		 * @return Checksum dict
+		 */
+		idempotent Ice::SliceChecksumDict getSliceChecksums();
+	};
+};

allianceauth/services/modules/mumble/Murmur.ice

@@ -0,0 +1,927 @@
+// Copyright 2008-2021 The Mumble Developers. All rights reserved.
+// Use of this source code is governed by a BSD-style license
+// that can be found in the LICENSE file at the root of the
+// Mumble source tree or at <https://www.mumble.info/LICENSE>.
+
+/**
+ *
+ * Information and control of the murmur server. Each server has
+ * one {@link Meta} interface that controls global information, and
+ * each virtual server has a {@link Server} interface.
+ *
+ **/
+
+#include <Ice/SliceChecksumDict.ice>
+
+module Murmur
+{
+
+	/** A network address in IPv6 format.
+	 **/
+	["python:seq:tuple"] sequence<byte> NetAddress;
+
+	/** A connected user.
+	 **/
+	struct User {
+		/** Session ID. This identifies the connection to the server. */
+		int session;
+		/** User ID. -1 if the user is anonymous. */
+		int userid;
+		/** Is user muted by the server? */
+		bool mute;
+		/** Is user deafened by the server? If true, this implies mute. */
+		bool deaf;
+		/** Is the user suppressed by the server? This means the user is not muted, but does not have speech privileges in the current channel. */
+		bool suppress;
+		/** Is the user a priority speaker? */
+		bool prioritySpeaker;
+		/** Is the user self-muted? */
+		bool selfMute;
+		/** Is the user self-deafened? If true, this implies mute. */
+		bool selfDeaf;
+		/** Is the User recording? (This flag is read-only and cannot be changed using setState().) **/
+		bool recording;
+		/** Channel ID the user is in. Matches {@link Channel.id}. */
+		int channel;
+		/** The name of the user. */
+		string name;
+		/** Seconds user has been online. */
+		int onlinesecs;
+		/** Average transmission rate in bytes per second over the last few seconds. */
+		int bytespersec;
+		/** Legacy client version. */
+		int version;
+		/** New client version. (See https://github.com/mumble-voip/mumble/issues/5827) */
+		long version2;
+		/** Client release. For official releases, this equals the version. For snapshots and git compiles, this will be something else. */
+		string release;
+		/** Client OS. */
+		string os;
+		/** Client OS Version. */
+		string osversion;
+		/** Plugin Identity. This will be the user's unique ID inside the current game. */
+		string identity;
+		/**
+		   Base64-encoded Plugin context. This is a binary blob identifying the game and team the user is on.
+
+		   The used Base64 alphabet is the one specified in RFC 2045.
+
+		   Before Mumble 1.3.0, this string was not Base64-encoded. This could cause problems for some Ice
+		   implementations, such as the .NET implementation.
+
+		   If you need the exact string that is used by Mumble, you can get it by Base64-decoding this string.
+
+		   If you simply need to detect whether two users are in the same game world, string comparisons will
+		   continue to work as before.
+		 */
+		string context;
+		/** User comment. Shown as tooltip for this user. */
+		string comment;
+		/** Client address. */
+		NetAddress address;
+		/** TCP only. True until UDP connectivity is established. */
+		bool tcponly;
+		/** Idle time. This is how many seconds it is since the user last spoke. Other activity is not counted. */
+		int idlesecs;
+		/** UDP Ping Average. This is the average ping for the user via UDP over the duration of the connection. */
+		float udpPing;
+		/** TCP Ping Average. This is the average ping for the user via TCP over the duration of the connection. */
+		float tcpPing;
+	};
+
+	sequence<int> IntList;
+
+	/** A text message between users.
+	 **/
+	struct TextMessage {
+		/** Sessions (connected users) who were sent this message. */
+		IntList sessions;
+		/** Channels who were sent this message. */
+		IntList channels;
+		/** Trees of channels who were sent this message. */
+		IntList trees;
+		/** The contents of the message. */
+		string text;
+	};
+
+	/** A channel.
+	 **/
+	struct Channel {
+		/** Channel ID. This is unique per channel, and the root channel is always id 0. */
+		int id;
+		/** Name of the channel. There can not be two channels with the same parent that has the same name. */
+		string name;
+		/** ID of parent channel, or -1 if this is the root channel. */
+		int parent;
+		/** List of id of linked channels. */
+		IntList links;
+		/** Description of channel. Shown as tooltip for this channel. */
+		string description;
+		/** Channel is temporary, and will be removed when the last user leaves it. */
+		bool temporary;
+		/** Position of the channel which is used in Client for sorting. */
+		int position;
+	};
+
+	/** A group. Groups are defined per channel, and can inherit members from parent channels.
+	 **/
+	struct Group {
+		/** Group name */
+		string name;
+		/** Is this group inherited from a parent channel? Read-only. */
+		bool inherited;
+		/** Does this group inherit members from parent channels? */
+		bool inherit;
+		/** Can subchannels inherit members from this group? */
+		bool inheritable;
+		/** List of users to add to the group. */
+		IntList add;
+		/** List of inherited users to remove from the group. */
+		IntList remove;
+		/** Current members of the group, including inherited members. Read-only. */
+		IntList members;
+	};
+
+	/** Write access to channel control. Implies all other permissions (except Speak). */
+	const int PermissionWrite = 0x01;
+	/** Traverse channel. Without this, a client cannot reach subchannels, no matter which privileges he has there. */
+	const int PermissionTraverse = 0x02;
+	/** Enter channel. */
+	const int PermissionEnter = 0x04;
+	/** Speak in channel. */
+	const int PermissionSpeak = 0x08;
+	/** Whisper to channel. This is different from Speak, so you can set up different permissions. */
+	const int PermissionWhisper = 0x100;
+	/** Mute and deafen other users in this channel. */
+	const int PermissionMuteDeafen = 0x10;
+	/** Move users from channel. You need this permission in both the source and destination channel to move another user. */
+	const int PermissionMove = 0x20;
+	/** Make new channel as a subchannel of this channel. */
+	const int PermissionMakeChannel = 0x40;
+	/** Make new temporary channel as a subchannel of this channel. */
+	const int PermissionMakeTempChannel = 0x400;
+	/** Link this channel. You need this permission in both the source and destination channel to link channels, or in either channel to unlink them. */
+	const int PermissionLinkChannel = 0x80;
+	/** Send text message to channel. */
+	const int PermissionTextMessage = 0x200;
+	/** Kick user from server. Only valid on root channel. */
+	const int PermissionKick = 0x10000;
+	/** Ban user from server. Only valid on root channel. */
+	const int PermissionBan = 0x20000;
+	/** Register and unregister users. Only valid on root channel. */
+	const int PermissionRegister = 0x40000;
+	/** Register and unregister users. Only valid on root channel. */
+	const int PermissionRegisterSelf = 0x80000;
+	/** Reset the comment or avatar of a user. Only valid on root channel. */
+	const int ResetUserContent = 0x100000;
+
+
+	/** Access Control List for a channel. ACLs are defined per channel, and can be inherited from parent channels.
+	 **/
+	struct ACL {
+		/** Does the ACL apply to this channel? */
+		bool applyHere;
+		/** Does the ACL apply to subchannels? */
+		bool applySubs;
+		/** Is this ACL inherited from a parent channel? Read-only. */
+		bool inherited;
+		/** ID of user this ACL applies to. -1 if using a group name. */
+		int userid;
+		/** Group this ACL applies to. Blank if using userid. */
+		string group;
+		/** Binary mask of privileges to allow. */
+		int allow;
+		/** Binary mask of privileges to deny. */
+		int deny;
+	};
+
+	/** A single ip mask for a ban.
+	 **/
+	struct Ban {
+		/** Address to ban. */
+		NetAddress address;
+		/** Number of bits in ban to apply. */
+		int bits;
+		/** Username associated with ban. */
+		string name;
+		/** Hash of banned user. */
+		string hash;
+		/** Reason for ban. */
+		string reason;
+		/** Date ban was applied in unix time format. */
+		int start;
+		/** Duration of ban. */
+		int duration;
+	};
+
+	/** A entry in the log.
+	 **/
+	struct LogEntry {
+		/** Timestamp in UNIX time_t */
+		int timestamp;
+		/** The log message. */
+		string txt;
+	};
+
+	class Tree;
+	sequence<Tree> TreeList;
+
+	enum ChannelInfo { ChannelDescription, ChannelPosition };
+	enum UserInfo { UserName, UserEmail, UserComment, UserHash, UserPassword, UserLastActive, UserKDFIterations };
+
+	dictionary<int, User> UserMap;
+	dictionary<int, Channel> ChannelMap;
+	sequence<Channel> ChannelList;
+	sequence<User> UserList;
+	sequence<Group> GroupList;
+	sequence<ACL> ACLList;
+	sequence<LogEntry> LogList;
+	sequence<Ban> BanList;
+	sequence<int> IdList;
+	sequence<string> NameList;
+	dictionary<int, string> NameMap;
+	dictionary<string, int> IdMap;
+	sequence<byte> Texture;
+	dictionary<string, string> ConfigMap;
+	sequence<string> GroupNameList;
+	sequence<byte> CertificateDer;
+	sequence<CertificateDer> CertificateList;
+
+	/** User information map.
+	 * Older versions of ice-php can't handle enums as keys. If you are using one of these, replace 'UserInfo' with 'byte'.
+	 */
+
+	dictionary<UserInfo, string> UserInfoMap;
+
+	/** User and subchannel state. Read-only.
+	 **/
+	class Tree {
+		/** Channel definition of current channel. */
+		Channel c;
+		/** List of subchannels. */
+		TreeList children;
+		/** Users in this channel. */
+		UserList users;
+	};
+
+	exception MurmurException {};
+	/** This is thrown when you specify an invalid session. This may happen if the user has disconnected since your last call to {@link Server.getUsers}. See {@link User.session} */
+	exception InvalidSessionException extends MurmurException {};
+	/** This is thrown when you specify an invalid channel id. This may happen if the channel was removed by another provess. It can also be thrown if you try to add an invalid channel. */
+	exception InvalidChannelException extends MurmurException {};
+	/** This is thrown when you try to do an operation on a server that does not exist. This may happen if someone has removed the server. */
+	exception InvalidServerException extends MurmurException {};
+	/** This happens if you try to fetch user or channel state on a stopped server, if you try to stop an already stopped server or start an already started server. */
+	exception ServerBootedException extends MurmurException {};
+	/** This is thrown if {@link Server.start} fails, and should generally be the cause for some concern. */
+	exception ServerFailureException extends MurmurException {};
+	/** This is thrown when you specify an invalid userid. */
+	exception InvalidUserException extends MurmurException {};
+	/** This is thrown when you try to set an invalid texture. */
+	exception InvalidTextureException extends MurmurException {};
+	/** This is thrown when you supply an invalid callback. */
+	exception InvalidCallbackException extends MurmurException {};
+	/**  This is thrown when you supply the wrong secret in the calling context. */
+	exception InvalidSecretException extends MurmurException {};
+	/** This is thrown when the channel operation would exceed the channel nesting limit */
+	exception NestingLimitException extends MurmurException {};
+	/**  This is thrown when you ask the server to disclose something that should be secret. */
+	exception WriteOnlyException extends MurmurException {};
+	/** This is thrown when invalid input data was specified. */
+	exception InvalidInputDataException extends MurmurException {};
+
+	/** Callback interface for servers. You can supply an implementation of this to receive notification
+	 *  messages from the server.
+	 *  If an added callback ever throws an exception or goes away, it will be automatically removed.
+	 *  Please note that all callbacks are done asynchronously; murmur does not wait for the callback to
+	 *  complete before continuing processing.
+	 *  Note that callbacks are removed when a server is stopped, so you should have a callback for
+	 *  {@link MetaCallback.started} which calls {@link Server.addCallback}.
+	 *  @see MetaCallback
+	 *  @see Server.addCallback
+	 */
+	interface ServerCallback {
+		/** Called when a user connects to the server.
+		 *  @param state State of connected user.
+		 */
+		idempotent void userConnected(User state);
+		/** Called when a user disconnects from the server. The user has already been removed, so you can no longer use methods like {@link Server.getState}
+		 *  to retrieve the user's state.
+		 *  @param state State of disconnected user.
+		 */
+		idempotent void userDisconnected(User state);
+		/** Called when a user state changes. This is called if the user moves, is renamed, is muted, deafened etc.
+		 *  @param state New state of user.
+		 */
+		idempotent void userStateChanged(User state);
+		/** Called when user writes a text message
+		 *  @param state the User sending the message
+		 *  @param message the TextMessage the user has sent
+		 */
+		idempotent void userTextMessage(User state, TextMessage message);
+		/** Called when a new channel is created.
+		 *  @param state State of new channel.
+		 */
+		idempotent void channelCreated(Channel state);
+		/** Called when a channel is removed. The channel has already been removed, you can no longer use methods like {@link Server.getChannelState}
+		 *  @param state State of removed channel.
+		 */
+		idempotent void channelRemoved(Channel state);
+		/** Called when a new channel state changes. This is called if the channel is moved, renamed or if new links are added.
+		 *  @param state New state of channel.
+		 */
+		idempotent void channelStateChanged(Channel state);
+	};
+
+	/** Context for actions in the Server menu. */
+	const int ContextServer = 0x01;
+	/** Context for actions in the Channel menu. */
+	const int ContextChannel = 0x02;
+	/** Context for actions in the User menu. */
+	const int ContextUser = 0x04;
+
+	/** Callback interface for context actions. You need to supply one of these for {@link Server.addContext}.
+	 *  If an added callback ever throws an exception or goes away, it will be automatically removed.
+	 *  Please note that all callbacks are done asynchronously; murmur does not wait for the callback to
+	 *  complete before continuing processing.
+	 */
+	interface ServerContextCallback {
+		/** Called when a context action is performed.
+		 *  @param action Action to be performed.
+		 *  @param usr User which initiated the action.
+		 *  @param session If nonzero, session of target user.
+		 *  @param channelid If not -1, id of target channel.
+		 */
+		idempotent void contextAction(string action, User usr, int session, int channelid);
+	};
+
+	/** Callback interface for server authentication. You need to supply one of these for {@link Server.setAuthenticator}.
+	 *  If an added callback ever throws an exception or goes away, it will be automatically removed.
+	 *  Please note that unlike {@link ServerCallback} and {@link ServerContextCallback}, these methods are called
+	 *  synchronously. If the response lags, the entire murmur server will lag.
+	 *  Also note that, as the method calls are synchronous, making a call to {@link Server} or {@link Meta} will
+	 *  deadlock the server.
+	 */
+	interface ServerAuthenticator {
+		/** Called to authenticate a user. If you do not know the username in question, always return -2 from this
+		 *  method to fall through to normal database authentication.
+		 *  Note that if authentication succeeds, murmur will create a record of the user in it's database, reserving
+		 *  the username and id so it cannot be used for normal database authentication.
+		 *  The data in the certificate (name, email addresses etc), as well as the list of signing certificates,
+		 *  should only be trusted if certstrong is true.
+		 *
+		 *  Internally, Murmur treats usernames as case-insensitive. It is recommended
+		 *  that authenticators do the same. Murmur checks if a username is in use when
+		 *  a user connects. If the connecting user is registered, the other username is
+		 *  kicked. If the connecting user is not registered, the connecting user is not
+		 *  allowed to join the server.
+		 *
+		 *  @param name Username to authenticate.
+		 *  @param pw Password to authenticate with.
+		 *  @param certificates List of der encoded certificates the user connected with.
+		 *  @param certhash Hash of user certificate, as used by murmur internally when matching.
+		 *  @param certstrong True if certificate was valid and signed by a trusted CA.
+		 *  @param newname Set this to change the username from the supplied one.
+		 *  @param groups List of groups on the root channel that the user will be added to for the duration of the connection.
+		 *  @return UserID of authenticated user, -1 for authentication failures, -2 for unknown user (fallthrough),
+		 *          -3 for authentication failures where the data could (temporarily) not be verified.
+		 */
+		idempotent int authenticate(string name, string pw, CertificateList certificates, string certhash, bool certstrong, out string newname, out GroupNameList groups);
+
+		/** Fetch information about a user. This is used to retrieve information like email address, keyhash etc. If you
+		 *  want murmur to take care of this information itself, simply return false to fall through.
+		 *  @param id User id.
+		 *  @param info Information about user. This needs to include at least "name".
+		 *  @return true if information is present, false to fall through.
+		 */
+		idempotent bool getInfo(int id, out UserInfoMap info);
+
+		/** Map a name to a user id.
+		 *  @param name Username to map.
+		 *  @return User id or -2 for unknown name.
+		 */
+		idempotent int nameToId(string name);
+
+		/** Map a user id to a username.
+		 *  @param id User id to map.
+		 *  @return Name of user or empty string for unknown id.
+		 */
+		idempotent string idToName(int id);
+
+		/** Map a user to a custom Texture.
+		 *  @param id User id to map.
+		 *  @return User texture or an empty texture for unknown users or users without textures.
+		 */
+		idempotent Texture idToTexture(int id);
+	};
+
+	/** Callback interface for server authentication and registration. This allows you to support both authentication
+	 *  and account updating.
+	 *  You do not need to implement this if all you want is authentication, you only need this if other scripts
+	 *  connected to the same server calls e.g. {@link Server.setTexture}.
+	 *  Almost all of these methods support fall through, meaning murmur should continue the operation against its
+	 *  own database.
+	 */
+	interface ServerUpdatingAuthenticator extends ServerAuthenticator {
+		/** Register a new user.
+		 *  @param info Information about user to register.
+		 *  @return User id of new user, -1 for registration failure, or -2 to fall through.
+		 */
+		int registerUser(UserInfoMap info);
+
+		/** Unregister a user.
+		 *  @param id Userid to unregister.
+		 *  @return 1 for successful unregistration, 0 for unsuccessful unregistration, -1 to fall through.
+		 */
+		int unregisterUser(int id);
+
+		/** Get a list of registered users matching filter.
+		 *  @param filter Substring usernames must contain. If empty, return all registered users.
+		 *  @return List of matching registered users.
+		 */
+		idempotent NameMap getRegisteredUsers(string filter);
+
+		/** Set additional information for user registration.
+		 *  @param id Userid of registered user.
+		 *  @param info Information to set about user. This should be merged with existing information.
+		 *  @return 1 for successful update, 0 for unsuccessful update, -1 to fall through.
+		 */
+		idempotent int setInfo(int id, UserInfoMap info);
+
+		/** Set texture (now called avatar) of user registration.
+		 *  @param id registrationId of registered user.
+		 *  @param tex New texture.
+		 *  @return 1 for successful update, 0 for unsuccessful update, -1 to fall through.
+		 */
+		idempotent int setTexture(int id, Texture tex);
+	};
+
+	/** Per-server interface. This includes all methods for configuring and altering
+	 * the state of a single virtual server. You can retrieve a pointer to this interface
+	 * from one of the methods in {@link Meta}.
+	 **/
+	["amd"] interface Server {
+		/** Shows if the server currently running (accepting users).
+		 *
+		 * @return Run-state of server.
+		 */
+		idempotent bool isRunning() throws InvalidSecretException;
+
+		/** Start server. */
+		void start() throws ServerBootedException, ServerFailureException, InvalidSecretException;
+
+		/** Stop server.
+		 * Note: Server will be restarted on Murmur restart unless explicitly disabled
+		 *       with setConf("boot", false)
+		 */
+		void stop() throws ServerBootedException, InvalidSecretException;
+
+		/** Delete server and all it's configuration. */
+		void delete() throws ServerBootedException, InvalidSecretException;
+
+		/** Fetch the server id.
+		 *
+		 * @return Unique server id.
+		 */
+		idempotent int id() throws InvalidSecretException;
+
+		/** Add a callback. The callback will receive notifications about changes to users and channels.
+		 *
+		 * @param cb Callback interface which will receive notifications.
+		 * @see removeCallback
+		 */
+		void addCallback(ServerCallback *cb) throws ServerBootedException, InvalidCallbackException, InvalidSecretException;
+
+		/** Remove a callback.
+		 *
+		 * @param cb Callback interface to be removed.
+		 * @see addCallback
+		 */
+		void removeCallback(ServerCallback *cb) throws ServerBootedException, InvalidCallbackException, InvalidSecretException;
+
+		/** Set external authenticator. If set, all authentications from clients are forwarded to this
+		 *  proxy.
+		 *
+		 * @param auth Authenticator object to perform subsequent authentications.
+		 */
+		void setAuthenticator(ServerAuthenticator *auth) throws ServerBootedException, InvalidCallbackException, InvalidSecretException;
+
+		/** Retrieve configuration item.
+		 * @param key Configuration key.
+		 * @return Configuration value. If this is empty, see {@link Meta.getDefaultConf}
+		 */
+		idempotent string getConf(string key) throws InvalidSecretException, WriteOnlyException;
+
+		/** Retrieve all configuration items.
+		 * @return All configured values. If a value isn't set here, the value from {@link Meta.getDefaultConf} is used.
+		 */
+		idempotent ConfigMap getAllConf() throws InvalidSecretException;
+
+		/** Set a configuration item.
+		 * @param key Configuration key.
+		 * @param value Configuration value.
+		 */
+		idempotent void setConf(string key, string value) throws InvalidSecretException;
+
+		/** Set superuser password. This is just a convenience for using {@link updateRegistration} on user id 0.
+		 * @param pw Password.
+		 */
+		idempotent void setSuperuserPassword(string pw) throws InvalidSecretException;
+
+		/** Fetch log entries.
+		 * @param first Lowest numbered entry to fetch. 0 is the most recent item.
+		 * @param last Last entry to fetch.
+		 * @return List of log entries.
+		 */
+		idempotent LogList getLog(int first, int last) throws InvalidSecretException;
+
+		/** Fetch length of log
+		 * @return Number of entries in log
+		 */
+		idempotent int getLogLen() throws InvalidSecretException;
+
+		/** Fetch all users. This returns all currently connected users on the server.
+		 * @return List of connected users.
+		 * @see getState
+		 */
+		idempotent UserMap getUsers() throws ServerBootedException, InvalidSecretException;
+
+		/** Fetch all channels. This returns all defined channels on the server. The root channel is always channel 0.
+		 * @return List of defined channels.
+		 * @see getChannelState
+		 */
+		idempotent ChannelMap getChannels() throws ServerBootedException, InvalidSecretException;
+
+		/** Fetch certificate of user. This returns the complete certificate chain of a user.
+		 * @param session Connection ID of user. See {@link User.session}.
+		 * @return Certificate list of user.
+		 */
+		idempotent CertificateList getCertificateList(int session) throws ServerBootedException, InvalidSessionException, InvalidSecretException;
+
+		/** Fetch all channels and connected users as a tree. This retrieves an easy-to-use representation of the server
+		 *  as a tree. This is primarily used for viewing the state of the server on a webpage.
+		 * @return Recursive tree of all channels and connected users.
+		 */
+		idempotent Tree getTree() throws ServerBootedException, InvalidSecretException;
+
+		/** Fetch all current IP bans on the server.
+		 * @return List of bans.
+		 */
+		idempotent BanList getBans() throws ServerBootedException, InvalidSecretException;
+
+		/** Set all current IP bans on the server. This will replace any bans already present, so if you want to add a ban, be sure to call {@link getBans} and then
+		 *  append to the returned list before calling this method.
+		 * @param bans List of bans.
+		 */
+		idempotent void setBans(BanList bans) throws ServerBootedException, InvalidSecretException;
+
+		/** Kick a user. The user is not banned, and is free to rejoin the server.
+		 * @param session Connection ID of user. See {@link User.session}.
+		 * @param reason Text message to show when user is kicked.
+		 */
+		void kickUser(int session, string reason) throws ServerBootedException, InvalidSessionException, InvalidSecretException;
+
+		/** Get state of a single connected user.
+		 * @param session Connection ID of user. See {@link User.session}.
+		 * @return State of connected user.
+		 * @see setState
+		 * @see getUsers
+		 */
+		idempotent User getState(int session) throws ServerBootedException, InvalidSessionException, InvalidSecretException;
+
+		/** Set user state. You can use this to move, mute and deafen users.
+		 * @param state User state to set.
+		 * @see getState
+		 */
+		idempotent void setState(User state) throws ServerBootedException, InvalidSessionException, InvalidChannelException, InvalidSecretException;
+
+		/** Send text message to a single user.
+		 * @param session Connection ID of user. See {@link User.session}.
+		 * @param text Message to send.
+		 * @see sendMessageChannel
+		 */
+		void sendMessage(int session, string text) throws ServerBootedException, InvalidSessionException, InvalidSecretException;
+
+		/** Check if user is permitted to perform action.
+		 * @param session Connection ID of user. See {@link User.session}.
+		 * @param channelid ID of Channel. See {@link Channel.id}.
+		 * @param perm Permission bits to check.
+		 * @return true if any of the permissions in perm were set for the user.
+		 */
+		bool hasPermission(int session, int channelid, int perm) throws ServerBootedException, InvalidSessionException, InvalidChannelException, InvalidSecretException;
+
+		/** Return users effective permissions
+		 * @param session Connection ID of user. See {@link User.session}.
+		 * @param channelid ID of Channel. See {@link Channel.id}.
+		 * @return bitfield of allowed actions
+		 */
+		idempotent int effectivePermissions(int session, int channelid) throws ServerBootedException, InvalidSessionException, InvalidChannelException, InvalidSecretException;
+
+		/** Add a context callback. This is done per user, and will add a context menu action for the user.
+		 *
+		 * @param session Session of user which should receive context entry.
+		 * @param action Action string, a unique name to associate with the action.
+		 * @param text Name of action shown to user.
+		 * @param cb Callback interface which will receive notifications.
+		 * @param ctx Context this should be used in. Needs to be one or a combination of {@link ContextServer}, {@link ContextChannel} and {@link ContextUser}.
+		 * @see removeContextCallback
+		 */
+		void addContextCallback(int session, string action, string text, ServerContextCallback *cb, int ctx) throws ServerBootedException, InvalidCallbackException, InvalidSecretException;
+
+		/** Remove a callback.
+		 *
+		 * @param cb Callback interface to be removed. This callback will be removed from all from all users.
+		 * @see addContextCallback
+		 */
+		void removeContextCallback(ServerContextCallback *cb) throws ServerBootedException, InvalidCallbackException, InvalidSecretException;
+
+		/** Get state of single channel.
+		 * @param channelid ID of Channel. See {@link Channel.id}.
+		 * @return State of channel.
+		 * @see setChannelState
+		 * @see getChannels
+		 */
+		idempotent Channel getChannelState(int channelid) throws ServerBootedException, InvalidChannelException, InvalidSecretException;
+
+		/** Set state of a single channel. You can use this to move or relink channels.
+		 * @param state Channel state to set.
+		 * @see getChannelState
+		 */
+		idempotent void setChannelState(Channel state) throws ServerBootedException, InvalidChannelException, InvalidSecretException, NestingLimitException;
+
+		/** Remove a channel and all its subchannels.
+		 * @param channelid ID of Channel. See {@link Channel.id}.
+		 */
+		void removeChannel(int channelid) throws ServerBootedException, InvalidChannelException, InvalidSecretException;
+
+		/** Add a new channel.
+		 * @param name Name of new channel.
+		 * @param parent Channel ID of parent channel. See {@link Channel.id}.
+		 * @return ID of newly created channel.
+		 */
+		int addChannel(string name, int parent) throws ServerBootedException, InvalidChannelException, InvalidSecretException, NestingLimitException;
+
+		/** Send text message to channel or a tree of channels.
+		 * @param channelid Channel ID of channel to send to. See {@link Channel.id}.
+		 * @param tree If true, the message will be sent to the channel and all its subchannels.
+		 * @param text Message to send.
+		 * @see sendMessage
+		 */
+		void sendMessageChannel(int channelid, bool tree, string text) throws ServerBootedException, InvalidChannelException, InvalidSecretException;
+
+		/** Retrieve ACLs and Groups on a channel.
+		 * @param channelid Channel ID of channel to fetch from. See {@link Channel.id}.
+		 * @param acls List of ACLs on the channel. This will include inherited ACLs.
+		 * @param groups List of groups on the channel. This will include inherited groups.
+		 * @param inherit Does this channel inherit ACLs from the parent channel?
+		 */
+		idempotent void getACL(int channelid, out ACLList acls, out GroupList groups, out bool inherit) throws ServerBootedException, InvalidChannelException, InvalidSecretException;
+
+		/** Set ACLs and Groups on a channel. Note that this will replace all existing ACLs and groups on the channel.
+		 * @param channelid Channel ID of channel to fetch from. See {@link Channel.id}.
+		 * @param acls List of ACLs on the channel.
+		 * @param groups List of groups on the channel.
+		 * @param inherit Should this channel inherit ACLs from the parent channel?
+		 */
+		idempotent void setACL(int channelid, ACLList acls, GroupList groups, bool inherit) throws ServerBootedException, InvalidChannelException, InvalidSecretException;
+
+		/** Temporarily add a user to a group on a channel. This state is not saved, and is intended for temporary memberships.
+		 * @param channelid Channel ID of channel to add to. See {@link Channel.id}.
+		 * @param session Connection ID of user. See {@link User.session}.
+		 * @param group Group name to add to.
+		 */
+		idempotent void addUserToGroup(int channelid, int session, string group) throws ServerBootedException, InvalidChannelException, InvalidSessionException, InvalidSecretException;
+
+		/** Remove a user from a temporary group membership on a channel. This state is not saved, and is intended for temporary memberships.
+		 * @param channelid Channel ID of channel to add to. See {@link Channel.id}.
+		 * @param session Connection ID of user. See {@link User.session}.
+		 * @param group Group name to remove from.
+		 */
+		idempotent void removeUserFromGroup(int channelid, int session, string group) throws ServerBootedException, InvalidChannelException, InvalidSessionException, InvalidSecretException;
+
+		/** Redirect whisper targets for user. If set, whenever a user tries to whisper to group "source", the whisper will be redirected to group "target".
+		 * To remove a redirect pass an empty target string. This is intended for context groups.
+		 * @param session Connection ID of user. See {@link User.session}.
+		 * @param source Group name to redirect from.
+		 * @param target Group name to redirect to.
+		 */
+		idempotent void redirectWhisperGroup(int session, string source, string target) throws ServerBootedException, InvalidSessionException, InvalidSecretException;
+
+		/** Map a list of {@link User.userid} to a matching name.
+		 * @param List of ids.
+		 * @return Matching list of names, with an empty string representing invalid or unknown ids.
+		 */
+		idempotent NameMap getUserNames(IdList ids) throws ServerBootedException, InvalidSecretException;
+
+		/** Map a list of user names to a matching id.
+		 * @param List of names.
+		 * @reuturn List of matching ids, with -1 representing invalid or unknown user names.
+		 */
+		idempotent IdMap getUserIds(NameList names) throws ServerBootedException, InvalidSecretException;
+
+		/** Register a new user.
+		 * @param info Information about new user. Must include at least "name".
+		 * @return The ID of the user. See {@link RegisteredUser.userid}.
+		 */
+		int registerUser(UserInfoMap info) throws ServerBootedException, InvalidUserException, InvalidSecretException;
+
+		/** Remove a user registration.
+		 * @param userid ID of registered user. See {@link RegisteredUser.userid}.
+		 */
+		void unregisterUser(int userid) throws ServerBootedException, InvalidUserException, InvalidSecretException;
+
+		/** Update the registration for a user. You can use this to set the email or password of a user,
+		 * and can also use it to change the user's name.
+		 * @param registration Updated registration record.
+		 */
+		idempotent void updateRegistration(int userid, UserInfoMap info) throws ServerBootedException, InvalidUserException, InvalidSecretException;
+
+		/** Fetch registration for a single user.
+		 * @param userid ID of registered user. See {@link RegisteredUser.userid}.
+		 * @return Registration record.
+		 */
+		idempotent UserInfoMap getRegistration(int userid) throws ServerBootedException, InvalidUserException, InvalidSecretException;
+
+		/** Fetch a group of registered users.
+		 * @param filter Substring of user name. If blank, will retrieve all registered users.
+		 * @return List of registration records.
+		 */
+		idempotent NameMap getRegisteredUsers(string filter) throws ServerBootedException, InvalidSecretException;
+
+		/** Verify the password of a user. You can use this to verify a user's credentials.
+		 * @param name User name. See {@link RegisteredUser.name}.
+		 * @param pw User password.
+		 * @return User ID of registered user (See {@link RegisteredUser.userid}), -1 for failed authentication or -2 for unknown usernames.
+		 */
+		idempotent int verifyPassword(string name, string pw) throws ServerBootedException, InvalidSecretException;
+
+		/** Fetch user texture. Textures are stored as zlib compress()ed 600x60 32-bit BGRA data.
+		 * @param userid ID of registered user. See {@link RegisteredUser.userid}.
+		 * @return Custom texture associated with user or an empty texture.
+		 */
+		idempotent Texture getTexture(int userid) throws ServerBootedException, InvalidUserException, InvalidSecretException;
+
+		/** Set a user texture (now called avatar).
+		 * @param userid ID of registered user. See {@link RegisteredUser.userid}.
+		 * @param tex Texture (as a Byte-Array) to set for the user, or an empty texture to remove the existing texture.
+		 */
+		idempotent void setTexture(int userid, Texture tex) throws ServerBootedException, InvalidUserException, InvalidTextureException, InvalidSecretException;
+
+		/** Get virtual server uptime.
+		 * @return Uptime of the virtual server in seconds
+		 */
+		idempotent int getUptime() throws ServerBootedException, InvalidSecretException;
+
+		/**
+		 * Update the server's certificate information.
+		 *
+		 * Reconfigure the running server's TLS socket with the given
+		 * certificate and private key.
+		 *
+		 * The certificate and and private key must be PEM formatted.
+		 *
+		 * New clients will see the new certificate.
+		 * Existing clients will continue to see the certificate the server
+		 * was using when they connected to it.
+		 *
+		 * This method throws InvalidInputDataException if any of the
+		 * following errors happen:
+		 *  - Unable to decode the PEM certificate and/or private key.
+		 *  - Unable to decrypt the private key with the given passphrase.
+		 *  - The certificate and/or private key do not contain RSA keys.
+		 *  - The certificate is not usable with the given private key.
+		 */
+		 idempotent void updateCertificate(string certificate, string privateKey, string passphrase) throws ServerBootedException, InvalidSecretException, InvalidInputDataException;
+
+		 /**
+		  * Makes the given user start listening to the given channel.
+		  * @param userid The ID of the user
+		  * @param channelid The ID of the channel
+		  */
+		 idempotent void startListening(int userid, int channelid);
+
+		 /**
+		  * Makes the given user stop listening to the given channel.
+		  * @param userid The ID of the user
+		  * @param channelid The ID of the channel
+		  */
+		 idempotent void stopListening(int userid, int channelid);
+
+		 /**
+		  * @param userid The ID of the user
+		  * @param channelid The ID of the channel
+		  * @returns Whether the given user is currently listening to the given channel
+		  */
+		 idempotent bool isListening(int userid, int channelid);
+
+		 /**
+		  * @param userid The ID of the user
+		  * @returns An ID-list of channels the given user is listening to
+		  */
+		 idempotent IntList getListeningChannels(int userid);
+
+		 /**
+		  * @param channelid The ID of the channel
+		  * @returns An ID-list of users listening to the given channel
+		  */
+		 idempotent IntList getListeningUsers(int channelid);
+
+		 /**
+		  * @param receiverUserIDs list of IDs of the users the message shall be sent to
+		  */
+		 idempotent void sendWelcomeMessage(IdList receiverUserIDs);
+	};
+
+	/** Callback interface for Meta. You can supply an implementation of this to receive notifications
+	 *  when servers are stopped or started.
+	 *  If an added callback ever throws an exception or goes away, it will be automatically removed.
+	 *  Please note that all callbacks are done asynchronously; murmur does not wait for the callback to
+	 *  complete before continuing processing.
+	 *  @see ServerCallback
+	 *  @see Meta.addCallback
+	 */
+	interface MetaCallback {
+		/** Called when a server is started. The server is up and running when this event is sent, so all methods that
+		 *  need a running server will work.
+		 *  @param srv Interface for started server.
+		 */
+		void started(Server *srv);
+
+		/** Called when a server is stopped. The server is already stopped when this event is sent, so no methods that
+		 *  need a running server will work.
+		 *  @param srv Interface for started server.
+		 */
+		void stopped(Server *srv);
+	};
+
+	sequence<Server *> ServerList;
+
+	/** This is the meta interface. It is primarily used for retrieving the {@link Server} interfaces for each individual server.
+	 **/
+	["amd"] interface Meta {
+		/** Fetch interface to specific server.
+		 * @param id Server ID. See {@link Server.getId}.
+		 * @return Interface for specified server, or a null proxy if id is invalid.
+		 */
+		idempotent Server *getServer(int id) throws InvalidSecretException;
+
+		/** Create a new server. Call {@link Server.getId} on the returned interface to find it's ID.
+		 * @return Interface for new server.
+		 */
+		Server *newServer() throws InvalidSecretException;
+
+		/** Fetch list of all currently running servers.
+		 * @return List of interfaces for running servers.
+		 */
+		idempotent ServerList getBootedServers() throws InvalidSecretException;
+
+		/** Fetch list of all defined servers.
+		 * @return List of interfaces for all servers.
+		 */
+		idempotent ServerList getAllServers() throws InvalidSecretException;
+
+		/** Fetch default configuration. This returns the configuration items that were set in the configuration file, or
+		 * the built-in default. The individual servers will use these values unless they have been overridden in the
+		 * server specific configuration. The only special case is the port, which defaults to the value defined here +
+		 * the servers ID - 1 (so that virtual server #1 uses the defined port, server #2 uses port+1 etc).
+		 * @return Default configuration of the servers.
+		 */
+		idempotent ConfigMap getDefaultConf() throws InvalidSecretException;
+
+		/** Fetch version of Murmur.
+		 * @param major Major version.
+		 * @param minor Minor version.
+		 * @param patch Patchlevel.
+		 * @param text Textual representation of version. Note that this may not match the {@link major}, {@link minor} and {@link patch} levels, as it
+		 *   may be simply the compile date or the SVN revision. This is usually the text you want to present to users.
+		 */
+		idempotent void getVersion(out int major, out int minor, out int patch, out string text);
+
+		/** Add a callback. The callback will receive notifications when servers are started or stopped.
+		 *
+		 * @param cb Callback interface which will receive notifications.
+		 */
+		void addCallback(MetaCallback *cb) throws InvalidCallbackException, InvalidSecretException;
+
+		/** Remove a callback.
+		 *
+		 * @param cb Callback interface to be removed.
+		 */
+		void removeCallback(MetaCallback *cb) throws InvalidCallbackException, InvalidSecretException;
+
+		/** Get murmur uptime.
+		 * @return Uptime of murmur in seconds
+		 */
+		idempotent int getUptime();
+
+		/** Get slice file.
+		 * @return Contents of the slice file server compiled with.
+		 */
+		idempotent string getSlice();
+
+		/** Returns a checksum dict for the slice file.
+		 * @return Checksum dict
+		 */
+		idempotent Ice::SliceChecksumDict getSliceChecksums();
+	};
+};

allianceauth/services/modules/mumble/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from .models import MumbleUser
+from .models import IdlerHandler, MumbleServerServer, MumbleUser
 from ...admin import ServicesUserAdmin
 
 
@@ -8,11 +8,23 @@ from ...admin import ServicesUserAdmin
 class MumbleUserAdmin(ServicesUserAdmin):
     list_display = ServicesUserAdmin.list_display + (
         'username',
-        'groups',
+        'release',
+        'version'
     )
     search_fields = ServicesUserAdmin.search_fields + (
         'username',
-        'groups'
     )
 
-    fields = ('user', 'username', 'groups')  # pwhash is hidden from admin panel
+
+@admin.register(MumbleServerServer)
+class MumbleServerServerAdmin(admin.ModelAdmin):
+    list_display = ["name", "ip", "port", "slice", "virtual_servers", "avatar_enable", "reject_on_error", "offset"]
+    list_filter = ["slice", "avatar_enable", "reject_on_error", "offset"]
+    search_fields = ["name"]
+
+
+@admin.register(IdlerHandler)
+class IdlerhandlerAdmin(admin.ModelAdmin):
+    list_display = ["name", "enabled", "seconds", "interval", "channel", "denylist"]
+    list_filter = ["enabled", "denylist"]
+    search_fields = ["name"]

allianceauth/services/modules/mumble/app_settings.py

@@ -0,0 +1,5 @@
+from django.conf import settings
+
+MUMBLE_TEMPS_FORCE_SSO = getattr(settings, "MUMBLE_TEMPS_FORCE_SSO", True)
+MUMBLE_TEMPS_SSO_PREFIX = getattr(settings, "MUMBLE_TEMPS_SSO_PREFIX", "[TEMP]")
+MUMBLE_TEMPS_LOGIN_PREFIX = getattr(settings, "MUMBLE_TEMPS_LOGIN_PREFIX", "[*TEMP]")

allianceauth/services/modules/mumble/auth_hooks.py

@@ -1,6 +1,7 @@
 import logging
 import urllib
 
+from allianceauth.menu.hooks import MenuItemHook
 from django.conf import settings
 from django.template.loader import render_to_string
 from allianceauth.notifications import notify
@@ -10,6 +11,7 @@ from allianceauth.services.hooks import ServicesHook
 from .tasks import MumbleTasks
 from .models import MumbleUser
 from .urls import urlpatterns
+from django.utils.translation import gettext_lazy as _
 
 logger = logging.getLogger(__name__)
 
@@ -35,24 +37,10 @@ class MumbleService(ServicesHook):
         except MumbleUser.DoesNotExist:
             logging.debug("User does not have a mumble account")
 
-    def update_groups(self, user):
-        logger.debug(f"Updating {self.name} groups for {user}")
-        if MumbleTasks.has_account(user):
-            MumbleTasks.update_groups.delay(user.pk)
-
-    def sync_nickname(self, user):
-        logger.debug(f"Updating {self.name} nickname for {user}")
-        if MumbleTasks.has_account(user):
-            MumbleTasks.update_display_name.apply_async(args=[user.pk], countdown=5) # cooldown on this task to ensure DB clean when syncing
-
     def validate_user(self, user):
         if MumbleTasks.has_account(user) and not self.service_active_for_user(user):
             self.delete_user(user, notify_user=True)
 
-    def update_all_groups(self):
-        logger.debug("Updating all %s groups" % self.name)
-        MumbleTasks.update_all_groups.delay()
-
     def service_active_for_user(self, user):
         return user.has_perm(self.access_perm)
 
@@ -73,5 +61,26 @@ class MumbleService(ServicesHook):
 
 
 @hooks.register('services_hook')
-def register_mumble_service():
+def register_mumble_service() -> ServicesHook:
     return MumbleService()
+
+
+class MumbleMenuItem(MenuItemHook):
+    def __init__(self) -> None:
+        MenuItemHook.__init__(
+            self=self,
+            text=_("Mumble Temp Links"),
+            classes="fa-solid fa-microphone",
+            url_name="mumble:templinks",
+            navactive=["mumble:templinks"],
+        )
+
+    def render(self, request) -> str:
+        if request.user.has_perm("mumble.create_new_templinks"):
+            return MenuItemHook.render(self, request)
+        return ""
+
+
+@hooks.register("menu_item_hook")
+def register_menu() -> MumbleMenuItem:
+    return MumbleMenuItem()

allianceauth/services/modules/mumble/authenticator.py

@@ -0,0 +1,631 @@
+#!/usr/bin/env python
+
+# Copyright (C) 2010 Stefan Hacker <dd0t@users.sourceforge.net>
+# All rights reserved.
+# Adapted by Adarnof for AllianceAuth
+# Further modified by the Alliance Auth team and contributers
+# Rewritten for Django Context by the Alliance Auth Team
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+
+# - Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+# - Neither the name of the Mumble Developers nor the names of its
+#   contributors may be used to endorse or promote products derived from this
+#   software without specific prior written permission.
+
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# `AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+import importlib.util
+import logging
+import Ice
+
+from urllib.request import urlopen
+from threading import Timer
+from passlib.hash import bcrypt_sha256
+from hashlib import sha1
+
+import django
+from django.utils.datetime_safe import datetime
+import os
+import sys
+logger = logging.getLogger(__name__)
+
+sys.path.append(os.getcwd())
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "myauth.settings.local")
+os.environ["DJANGO_ALLOW_ASYNC_UNSAFE"] = "true"
+django.setup()
+
+from allianceauth import __version__  # noqa
+from allianceauth.services.modules.mumble.models import MumbleServerServer, MumbleUser, TempUser # noqa
+
+
+def main(server_id: int = 1) -> None:
+    """_summary_
+
+    Args:
+        server_id (int, optional): _description_. Defaults to 1.
+
+    Raises:
+        e: _description_
+        Murmur.InvalidSecretException: _description_
+        e: _description_
+
+    Returns:
+        _type_: _description_
+    """
+    slicedir = Ice.getSliceDir()
+    if not slicedir:
+        slicedir = ["-I/usr/share/Ice/slice", "-I/usr/share/slice"]
+    else:
+        slicedir = ['-I' + slicedir]
+
+    package_dir = next(iter(importlib.util.find_spec('allianceauth.services.modules.mumble').submodule_search_locations))
+    package_ice = os.path.join(package_dir, server_config_obj.slice)
+
+    logger.info(f"Using slice file: {package_ice}")
+    slicedir.append("-I" + os.path.dirname(package_ice))
+
+    Ice.loadSlice("", slicedir + [package_ice])
+    try:
+        import MumbleServer as Murmur  # Mumble >=1.5.17
+    except ImportError:
+        import Murmur  # Mumble <=1.5.17
+
+    server_config_obj = MumbleServerServer.objects.get(id=server_id)
+
+    class AllianceAuthAuthenticatorApp(Ice.Application):
+        def run(self, args) -> int:
+            self.shutdownOnInterrupt()
+
+            if not self.initializeIceConnection():
+                return 1
+
+            if server_config_obj.watchdog > 0:
+                self.failedWatch = True
+                self.checkConnection()
+
+            # Serve till we are stopped
+            self.communicator().waitForShutdown()
+            self.watchdog.cancel()
+
+            if self.interrupted():
+                logger.warning("Caught interrupt, shutting down")
+
+            return 0
+
+        def initializeIceConnection(self) -> bool:
+            """
+            Establishes the two-way Ice connection and adds the authenticator to the
+            configured servers
+            """
+            ice = self.communicator()
+            logger.debug("Using shared ice secret")
+            ice.getImplicitContext().put("secret", server_config_obj.secret)
+
+            logger.info(f"Connecting to Ice server ({server_config_obj.ip}:{server_config_obj.port})")
+            base = ice.stringToProxy(f"Meta:tcp -h {server_config_obj.ip} -p {server_config_obj.port}")
+            self.meta = Murmur.MetaPrx.uncheckedCast(base)
+
+            adapter = ice.createObjectAdapterWithEndpoints("Callback.Client", f"tcp -h {server_config_obj.endpoint}")
+            adapter.activate()
+
+            metacbprx = adapter.addWithUUID(metaCallback(self))
+            self.metacb = Murmur.MetaCallbackPrx.uncheckedCast(metacbprx)
+
+            servercbprx = adapter.addWithUUID(serverCallback(self))
+            self.servercb = Murmur.ServerCallbackPrx.uncheckedCast(servercbprx)
+
+            authprx = adapter.addWithUUID(AllianceAuthAuthenticator())
+            self.auth = Murmur.ServerUpdatingAuthenticatorPrx.uncheckedCast(authprx)
+
+            return self.attachCallbacks()
+
+        def attachCallbacks(self, quiet=False) -> bool:
+            """
+            Attaches all callbacks for meta and authenticators
+            """
+
+            # Ice.ConnectionRefusedException
+            # logger.debug('Attaching callbacks')
+            try:
+                if not quiet:
+                    logger.info("Attaching meta callback")
+
+                self.meta.addCallback(self.metacb)
+
+                for server in self.meta.getBootedServers():
+                    if server.id() in server_config_obj.virtual_servers_list():
+                        logger.info("Setting authenticator for virtual server %d", server.id())
+                        server.setAuthenticator(self.auth)
+                        server.addCallback(self.servercb)
+                        if server_config_obj.idler_handler:
+                            idler_handler(server)
+
+            except (Murmur.InvalidSecretException, Ice.UnknownUserException, Ice.ConnectionRefusedException) as e:
+                logger.exception(e)
+                if isinstance(e, Ice.ConnectionRefusedException):
+                    logger.error("Server refused connection")
+                elif (isinstance(e, Murmur.InvalidSecretException) or isinstance(e, Ice.UnknownUserException) and (e.unknown == "Murmur::InvalidSecretException")):
+                    logger.error("Invalid ice secret")
+                else:
+                    # We do not actually want to handle this one, re-raise it
+                    raise e
+
+                self.connected = False
+                return False
+
+            self.connected = True
+            return True
+
+        def checkConnection(self) -> None:
+            """
+            Tries reapplies all callbacks to make sure the authenticator
+            survives server restarts and disconnects.
+            """
+            try:
+                if not self.attachCallbacks(quiet=not self.failedWatch):
+                    self.failedWatch = True
+                else:
+                    self.failedWatch = False
+            except Ice.Exception as e:
+                logger.error(f"Failed connection check, will retry in next watchdog run ({server_config_obj.watchdog}s)")
+                logger.exception(e)
+                self.failedWatch = True
+
+            # Renew the timer
+            self.watchdog = Timer(server_config_obj.watchdog, self.checkConnection)
+            self.watchdog.start()
+
+    def checkSecret(func):
+        """
+        Decorator that checks whether the server transmitted the right secret
+        if a secret is supposed to be used.
+        """
+        if not server_config_obj.secret:
+            return func
+
+        def newfunc(*args, **kws):
+            if "current" in kws:
+                current = kws["current"]
+            else:
+                current = args[-1]
+
+            if not current or "secret" not in current.ctx or current.ctx["secret"] != server_config_obj.secret:
+                logger.error("Server transmitted invalid secret. Possible injection attempt.")
+                raise Murmur.InvalidSecretException()
+
+            return func(*args, **kws)
+
+        return newfunc
+
+    def fortifyIceFu(retval=None, exceptions=(Ice.Exception,)):
+        """
+        Decorator that catches exceptions,logs them and returns a safe retval
+        value. This helps preventing the authenticator getting stuck in
+        critical code paths. Only exceptions that are instances of classes
+        given in the exceptions list are not caught.
+
+        The default is to catch all non-Ice exceptions.
+        """
+
+        def newdec(func):
+            def newfunc(*args, **kws):
+                try:
+                    return func(*args, **kws)
+                except Exception as e:
+                    catch = True
+                    for ex in exceptions:
+                        if isinstance(e, ex):
+                            catch = False
+                            break
+                    if catch:
+                        logger.critical("Unexpected exception caught")
+                        logger.exception(e)
+                        return retval
+                    raise
+
+            return newfunc
+
+        return newdec
+
+    class metaCallback(Murmur.MetaCallback):
+        def __init__(self, app) -> None:
+            Murmur.MetaCallback.__init__(self)
+            self.app = app
+
+        @fortifyIceFu()
+        @checkSecret
+        def started(self, server, current=None) -> None:
+            """
+            This function is called when a virtual server is started
+            and makes sure an authenticator gets attached if needed.
+            """
+            if server.id() in server_config_obj.virtual_servers_list():
+                logger.info("Setting authenticator for virtual server %d", server.id())
+                try:
+                    server.setAuthenticator(self.app.auth)
+                # Apparently this server was restarted without us noticing
+                except (Murmur.InvalidSecretException, Ice.UnknownUserException) as e:
+                    if (hasattr(e, "unknown") and e.unknown != "Murmur::InvalidSecretException"):
+                        # Special handling for Murmur 1.2.2 servers with invalid slice files
+                        raise e
+                    logger.error("Invalid ice secret")
+                    return
+            else:
+                logger.debug("Virtual server %d got started", server.id())
+
+        @fortifyIceFu()
+        @checkSecret
+        def stopped(self, server, current=None) -> None:
+            """
+            This function is called when a virtual server is stopped
+            """
+            if self.app.connected:
+                # Only try to output the server id if we think we are still connected to prevent
+                # flooding of our thread pool
+                try:
+                    if server.id() in server_config_obj.virtual_servers_list():
+                        logger.info(f"Authenticated virtual server {server.id()} got stopped")
+                    else:
+                        logger.debug(f"Virtual server {server.id()} got stopped")
+                    return
+                except Ice.ConnectionRefusedException:
+                    self.app.connected = False
+
+            logger.debug("Server shutdown stopped a virtual server")
+
+    if server_config_obj.reject_on_error:  # Python 2.4 compat
+        authenticateFortifyResult = (-1, None, None)
+    else:
+        authenticateFortifyResult = (-2, None, None)
+
+    class serverCallback(Murmur.ServerCallback):
+        def __init__(self, app) -> None:
+            Murmur.ServerCallback.__init__(self)
+            self.app = app
+
+        def userConnected(self, user, current=None) -> None:
+            try:
+                mumble_user = MumbleUser.objects.get(username=user)
+                mumble_user.release = user.release
+                mumble_user.version = user.version
+                mumble_user.last_connect = datetime.now()
+                mumble_user.save()
+            except MumbleUser.DoesNotExist as a:
+                try:
+                    mumble_user = TempUser.objects.get(username=user)
+                    mumble_user.release = user.release
+                    mumble_user.version = user.version
+                    mumble_user.last_connect = datetime.now()
+                    mumble_user.save()
+                except Exception as b:
+                    logger.exception(a)
+                    logger.exception(b)
+
+        def userDisconnected(self, user, current=None) -> None:
+            try:
+                mumble_user = MumbleUser.objects.get(username=user)
+                mumble_user.last_disconnect = datetime.now()
+                mumble_user.save()
+            except MumbleUser.DoesNotExist as a:
+                try:
+                    mumble_user = TempUser.objects.get(username=user)
+                    mumble_user.last_disconnect = datetime.now()
+                    mumble_user.save()
+                except Exception as b:
+                    logger.exception(a)
+                    logger.exception(b)
+
+        def userStateChanged(self, user, current=None) -> None:
+            pass
+
+        def userTextMessage(self, user, text_message=None) -> None:
+            if text_message.text == "!kicktemps":
+                if self.server.hasPermission(user.session, 0, 0x10000):
+                    self.server.sendMessage(user.session, "Kicking all templink clients!")
+
+                    users = self.server.getUsers()
+                    for (userid, auser) in users.items():
+                        if auser.userid > (server_config_obj.offset * 2):
+                            self.server.kickUser(auser.session, "Kicking all temp users! :-)")
+
+                    self.server.sendMessage(user.session, "All templink clients kicked!")
+
+                else:
+                    self.server.sendMessage(user.session, "You do not have kick permissions!")
+
+        def channelCreated(self, channel, current=None) -> None:
+            pass
+
+        def channelRemoved(self, channel, current=None) -> None:
+            pass
+
+        def channelStateChanged(self, channel, current=None) -> None:
+            pass
+
+    class AllianceAuthAuthenticator(Murmur.ServerUpdatingAuthenticator):
+        texture_cache = {}
+
+        def __init__(self):
+            Murmur.ServerUpdatingAuthenticator.__init__(self)
+
+        @fortifyIceFu(authenticateFortifyResult)
+        @checkSecret
+        def authenticate(self, name, pw, certlist, certhash, strong, current=None) -> tuple[int, str | None, str | None]:
+            """
+            This function is called to authenticate a user
+            """
+            FALL_THROUGH = -2
+            AUTH_REFUSED = -1
+            if name == "SuperUser":
+                logger.debug("Forced fall through for SuperUser")
+                return (FALL_THROUGH, None, None)
+
+            try:
+                mumble_user = MumbleUser.objects.get(username=name)
+            except MumbleUser.DoesNotExist:
+                try:
+                    mumble_user = TempUser.objects.get(username=name)
+                except TempUser.DoesNotExist:
+                    return (-2, None, None)  # No Standard or Temp User
+
+            logger.debug("checking password with hash function: %s" % mumble_user.hashfn)
+            if allianceauth_check_hash(pw, mumble_user.pwhash, mumble_user.hashfn):
+                logger.info(f'User authenticated: {mumble_user.display_name} {mumble_user.user_id + server_config_obj.offset}')
+                logger.debug("Group memberships: %s", mumble_user.group_string())
+                return (mumble_user.user_id + server_config_obj.offset, mumble_user.display_name, mumble_user.group_string())
+            logger.info(
+                f'Failed authentication attempt for user: {name} {mumble_user.user_id + server_config_obj.offset}')
+            return (AUTH_REFUSED, None, None)
+
+        @fortifyIceFu((False, None))
+        @checkSecret
+        def getInfo(self, id, current=None) -> tuple[bool, None]:
+            """
+            Gets called to fetch user specific information
+            """
+            # We do not expose any additional information so always fall through
+            logger.debug("getInfo for %d -> denied", id)
+            return (False, None)
+
+        @fortifyIceFu(-2)
+        @checkSecret
+        def nameToId(self, name, current=None) -> int:
+            """
+            Gets called to get the id for a given username
+            """
+            if name == "SuperUser":
+                logger.debug("nameToId SuperUser -> forced fall through")
+                return -2  # FALL_THROUGH
+
+            try:
+                return (MumbleUser.objects.get(username=name).pk + server_config_obj.offset)
+            except MumbleUser.DoesNotExist:
+                try:
+                    return (TempUser.objects.get(username=name).pk + server_config_obj.offset * 2)
+                except TempUser.DoesNotExist:
+                    return -2  # FALL_THROUGH
+
+        @fortifyIceFu("")
+        @checkSecret
+        def idToName(self, id, current=None) -> str:
+            """
+            Gets called to get the username for a given id
+            """
+            if id < server_config_obj.offset:
+                return ""  # FALL_THROUGH
+
+            try:
+                mumble_user = MumbleUser.objects.get(user_id=id - server_config_obj.offset)
+                mumble_user.username
+            except MumbleUser.DoesNotExist:
+                try:
+                    mumble_user = TempUser.objects.get(user_id=id - server_config_obj.offset * 2)
+                    mumble_user.username
+                except TempUser.DoesNotExist:
+                    return ""  # FALL_THROUGH
+
+            # I dont quite rightly know why we have this
+            # SuperUser shouldnt be in our Authenticator?
+            # But Maybe it can be?
+            if MumbleUser.objects.get(user_id=id - server_config_obj.offset).username == "SuperUser":
+                logger.debug('idToName %d -> "SuperUser" caught')
+                return ""  # FALL_THROUGH
+            else:
+                return mumble_user.username
+
+        @fortifyIceFu("")
+        @checkSecret
+        def idToTexture(self, id, current=None):
+            """
+            Gets called to get the corresponding texture for a user
+            """
+            if server_config_obj.avatar_enable is False:
+                logger.debug(f"idToTexture {id} -> avatar display disabled, fall through")
+                return ""  # FALL_THROUGH
+
+            if id < server_config_obj.offset:
+                return ""  # FALL_THROUGH
+
+            try:
+                avatar_url = MumbleUser.objects.get(user_id=id - server_config_obj.offset).user.profile.main_character.portrait_url()
+            except MumbleUser.DoesNotExist:
+                logger.debug(f"idToTexture {id} -> MumbleUser.DoesNotExist, Fall Through")
+                return ""  # FALL_THROUGH
+
+            if avatar_url:
+                if avatar_url in self.texture_cache:
+                    logger.debug('idToTexture {id} -> cached avatar returned: {avatar_url}')
+                    return self.texture_cache[avatar_url]
+
+                # Not cached? Try to retrieve from CCP image server.
+                try:
+                    logger.debug('idToTexture %d -> try file "%s"', id, avatar_url)
+                    handle = urlopen(avatar_url)
+
+                except (OSError, Exception) as e:
+                    logger.exception(e)
+                    logger.debug(f'idToTexture {id} -> image download for {avatar_url} failed, fall through')
+                    return ""  # FALL_THROUGH
+                else:
+                    file = handle.read()
+                    handle.close()
+
+                # Cache resulting avatar by file address and return image.
+                self.texture_cache[avatar_url] = file
+                logger.debug(f'idToTexture {id} -> avatar from {avatar_url} retrieved and returned')
+                return self.texture_cache[avatar_url]
+
+            else:
+                logger.debug(f"idToTexture {id} -> empty avatar_url, final fall through")
+                return ""  # FALL_THROUGH
+
+        @fortifyIceFu(-2)
+        @checkSecret
+        def registerUser(self, name, current=None) -> int:
+            """
+            Gets called when the server is asked to register a user.
+            """
+            logger.debug(f'registerUser {name} -> fall through')
+            return -2  # FALL_THROUGH
+
+        @fortifyIceFu(-1)
+        @checkSecret
+        def unregisterUser(self, id, current=None) -> int:
+            """
+            Gets called when the server is asked to unregister a user.
+            """
+            # Return -1 to fall through to internal server database, so as to not modify Alliance Auth
+            # but we can make murmur delete all additional logger.information it got this way.
+            logger.debug(f"unregisterUser {id} -> fall through", )
+            return -1  # FALL_THROUGH
+
+        @fortifyIceFu({})
+        @checkSecret
+        def getRegisteredUsers(self, filter, current=None) -> dict:
+            """
+            Returns a list of usernames in the AllianceAuth database which contain
+            filter as a substring.
+            """
+
+            if not filter:
+                mumble_users = MumbleUser.objects.all()
+            else:
+                mumble_users = MumbleUser.objects.filter(username__icontains=filter)
+
+            if not mumble_users.exists():
+                logger.debug(f'getRegisteredUsers -> empty list for filter {filter}', )
+                return {}
+            logger.debug(f'getRegisteredUsers -> {len(mumble_users)} results for filter {filter}')
+
+            return {mumble_user.user_id + server_config_obj.offset: mumble_user.username for mumble_user in mumble_users}
+
+        @fortifyIceFu(-1)
+        @checkSecret
+        def setInfo(self, id, info, current=None) -> int:
+            """
+            Gets called when the server is supposed to save additional information
+            about a user to his database
+            """
+            # Return -1 to fall through to the internal server handler.
+            # Store this in Murmur, Not Alliance Auth
+            logger.debug(f"setInfo {id} -> fall through")
+            return -1  # FALL_THROUGH
+
+        @fortifyIceFu(-1)
+        @checkSecret
+        def setTexture(self, id, texture, current=None) -> int:
+            """
+            Gets called when the server is asked to update the user texture of a user
+            """
+            # Return -1 to fall through to the internal server handler.
+            # Store this in Murmur, Not Alliance Auth
+            logger.debug(f"setTexture {id} -> fall through")
+            return -1  # FALL_THROUGH
+
+    #
+    # --- Start of authenticator
+    #
+    logger.info(f"Starting AllianceAuth Mumble Authenticator V:{__version__}")
+    initdata = Ice.InitializationData()
+    initdata.properties = Ice.createProperties([], initdata.properties)
+
+    initdata.properties.setProperty('Ice.ImplicitContext', 'Shared')
+    initdata.properties.setProperty('Ice.Default.EncodingVersion', '1.0')
+    initdata.logger = logger
+
+    app = AllianceAuthAuthenticatorApp()
+    state = app.main(sys.argv, initData=initdata)
+    logger.info('Shutdown complete')
+
+
+def allianceauth_check_hash(password, hash, hash_type) -> bool:
+    """
+    :param password: Password to be verified
+    :param hash: Hash for the password to be checked against
+    :param hash_type: Hashing function originally used to generate the hash
+    """
+    if hash_type == "sha1":
+        return sha1(password).hexdigest() == hash
+    elif hash_type == "bcrypt-sha256":
+        return bcrypt_sha256.verify(password, hash)
+    else:
+        logger.warning("No valid hash function found for %s" % hash_type)
+        return False
+
+
+def idler_handler(server) -> None:
+    logger.debug("IdlerHandler: Starting")
+    users = server.getUsers().values()
+    logger.debug("IdleHandler: Fetched All Users")
+    for user in users:
+        logger.debug(f"IdleHandler: Checking user {user.name}")
+        if isinstance(user, int):
+            logger.debug(f"IdleHandler: Skipping User {user.name}, This happens occasionally")
+            continue
+
+        if user_idlesecs > server_config_obj.idler_handler.seconds:
+            logger.debug(
+                f"IdleHandler: User {user.name} is AFK, for {user_idlesecs}/{server_config_obj.idler_handler.seconds}"
+            )
+            state = server.getState(user.session)
+            if state:
+                # AllowList > DenyList
+                if server_config_obj.idler_handler.denylist is False:
+                    if state.channel not in server_config_obj.idler_handler.list:
+                        return
+                elif server_config_obj.idler_handler.denylist is True:
+                    if state.channel in server_config_obj.idler_handler.list:
+                        return
+
+                if state.channel == server_config_obj.idler_handler.channel:
+                    return
+
+                state.channel = server_config_obj.idler_handler.channel
+                state.selfMute = True
+                state.selfDeaf = True
+                server.setState(state)
+                logger.debug(f"IdleHandler: Moved AFK User {user.name}")
+
+    Timer(server_config_obj.idler_handler.interval, idler_handler, (server,)).start()
+
+
+if __name__ == "__main__":
+    main()

allianceauth/services/modules/mumble/management/commands/mumble_authenticator.py

@@ -0,0 +1,15 @@
+from allianceauth.services.modules.mumble import authenticator
+
+from django.core.management.base import BaseCommand
+
+
+class Command(BaseCommand):
+    help = 'Run the Mumble Authenticator'
+
+    def add_arguments(self, parser) -> None:
+        parser.add_argument(
+            '--server_id', action='store', default=1,
+            help='Run the Mumble Authenticator for the given Server Configuration ID')
+
+    def handle(self, *args, **options) -> None:
+        authenticator.main()

allianceauth/services/modules/mumble/managers.py

@@ -0,0 +1,48 @@
+import random
+import string
+from allianceauth.eveonline.models import EveCharacter
+from allianceauth.services.hooks import NameFormatter
+from passlib.hash import bcrypt_sha256
+from django.db import models
+from allianceauth.services.abstract import AbstractServiceModel
+import logging
+from django.contrib.auth.models import User
+from django.utils.translation import gettext_lazy as _
+
+logger = logging.getLogger(__name__)
+
+
+class MumbleManager(models.Manager):
+    @staticmethod
+    def get_username(user) -> str:
+        return user.profile.main_character.character_name  # main character as the user.username may be incorrect
+
+    @staticmethod
+    def sanitise_username(username) -> str:
+        return username.replace(" ", "_")
+
+    @staticmethod
+    def generate_random_pass() -> str:
+        return ''.join([random.choice(string.ascii_letters + string.digits) for n in range(16)])
+
+    @staticmethod
+    def gen_pwhash(password) -> str:
+        return bcrypt_sha256.encrypt(password.encode('utf-8'))
+
+    def create(self, user):
+        try:
+            username = self.get_username(user)
+            logger.debug(f"Creating mumble user with username {username}")
+            username_clean = self.sanitise_username(username)
+            password = self.generate_random_pass()
+            pwhash = self.gen_pwhash(password)
+            logger.debug("Proceeding with mumble user creation: clean username {}, pwhash starts with {}".format(
+                username_clean, pwhash[0:5]))
+            logger.info(f"Creating mumble user {username_clean}")
+
+            result = super().create(user=user, username=username_clean, pwhash=pwhash)
+            result.credentials.update({'username': result.username, 'password': password})
+            return result
+        except AttributeError:  # No Main or similar errors
+            return False
+        return False

allianceauth/services/modules/mumble/migrations/0013_connection_history.py

@@ -0,0 +1,37 @@
+# Generated by Django 4.2.16 on 2024-10-07 13:39
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("mumble", "0012_mumble_client_info"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="mumbleuser",
+            options={
+                "permissions": (
+                    ("access_mumble", "Can access the Mumble service"),
+                    (
+                        "view_connection_history",
+                        "Can access the connection history of the Mumble service",
+                    ),
+                )
+            },
+        ),
+        migrations.AlterField(
+            model_name="mumbleuser",
+            name="release",
+            field=models.TextField(
+                blank=True,
+                editable=False,
+                help_text="Client release. For official releases, this equals the version. For snapshots and git compiles, this will be something else.",
+                max_length=254,
+                null=True,
+                verbose_name="Mumble Release",
+            ),
+        ),
+    ]

allianceauth/services/modules/mumble/migrations/0014_idlerhandler_remove_mumbleuser_display_name_and_more.py

@@ -0,0 +1,66 @@
+# Generated by Django 4.2.16 on 2024-12-06 06:20
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mumble', '0013_connection_history'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='IdlerHandler',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=50, verbose_name='')),
+                ('enabled', models.BooleanField(default=False, verbose_name='')),
+                ('seconds', models.SmallIntegerField(default=3600, verbose_name='')),
+                ('interval', models.SmallIntegerField(default=60, verbose_name='')),
+                ('channel', models.SmallIntegerField(verbose_name='')),
+                ('denylist', models.BooleanField(default=True, verbose_name='')),
+                ('list', models.CharField(default='', max_length=50, verbose_name='')),
+            ],
+            options={
+                'verbose_name': '',
+                'verbose_name_plural': 's',
+            },
+        ),
+        migrations.RemoveField(
+            model_name='mumbleuser',
+            name='display_name',
+        ),
+        migrations.RemoveField(
+            model_name='mumbleuser',
+            name='groups',
+        ),
+        migrations.AlterField(
+            model_name='mumbleuser',
+            name='hashfn',
+            field=models.CharField(choices=[('bcrypt-sha256', ''), ('sha1', '')], default='bcrypt-sha256', max_length=15),
+        ),
+        migrations.CreateModel(
+            name='MumbleServerServer',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=50, verbose_name='')),
+                ('ip', models.GenericIPAddressField(verbose_name='')),
+                ('endpoint', models.GenericIPAddressField(verbose_name='')),
+                ('port', models.PositiveSmallIntegerField(default=6502, verbose_name='')),
+                ('secret', models.CharField(max_length=50, verbose_name='')),
+                ('watchdog', models.SmallIntegerField(default=30, verbose_name='')),
+                ('slice', models.CharField(choices=[('MumbleServer.ice', 'MumbleServer.ice eg, Mumble >=1.5.17'), ('Murmur.Ice', 'Murmur.Ice eg, Mumble <=1.5.17')], default='MumbleServer.ice', max_length=16)),
+                ('virtual_servers', models.CharField(default='1', max_length=50, verbose_name='')),
+                ('avatar_enable', models.BooleanField(verbose_name='')),
+                ('reject_on_error', models.BooleanField(verbose_name='')),
+                ('offset', models.IntegerField(default=1000000000, verbose_name='')),
+                ('idler_handler', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='mumble.idlerhandler', verbose_name='')),
+            ],
+            options={
+                'verbose_name': '',
+                'verbose_name_plural': 's',
+            },
+        ),
+    ]

allianceauth/services/modules/mumble/migrations/0015_alter_idlerhandler_options_and_more.py

@@ -0,0 +1,121 @@
+# Generated by Django 4.2.16 on 2024-12-06 09:58
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mumble', '0014_idlerhandler_remove_mumbleuser_display_name_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='idlerhandler',
+            options={'default_permissions': (), 'verbose_name': 'Idler Handler', 'verbose_name_plural': 'Idler Handlers'},
+        ),
+        migrations.AlterModelOptions(
+            name='mumbleserverserver',
+            options={'default_permissions': (), 'verbose_name': 'Mumble Server', 'verbose_name_plural': 'Mumble Servers'},
+        ),
+        migrations.AlterModelOptions(
+            name='mumbleuser',
+            options={'permissions': (('access_mumble', 'Can access the Mumble service'), ('view_connection_history', 'Can access the connection history of the Mumble service')), 'verbose_name': 'User', 'verbose_name_plural': 'Users'},
+        ),
+        migrations.AlterField(
+            model_name='idlerhandler',
+            name='channel',
+            field=models.SmallIntegerField(verbose_name='AFK Channel'),
+        ),
+        migrations.AlterField(
+            model_name='idlerhandler',
+            name='enabled',
+            field=models.BooleanField(default=False, verbose_name='Enabled'),
+        ),
+        migrations.AlterField(
+            model_name='idlerhandler',
+            name='interval',
+            field=models.SmallIntegerField(default=60, verbose_name='Run Interval'),
+        ),
+        migrations.AlterField(
+            model_name='idlerhandler',
+            name='name',
+            field=models.CharField(max_length=50, verbose_name='Name'),
+        ),
+        migrations.AlterField(
+            model_name='idlerhandler',
+            name='seconds',
+            field=models.SmallIntegerField(default=3600, verbose_name='Idle Seconds'),
+        ),
+        migrations.AlterField(
+            model_name='mumbleserverserver',
+            name='avatar_enable',
+            field=models.BooleanField(default=True, verbose_name='Enable EVE Avatars'),
+        ),
+        migrations.AlterField(
+            model_name='mumbleserverserver',
+            name='endpoint',
+            field=models.GenericIPAddressField(default='127.0.0.1', verbose_name='Endpoint IP Address'),
+        ),
+        migrations.AlterField(
+            model_name='mumbleserverserver',
+            name='idler_handler',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='mumble.idlerhandler', verbose_name='Idler Handler'),
+        ),
+        migrations.AlterField(
+            model_name='mumbleserverserver',
+            name='ip',
+            field=models.GenericIPAddressField(default='127.0.0.1', verbose_name='Host IP Address'),
+        ),
+        migrations.AlterField(
+            model_name='mumbleserverserver',
+            name='name',
+            field=models.CharField(max_length=50),
+        ),
+        migrations.AlterField(
+            model_name='mumbleserverserver',
+            name='offset',
+            field=models.IntegerField(default=1000000000, verbose_name='ID Offset'),
+        ),
+        migrations.AlterField(
+            model_name='mumbleserverserver',
+            name='port',
+            field=models.PositiveSmallIntegerField(default=6502, verbose_name='Port'),
+        ),
+        migrations.AlterField(
+            model_name='mumbleserverserver',
+            name='reject_on_error',
+            field=models.BooleanField(default=True, verbose_name='Reject Unauthenticated'),
+        ),
+        migrations.AlterField(
+            model_name='mumbleserverserver',
+            name='secret',
+            field=models.CharField(max_length=50, verbose_name='ICE Secret'),
+        ),
+        migrations.AlterField(
+            model_name='mumbleserverserver',
+            name='slice',
+            field=models.CharField(choices=[('MumbleServer.ice', 'MumbleServer.ice (Mumble >=1.5.17)'), ('Murmur.Ice', 'Murmur.Ice (Mumble <=1.5.17)')], default='MumbleServer.ice', max_length=16),
+        ),
+        migrations.AlterField(
+            model_name='mumbleserverserver',
+            name='virtual_servers',
+            field=models.CharField(default='1', max_length=50, verbose_name='Virtual Servers'),
+        ),
+        migrations.AlterField(
+            model_name='mumbleserverserver',
+            name='watchdog',
+            field=models.SmallIntegerField(default=30, verbose_name='Watchdog Interval'),
+        ),
+        migrations.AlterField(
+            model_name='mumbleuser',
+            name='hashfn',
+            field=models.CharField(choices=[('bcrypt-sha256', 'SHA256'), ('sha1', 'SHA1')], default='bcrypt-sha256', max_length=15),
+        ),
+        migrations.AlterField(
+            model_name='mumbleuser',
+            name='last_disconnect',
+            field=models.DateTimeField(blank=True, editable=False, help_text='Timestamp of the users Last Disconnection from Mumble', max_length=254, null=True, verbose_name='Last Disconnection'),
+        ),
+    ]

allianceauth/services/modules/mumble/migrations/0016_templink_alter_mumbleuser_last_connect_and_more.py

@@ -0,0 +1,60 @@
+# Generated by Django 4.2.16 on 2024-12-06 10:47
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('eveonline', '0017_alliance_and_corp_names_are_not_unique'),
+        ('mumble', '0015_alter_idlerhandler_options_and_more'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='TempLink',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('expires', models.DateTimeField(verbose_name='Expiry')),
+                ('link_ref', models.CharField(max_length=20)),
+                ('creator', models.ForeignKey(default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, to='eveonline.evecharacter')),
+            ],
+            options={
+                'permissions': (('create_new_links', 'Can Create Temp Links'),),
+            },
+        ),
+        migrations.AlterField(
+            model_name='mumbleuser',
+            name='last_connect',
+            field=models.DateTimeField(blank=True, editable=False, help_text='Timestamp of the users Last Connection to Mumble', null=True, verbose_name='Last Connection'),
+        ),
+        migrations.AlterField(
+            model_name='mumbleuser',
+            name='last_disconnect',
+            field=models.DateTimeField(blank=True, editable=False, help_text='Timestamp of the users Last Disconnection from Mumble', null=True, verbose_name='Last Disconnection'),
+        ),
+        migrations.AlterField(
+            model_name='mumbleuser',
+            name='release',
+            field=models.TextField(blank=True, editable=False, help_text='Client release. For official releases, this equals the version. For snapshots and git compiles, this will be something else.', null=True, verbose_name='Mumble Release'),
+        ),
+        migrations.CreateModel(
+            name='TempUser',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=200)),
+                ('username', models.CharField(max_length=254, unique=True)),
+                ('pwhash', models.CharField(max_length=90)),
+                ('hashfn', models.CharField(choices=[('bcrypt-sha256', 'SHA256'), ('sha1', 'SHA1')], default='bcrypt-sha256', max_length=15)),
+                ('certhash', models.CharField(blank=True, editable=False, help_text='Hash of Mumble client certificate as presented when user authenticates', max_length=254, null=True, verbose_name='Certificate Hash')),
+                ('release', models.TextField(blank=True, editable=False, help_text='Client release. For official releases, this equals the version. For snapshots and git compiles, this will be something else.', null=True, verbose_name='Mumble Release')),
+                ('version', models.IntegerField(blank=True, editable=False, help_text='Client version. Major version in upper 16 bits, followed by 8 bits of minor version and 8 bits of patchlevel. Version 1.2.3 = 0x010203.', null=True, verbose_name='Mumble Version')),
+                ('last_connect', models.DateTimeField(blank=True, editable=False, help_text='Timestamp of the users Last Connection to Mumble', null=True, verbose_name='Last Connection')),
+                ('last_disconnect', models.DateTimeField(blank=True, editable=False, help_text='Timestamp of the users Last Disconnection from Mumble', null=True, verbose_name='Last Disconnection')),
+                ('expires', models.DateTimeField(verbose_name='Expiry')),
+                ('character_id', models.IntegerField(blank=True, default=None, null=True)),
+                ('templink', models.ForeignKey(default=None, null=True, on_delete=django.db.models.deletion.CASCADE, to='mumble.templink')),
+            ],
+        ),
+    ]

allianceauth/services/modules/mumble/migrations/0017_alter_tempuser_options_alter_idlerhandler_denylist_and_more.py

@@ -0,0 +1,27 @@
+# Generated by Django 4.2.16 on 2024-12-29 13:14
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mumble', '0016_templink_alter_mumbleuser_last_connect_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='tempuser',
+            options={'permissions': (), 'verbose_name': 'Temp User', 'verbose_name_plural': 'Temp Users'},
+        ),
+        migrations.AlterField(
+            model_name='idlerhandler',
+            name='denylist',
+            field=models.BooleanField(default=True, help_text='True for DenyList, False for Allowlist', verbose_name='DenyList'),
+        ),
+        migrations.AlterField(
+            model_name='idlerhandler',
+            name='list',
+            field=models.CharField(default='', max_length=50, verbose_name='Allow/Deny list'),
+        ),
+    ]

allianceauth/services/modules/mumble/models.py

@@ -1,162 +1,263 @@
 import random
 import string
-from passlib.hash import bcrypt_sha256
-
-from django.db import models
-from django.contrib.auth.models import Group
+from allianceauth.eveonline.models import EveCharacter
 from allianceauth.services.hooks import NameFormatter
+from allianceauth.services.modules.mumble.managers import MumbleManager
+from passlib.hash import bcrypt_sha256
+from django.db import models
 from allianceauth.services.abstract import AbstractServiceModel
 import logging
+from django.contrib.auth.models import User
+from django.utils.translation import gettext_lazy as _
 
 logger = logging.getLogger(__name__)
 
 
-class MumbleManager(models.Manager):
-    HASH_FN = 'bcrypt-sha256'
-
-    @staticmethod
-    def get_display_name(user):
-        from .auth_hooks import MumbleService
-        return NameFormatter(MumbleService(), user).format_name()
-
-    @staticmethod
-    def get_username(user):
-        return user.profile.main_character.character_name  # main character as the user.username may be incorect
-
-    @staticmethod
-    def sanitise_username(username):
-        return username.replace(" ", "_")
-
-    @staticmethod
-    def generate_random_pass():
-        return ''.join([random.choice(string.ascii_letters + string.digits) for n in range(16)])
-
-    @staticmethod
-    def gen_pwhash(password):
-        return bcrypt_sha256.encrypt(password.encode('utf-8'))
-
-    def create(self, user):
-        try:
-            username = self.get_username(user)
-            logger.debug(f"Creating mumble user with username {username}")
-            username_clean = self.sanitise_username(username)
-            display_name = self.get_display_name(user)
-            password = self.generate_random_pass()
-            pwhash = self.gen_pwhash(password)
-            logger.debug("Proceeding with mumble user creation: clean username {}, pwhash starts with {}".format(
-                username_clean, pwhash[0:5]))
-            logger.info(f"Creating mumble user {username_clean}")
-
-            result = super().create(user=user, username=username_clean,
-                                                    pwhash=pwhash, hashfn=self.HASH_FN,
-                                                    display_name=display_name)
-            result.update_groups()
-            result.credentials.update({'username': result.username, 'password': password})
-            return result
-        except AttributeError:  # No Main or similar errors
-            return False
-        return False
-
-    def user_exists(self, username):
-        return self.filter(username=username).exists()
-
-
 class MumbleUser(AbstractServiceModel):
+    class HashFunction(models.TextChoices):
+        SHA256 = 'bcrypt-sha256', _('SHA256')
+        SHA1 = 'sha1', _('SHA1')
     user = models.OneToOneField(
-        'auth.User',
+        User,
         primary_key=True,
         on_delete=models.CASCADE,
         related_name='mumble'
     )
     username = models.CharField(max_length=254, unique=True)
     pwhash = models.CharField(max_length=90)
-    hashfn = models.CharField(max_length=20, default='sha1')
-    groups = models.TextField(blank=True, null=True)
+    hashfn = models.CharField(
+        max_length=15,
+        choices=HashFunction.choices,
+        default=HashFunction.SHA256)
     certhash = models.CharField(
         verbose_name="Certificate Hash",
-        max_length=254,
-        blank=True,
-        null=True,
-        editable=False,
-        help_text="Hash of Mumble client certificate as presented when user authenticates"
-    )
-    display_name = models.CharField(
-        max_length=254,
-        unique=True
-    )
+        max_length=254,blank=True, null=True, editable=False,
+        help_text="Hash of Mumble client certificate as presented when user authenticates")
     release = models.TextField(
         verbose_name="Mumble Release",
-        max_length=254,
-        blank=True,
-        null=True,
-        editable=False,
-        help_text="The Mumble Release the user last authenticated with"
-    )
+        blank=True, null=True, editable=False,
+        help_text="Client release. For official releases, this equals the version. For snapshots and git compiles, this will be something else.")
     version = models.IntegerField(
         verbose_name="Mumble Version",
-        blank=True,
-        null=True,
-        editable=False,
-        help_text="Client version. Major version in upper 16 bits, followed by 8 bits of minor version and 8 bits of patchlevel. Version 1.2.3 = 0x010203."
-    )
+        blank=True, null=True, editable=False,
+        help_text="Client version. Major version in upper 16 bits, followed by 8 bits of minor version and 8 bits of patchlevel. Version 1.2.3 = 0x010203.")
     last_connect = models.DateTimeField(
         verbose_name="Last Connection",
-        max_length=254,
-        blank=True,
-        null=True,
-        editable=False,
-        help_text="Timestamp of the users Last Connection to Mumble"
-    )
+        blank=True, null=True, editable=False,
+        help_text="Timestamp of the users Last Connection to Mumble")
     last_disconnect = models.DateTimeField(
         verbose_name="Last Disconnection",
-        max_length=254,
-        blank=True,
-        null=True,
-        editable=False,
-        help_text="Timestamp of the users Last Disconnection to Mumble"
-    )
+        blank=True, null=True, editable=False,
+        help_text="Timestamp of the users Last Disconnection from Mumble")
 
     objects = MumbleManager()
 
-    def __str__(self):
-        return self.username
+    @property
+    def display_name(self) -> str:
+        from .auth_hooks import MumbleService
+        return NameFormatter(MumbleService(), self.user).format_name()
 
-    def update_password(self, password=None):
+    @property
+    def groups(self) -> str:
+        # Not sure where this is used, there was a test for it
+        return self.group_string()
+
+    def __str__(self) -> str:
+        return f"{self.username}"
+
+    def update_password(self, password=None) -> None:
         init_password = password
-        logger.debug(f"Updating mumble user %s password.")
+        logger.debug(f"Updating mumble user {self.user} password.")
         if not password:
             password = MumbleManager.generate_random_pass()
         pwhash = MumbleManager.gen_pwhash(password)
-        logger.debug("Proceeding with mumble user {} password update - pwhash starts with {}".format(
-            self.user, pwhash[0:5]))
+        logger.debug(f"Proceeding with mumble user {self.user} password update - pwhash starts with {pwhash[0:5]}")
         self.pwhash = pwhash
-        self.hashfn = MumbleManager.HASH_FN
+        self.hashfn = self.HashFunction.SHA256
         self.save()
         if init_password is None:
             self.credentials.update({'username': self.username, 'password': password})
 
-    def reset_password(self):
+    def reset_password(self) -> None:
         self.update_password()
 
-    def update_groups(self, groups: Group=None):
-        if groups is None:
-            groups = self.user.groups.all()
-        groups_str = [self.user.profile.state.name]
-        for group in groups:
-            groups_str.append(str(group.name))
-        safe_groups = ','.join({g.replace(' ', '-') for g in groups_str})
-        logger.info(f"Updating mumble user {self.user} groups to {safe_groups}")
-        self.groups = safe_groups
-        self.save()
-        return True
+    def group_string(self) -> str:
+        """Return a Mumble Safe Formatted List of Groups
+        This used to be a ModelField, generated on the fly now with DjangoAuthenticatorTM
 
-    def update_display_name(self):
-        logger.info(f"Updating mumble user {self.user} display name")
-        self.display_name = MumbleManager.get_display_name(self.user)
-        self.save()
-        return True
+        Returns:
+            LiteralString: Mumble Safe Formatted List of Groups
+        """
+        groups_str = [self.user.profile.state.name]
+        for group in self.user.groups.all():
+            groups_str.append(str(group.name))
+        return ','.join({g.replace(' ', '-') for g in groups_str})
 
     class Meta:
+        verbose_name = _("User")
+        verbose_name_plural = _("Users")
         permissions = (
             ("access_mumble", "Can access the Mumble service"),
+            ("view_connection_history", "Can access the connection history of the Mumble service"),
         )
+
+
+class TempLink(models.Model):
+    expires = models.DateTimeField(_("Expiry"), auto_now=False, auto_now_add=False)
+    link_ref = models.CharField(max_length=20)
+    creator = models.ForeignKey(EveCharacter, on_delete=models.SET_NULL, null=True, default=None)
+
+    class Meta:
+        permissions = (("create_new_links", "Can Create Temp Links"),)
+
+    def __str__(self):
+        return f"Link {self.link_ref} - {self.expires}"
+
+
+class TempUser(models.Model):
+    class HashFunction(models.TextChoices):
+        SHA256 = 'bcrypt-sha256', _('SHA256')
+        SHA1 = 'sha1', _('SHA1')
+    name = models.CharField(max_length=200)  # Display name to show
+    username = models.CharField(max_length=254, unique=True)
+    pwhash = models.CharField(max_length=90)
+    hashfn = models.CharField(
+        max_length=15,
+        choices=HashFunction.choices,
+        default=HashFunction.SHA256)
+    certhash = models.CharField(
+        verbose_name="Certificate Hash",
+        max_length=254,blank=True, null=True, editable=False,
+        help_text="Hash of Mumble client certificate as presented when user authenticates")
+    release = models.TextField(
+        verbose_name="Mumble Release",
+        blank=True, null=True, editable=False,
+        help_text="Client release. For official releases, this equals the version. For snapshots and git compiles, this will be something else.")
+    version = models.IntegerField(
+        verbose_name="Mumble Version",
+        blank=True, null=True, editable=False,
+        help_text="Client version. Major version in upper 16 bits, followed by 8 bits of minor version and 8 bits of patchlevel. Version 1.2.3 = 0x010203.")
+    last_connect = models.DateTimeField(
+        verbose_name="Last Connection",
+        blank=True, null=True, editable=False,
+        help_text="Timestamp of the users Last Connection to Mumble")
+    last_disconnect = models.DateTimeField(
+        verbose_name="Last Disconnection",
+        blank=True, null=True, editable=False,
+        help_text="Timestamp of the users Last Disconnection from Mumble")
+    expires = models.DateTimeField(_("Expiry"), auto_now=False, auto_now_add=False)
+
+    templink = models.ForeignKey(TempLink, on_delete=models.CASCADE, null=True, default=None)
+    character_id = models.IntegerField(default=None, blank=True, null=True)
+
+    @property
+    def display_name(self) -> str:
+        from .auth_hooks import MumbleService
+        return NameFormatter(MumbleService(), self.user).format_name()
+
+    @property
+    def groups(self) -> str:
+        # Not sure where this is used, there was a test for it
+        return self.group_string()
+
+    @staticmethod
+    def get_username(user) -> str:
+        return user.profile.main_character.character_name  # main character as the user.username may be incorrect
+
+    @staticmethod
+    def sanitise_username(username) -> str:
+        return username.replace(" ", "_")
+
+    @staticmethod
+    def generate_random_pass() -> str:
+        return ''.join([random.choice(string.ascii_letters + string.digits) for n in range(16)])
+
+    @staticmethod
+    def gen_pwhash(password) -> str:
+        return bcrypt_sha256.encrypt(password.encode('utf-8'))
+
+    def __str__(self) -> str:
+        return f"Temp User: {self.username} - {self.name}"
+
+    def group_string(self) -> str:
+        """Overwritten from MumbleUser, we could add features to this in the future
+        """
+        return str(["Guest"])
+
+    class Meta:
+        verbose_name = _("Temp User")
+        verbose_name_plural = _("Temp Users")
+        permissions = ()
+
+
+class IdlerHandler(models.Model):
+    name = models.CharField(_("Name"), max_length=50)
+    enabled = models.BooleanField(_("Enabled"), default=False)
+    seconds = models.SmallIntegerField(_("Idle Seconds"), default=3600)
+    interval = models.SmallIntegerField(_("Run Interval"), default=60)
+    channel = models.SmallIntegerField(_("AFK Channel"))
+    denylist = models.BooleanField(_("DenyList"), default=True, help_text="True for DenyList, False for Allowlist")
+    list = models.CharField(_("Allow/Deny list"), max_length=50, default="")
+
+    class Meta:
+        verbose_name = _("Idler Handler")
+        verbose_name_plural = _("Idler Handlers")
+        default_permissions = ()
+
+    def __str__(self) -> str:
+        return f"{self.name}"
+
+
+class MumbleServerServer(models.Model):  # This will clash with ICE MumbleServer
+    class ServerVersion(models.TextChoices):
+        MUMBLESERVER_ICE = 'MumbleServer.ice', _('MumbleServer.ice (Mumble >=1.5.17)')
+        MURMUR_ICE = 'Murmur.Ice', _('Murmur.Ice (Mumble <=1.5.17)')
+    name = models.CharField(max_length=50)
+    ip = models.GenericIPAddressField(
+        verbose_name=_("Host IP Address"),
+        protocol="both",
+        unpack_ipv4=False,
+        default="127.0.0.1")
+    endpoint = models.GenericIPAddressField(
+        verbose_name=_("Endpoint IP Address"),
+        protocol="both",
+        unpack_ipv4=False,
+        default="127.0.0.1")
+
+    port = models.PositiveSmallIntegerField(verbose_name=_("Port"), default=6502)
+    secret = models.CharField(verbose_name=_("ICE Secret"), max_length=50)
+    watchdog = models.SmallIntegerField(verbose_name=_("Watchdog Interval"), default=30)
+    slice = models.CharField(
+        max_length=16,
+        choices=ServerVersion.choices,
+        default=ServerVersion.MUMBLESERVER_ICE)
+    virtual_servers = models.CharField(
+        verbose_name=_("Virtual Servers"),
+        max_length=50,
+        default="1")
+    avatar_enable = models.BooleanField(
+        verbose_name=_("Enable EVE Avatars"),
+        default=True)
+    reject_on_error = models.BooleanField(
+        verbose_name=_("Reject Unauthenticated"),
+        default=True)
+    offset = models.IntegerField(
+        verbose_name=_("ID Offset"),
+        default=1000000000)
+    idler_handler = models.ForeignKey(
+        IdlerHandler,
+        verbose_name=_("Idler Handler"),
+        on_delete=models.SET_NULL,
+        null=True,
+        blank=True)
+
+    class Meta:
+        verbose_name = _("Mumble Server")
+        verbose_name_plural = _("Mumble Servers")
+        default_permissions = ()
+
+    def __str__(self) -> str:
+        return f"{self.name}"
+
+    def virtual_servers_list(self) -> list:
+        return [int(num) for num in self.virtual_servers.replace(",", " ").split() if num]

allianceauth/services/modules/mumble/tasks.py

@@ -1,10 +1,9 @@
+from datetime import datetime, timezone
 import logging
 
-from django.contrib.auth.models import User
 from django.core.exceptions import ObjectDoesNotExist
 from celery import shared_task
-from allianceauth.services.tasks import QueueOnce
-from .models import MumbleUser
+from .models import MumbleUser, TempLink, TempUser
 
 logger = logging.getLogger(__name__)
 
@@ -25,56 +24,9 @@ class MumbleTasks:
         logger.info("Deleting all MumbleUser models")
         MumbleUser.objects.all().delete()
 
-    @staticmethod
-    @shared_task(bind=True, name="mumble.update_groups", base=QueueOnce)
-    def update_groups(self, pk):
-        user = User.objects.get(pk=pk)
-        logger.debug("Updating mumble groups for user %s" % user)
-        if MumbleTasks.has_account(user):
-            try:
-                if not user.mumble.update_groups():
-                    raise Exception("Group sync failed")
-                logger.debug("Updated user %s mumble groups." % user)
-                return True
-            except MumbleUser.DoesNotExist:
-                logger.info(f"Mumble group sync failed for {user}, user does not have a mumble account")
-            except:
-                logger.exception("Mumble group sync failed for %s, retrying in 10 mins" % user)
-                raise self.retry(countdown=60 * 10)
-        else:
-            logger.debug("User %s does not have a mumble account, skipping" % user)
-        return False
 
-    @staticmethod
-    @shared_task(bind=True, name="mumble.update_display_name", base=QueueOnce)
-    def update_display_name(self, pk):
-        user = User.objects.get(pk=pk)
-        logger.debug("Updating mumble groups for user %s" % user)
-        if MumbleTasks.has_account(user):
-            try:
-                if not user.mumble.update_display_name():
-                    raise Exception("Display Name Sync failed")
-                logger.debug("Updated user %s mumble display name." % user)
-                return True
-            except MumbleUser.DoesNotExist:
-                logger.info(f"Mumble display name sync failed for {user}, user does not have a mumble account")
-            except:
-                logger.exception("Mumble display name sync failed for %s, retrying in 10 mins" % user)
-                raise self.retry(countdown=60 * 10)
-        else:
-            logger.debug("User %s does not have a mumble account, skipping" % user)
-        return False
-
-    @staticmethod
-    @shared_task(name="mumble.update_all_groups")
-    def update_all_groups():
-        logger.debug("Updating ALL mumble groups")
-        for mumble_user in MumbleUser.objects.exclude(username__exact=''):
-            MumbleTasks.update_groups.delay(mumble_user.user.pk)
-
-    @staticmethod
-    @shared_task(name="mumble.update_all_display_names")
-    def update_all_display_names():
-        logger.debug("Updating ALL mumble display names")
-        for mumble_user in MumbleUser.objects.exclude(username__exact=''):
-            MumbleTasks.update_display_name.delay(mumble_user.user.pk)
+@shared_task
+def tidy_up_temp_links() -> None:
+    TempLink.objects.filter(expires__lt=datetime.now(timezone.utc).timestamp()).delete()
+    TempUser.objects.filter(templink__isnull=True).delete()
+    TempUser.objects.filter(expires__lt=datetime.now(timezone.utc).timestamp()).delete()

allianceauth/services/modules/mumble/templates/services/mumble/base.html

@@ -0,0 +1,19 @@
+{% extends "allianceauth/base-bs5.html" %}
+
+{% load i18n %}
+
+{% block page_title %}
+    {% translate "Mumble Temporary Links" %}
+{% endblock page_title %}
+
+{% block header_nav_brand %}
+    {% translate "Mumble Temporary Links" %}
+{% endblock header_nav_brand %}
+
+{% block content %}
+    <div class="allianceauth-mumble">
+        <div class="row">
+            {% block mumble %}{% endblock mumble %}
+        </div>
+    </div>
+{% endblock %}

allianceauth/services/modules/mumble/templates/services/mumble/link.html

@@ -0,0 +1,120 @@
+{% extends "services/mumble/base.html" %}
+
+{% load static %}
+{% load i18n %}
+
+{% block mumble %}
+    <div class="text-center">
+        <p>
+            <img class="ra-avatar img-circle" src="{{ link.creator.portrait_url_128 }}" alt="{{ link.creator.character_name }}" />
+        </p>
+
+        <h4>
+            {% blocktranslatelate with character=link.creator.character_name %}
+                {{ character }} has invited you to join Mumble!
+            {% endblocktranslatelate %}
+        </h4>
+
+        <p>
+            {% translate "Time Remaining" %}: <span id="countdown{{ link.link_ref }}"></span>
+        </p>
+        <p>
+            <span class="label label-info">{% translate "Link Ref" %}: {{ link.link_ref }}</span>
+        </p>
+
+        <p>
+            <a class="btn btn-primary" href="mumble://{{ connect_url }}">
+                <img src="{% static 'services/mumble/images/mumble-icon.png' %}" alt="{% translate 'Mumble' %}" height="64" width="64" style="margin: 15px" />
+
+                <span style="margin: 15px;">
+                    {% translate "Click to Join Mumble as" %}: <b>{{ temp_user.name }}</b>
+                </span>
+            </a>
+        </p>
+
+        <div class="row justify-content-center">
+            <div class="col-md-10 col-lg-8">
+                <div class="card">
+                    <div class="card-header text-center">
+                        <div class="card-title mb-0">{% translate "Manually Connect" %}</div>
+                    </div>
+
+                    <div class="card-body">
+                        <p>
+                            {% translate "If you have problems with the application link above, please use the following in Mumble's connection dialog." %}
+                        </p>
+                        <p>
+                            {% translate "Mumble URL" %}: <span class="badge bg-dark">{{ mumble }}</span>
+                        </p>
+                        <p>
+                            {% translate "Username" %}: <span class="badge bg-dark">{{ temp_user.username }}</span>
+                        </p>
+                        <p>
+                            {% translate "Password" %}: <span class="badge bg-dark">{{ temp_user.password }}</span>
+                        </p>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    {% include "bundles/moment-js.html" with locale=True %}
+    {% include "bundles/timers-js.html" %}
+
+    <script>
+        /* global moment */
+        const locale = '{{ LANGUAGE_CODE }}';
+        const timers = [{
+            'id': '{{ link.link_ref }}',
+            'targetDate': moment('{{ link.expires| date:"c" }}'),
+            'expired': false
+        }];
+
+        moment.locale(locale);
+
+        /**
+         * Update a timer
+         *
+         * @param timer
+         */
+        const updateTimer = (timer) => {
+            if (timer.targetDate.isAfter(Date.now())) {
+                const duration = moment.duration(timer.targetDate - moment(), 'milliseconds');
+
+                document.getElementById("countdown" + timer.id).innerHTML = getDurationString(duration);
+            } else {
+                timer.expired = true;
+
+                document.getElementById("countdown" + timer.id).innerHTML = "";
+            }
+        };
+
+        /**
+         * Update all timers
+         */
+        const updateAllTimers = () => {
+            const l = timers.length;
+
+            for (let i = 0; i < l; ++i) {
+                if (timers[i].expired) {
+                    continue;
+                }
+
+                updateTimer(timers[i]);
+            }
+        };
+
+        /**
+         * Timed update
+         */
+        const timedUpdate = () => {
+            updateAllTimers();
+        };
+
+        // Set initial values
+        timedUpdate();
+
+        // Start timed updates
+        setInterval(timedUpdate, 1000);
+    </script>
+{% endblock mumble %}

allianceauth/services/modules/mumble/templates/services/mumble/login.html

@@ -0,0 +1,139 @@
+{% extends "services/mumble/base.html" %}
+
+{% load static %}
+{% load i18n %}
+
+{% block mumble %}
+    <div class="col-md-12 text-center">
+        <div class="mumble-sso-login mb-3">
+            <p>
+                <img class="ra-avatar img-circle" src="{{ link.creator.portrait_url_128 }}" alt="{{ link.creator.character_name }}" />
+            </p>
+
+            <h4>
+                {% blocktranslatelate with character=link.creator.character_name %}
+                    {{ character }} has invited you to join Mumble!
+                {% endblocktranslatelate %}
+            </h4>
+
+            <p>
+                {% translate "Time Remaining" %}: <span id="countdown{{ link.link_ref }}"></span>
+            </p>
+            <p>
+                <span class="label label-info">{% translate "Link Ref" %}: {{ link.link_ref }}</span>
+            </p>
+
+            <form action="{% url 'mumble:join' link.link_ref %}" method="post">
+                {% csrf_token %}
+
+                <input type="hidden" name="sso" value="True" />
+                <input
+                    type="image"
+                    class="img-responsive center-block"
+                    src="{% static 'allianceauth/authentication/img/sso/EVE_SSO_Login_Buttons_Large_Black.png' %}"
+                    alt="{% translate 'Login with SSO"' %}"
+                    >
+                </form>
+            </div>
+
+            <div class="mumble-non-sso-login">
+                <div class="row justify-content-center">
+                    <div class="col-md-10 col-lg-8">
+                        <div class="card">
+                            <div class="card-header text-center">
+                                <div class="card-title mb-0">{% translate "Non SSO Login" %}</div>
+                            </div>
+
+                            <div class="card-body text-start">
+                                <div class="form-group">
+                                    <form action="{% url 'mumble:join' link.link_ref %}" method="post">
+                                        {% csrf_token %}
+
+                                        <input type="hidden" name="sso" value="False" />
+
+                                        <p class="text-center">
+                                            {% translate "If you cannot SSO with your EVE character, You can enter your own details below." %}
+                                        </p>
+
+                                        <p>
+                                            <label for="name">{% translate "Name" %}</label>
+                                            <input type="text" class="form-control" name="name" id="name" placeholder="{% translate 'Who are you?' %}" />
+                                        </p>
+
+                                        <p>
+                                            <label for="association">{% translate "Association" %}</label>
+                                            <input type="text" class="form-control" name="association" id="association" placeholder="{% translate 'Who are you with?' %}" />
+                                        </p>
+
+                                        <button type="submit" value="{% translate 'Submit' %}" class="btn btn-primary">
+                                            {% translate "Login Without SSO" %}
+                                        </button>
+                                    </form>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        {% include "bundles/moment-js.html" with locale=True %}
+        {% include "bundles/timers-js.html" %}
+
+        <script>
+            /* global moment */
+            const locale = '{{ LANGUAGE_CODE }}';
+            const timers = [{
+                'id': '{{ link.link_ref }}',
+                'targetDate': moment('{{ link.expires| date:"c" }}'),
+                'expired': false
+            }];
+
+            moment.locale(locale);
+
+            /**
+             * Update a timer
+             *
+             * @param timer
+             */
+            const updateTimer = (timer) => {
+                if (timer.targetDate.isAfter(Date.now())) {
+                    const duration = moment.duration(timer.targetDate - moment(), 'milliseconds');
+
+                    document.getElementById("countdown" + timer.id).innerHTML = getDurationString(duration);
+                } else {
+                    timer.expired = true;
+
+                    document.getElementById("countdown" + timer.id).innerHTML = "";
+                }
+            };
+
+            /**
+             * Update all timers
+             */
+            const updateAllTimers = () => {
+                const l = timers.length;
+
+                for (let i = 0; i < l; ++i) {
+                    if (timers[i].expired) {
+                        continue;
+                    }
+
+                    updateTimer(timers[i]);
+                }
+            };
+
+            /**
+             * Timed update
+             */
+            const timedUpdate = () => {
+                updateAllTimers();
+            };
+
+            // Set initial values
+            timedUpdate();
+
+            // Start timed updates
+            setInterval(timedUpdate, 1000);
+        </script>
+    {% endblock mumble %}

allianceauth/services/modules/mumble/templates/services/mumble/mumble_connection_history.html

@@ -0,0 +1,209 @@
+{% extends "allianceauth/base-bs5.html" %}
+
+{% load i18n %}
+
+{% block page_title %}
+    {% translate "Mumble" %}
+{% endblock page_title %}
+
+{% block header_nav_brand %}
+    <a class="navbar-brand">{% trans "Mumble History" %} - {{ mumble_url }}</a>
+{% endblock header_nav_brand %}
+
+{% block header_nav_collapse_left %}
+{% endblock header_nav_collapse_left %}
+
+{% block header_nav_collapse_right %}
+{% endblock header_nav_collapse_right %}
+
+{% block content %}
+    <div class="card col-lg-12 mb-3">
+        <div class="card-header">
+            <span class="card-title">{% translate "Server Connection History" %}</span>
+        </div>
+
+        <div class="card-body">
+            <div class="table-responsive">
+                <table class="table w-100" id="table-mumble-connection-history">
+                    <thead>
+                        <tr>
+                            <th class="text-start">{% translate "User" %}</th>
+                            <th class="text-start">{% translate "Displayed Name" %}</th>
+                            <th class="text-start">{% translate "Release" %}</th>
+                            <th class="text-start">{% translate "Version" %}</th>
+                            <th class="text-end">{% translate "Last Connect" %}</th>
+                            <th class="text-end">{% translate "Last Disconnect" %}</th>
+                        </tr>
+                    </thead>
+                </table>
+            </div>
+        </div>
+    </div>
+
+    <div class="row">
+        <div class="col-lg-6">
+            <div class="card">
+                <div class="card-header">
+                    <span class="card-title">{% translate "Server Connection Breakdown" %}</span>
+                </div>
+
+                <div class="card-body">
+                    <canvas id="pieChart"></canvas> <!-- Canvas element for the pie chart -->
+                </div>
+            </div>
+        </div>
+
+        <div class="col-lg-6">
+            <div class="card">
+                <div class="card-header">
+                    <span class="card-title">{% translate "Server Connection Breakdown" %}</span>
+                </div>
+
+                <div class="card-body">
+                    <div class="table-responsive">
+                        <table class="table w-100" id="table-mumble-connection-stats">
+                            <thead>
+                                <tr>
+                                    <th class="text-start">{% translate "Version" %}</th>
+                                    <th class="text-end">{% translate "Number" %}</th>
+                                </tr>
+                            </thead>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+{% endblock content %}
+
+{% block extra_javascript %}
+    {% include "bundles/datatables-js-bs5.html" %}
+    {% include "bundles/filterdropdown-js.html" %}
+    {% include "bundles/chart-js.html" %}
+    {% include "bundles/moment-js.html" with locale=True %}
+
+    <script>
+        $(document).ready(function () {
+            const MUMBLESTATS_DATETIME_FORMAT = 'YYYY-MM-DD, HH:mm';
+
+            'use strict';
+
+            $("#table-mumble-connection-history").DataTable({
+                ajax: {
+                    url: '{% url "mumble:connection_history_data" %}',
+                    dataSrc: 'connection_history_data',
+                },
+                columns: [
+                    { data: 'user' },
+                    { data: 'display_name' },
+                    { data: 'release' },
+                    { data: 'version' },
+                    {
+                        data: 'last_connect',
+                        render: (data) => {
+                            return moment(data).utc().format(MUMBLESTATS_DATETIME_FORMAT);
+                        },
+                        className: 'text-end',
+                    },
+                    {
+                        data: 'last_disconnect',
+                        render: (data) => {
+                            return moment(data).utc().format(MUMBLESTATS_DATETIME_FORMAT);
+                        },
+                        className: 'text-end',
+                    },
+                ],
+                order: [[4, 'desc']],
+                processing: true,
+                stateSave: true,
+                stateDuration: 0,
+                filterDropDown: {
+                    columns: [
+                        {
+                            idx: 2,
+                        },
+                        {
+                            idx: 3,
+                        },
+                    ],
+                    bootstrap: true,
+                    bootstrap_version: 5,
+                },
+            });
+
+            $("#table-mumble-connection-stats").DataTable({
+                ajax: {
+                    url: '{% url "mumble:release_counts_data" %}',
+                    dataSrc: 'release_counts_data',
+                },
+                columns: [
+                    { data: 'release' },
+                    { data: 'user_count', className: 'text-end' },
+                ],
+                order: [[1, 'desc']],
+                processing: true,
+                stateSave: true,
+                stateDuration: 0,
+            });
+
+            // Initialize empty Pie chart
+            const elementBody = document.querySelector('body');
+            const elementBodyCss = getComputedStyle(elementBody);
+            const ctx = document.getElementById('pieChart').getContext('2d');
+            const pieChart = new Chart(ctx, {
+                type: 'pie',
+                data: {
+                    labels: [], // Initially empty
+                    datasets: [
+                        {
+                            label: 'Server Connection Breakdown',
+                            data: [], // Initially empty
+                            backgroundColor: [
+                                'rgba(255, 99, 132, 0.2)',
+                                'rgba(54, 162, 235, 0.2)',
+                                'rgba(255, 206, 86, 0.2)'
+                            ],
+                            borderColor: [
+                                'rgba(255, 99, 132, 1)',
+                                'rgba(54, 162, 235, 1)',
+                                'rgba(255, 206, 86, 1)'
+                            ],
+                            borderWidth: 1
+                        }
+                    ]
+                },
+                options: {
+                    responsive: true,
+                    plugins: {
+                        legend: {
+                            position: 'top'
+                        }
+                    }
+                }
+            });
+
+            Chart.defaults.color = elementBodyCss.color;
+
+            // AJAX call to dynamically update the chart
+            $.ajax({
+                url: '{% url "mumble:release_pie_chart_data" %}', // Your Django view URL that returns chart data
+                method: "GET",
+                success: (data) => {
+                    // Replace chart data with the data from the AJAX response
+                    pieChart.data.labels = data.labels; // Set the new labels
+                    pieChart.data.datasets[0].data = data.values; // Set the new values
+
+                    // Update the chart to reflect the new data
+                    pieChart.update();
+                },
+                error: (xhr, status, error) => {
+                    console.error('Error fetching pie chart data:', status, error);
+                },
+            });
+        });
+    </script>
+{% endblock extra_javascript %}
+
+{% block extra_css %}
+    {% include "bundles/datatables-css-bs5.html" %}
+{% endblock extra_css %}

allianceauth/services/modules/mumble/templates/services/mumble/mumble_service_ctrl.html

@@ -4,15 +4,17 @@
 
 {% block title %}
     {{ service_name }}
-{% endblock %}
+{% endblock title %}
 
 {% block url %}
-    <a href="{{ service_url }}">{{ service_url }}</a>
-{% endblock %}
+    {% if username != '' %}
+        <a href="mumble://{{ connect_url }}">{{ service_url }}</a>
+    {% endif %}
+{% endblock url %}
 
 {% block user %}
     {% include "services/service_username.html" with username=username %}
-{% endblock %}
+{% endblock user %}
 
 {% block controls %}
     {% if username == "" %}
@@ -46,4 +48,9 @@
             </a>
         {% endif %}
     {% endif %}
-{% endblock %}
+    {% if request.user.is_superuser %}
+    <a class="btn btn-primary" type="button" id="btnMumbleConnectionHistory" href="{% url 'mumble:connection_history' %}" title="{% translate 'Mumble Connection History' %}">
+        <i class="fa-solid fa-clock-rotate-left"></i> History
+    </a>
+{% endif %}
+{% endblock controls %}

allianceauth/services/modules/mumble/templates/services/mumble/templinks.html

@@ -0,0 +1,197 @@
+{% extends "services/mumble/base.html" %}
+
+{% load i18n %}
+{% load humanize %}
+
+{% block mumble %}
+    <div class="col-md-6 mb-2">
+        <div class="card h-100">
+            <div class="card-header bg-warning">
+                <div class="card-title mb-0">{% translate "Mumble Temporary Links" %}</div>
+            </div>
+
+            <div class="card-body text-center">
+                <p>
+                    {% blocktranslate trimmed with bold_start="<b>" bold_end="</b>" %}
+                        Temp Links Give Access to mumble with the {{ bold_start }}Guest{{ bold_end }} Group for the preset time
+                    {% endblocktranslate %}
+                </p>
+
+                <p>
+                    {% blocktranslate trimmed with bold_start="<b class='text-warning'>" bold_end="</b>" %}
+                        Connected users {{ bold_start }}will not{{ bold_end }} be kicked at the end of this period.
+                    {% endblocktranslate %}
+                </p>
+
+                <p>
+                    {% blocktranslate trimmed with badge_start="<span class='badge bg-danger'>" badge_end="</span>" %}
+                        Templink users can be kicked in mumble by typing {{ badge_start }}!kicktemps{{ badge_end }} in mumble chat.
+                    {% endblocktranslate %}
+                </p>
+
+                <p>
+                    {% blocktranslate trimmed with bold_start="<b class='text-warning'>" bold_end="</b>" %}
+                        There are {{ bold_start }}no restrictions{{ bold_end }} on who or how many can use a templink, share wisely.
+                    {% endblocktranslate %}
+                </p>
+
+            </div>
+        </div>
+    </div>
+
+    <div class="col-md-6 mt-sm-2 mt-md-0 mb-2">
+        <div class="card h-100">
+            <div class="card-header">
+                <div class="card-title mb-0">{% translate "Create New Link" %}</div>
+            </div>
+
+            <div class="card-body text-center">
+                <p>{% translate "Your link will be displayed on the next page for an easy copy and paste." %}</p>
+
+                <form action="{% url 'mumble:index' %}" method="post">
+                    {% csrf_token %}
+
+                    <div class="mb-3">
+                        <label for="time">{% translate "Duration (hours)" %}</label>
+                        <select class="form-select" name="time" id="time">
+                            <option value="3">3</option>
+                            <option value="6">6</option>
+                            <option value="12">12</option>
+                            <option value="24">24</option>
+                        </select>
+                    </div>
+
+                    <input class="btn btn-primary" type="submit" value="{% translate 'OK' %}" />
+                </form>
+            </div>
+        </div>
+    </div>
+
+    {% if tl %}
+        <div class="my-2">
+            <div class="card">
+                <div class="card-header bg-success">
+                    <div class="card-title mb-0">{% translate "New Link" %}</div>
+                </div>
+
+                <div class="card-body text-center" style="min-height: 100px;">
+                    <p>
+                        {% translate "Expires in" %}: <span id="countdown{{ tl.link_ref }}hot"></span>
+                    </p>
+
+                    <pre>{{ SITE_URL }}{% url 'mumble:join' tl.link_ref %}</pre>
+
+                    <button class="btn btn-info" id="clipboard-new" data-clipboard-text="{{ SITE_URL }}{% url 'mumble:join' tl.link_ref %}">
+                        {% translate "Copy to Clipboard!" %}
+                    </button>
+                </div>
+            </div>
+        </div>
+    {% endif %}
+
+    <div class="my-2">
+        <div class="card pb-2">
+            <div class="card-header">
+                <div class="card-title mb-0">{% translate "Active Links" %}</div>
+            </div>
+
+            <div class="card-body" style="min-height: 100px;">
+                <table class="table table-striped">
+                    <thead>
+                        <tr>
+                            <th></th>
+                            <th class="text-center">{% translate "Creator" %}</th>
+                            <th class="text-center">{% translate "Key" %}</th>
+                            <th class="text-center">{% translate "Time Left" %}</th>
+                            <th class="text-center">{% translate "Copy" %}</th>
+                            <th class="text-center">{% translate "Nuke" %}</th>
+                        </tr>
+                    </thead>
+
+                    <tbody>
+                        {% for lnk in tl_list %}
+                            <tr>
+                                <td class="text-center">
+                                    <img class="ra-avatar img-circle" src="{{ lnk.creator.portrait_url_32 }}" alt="{{ lnk.creator.character_name }}" />
+                                </td>
+
+                                <td class="text-center">{{ lnk.creator.character_name }}</td>
+
+                                <td class="text-center">{{ lnk.link_ref }}</td>
+
+                                <td class="text-center" id="countdown{{ lnk.link_ref }}"></td>
+
+                                <td class="text-center">
+                                    <button class="btn btn-info"
+                                            id="clipboard-{{ lnk.link_ref }}"
+                                            data-clipboard-text="{{ SITE_URL }}{% url 'mumble:join' lnk.link_ref %}">
+                                        {% translate "Copy to Clipboard!" %}
+                                    </button>
+                                </td>
+
+                                <td class="text-center">
+                                    <a class="btn btn-danger" href="{% url 'mumble:nuke' lnk.link_ref %}">{% translate "Nuke Link!" %}</a>
+                                </td>
+                            </tr>
+                        {% endfor %}
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+
+    {% if ex_tl_list.count > 0 %}
+        <div class="my-2">
+            <div class="card">
+                <div class="card-header">
+                    <div class="card-title mb-0">{% translate "Expired Links" %}</div>
+                </div>
+
+                <div class="card-body" style="min-height: 100px;">
+                    <table class="table table-striped">
+                        <thead>
+                            <tr>
+                                <th></th>
+                                <th class="text-center">{% translate "Creator" %}</th>
+                                <th class="text-center">{% translate "Key" %}</th>
+                                <th class="text-center">{% translate "Nuke" %}</th>
+                            </tr>
+                        </thead>
+
+                        <tbody>
+                            {% for lnk in ex_tl_list %}
+                                <tr>
+                                    <td class="text-center">
+                                        <img class="ra-avatar img-circle" src="{{ lnk.creator.portrait_url_32 }}" alt="{{ lnk.creator.character_name }}" />
+                                    </td>
+
+                                    <td class="text-center">{{ lnk.creator.character_name }}</td>
+
+                                    <td class="text-center">{{ lnk.link_ref }}</td>
+
+                                    <td class="text-center">
+                                        <a class="btn btn-danger" href="{% url 'mumble:nuke' lnk.link_ref %}">{% translate "Nuke Link!" %}</a>
+                                    </td>
+                                </tr>
+                            {% endfor %}
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+    {% endif %}
+{% endblock mumble %}
+
+{% block extra_javascript %}
+    {% include "bundles/clipboard-js.html" %}
+
+    <script>
+        /* global ClipboardJS */
+        const clipboard = new ClipboardJS('#clipboard-new');
+
+        {% for lnk in tl_list %}
+            const lnk{{ lnk.link_ref }} = new ClipboardJS('#clipboard-{{ lnk.link_ref }}');
+        {% endfor %}
+    </script>
+
+{% endblock extra_javascript %}

allianceauth/services/modules/mumble/tests.py

@@ -1,212 +0,0 @@
-from unittest import mock
-
-from django.test import TestCase, RequestFactory
-from django import urls
-from django.contrib.auth.models import User, Group, Permission
-from django.core.exceptions import ObjectDoesNotExist
-
-from allianceauth.tests.auth_utils import AuthUtils
-
-from .auth_hooks import MumbleService
-from .models import MumbleUser
-from .tasks import MumbleTasks
-
-MODULE_PATH = 'allianceauth.services.modules.mumble'
-DEFAULT_AUTH_GROUP = 'Member'
-
-
-def add_permissions():
-    permission = Permission.objects.get(codename='access_mumble')
-    members = Group.objects.get_or_create(name=DEFAULT_AUTH_GROUP)[0]
-    AuthUtils.add_permissions_to_groups([permission], [members])
-
-
-class MumbleHooksTestCase(TestCase):
-    def setUp(self):
-        self.member = 'member_user'
-        member = AuthUtils.create_member(self.member)
-        AuthUtils.add_main_character(member, 'auth_member', '12345', corp_id='111', corp_name='Test Corporation', corp_ticker='TESTR')
-        member = User.objects.get(pk=member.pk)
-        MumbleUser.objects.create(user=member)
-        self.none_user = 'none_user'
-        none_user = AuthUtils.create_user(self.none_user)
-        self.service = MumbleService
-        add_permissions()
-
-    def test_has_account(self):
-        member = User.objects.get(username=self.member)
-        none_user = User.objects.get(username=self.none_user)
-        self.assertTrue(MumbleTasks.has_account(member))
-        self.assertFalse(MumbleTasks.has_account(none_user))
-
-    def test_service_enabled(self):
-        service = self.service()
-        member = User.objects.get(username=self.member)
-        none_user = User.objects.get(username=self.none_user)
-
-        self.assertTrue(service.service_active_for_user(member))
-        self.assertFalse(service.service_active_for_user(none_user))
-
-    @mock.patch(MODULE_PATH + '.tasks.User.mumble')
-    def test_update_all_groups(self, mumble):
-        service = self.service()
-        service.update_all_groups()
-        # Check member and blue user have groups updated
-        self.assertTrue(mumble.update_groups.called)
-        self.assertEqual(mumble.update_groups.call_count, 1)
-
-    def test_update_groups(self):
-        # Check member has Member group updated
-        service = self.service()
-        member = User.objects.get(username=self.member)
-        member.mumble.groups = ''  # Remove the group set in setUp
-        member.mumble.save()
-
-        service.update_groups(member)
-
-        mumble_user = MumbleUser.objects.get(user=member)
-        self.assertIn(DEFAULT_AUTH_GROUP, mumble_user.groups)
-
-        # Check none user does not have groups updated
-        service = self.service()
-        none_user = User.objects.get(username=self.none_user)
-        result = service.update_groups(none_user)
-        self.assertFalse(result)
-
-    def test_validate_user(self):
-        service = self.service()
-        # Test member is not deleted
-        member = User.objects.get(username=self.member)
-        service.validate_user(member)
-        self.assertTrue(member.mumble)
-
-        # Test none user is deleted
-        none_user = User.objects.get(username=self.none_user)
-        MumbleUser.objects.create(user=none_user)
-        service.validate_user(none_user)
-        with self.assertRaises(ObjectDoesNotExist):
-            none_mumble = User.objects.get(username=self.none_user).mumble
-
-    def test_delete_user(self):
-        member = User.objects.get(username=self.member)
-
-        service = self.service()
-        result = service.delete_user(member)
-
-        self.assertTrue(result)
-        with self.assertRaises(ObjectDoesNotExist):
-            mumble_user = User.objects.get(username=self.member).mumble
-
-    def test_render_services_ctrl(self):
-        service = self.service()
-        member = User.objects.get(username=self.member)
-        request = RequestFactory().get('/services/')
-        request.user = member
-
-        response = service.render_services_ctrl(request)
-        self.assertTemplateUsed(service.service_ctrl_template)
-        self.assertIn(urls.reverse('mumble:deactivate'), response)
-        self.assertIn(urls.reverse('mumble:reset_password'), response)
-        self.assertIn(urls.reverse('mumble:set_password'), response)
-
-        # Test register becomes available
-        member.mumble.delete()
-        member = User.objects.get(username=self.member)
-        request.user = member
-        response = service.render_services_ctrl(request)
-        self.assertIn(urls.reverse('mumble:activate'), response)
-
-
-class MumbleViewsTestCase(TestCase):
-    def setUp(self):
-        self.member = AuthUtils.create_member('auth_member')
-        self.member.email = 'auth_member@example.com'
-        self.member.save()
-        AuthUtils.add_main_character(self.member, 'auth_member', '12345', corp_id='111', corp_name='Test Corporation', corp_ticker='TESTR')
-        self.member = User.objects.get(pk=self.member.pk)
-        add_permissions()
-
-    def login(self):
-        self.client.force_login(self.member)
-
-    def test_activate_update(self):
-        self.login()
-        expected_username = 'auth_member'
-        expected_displayname = '[TESTR]auth_member'
-        response = self.client.get(urls.reverse('mumble:activate'), follow=False)
-        self.assertEqual(response.status_code, 200)
-        self.assertContains(response, expected_username)
-        # create
-        mumble_user = MumbleUser.objects.get(user=self.member)
-        self.assertEqual(mumble_user.username, expected_username)
-        self.assertTrue(MumbleUser.objects.user_exists(expected_username))
-        self.assertEqual(str(mumble_user), expected_username)
-        self.assertEqual(mumble_user.display_name, expected_displayname)
-        self.assertTrue(mumble_user.pwhash)
-        self.assertIn('Guest', mumble_user.groups)
-        self.assertIn('Member', mumble_user.groups)
-        self.assertIn(',', mumble_user.groups)
-        # test update
-        self.member.profile.main_character.character_name = "auth_member_updated"
-        self.member.profile.main_character.corporation_ticker = "TESTU"
-        self.member.profile.main_character.save()
-        mumble_user.update_display_name()
-        mumble_user = MumbleUser.objects.get(user=self.member)
-        expected_displayname = '[TESTU]auth_member_updated'
-        self.assertEqual(mumble_user.username, expected_username)
-        self.assertTrue(MumbleUser.objects.user_exists(expected_username))
-        self.assertEqual(str(mumble_user), expected_username)
-        self.assertEqual(mumble_user.display_name, expected_displayname)
-        self.assertTrue(mumble_user.pwhash)
-        self.assertIn('Guest', mumble_user.groups)
-        self.assertIn('Member', mumble_user.groups)
-        self.assertIn(',', mumble_user.groups)
-
-
-    def test_deactivate_post(self):
-        self.login()
-        MumbleUser.objects.create(user=self.member)
-
-        response = self.client.post(urls.reverse('mumble:deactivate'))
-
-        self.assertRedirects(response, expected_url=urls.reverse('services:services'), target_status_code=200)
-        with self.assertRaises(ObjectDoesNotExist):
-            mumble_user = User.objects.get(pk=self.member.pk).mumble
-
-    def test_set_password(self):
-        self.login()
-        created = MumbleUser.objects.create(user=self.member)
-        old_pwd = created.credentials.get('password')
-
-        response = self.client.post(urls.reverse('mumble:set_password'), data={'password': '1234asdf'})
-
-        self.assertNotEqual(MumbleUser.objects.get(user=self.member).pwhash, old_pwd)
-        self.assertRedirects(response, expected_url=urls.reverse('services:services'), target_status_code=200)
-
-    def test_reset_password(self):
-        self.login()
-        created = MumbleUser.objects.create(user=self.member)
-        old_pwd = created.credentials.get('password')
-
-        response = self.client.get(urls.reverse('mumble:reset_password'))
-
-        self.assertNotEqual(MumbleUser.objects.get(user=self.member).pwhash, old_pwd)
-        self.assertTemplateUsed(response, 'services/service_credentials.html')
-        self.assertContains(response, 'auth_member')
-
-class MumbleManagerTestCase(TestCase):
-    def setUp(self):
-        from .models import MumbleManager
-        self.manager = MumbleManager
-
-    def test_generate_random_password(self):
-        password = self.manager.generate_random_pass()
-
-        self.assertEqual(len(password), 16)
-        self.assertIsInstance(password, str)
-
-    def test_gen_pwhash(self):
-        pwhash = self.manager.gen_pwhash('test')
-
-        self.assertEqual(pwhash[:15], '$bcrypt-sha256$')
-        self.assertEqual(len(pwhash), 83)

allianceauth/services/modules/mumble/tests/test_hooks.py

@@ -0,0 +1,88 @@
+from allianceauth.services.modules.mumble.auth_hooks import MumbleService
+from allianceauth.services.modules.mumble.models import MumbleUser
+from allianceauth.services.modules.mumble.tasks import MumbleTasks
+from django.test import TestCase, RequestFactory
+from django import urls
+from django.contrib.auth.models import User, Group, Permission
+from django.core.exceptions import ObjectDoesNotExist
+
+from allianceauth.tests.auth_utils import AuthUtils
+
+MODULE_PATH = 'allianceauth.services.modules.mumble'
+DEFAULT_AUTH_GROUP = 'Member'
+
+
+def add_permissions():
+    permission = Permission.objects.get(codename='access_mumble')
+    members = Group.objects.get_or_create(name=DEFAULT_AUTH_GROUP)[0]
+    AuthUtils.add_permissions_to_groups([permission], [members])
+
+
+class MumbleHooksTestCase(TestCase):
+    def setUp(self):
+        self.member = 'member_user'
+        member = AuthUtils.create_member(self.member)
+        AuthUtils.add_main_character(member, 'auth_member', '12345', corp_id='111', corp_name='Test Corporation', corp_ticker='TESTR')
+        member = User.objects.get(pk=member.pk)
+        MumbleUser.objects.create(user=member)
+        self.none_user = 'none_user'
+        none_user = AuthUtils.create_user(self.none_user)
+        self.service = MumbleService
+        add_permissions()
+
+    def test_has_account(self):
+        member = User.objects.get(username=self.member)
+        none_user = User.objects.get(username=self.none_user)
+        self.assertTrue(MumbleTasks.has_account(member))
+        self.assertFalse(MumbleTasks.has_account(none_user))
+
+    def test_service_enabled(self):
+        service = self.service()
+        member = User.objects.get(username=self.member)
+        none_user = User.objects.get(username=self.none_user)
+
+        self.assertTrue(service.service_active_for_user(member))
+        self.assertFalse(service.service_active_for_user(none_user))
+
+    def test_validate_user(self):
+        service = self.service()
+        # Test member is not deleted
+        member = User.objects.get(username=self.member)
+        service.validate_user(member)
+        self.assertTrue(member.mumble)
+
+        # Test none user is deleted
+        none_user = User.objects.get(username=self.none_user)
+        MumbleUser.objects.create(user=none_user)
+        service.validate_user(none_user)
+        with self.assertRaises(ObjectDoesNotExist):
+            none_mumble = User.objects.get(username=self.none_user).mumble
+
+    def test_delete_user(self):
+        member = User.objects.get(username=self.member)
+
+        service = self.service()
+        result = service.delete_user(member)
+
+        self.assertTrue(result)
+        with self.assertRaises(ObjectDoesNotExist):
+            mumble_user = User.objects.get(username=self.member).mumble
+
+    def test_render_services_ctrl(self):
+        service = self.service()
+        member = User.objects.get(username=self.member)
+        request = RequestFactory().get('/services/')
+        request.user = member
+
+        response = service.render_services_ctrl(request)
+        self.assertTemplateUsed(service.service_ctrl_template)
+        self.assertIn(urls.reverse('mumble:deactivate'), response)
+        self.assertIn(urls.reverse('mumble:reset_password'), response)
+        self.assertIn(urls.reverse('mumble:set_password'), response)
+
+        # Test register becomes available
+        member.mumble.delete()
+        member = User.objects.get(username=self.member)
+        request.user = member
+        response = service.render_services_ctrl(request)
+        self.assertIn(urls.reverse('mumble:activate'), response)

allianceauth/services/modules/mumble/tests/test_models.py

@@ -0,0 +1,117 @@
+import unittest
+from allianceauth.authentication.admin import Permission
+from allianceauth.tests.auth_utils import AuthUtils
+from django.test import TestCase
+from django.utils import timezone
+from django.contrib.auth.models import User, Group
+from unittest.mock import patch
+from datetime import timedelta
+
+from ..models import (
+    MumbleUser,
+    TempLink,
+    TempUser,
+    IdlerHandler,
+    MumbleServerServer
+)
+
+MODULE_PATH = 'allianceauth.services.modules.mumble'
+DEFAULT_AUTH_GROUP = 'Member'
+
+
+def add_permissions():
+    permission = Permission.objects.get(codename='access_mumble')
+    members = Group.objects.get_or_create(name=DEFAULT_AUTH_GROUP)[0]
+    AuthUtils.add_permissions_to_groups([permission], [members])
+
+
+class MumbleUserTests(TestCase):
+    def setUp(self):
+        self.member = AuthUtils.create_member('auth_member')
+        self.member.email = 'auth_member@example.com'
+        self.member.save()
+        AuthUtils.add_main_character(self.member, 'john_mumble', '12345', corp_id='111', corp_name='Test Corporation', corp_ticker='TESTR')
+        self.member = User.objects.get(pk=self.member.pk)
+        add_permissions()
+        self.mumble_user = MumbleUser.objects.create(user=self.member)
+
+    def test_mumble_user_str(self):
+        """
+        Test that __str__ returns the username.
+        """
+        self.assertEqual(str(self.mumble_user), 'john_mumble')
+
+    def test_update_password_no_arg(self):
+        """
+        Test update_password when no password is provided
+        (it should generate a random one).
+        """
+        old_pwhash = self.mumble_user.pwhash
+        self.mumble_user.update_password()  # No password argument
+        # pwhash should have changed (random pass)
+        self.assertNotEqual(old_pwhash, self.mumble_user.pwhash)
+        self.assertTrue(self.mumble_user.credentials)  # Should have 'username' & 'password'
+
+    def test_reset_password(self):
+        """
+        reset_password is basically an alias to update_password with no password argument.
+        """
+        old_pwhash = self.mumble_user.pwhash
+        self.mumble_user.reset_password()
+        self.assertNotEqual(old_pwhash, self.mumble_user.pwhash)
+        self.assertTrue(self.mumble_user.credentials)
+
+
+class IdlerHandlerTests(TestCase):
+    def setUp(self):
+        self.idler = IdlerHandler.objects.create(
+            name="MyAFKIdler",
+            enabled=True,
+            seconds=7200,
+            interval=120,
+            channel=999,
+            denylist=False,
+            list="some_list"
+        )
+
+    def test_idler_handler_str(self):
+        self.assertEqual(str(self.idler), "MyAFKIdler")
+
+
+class MumbleServerServerTests(TestCase):
+    def setUp(self):
+        self.idler = IdlerHandler.objects.create(
+            name="MyAFKIdler",
+            enabled=True,
+            seconds=3600,
+            interval=60,
+            channel=999,
+            denylist=True,
+            list=""
+        )
+        self.server = MumbleServerServer.objects.create(
+            name="MyMumbleServer",
+            ip="127.0.0.1",
+            endpoint="127.0.0.1",
+            port=6502,
+            secret="supersecret",
+            watchdog=30,
+            slice="MumbleServer.ice",
+            virtual_servers="1,2",
+            avatar_enable=True,
+            reject_on_error=True,
+            offset=1000000000,
+            idler_handler=self.idler
+        )
+
+    def test_mumble_server_str(self):
+        """
+        Test string representation of MumbleServerServer.
+        """
+        self.assertEqual(str(self.server), "MyMumbleServer")
+
+    def test_virtual_servers_list(self):
+        """
+        The virtual_servers_list should parse '1,2' into [1, 2].
+        """
+        self.assertEqual(self.server.virtual_servers_list(), [1, 2])