Merge remote-tracking branch 'origin/2/main' into add_oauth_lib_and_r…

…equirer
canonical · Jan 14, 2025 · a3775e8 · a3775e8
2 parents 3c0236b + 1845a09
commit a3775e8
Show file tree

Hide file tree

Showing 91 changed files with 782 additions and 2,933 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -33,5 +33,6 @@ Please, provide some information about your PR before proceeding.
 - [ ] The documentation is generated using `src-docs`
 - [ ] The documentation for charmhub is updated.
 - [ ] The PR is tagged with appropriate label (`urgent`, `trivial`, `complex`)
+- [ ] The changelog is updated with changes that affect the users of the charm.
 
 <!-- Explanation for any unchecked items above -->
diff --git a/.github/workflows/integration_test.yaml b/.github/workflows/integration_test.yaml
@@ -2,6 +2,9 @@ name: Integration tests
 
 on:
   pull_request:
+  schedule:
+    # Trigger at 6:00 AM and 6:00 PM UTC
+    - cron: "0 6,18 * * *"
 
 jobs:
   integration-tests:
@@ -13,4 +16,9 @@ jobs:
       trivy-image-config: "trivy.yaml"
       juju-channel: 3.4/stable
       channel: 1.28-strict/stable
-      modules: '["test_charm", "test_nginx", "test_s3", "test_scaling"]'
+      modules: '["test_charm", "test_nginx", "test_s3", "test_scaling", "test_matrix_auth"]'
+  allure-report:
+    if: ${{ (success() || failure()) && github.event_name == 'schedule' }}
+    needs:
+      - integration-tests
+    uses: canonical/operator-workflows/.github/workflows/allure_report.yaml@main
diff --git a/.trivyignore b/.trivyignore
@@ -1,14 +1,4 @@
 # Vulnerabilites related to: Pebble, Node.JS and gosu
-CVE-2021-39293
-CVE-2021-41771
-CVE-2021-41772
-CVE-2021-44716
-CVE-2022-23772
-CVE-2022-23806
-CVE-2022-24675
-CVE-2022-24921
-CVE-2022-25883
-CVE-2022-27664
 CVE-2022-28131
 CVE-2022-28327
 CVE-2022-2879
@@ -47,9 +37,9 @@ CVE-2024-29415
 CVE-2024-34156
 CVE-2024-21538
 CVE-2024-24788
-# This should be removed once the following PR is merged.
-# https://github.com/element-hq/synapse/pull/17955
-CVE-2024-52804
 # Fix ongoing:
 # https://github.com/element-hq/synapse/pull/17985
 CVE-2024-53981
+# This should be removed once pebble releases a new version.
+# https://github.com/canonical/pebble/commit/0c134f8e0d80f4bd8f42011279c8f0737b59a673
+CVE-2024-45338
diff --git a/LICENSE b/LICENSE
@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2024 Canonical Ltd.
+   Copyright 2025 Canonical Ltd.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/actions.yaml b/actions.yaml
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 anonymize-user:
@@ -41,15 +41,6 @@ verify-user-email:
   required:
     - username
     - email
-promote-user-admin:
-  description: |
-    Promote a user as a server administrator.
-    You need to supply a user name.
-  properties:
-    username:
-      description: |
-        User name to be promoted to admin.
-      type: string
 create-backup:
   description: |
     Creates a backup to s3 storage.

diff --git a/charmcraft.yaml b/charmcraft.yaml
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 # This file configures Charmcraft.

diff --git a/config.yaml b/config.yaml
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 options:
@@ -22,12 +22,6 @@ options:
     default: false
     description: |
       Configures whether to enable e-mail notifications. Requires SMTP integration.
-  enable_mjolnir:
-    type: boolean
-    default: false
-    description: |
-      Configures whether to enable Mjolnir - moderation tool for Matrix.
-      Reference: https://github.com/matrix-org/mjolnir
   enable_password_config:
     type: boolean
     default: true

diff --git a/docs/changelog.md b/docs/changelog.md
@@ -0,0 +1,5 @@
+# Changelog
+
+### 2025-01-09
+
+- Add changelog for tracking user-relevant changes.
diff --git a/docs/explanation/moderation-and-spam-control.md b/docs/explanation/moderation-and-spam-control.md
@@ -60,22 +60,4 @@ For details and implementation, visit the module’s repository: [Synapse Invite
 
 ## Mjolnir
 
-Synapse charm also has Mjolnir in place. Mjolnir is an all-in-one moderation
-tool designed to protect Synapse server from malicious invites, spam messages,
-and other unwanted activities.
-
-### Key features
-
-- Bans and redactions: Quickly remove malicious users and their messages from
-rooms.
-- Anti-spam: Automatically detect and mitigate spam activity.
-- Server ACLs: Manage and enforce access control lists at the server level.
-- Room directory changes and alias transfers: Adjust room visibility and manage
-aliases efficiently.
-- Account deactivation: Disable abusive or compromised accounts.
-- Room shutdown: Close problematic rooms completely.
-
-### More information
-
-For more details and implementation guidance, refer to the [Mjolnir GitHub repository](https://github.com/matrix-org/mjolnir).
-
+With the arrival of MAS mjolnir has been temporary disabled.
diff --git a/docs/how-to/contribute.md b/docs/how-to/contribute.md
@@ -63,6 +63,12 @@ Run the following command:
 echo -e "tox -e src-docs\ngit add src-docs\n" >> .git/hooks/pre-commit
 chmod +x .git/hooks/pre-commit
 ```
+### Changelog
+
+Please ensure that any new feature, fix, or significant change is documented by
+adding an entry to the `docs/changelog.md` file.
+
+To learn more about changelog best practices, visit [Keep a Changelog](https://keepachangelog.com/).
 
 ## Build charm
 

diff --git a/generate-src-docs.sh b/generate-src-docs.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 rm -rf src-docs

diff --git a/lib/charms/nginx_ingress_integrator/v0/nginx_route.py b/lib/charms/nginx_ingress_integrator/v0/nginx_route.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # Licensed under the Apache2.0. See LICENSE file in charm source for details.
 """Library for the nginx-route relation.
 

diff --git a/lib/charms/smtp_integrator/v0/smtp.py b/lib/charms/smtp_integrator/v0/smtp.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # Licensed under the Apache2.0. See LICENSE file in charm source for details.
 
 """Library to manage the integration with the SMTP Integrator charm.