Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Allow tracking puppeted users for MAU #11561

Merged
merged 6 commits into from
Jan 12, 2022
Merged

Allow tracking puppeted users for MAU #11561

merged 6 commits into from
Jan 12, 2022

Commits on Dec 10, 2021

  1. Allow tracking puppeted users for MAU 

    Currently when puppeting another user, the user doing the puppeting is tracked for client ip's and MAU (if configured).

When tracking MAU is important, it becomes necessary to be possible to also track the client IP's and MAU of puppeted users. As an example a client that manages user creation and creation of tokens via the Synapse admin API, passing those tokens for the client to use.

This PR adds optional configuration to enable tracking of puppeted users into monthly active users. The default behaviour stays the same.

Signed-off-by: Jason Robinson <jasonr@matrix.org>
    @jaywink
    jaywink committed Dec 10, 2021
    Configuration menu
    Copy the full SHA
    9e90cc1 View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2021

  1. Apply suggestions from code review 

    Co-authored-by: Sean Quah <8349537+squahtx@users.noreply.github.com>
    @jaywink @squahtx
    jaywink and squahtx authored Dec 22, 2021
    Configuration menu
    Copy the full SHA
    6f1a4e3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into jaywink/allow-tracking-puppets-mau 

    # Conflicts:
#	tests/api/test_auth.py
    @jaywink
    jaywink committed Dec 22, 2021
    Configuration menu
    Copy the full SHA
    fd5eedd View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2022

  1. Use track_puppeted_user_ips instead 

    Also move it from server to api config, which seems more relevant, given the code it is used is in api auth.

Signed-off-by: Jason Robinson <jasonr@matrix.org>
    @jaywink
    jaywink committed Jan 5, 2022
    Configuration menu
    Copy the full SHA
    9e6a74b View commit details
    Browse the repository at this point in the history

  2. Remove whitespace causing linting issue 

    Signed-off-by: Jason Robinson <jasonr@matrix.org>
    @jaywink
    jaywink committed Jan 5, 2022
    Configuration menu
    Copy the full SHA
    c8c3236 View commit details
    Browse the repository at this point in the history

  3. Add note about MAU tracking for puppeted users 

    Signed-off-by: Jason Robinson <jasonr@matrix.org>
    @jaywink
    jaywink committed Jan 5, 2022
    Configuration menu
    Copy the full SHA
    0950d56 View commit details
    Browse the repository at this point in the history