Add mau_appservice_trial_days config

changelog.d/12619.feature

@@ -0,0 +1 @@
+Add new `enable_registration_token_3pid_bypass` configuration option to specify a different trial period for users registered via an appservice.

docs/sample_config.yaml

@@ -407,6 +407,10 @@ manhole_settings:
 # sign up in a short space of time never to return after their initial
 # session.
 #
+# 'mau_appservice_trial_days' is similar to the above, but applies a different
+# trial number depending on the appservice ID registered to the user. A value
+# of 0 means no trial days are applied.
+#
 # 'mau_limit_alerting' is a means of limiting client side alerting
 # should the mau limit be reached. This is useful for small instances
 # where the admin has 5 mau seats (say) for 5 specific people and no
@@ -417,6 +421,8 @@ manhole_settings:
 #max_mau_value: 50
 #mau_trial_days: 2
 #mau_limit_alerting: false
+#mau_appservice_trial_days:
+#  "appservice-id": 1
 
 # If enabled, the metrics for the number of monthly active users will
 # be populated, however no one will be limited. If limit_usage_by_mau

synapse/config/server.py

@@ -413,6 +413,7 @@ def read_config(self, config: JsonDict, **kwargs: Any) -> None:
         )
 
         self.mau_trial_days = config.get("mau_trial_days", 0)
+        self.mau_appservice_trial_days = config.get("mau_appservice_trial_days", {})
         self.mau_limit_alerting = config.get("mau_limit_alerting", True)
 
         # How long to keep redacted events in the database in unredacted form
@@ -1105,6 +1106,10 @@ def generate_config_section(
         # sign up in a short space of time never to return after their initial
         # session.
         #
+        # 'mau_appservice_trial_days' is similar to the above, but applies a different
+        # trial number depending on the appservice ID registered to the user. A value
+        # of 0 means no trial days are applied.
+        #
         # 'mau_limit_alerting' is a means of limiting client side alerting
         # should the mau limit be reached. This is useful for small instances
         # where the admin has 5 mau seats (say) for 5 specific people and no
@@ -1115,6 +1120,8 @@ def generate_config_section(
         #max_mau_value: 50
         #mau_trial_days: 2
         #mau_limit_alerting: false
+        #mau_appservice_trial_days:
+        #  "appservice-id": 1
 
         # If enabled, the metrics for the number of monthly active users will
         # be populated, however no one will be limited. If limit_usage_by_mau

synapse/storage/databases/main/registration.py

@@ -215,7 +215,8 @@ async def get_userinfo_by_id(self, user_id: str) -> Optional[UserInfo]:
 
     async def is_trial_user(self, user_id: str) -> bool:
         """Checks if user is in the "trial" period, i.e. within the first
-        N days of registration defined by `mau_trial_days` config
+        N days of registration defined by `mau_trial_days` config or the
+        `mau_appservice_trial_days` config.
 
         Args:
             user_id: The user to check for trial status.
@@ -226,7 +227,10 @@ async def is_trial_user(self, user_id: str) -> bool:
             return False
 
         now = self._clock.time_msec()
-        trial_duration_ms = self.config.server.mau_trial_days * 24 * 60 * 60 * 1000
+        days = self.config.server.mau_appservice_trial_days.get(
+            info["appservice_id"], self.config.server.mau_trial_days
+        )
+        trial_duration_ms = days * 24 * 60 * 60 * 1000
         is_trial = (now - info["creation_ts"] * 1000) < trial_duration_ms
         return is_trial
 

tests/test_mau.py

@@ -229,6 +229,68 @@ def test_tracked_but_not_limited(self):
         self.reactor.advance(100)
         self.assertEqual(2, self.successResultOf(count))
 
+    @override_config(
+        {
+            "mau_trial_days": 3,
+            "mau_appservice_trial_days": {"SomeASID": 1, "AnotherASID": 2},
+        }
+    )
+    def test_as_trial_days(self):
+        """Test that application services can still create users when the MAU
+        limit has been reached. This only works when application service
+        user ip tracking is disabled.
+        """
+
+        # Create and sync so that the MAU counts get updated
+        token1 = self.create_user("kermit1")
+        token2 = self.create_user("kermit2")
+
+        # Cheekily add an application service that we use to register a new user
+        # with.
+        as_token_1 = "foobartoken1"
+        self.store.services_cache.append(
+            ApplicationService(
+                token=as_token_1,
+                hostname=self.hs.hostname,
+                id="SomeASID",
+                sender="@as_sender_1:test",
+                namespaces={"users": [{"regex": "@as_2*", "exclusive": True}]},
+            )
+        )
+
+        as_token_2 = "foobartoken2"
+        self.store.services_cache.append(
+            ApplicationService(
+                token=as_token_2,
+                hostname=self.hs.hostname,
+                id="AnotherASID",
+                sender="@as_sender_2:test",
+                namespaces={"users": [{"regex": "@as_2*", "exclusive": True}]},
+            )
+        )
+
+        token3 = self.create_user("as_kermit3", token=as_token_1, appservice=True)
+        token4 = self.create_user("as_kermit4", token=as_token_2, appservice=True)
+
+        # Advance time by a day to include the first appservice
+        self.reactor.advance(24 * 60 * 61)
+        self.do_sync_for_user(token3)
+        count = self.store.get_monthly_active_count()
+        self.assertEqual(1, self.successResultOf(count))
+
+        # Advance time by a day to include the next appservice
+        self.reactor.advance(24 * 60 * 61)
+        self.do_sync_for_user(token4)
+        count = self.store.get_monthly_active_count()
+        self.assertEqual(2, self.successResultOf(count))
+
+        # Advance time by 2 days to include the native users
+        self.reactor.advance(2 * 24 * 60 * 61)
+        self.do_sync_for_user(token1)
+        self.do_sync_for_user(token2)
+        count = self.store.get_monthly_active_count()
+        self.assertEqual(4, self.successResultOf(count))
+
     def create_user(self, localpart, token=None, appservice=False):
         request_data = {
             "username": localpart,