From 3e9e7178bc90754ad6f5414417079f6484b421e9 Mon Sep 17 00:00:00 2001
From: Ivan Tashkinov <ivantashkinov@gmail.com>
Date: Sun, 26 Dec 2021 22:49:00 +0300
Subject: Configurability of slow queries logging ([:pleroma, :telemetry,
 :slow_queries_logging]). Adjusted log messages truncation to 65 kb (was
 default: 8 kb). Non-truncated logging of slow query params.

---
 config/config.exs | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index b50c910b1..656778007 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -148,6 +148,8 @@ config :pleroma, Pleroma.Web.Endpoint,
   ]
 
 # Configures Elixir's Logger
+config :logger, truncate: 65536
+
 config :logger, :console,
   level: :debug,
   format: "\n$time $metadata[$level] $message\n",
@@ -852,6 +854,9 @@ config :pleroma, ConcurrentLimiter, [
   {Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy, [max_running: 5, max_waiting: 5]}
 ]
 
+config :pleroma, :telemetry,
+  slow_queries_logging: [exclude_sources: [nil, "oban_jobs"], min_duration: 500_000]
+
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.
 import_config "#{Mix.env()}.exs"
-- 
cgit v1.2.3


From cd1041c3a413b9b3ba4c763308b5fd77a53d7c3c Mon Sep 17 00:00:00 2001
From: Alibek Omarov <a1ba.omarov@gmail.com>
Date: Mon, 27 Dec 2021 02:27:48 +0300
Subject: API: optionally restrict moderators from accessing sensitive data

---
 config/config.exs      | 3 ++-
 config/description.exs | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 23c41eddd..ec242cadc 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -255,7 +255,8 @@ config :pleroma, :instance,
   ],
   show_reactions: true,
   password_reset_token_validity: 60 * 60 * 24,
-  profile_directory: true
+  profile_directory: true,
+  privileged_staff: false
 
 config :pleroma, :welcome,
   direct_message: [
diff --git a/config/description.exs b/config/description.exs
index 517077acf..a8fbd4d73 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -941,6 +941,11 @@ config :pleroma, :config_description, [
         key: :profile_directory,
         type: :boolean,
         description: "Enable profile directory."
+      },
+      %{
+        key: :privileged_staff,
+        type: :boolean,
+        description: "Let moderators access sensitive data (e.g. updating user credentials, get password reset token, delete users, index and read private statuses and chats)"
       }
     ]
   },
-- 
cgit v1.2.3


From f02715c4b2bfe5b1f055e44d8fece2047d85b611 Mon Sep 17 00:00:00 2001
From: Alibek Omarov <a1ba.omarov@gmail.com>
Date: Mon, 27 Dec 2021 03:12:32 +0300
Subject: Fix lint errors

---
 config/description.exs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/description.exs b/config/description.exs
index a8fbd4d73..ea3f34abe 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -945,7 +945,8 @@ config :pleroma, :config_description, [
       %{
         key: :privileged_staff,
         type: :boolean,
-        description: "Let moderators access sensitive data (e.g. updating user credentials, get password reset token, delete users, index and read private statuses and chats)"
+        description:
+          "Let moderators access sensitive data (e.g. updating user credentials, get password reset token, delete users, index and read private statuses and chats)"
       }
     ]
   },
-- 
cgit v1.2.3


From 08c0f09bad040ea713893be822342867f589efbe Mon Sep 17 00:00:00 2001
From: Ivan Tashkinov <ivantashkinov@gmail.com>
Date: Mon, 27 Dec 2021 09:13:31 +0300
Subject: Made slow queries logging disabled by default.

---
 config/config.exs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 656778007..30113a2e3 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -855,7 +855,11 @@ config :pleroma, ConcurrentLimiter, [
 ]
 
 config :pleroma, :telemetry,
-  slow_queries_logging: [exclude_sources: [nil, "oban_jobs"], min_duration: 500_000]
+  slow_queries_logging: [
+    enabled: false,
+    min_duration: 500_000,
+    exclude_sources: [nil, "oban_jobs"]
+  ]
 
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.
-- 
cgit v1.2.3